build

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

@@ -143,8 +143,15 @@ export default {
     },
     // 商品保存提交
     async submitForm() {
+      const { loss_num } = this.ruleForm
+      const { return_num } = this.sitem
+
+      if(Number(loss_num) > Number(return_num)){
+        this.$message.warning("丢失数量不能超过退货数量")
+        return
+      }
+
       await this.$refs.ruleForm.validate(async (valid) => {
-        console.log(valid)
         if (valid) {
           if (this.loading) {
             return;

src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue

@@ -188,6 +188,7 @@ export default {
     async initData() {
       const { code, data, message } = await asyncRequest.detail({
         id: this.queryId,
+        is_authority: '0'
       });
       if (code === 0) {
         const { is_stock, status,order_type, spuCode } = data;

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -481,6 +481,7 @@ export default {
 
       const res = await asyncRequest.list({
         ...model,
+        is_authority: "1",
         [this.select]: this.s_input,
         customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
         needRela: true

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

@@ -2,9 +2,16 @@
   <div class="work-order__wrapper">
     <el-form ref="formRef" :model="list">
       <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 prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
+        <!-- <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 prop="outChildCode" label="发货工单编号" width="160px" show-overflow-tooltip />
+        <el-table-column prop="outChildCode" label="提退货时的发货单状态" width="160px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-tag size="mini">
+              {{ (statusOptions.find(({value}) => value === String(scope.row.status)) || {}).label || '--' }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="发货仓库名称" prop="wsm_name" width="180px" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-popover placement="top" width="380" trigger="hover">
@@ -99,7 +106,13 @@ export default {
     list: [],
     loading: false,
     subLoading: false,
-    companyNo: ''
+    companyNo: '',
+    statusOptions: [
+      { value: '1', label: '待发货' },
+      { value: '2', label: '发货完成' },
+      { value: '3', label: '已收货' },
+      { value: '4', label: '已全部退货' }
+    ]
   }),
   computed: {
     isStock() {
@@ -157,15 +170,25 @@ export default {
         return_num
       })
     },
+
     async onSetOrderReturnChild() {
       this.$refs.formRef.validate(async isValid => {
         if (!isValid) return
 
-        const list = this.list.map(({ outChildCode, return_num, return_wsm_code }) => ({
-          return_num,
-          outChildCode,
-          return_wsm_code: Array.isArray(return_wsm_code) ? return_wsm_code[0] : return_wsm_code
-        }))
+        let sum = 0
+        const list = this.list.map(({ outChildCode, return_num, return_wsm_code }) => {
+          sum += return_num
+          return {
+            return_num,
+            outChildCode,
+            return_wsm_code: Array.isArray(return_wsm_code) ? return_wsm_code[0] : return_wsm_code
+          }
+        })
+
+        if (Number(this.sitem.error_num) !== sum) {
+          this.$message.warning('退货数量的和与异常数量不一致')
+          return
+        }
 
         const { code, message } = await asyncRequest.setOrderReturnChild({
           list,

src/views/sellOut/sellAfterApply/detail.vue

@@ -172,7 +172,7 @@
             </el-collapse-item>
 
             <el-collapse-item name="5" title="供应商审核"  v-if="isHasPermission({status:'9', process:'9'})">
-              <supplier-exam :sitem="sitem" @changeStatus="handleSupplierExam" />ff
+              <supplier-exam :sitem="sitem" @changeStatus="handleSupplierExam" />
             </el-collapse-item>
 
             <el-collapse-item name="6" title="待客户退货"  v-if="isHasPermission({status:'4', process:'4'})">