build

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -8,12 +8,13 @@ export default [
   {
     prop: 'type',
     label: '工单退货类型',
-    width: '160',
+    width: '100',
     _slot_: 'type'
   },
   {
     prop: 'outChildCode',
-    label: '发货工单编号'
+    label: '发货工单编号',
+    width: '140'
   },
   {
     prop: 'outCode',
@@ -25,6 +26,56 @@ export default [
     label: '状态',
     _slot_: 'status'
   },
+  {
+    prop: 'return_wsm_code',
+    label: '退货仓库编码',
+    width: '130px'
+  },
+  {
+    prop: 'return_wsm_name',
+    label: '退货仓库名称',
+    width: '130px'
+  },
+  {
+    prop: 'return_contactor_name',
+    label: '退货仓库负责人',
+    width: '110px'
+  },
+  {
+    prop: 'return_supplierName',
+    label: '退货仓库供应商名称',
+    width: '130px'
+  },
+  {
+    prop: 'return_supplierNo',
+    label: '退货仓库供应商编码',
+    width: '130px'
+  },
+  {
+    prop: 'send_wsm_code',
+    label: '发货仓库编码',
+    width: '130px'
+  },
+  {
+    prop: 'send_wsm_name',
+    label: '发货仓库名称',
+    width: '130px'
+  },
+  {
+    prop: 'send_contactor_name',
+    label: '发货仓库负责人',
+    width: '110px'
+  },
+  {
+    prop: 'send_supplierName',
+    label: '发货仓库供应商名称',
+    width: '130px'
+  },
+  {
+    prop: 'send_supplierNo',
+    label: '发货仓库供应商编码',
+    width: '130px'
+  },
   // {
   //   prop: 'companyNo',
   //   label: '业务公司编号',

src/views/sellOut/sellOutOrder/components/columnsForm.js

@@ -1,26 +1,26 @@
 export default [
   {
-    prop: "outCode",
-    label: "商品分类",
+    prop: 'outCode',
+    label: '商品分类'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
+    prop: 'good_name',
+    label: '商品名称'
   },
   {
-    prop: "good_num",
-    label: "发货数量",
+    prop: 'good_num',
+    label: '发货数量'
   },
   {
-    prop: "contactor",
-    label: "收货人",
+    prop: 'contactor',
+    label: '收货人'
   },
   {
-    prop: "mobile",
-    label: "收货联系电话",
+    prop: 'mobile',
+    label: '收货联系电话'
   },
   {
-    prop: "addr",
-    label: "收货地址",
-  },
+    prop: 'addr',
+    label: '收货地址'
+  }
 ]

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

@@ -76,8 +76,8 @@
     </template>
 
     <template v-else>
-      <el-form ref="formRef" :model="formData" :rules="rules">
-        <el-form-item prop="return_wsm_code" label="销售仓" style="display:flex">
+      <el-form ref="formRef" :model="formData" :rules="paramsRules">
+        <el-form-item prop="return_wsm_code" label="销售仓">
           <search-stock
             style="width:300px"
             :is-detail="false"
@@ -141,9 +141,6 @@ export default {
           required: true,
           message: '请选择退货仓库',
           trigger: 'change'
-        }],
-        return_num: [{
-          required: false
         }]
       })
     }

src/views/sellOut/sellReturn/detail.vue

@@ -135,8 +135,6 @@
                 </template>
               </show-data-table>
             </el-collapse-item>
-            <el-collapse-item title="发货工单" name="10">
-            </el-collapse-item>
             <el-collapse-item title="商品信息" name="2">
               <show-goods-data-table
                 :newTime="newTime"