build

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -25,6 +25,12 @@ export default [
     label: '订单编号',
     width: '160px'
   },
+  {
+    prop: 'type',
+    label: '仓库类型',
+    _slot_: 'stock_type',
+    width: '100px'
+  },
   {
     prop: 'status',
     label: '状态',

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -33,7 +33,7 @@
               </el-col>
 
               <el-col :span="4" style="margin-right:10px">
-                <el-select placeholder="仓库类型" size="mini" clearable v-model="parmValue.type" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
+                <el-select style="width:100%" placeholder="仓库类型" size="mini" clearable v-model="parmValue.type" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
                   <el-option label="销售仓" value="1" />
                   <el-option label="次品仓" value="2" />
                 </el-select>
@@ -133,7 +133,11 @@
         </template>
 
         <template #order_type="{scope}">
-          <el-tag>{{(xs_order_type_options.find(({id}) => id === scope.row.order_type) || {})?.label || '--'}}</el-tag>
+          <el-tag size="mini">{{(xs_order_type_options.find(({id}) => id === scope.row.order_type) || {})?.label || '--'}}</el-tag>
+        </template>
+
+        <template #stock_type="{scope}">
+          <el-tag size="mini">{{scope.row.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
         </template>
 
         <template #sendWsm="{scope}">

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

@@ -183,7 +183,6 @@ export default {
     async onSetOrderReturnChild() {
       this.$refs.formRef.validate(async isValid => {
         if (!isValid) return
-
         let sum = 0
         const list = this.list.map(({ outChildCode, return_num, return_wsm_code }) => {
           sum += return_num

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

@@ -154,11 +154,14 @@ export default {
       })
     },
     async onSetOrderReturnChild() {
-      const returnNum = Number(this.list[0].return_num)
+      const errors = []
+      const list = this.list.map(({ id, can_sell_num, defective_num, loss_num, return_num }, index) => {
+        const total = (can_sell_num + defective_num + loss_num)
+
+        if (Number(total) !== Number(return_num)) {
+          errors.push(index + 1)
+        }
 
-      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,
@@ -167,14 +170,13 @@ export default {
         })
       })
 
-      if (total !== returnNum) {
-        this.$message.warning('销售仓入库数量、次品仓入库数量、丢失数量相加必须等于退货数量')
+      if (errors.length > 0) {
+        this.$message.warning(errors.join(',') + '行,退货数量,销售数量,丢失数量的和必须与退货数量一致')
         return
       }
 
       this.subLoading = true
       const { code, message } = await asyncRequest.deliveryOrderReturnChild({ list, returnCode: this.sitem.returnCode })
-
       this.subLoading = false
 
       switch (code) {