外协修改

src/BIZComponents/inventoryTable.vue

@@ -481,6 +481,7 @@
             clearable
             :disabled="status == 'Detail'"
             v-model="scope.row.provenance"
+            collapse-tags
             multiple
           >
           </DictSelection>

src/views/purchasingManage/purchaseOrder/accountstatement/components/detailDialog.vue

@@ -64,7 +64,7 @@
       <recorpayTableList
         ref="recorpayListRef"
         :dataForm="dataForm"
-        :datasource.sync="recorpayList"
+        :recorpayList.sync="recorpayList"
         dialogType="view"
       ></recorpayTableList>
       <inventoryTable
@@ -124,7 +124,7 @@
         this.dialogType = dialogType;
         this.dataForm.type = type;
         let data = await infoAccountStatementAPI(row.id);
-        this.datasource = data.orderList;
+        this.datasource = data.orderList||[];
         this.recorpayList = data.recorpayList || [];
         this.dataForm = data;
         switch (this.dataForm.dateType) {

src/views/saleManage/saleOrder/customerReturnOrder/addOrEditDialog.vue

@@ -597,7 +597,7 @@
         this.$nextTick(() => {
           let params = {
             businessId: this.form.id || res,
-            businessKey: 'sales_return_handle_approve',
+            businessKey: 'sales_return_handle_approve_new',
             formCreateUserId: data.createUserId,
             variables: {
               businessCode: data.returnHandleNo

src/views/saleManage/saleOrder/customerReturnOrder/index.vue

@@ -179,13 +179,7 @@ export default {
   },
   data() {
     return {
-      activeComp: 'saleorder',
-      tabOptions: [
-        {key: 'saleorder', name: '销售订单'},
-        {key: 'invoice', name: '发货单'},
-        {key: 'customerReturnOrder', name: '退货处理单'},
-        {key: 'returnorder', name: '退货单'}
-      ],
+
       selection: [], //单选中集合
       delVisible: false, //批量删除弹框状态
       loading: false, // 加载状态
@@ -268,6 +262,20 @@ export default {
           showOverflowTooltip: true,
           minWidth: 180
         },
+        // {
+        //   prop: 'contactName2',
+        //   label: '已返修数量',
+        //   align: 'center',
+        //   showOverflowTooltip: true,
+        //   minWidth: 180
+        // },
+        // {
+        //   prop: 'contactName1',
+        //   label: '未返修数量',
+        //   align: 'center',
+        //   showOverflowTooltip: true,
+        //   minWidth: 180
+        // },
         {
           prop: 'approvalStatus',
           label: '状态',
@@ -357,7 +365,7 @@ export default {
       this.$nextTick(()=>{
         let params = {
           businessId:res.id,
-          businessKey : 'sales_return_handle_approve',
+          businessKey : 'sales_return_handle_approve_new',
           formCreateUserId: res.createUserId,
           variables: {
             businessCode: res.returnHandleNo

src/views/saleManage/saleOrder/returnGoods/components/customerReturnOrderDetail.vue

@@ -312,6 +312,16 @@
             prop: 'improveOpinion',
             label: '对改善后产品处理意见',
             align: 'center'
+          } ,
+          {
+            minWidth: 120,
+            prop: 'repairStatus',
+            label: '返修状态',
+            align: 'center',
+            fixed: 'right',
+            formatter: (_row, _column, cellValue) => {
+              return cellValue == 1 ? '待排产' :cellValue === 2?'已排产':cellValue === 3?'生产中':cellValue === 4?'入库中':cellValue === 5?'已入库':'';
+            }
           }
         ];