build

src/components/globalComponents/search-stock/main.vue

@@ -144,7 +144,8 @@ export default {
             addr_code: this.options[index].addr_code,
             addr_cn: this.options[index].addr_cn,
             supplierNo: this.options[index].supplierNo,
-            supplierName: this.options[index].supplierName
+            supplierName: this.options[index].supplierName,
+            contactor_name: this.options[index].contactor_name
           }
           this.$emit('searchChange', model)
         } else {

src/views/sellOut/sellAfterApply/components/set-work-order.vue

@@ -105,13 +105,14 @@ export default {
     })
   },
   methods: {
-    onStockChange({ code, supplierName, supplierNo, contactor } = {}, index) {
+    onStockChange({ code, supplierName, supplierNo, contactor_name } = {}, index) {
+      console.log(111, contactor_name)
       this.$set(this.list, index, {
         ...this.list[index],
         return_wsm_code: code ? [code] : '',
         returnSupplierName: supplierName,
         returnSupplierNo: supplierNo,
-        returnSupplierNameContactor: contactor
+        returnSupplierNameContactor: contactor_name
       })
 
       this.$nextTick(() => this.$refs.formRef.validate())

src/views/supplierSellOut/supplierSellAfterApply/components/set-work-order.vue

@@ -4,14 +4,13 @@
       <el-table size="mini" border :data="list">
         <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
         <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-toolti />
-        <!-- <el-table-column label="提退时发货单状态" prop="order_out_status" width="150px" show-overflow-tooltip /> -->
         <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
         <el-table-column label="发货仓库所在供应商名称" prop="supplierName" width="170px" show-overflow-tooltip />
         <el-table-column label="发货仓库所在供应商编码" prop="supplierNo" width="170px" show-overflow-tooltip />
         <el-table-column prop="wsm_name" label="发货仓库名称" width="160px" show-overflow-tooltip />
         <el-table-column prop="wsm_code" label="发货仓库编码" width="170px" show-overflow-tooltip />
         <el-table-column prop="contactor_name" label="发货仓库负责人" width="110px" show-overflow-tooltip />
-        <el-table-column prop="num" label="发货数量" how-overflow-tooltip />
+        <el-table-column prop="num" label="发货数量" show-overflow-tooltip />
         <el-form>
           <el-table-column width="110px" show-overflow-tooltip>
             <template slot="header">
@@ -87,9 +86,6 @@ export default {
           required: true,
           message: '请选择退货仓库',
           trigger: 'change'
-        }],
-        return_num: [{
-          required: false
         }]
       })
     }
@@ -97,6 +93,7 @@ export default {
   async mounted() {
     this.$nextTick(async() => {
       const { data, code, message } = await asyncRequest.sendList({ outCode: this.sitem.outCode })
+
       switch (code) {
         case 0:
           this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
@@ -108,13 +105,14 @@ export default {
     })
   },
   methods: {
-    onStockChange({ code, supplierName, supplierNo, contactor } = {}, index) {
+    onStockChange({ code, supplierName, supplierNo, contactor_name } = {}, index) {
+      console.log(111, contactor_name)
       this.$set(this.list, index, {
         ...this.list[index],
         return_wsm_code: code ? [code] : '',
         returnSupplierName: supplierName,
         returnSupplierNo: supplierNo,
-        returnSupplierNameContactor: contactor
+        returnSupplierNameContactor: contactor_name
       })
 
       this.$nextTick(() => this.$refs.formRef.validate())
@@ -126,7 +124,7 @@ export default {
       })
     },
     async onSetOrderReturnChild() {
-      this.$refs.validate(async isValid => {
+      this.$refs.formRef.validate(async isValid => {
         if (!isValid) return
 
         const list = this.list.map(({ outChildCode, return_num, return_wsm_code }) => ({
@@ -135,7 +133,11 @@ export default {
           return_num
         }))
 
-        const { code, message } = await asyncRequest.setOrderReturnChild({ list, returnCode: this.sitem.returnCode })
+        const { code, message } = await asyncRequest.setOrderReturnChild({
+          list,
+          returnCode: this.sitem.returnCode
+        })
+
         this.subLoading = false
 
         switch (code) {