build

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

@@ -133,12 +133,15 @@ export default {
       },
       immediate: true
     },
-    names: function(val, old) {
+    names: {
+      handler: function(val, old) {
       // console.log(val, old);
-      this.searchName = val
-      if (this.isDetail && this.searchName) {
-        this.remoteMethod(this.searchName)
-      }
+        this.searchName = val
+        if (this.isDetail && this.searchName) {
+          this.remoteMethod(this.searchName)
+        }
+      },
+      immediate: true
     }
   },
   mounted() {

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

@@ -12,7 +12,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="发货仓库名称" prop="wsm_name" width="180px" show-overflow-tooltip>
+        <el-table-column label="发货仓库名称" prop="wsm_name" min-width="180px" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-popover placement="top" width="380" trigger="hover">
               <h3>发货仓库</h3>
@@ -49,14 +49,13 @@
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column width="160px" show-overflow-tooltip>
+        <el-table-column v-if="!isStock" min-width="160px" show-overflow-tooltip>
           <template slot="header">
             <span style="color:red;margin-right:2px">*</span>退货仓库编码
           </template>
           <template slot-scope="scope">
             <el-form-item :prop="`${scope.$index}.return_wsm_code`" :rules="paramsRules.return_wsm_code">
               <search-stock
-                :is-detail="isStock"
                 :disabled="isStock"
                 :size="'mini'"
                 :value="list[scope.$index].return_wsm_code"
@@ -64,7 +63,6 @@
                 :is-relation="true"
                 :wsmtype="'5'"
                 :company-no="currentCompany"
-                :names="''"
                 @searchChange="onStockChange($event, scope.$index)"
               />
             </el-form-item>
@@ -72,9 +70,18 @@
         </el-table-column>
 
         <el-table-column label="退货仓库" align="center">
-          <el-table-column label="所在供应商名称" prop="returnSupplierName" width="160px" show-overflow-tooltip />
-          <el-table-column label="所在供应商编码" prop="returnSupplierNo" width="160px" show-overflow-tooltip />
-          <el-table-column label="负责人" width="110px" prop="returnSupplierNameContactor" show-overflow-tooltip />
+          <tempalte v-if="isStock">
+            <el-table-column label="负责人" min-width="110px" prop="contactor_name" show-overflow-tooltip />
+            <el-table-column label="仓库名称" prop="wsm_name" min-width="160px" show-overflow-tooltip />
+            <el-table-column label="所在供应商名称" prop="supplierName" min-width="160px" show-overflow-tooltip />
+            <el-table-column label="所在供应商编码" prop="supplierNo" min-width="160px" show-overflow-tooltip />
+          </tempalte>
+
+          <template v-else>
+            <el-table-column label="所在供应商名称" prop="returnSupplierName" min-width="160px" show-overflow-tooltip />
+            <el-table-column label="所在供应商编码" prop="returnSupplierNo" min-width="160px" show-overflow-tooltip />
+            <el-table-column label="负责人" min-width="110px" prop="returnSupplierNameContactor" show-overflow-tooltip />
+          </template>
         </el-table-column>
       </el-table>
     </el-form>
@@ -101,6 +108,7 @@ export default {
   mixins: [resToken, companyHelper],
   props: ['sitem'],
   data: () => ({
+    names: [],
     list: [],
     loading: false,
     subLoading: false,
@@ -136,11 +144,14 @@ export default {
         const { data, code, message } = await asyncRequest.sendList({ outCode })
         switch (code) {
           case 0:
-            this.list = data.map(item => ({
-              ...item,
-              return_num: 0,
-              return_wsm_code: isStock ? [item.wsm_code] : '' }
-            ))
+            this.list = data.map(item => {
+              return {
+                ...item,
+                return_num: 0,
+                names: isStock ? item.wsm_name : '',
+                return_wsm_code: isStock ? [item.wsm_code] : ''
+              }
+            })
             break
           default:
             this.$message.warning(message)

src/views/sellOut/sellAfterApply/components/wait-stockman.vue

@@ -22,7 +22,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="return_num" label="发货物流" width="110px" show-overflow-tooltip />
+        <!-- <el-table-column prop="return_num" label="发货物流" width="110px" show-overflow-tooltip /> -->
         <el-table-column prop="send_num" label="发货数量" width="110px" show-overflow-tooltip />
 
         <el-table-column label="退货销售仓库名称" prop="return_wsm_name" min-width="180px" show-overflow-tooltip>

src/views/sellOut/sellOutOrder/detail.vue

@@ -149,7 +149,7 @@
               />
             </el-collapse-item> -->
 
-            <el-collapse-item
+          <el-collapse-item
               title="售后退货单结果"
               name="4"
               v-if="