snow 2 years ago
parent
commit
b846bf1b81

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 12 - 7
src/views/sellOut/sellAfterApply/columns.js

@@ -256,10 +256,21 @@ const sellshowColumns = [
   },
   {
     prop: 'addr',
-    label: '收货地址',
+    label: '客户退回信息',
     _slot_: 'addr',
     span: 12
   },
+  {
+    prop: 'error_img',
+    label: '异常图片',
+    _slot_: 'error_img',
+    span: 12
+  },
+  {
+    prop: 'xx',
+    label: '业务公司退回仓库',
+    span: 12
+  },
   {
     prop: 'post_fee',
     label: '退货物流费用',
@@ -275,12 +286,6 @@ const sellshowColumns = [
     label: '退货物流单号',
     span: 12
   },
-  {
-    prop: 'error_img',
-    label: '异常图片',
-    _slot_: 'error_img',
-    span: 24
-  },
   {
     prop: 'error_remark',
     label: '备注',

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

@@ -6,7 +6,7 @@
         <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-toolti />
         <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 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 />

+ 8 - 0
src/views/sellOut/sellAfterApply/components/wait-stockman.vue

@@ -124,7 +124,9 @@ export default {
       })
     },
     async onSetOrderReturnChild() {
+      let total = 0
       const list = this.list.map(({ id, can_sell_num, defective_num, loss_num }) => {
+        total += (can_sell_num + defective_num + loss_num)
         return ({
           id,
           loss_num,
@@ -133,8 +135,14 @@ export default {
         })
       })
 
+      if (Number(this.sitem.out_num) !== total) {
+        this.$message.warning('销售仓入库数量、次品仓入库数量、丢失数量相加必须等于发货数量')
+        return
+      }
+
       this.subLoading = true
       const { code, message } = await asyncRequest.deliveryOrderReturnChild({ list, returnCode: this.sitem.returnCode })
+
       this.subLoading = false
 
       switch (code) {

Some files were not shown because too many files changed in this diff