feat

src/apis/service/sellOut/returnGoodWorkOrder/index.js

@@ -3,7 +3,8 @@ import http from '@/apis/axios'
 const api = 'admin/'
 export default {
   // 分页查询
-  list: (data, params) => http(api + 'after_child_list', data, 'post', params),
+  // list: (data, params) => http(api + 'after_child_list', data, 'post', params),
   detail: (data, params) => http(api + 'child_info', data, 'post', params),
-  express: (data, params) => http(api + 'child_send', data, 'post', params)
+  express: (data, params) => http(api + 'child_send', data, 'post', params),
+  list: (data, params) => http(api + 'reorder_child_list', data, 'post', params)
 }

src/apis/service/sellOut/sellAfterApply/index.js

@@ -23,7 +23,7 @@ export default {
   afterChild: (data, params) => http(api + 'after_child_list ', data, 'post', params),
   express: (data, params) => http(api + 'setdelivery ', data, 'post', params),
   sendList: (data, params) => http(api + 'child_list ', data, 'post', params),
-  setOrderReturnChild: (data, params) => http(api + 'set_order_return_child ', data, 'post', params),
+  reorderChildAdd: (data, params) => http(api + 'reorder_child_add ', data, 'post', params),
   deliveryOrderReturnChild: (data, params) => http(api + 'delivery_order_return_child ', data, 'post', params)
 }
 

src/views/purchaseIn/purchaseOrder/index.vue

@@ -453,7 +453,7 @@ export default {
       for(let i = 0; i < this.tableSelection.length; i++){
         const item = this.tableSelection[i];
 
-        if(item.status !== "1" || item.status !== "2"){
+        if(item.status !== "1" && item.status !== "2"){
           this.$message.warning("只能选择未入库的销售订单！");
           return 
         }

src/views/sellOut/deliveryWorkOrder/detail.vue

@@ -20,8 +20,6 @@
                     "
                   />
                 </template>
-                
-
                 <template slot="order_type">
                   <el-tag
                     :size="'mini'"
@@ -87,7 +85,6 @@
               </show-data-table>
             </el-collapse-item>
 
-            <!-- v-if="sitem.status === '1' && !isSupertube" -->
             <el-collapse-item title="待库管发货" name="2" v-if="sitem.status === '1' && !isSupertube && powers.includes('080')">
               <express-node @refresh="() => initData()" :sitem="sitem" />
             </el-collapse-item>
@@ -123,8 +120,8 @@ export default {
   },
   data() {
     return {
+      showColumns,
       activeTabs: "1",
-      showColumns: showColumns,
       statusOptions: [
         { value: "1", label: "待库管发货" },
         { value: "2", label: "发货完成" },

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="sellReturn pagePadding">
-    <div
-      v-if=" powers.some((i) => i == '001')"
-    >
+    <div v-if=" powers.some((i) => i == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -411,7 +409,6 @@ export default {
       if (!this.loading) {
         this.loading = true;
         let httpType = `aplication/zip`;
-  
         let model = JSON.parse(JSON.stringify(this.parmValue));
         delete model['s_input']
 
@@ -480,14 +477,12 @@ export default {
           router: this.$route.path,
         };
         model.preModel = JSON.stringify(routerModel);
-
         this.routeGoto(toRouter, model);
       } 
     },
     restSearch() {
       this.s_input = ""; //清除输入框内容
       this.select = "outChildCode"; //清除下拉框选中项
-
       this.parmValue = {
         order_type: "",
         company_name: "", //申请人部门
@@ -505,9 +500,10 @@ export default {
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
-        curr: 1,
         total: 0,
+        curr: 1
       };
+
       this.searchList();
     },
 

src/views/sellOut/hawbWorkbench/index.vue

@@ -128,8 +128,8 @@
               <el-table-column prop="supplierName" label="仓库所在供应商名称" min-width="140" show-overflow-tooltip />
               <el-table-column prop="contactor_name" label="仓库负责人" width="90" show-overflow-tooltip />
               <el-table-column prop="usable_stock" label="可用库存" width="110" show-overflow-tooltip />
-              <el-table-column label="仓库发货数" min-width="120" show-overflow-tooltip>
-                <template slot-scope="scope">
+              <!--  <el-table-column label="仓库发货数" min-width="120" show-overflow-tooltip>
+             <template slot-scope="scope">
                   <digital-input
                     :values="wsmList[scope.$index].num"
                     :placeholder="'仓库发货数'"
@@ -143,7 +143,7 @@
                     @reschange="num_change($event, scope.$index)"
                   />
                 </template>
-              </el-table-column>
+              </el-table-column> -->
             </el-table>
 
             <!-- <div style="width:100;display: flex;justify-content: flex-end;padding-right: 30px;margin: 20px 0px;">

src/views/sellOut/returnGoodWorkOrder/detail.vue

@@ -106,10 +106,8 @@ export default {
   computed: {
     ...mapGetters(['isSupertube']),
     powers() {
-      const tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "returnGoodWorkOrderDetail"
-        ) || {};
+      const {btnList} = this.$store.getters;
+      const tran = btnList.find((item) => item.menu_route == "returnGoodWorkOrderDetail" ) || {};
       const { action } = tran ?? {};
       return action ?? [];
     },

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -147,12 +147,11 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import columns from "./columns";
 import asyncRequest from "@/apis/service/sellOut/returnGoodWorkOrder";
-import { mapGetters } from "vuex";
-import urlConfig from "@/apis/url-config";
 import { xs_order_type_options ,xs_order_source_options} from "@/assets/js/statusList";
 import companyHelper from "@/mixins/companyHelper"
+import urlConfig from "@/apis/url-config";
+import { mapGetters } from "vuex";
 
 export default {
   name: "sellReturn",
@@ -190,19 +189,19 @@ export default {
       modelId: 0,
       parmValue: {
         // companyNo:"",
-        customer_code:[],
-        returnCode: "", //销售退货code
-        orderCode: "", //销售订单code
-        company_name: "",
-        good_code:"",
-        skuCode:"",
-        apply_name: "", //申请人
-        start: "",
-        end: "",
-        status: "", //节点状态
+        // customer_code:[],
+        // returnCode: "", //销售退货code
+        // orderCode: "", //销售订单code
+        // company_name: "",
+        // good_code:"",
+        // skuCode:"",
+        // apply_name: "", //申请人
+        // start: "",
+        // end: "",
+        // status: "", //节点状态
         page: 1, // 页码
         size: 15, // 每页显示条数
-        order_type: "",
+        // order_type: "",
       },
       tableData: [],
       passwordModel: false,

src/views/sellOut/sellAfterApply/components/approval-results.vue

@@ -111,25 +111,17 @@ export default {
       this.formData.wsm_code = code ? [code] : []
       this.$refs.formRef.validateField('wsm_code')
     },
-
     submit() {
       this.$refs.formRef.validate(isValid => {
         if (!isValid) return
-
-        const { status } = this.formData
+        const { status, wsm_code } = this.formData
         let _status = status
-
-        if (this.sitem.is_receive === '0' && status === '11') {
-          _status = '5'
-        }
-
-        const { wsm_code } = this.formData
+        if (this.sitem.is_receive === '0' && status === '11') { _status = '5' }
         const params = {
           ...this.formData,
           status: _status,
           wsm_code: Array.isArray(wsm_code) ? wsm_code[0] : wsm_code
         }
-
         this.$emit('changeStatus', params)
       })
     }

src/views/sellOut/sellAfterApply/components/purchase_exam.vue

@@ -194,8 +194,8 @@ export default {
       return action ?? [];
     },
     ppowers() {
-      const tran =
-        this.$store.getters.roleProcess.find((i) => i.process_type === "SHD") || {};
+      const { roleProcess } = this.$store.getters
+      const tran = roleProcess.find((i) => i.process_type === "SHD") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },

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

@@ -1,60 +1,63 @@
 <template>
   <div class="work-order__wrapper">
-    <el-form>
+    <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 label="提退时发货申请单状态" prop="order_out_status" width="150px" show-overflow-tooltip /> -->
         <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 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 />
-        <el-table-column prop="num" label="发货数量" how-overflow-tooltip />
-        <el-table-column width="110px" show-overflow-tooltip>
-          <template slot="header">
-            <span style="color:red;margin-right:2px">*</span>退货数量
-          </template>
-          <template slot-scope="scope">
-            <el-form-item required>
-              <digital-input
-                :values="list[scope.$index].return_num"
-                :placeholder="'退货数量'"
-                :disabled="false"
-                :max="100000000000"
-                :position="'right'"
-                :precision="0"
-                :size="'mini'"
-                :controls="false"
-                :append="''"
-                @reschange="onNumberChange($event, scope.$index)"
-              />
-            </el-form-item>
-          </template>
-        </el-table-column>
-        <el-table-column width="160px">
-          <template slot="header">
-            <span style="color:red;margin-right:2px">*</span>退货仓库编码
-          </template>
-          <template slot-scope="scope">
-            <search-stock
-              :is-detail="false"
-              :size="'mini'"
-              :value="list[scope.$index].return_wsm_code"
-              :placeholder="'仓库名称'"
-              :is-relation="true"
-              :wsmtype="'5'"
-              :company-no="currentCompany"
-              :disbaled="!currentCompany"
-              :names="''"
-              @searchChange="onStockChange($event, scope.$index)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column label="退货仓库所在供应商名称" prop="returnSupplierName" width="160px" how-overflow-tooltip />
-        <el-table-column label="退货仓库所在供应商编码" prop="returnSupplierNo" width="160px" how-overflow-tooltip />
-        <el-table-column label="退货仓库负责人" width="110px" prop="returnSupplierNameContactor" how-overflow-tooltip />
+        <el-table-column prop="num" label="发货数量" show-overflow-tooltip />
+        <el-form>
+          <el-table-column width="110px" 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_num`" :rules="paramsRules.return_num">
+                <digital-input
+                  :values="list[scope.$index].return_num"
+                  :placeholder="'退货数量'"
+                  :disabled="false"
+                  :max="100000000000"
+                  :position="'right'"
+                  :precision="0"
+                  :size="'mini'"
+                  :controls="false"
+                  :append="''"
+                  @reschange="onNumberChange($event, scope.$index)"
+                />
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column 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="false"
+                  :size="'mini'"
+                  :value="list[scope.$index].return_wsm_code"
+                  :placeholder="'仓库名称'"
+                  :is-relation="true"
+                  :wsmtype="'5'"
+                  :company-no="currentCompany"
+                  :disbaled="!currentCompany"
+                  :names="''"
+                  @searchChange="onStockChange($event, scope.$index)"
+                />
+              </el-form-item>
+            </template>
+          </el-table-column>
+        </el-form>
+        <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 />
       </el-table>
     </el-form>
 
@@ -73,15 +76,29 @@ export default {
   data: () => ({
     list: [],
     loading: false,
-    subLoading: false
+    subLoading: false,
+    companyNo: ''
   }),
+  computed: {
+    paramsRules() {
+      return ({
+        return_wsm_code: [{
+          required: true,
+          message: '请选择退货仓库',
+          trigger: 'change'
+        }],
+        return_num: [{
+          required: false
+        }]
+      })
+    }
+  },
   async mounted() {
     this.$nextTick(async() => {
       const { data, code, message } = await asyncRequest.sendList({ outCode: this.sitem.outCode })
-      console.log(data)
       switch (code) {
         case 0:
-          this.list = data.list
+          this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
           break
         default:
           this.$message.warning(message)
@@ -98,6 +115,8 @@ export default {
         returnSupplierNo: supplierNo,
         returnSupplierNameContactor: contactor
       })
+
+      this.$nextTick(() => this.$refs.formRef.validate())
     },
     onNumberChange(return_num, index) {
       this.$set(this.list, index, {
@@ -106,46 +125,31 @@ export default {
       })
     },
     async onSetOrderReturnChild() {
-      const numErrors = []
-      const codeErrors = []
-      const list = this.list.map(({ outChildCode, return_num, return_wsm_code }, index) => {
-        if (!return_num) {
-          numErrors.push(index)
-        }
+      this.$refs.validate(async isValid => {
+        if (!isValid) return
 
-        if (!return_wsm_code || !return_wsm_code.length) {
-          codeErrors.push(index)
-        }
-
-        return ({
+        const list = this.list.map(({ outChildCode, return_num, return_wsm_code }) => ({
           return_wsm_code: Array.isArray(return_wsm_code) ? return_wsm_code[0] : return_wsm_code,
           outChildCode,
           return_num
-        })
-      })
+        }))
 
-      // if (numErrors.length !== 0) {
-      //   this.$message.warning('第' + numErrors.map(row => row + 1).join(',') + '行，退货数量不能为空！')
-      //   return
-      // }
-
-      if (codeErrors.length !== 0) {
-        this.$message.warning('第' + codeErrors.map(row => row + 1).join(',') + '行，仓库不能为空！')
-        return
-      }
+        const { code, message } = await asyncRequest.setOrderReturnChild({
+          list,
+          returnCode: this.sitem.returnCode
+        })
 
-      this.subLoading = true
-      const { code, message } = await asyncRequest.setOrderReturnChild({ list, returnCode: this.sitem.returnCode })
-      this.subLoading = false
+        this.subLoading = false
 
-      switch (code) {
-        case 0:
-          this.$emit('reload')
-          break
-        default:
-          this.$message.warning(message)
-          break
-      }
+        switch (code) {
+          case 0:
+            this.$emit('reload')
+            break
+          default:
+            this.$message.warning(message)
+            break
+        }
+      })
     }
   }
 }

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

@@ -1,87 +1,93 @@
 <template>
   <div class="work-order__wrapper">
-    <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-tooltip />
-      <!-- <el-table-column label="发货单状态" prop="order_out_status" width="150px" show-overflow-tooltip /> -->
-      <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
-      <el-table-column label="发货仓库所在供应商名称" prop="send_supplierName" width="170px" show-overflow-tooltip />
-      <el-table-column label="发货仓库所在供应商编码" prop="send_supplierNo" width="170px" show-overflow-tooltip />
-      <el-table-column prop="send_wsm_name" label="发货仓库名称" width="170px" show-overflow-tooltip />
-      <el-table-column prop="send_wsm_code" label="发货仓库编码" width="170px" show-overflow-tooltip />
-      <el-table-column prop="send_contactor_name" label="发货仓库负责人" width="110px" show-overflow-tooltip />
-      <el-table-column prop="return_num" label="发货物流" width="110px" show-overflow-tooltip />
-      <el-table-column label="发货物流单号" width="110px" show-overflow-tooltip />
-      <el-table-column prop="send_num" label="发货数量" show-overflow-tooltip />
-      <el-table-column label="退货仓库所在供应商名称" prop="return_supplierName" width="180px" show-overflow-tooltip />
-      <el-table-column label="退货仓库所在供应商编码" prop="return_supplierNo" width="190px" show-overflow-tooltip />
-      <el-table-column label="退货数量" prop="return_num" width="110px" show-overflow-tooltip />
-      <el-table-column label="退货销售仓库名称" prop="return_wsm_name" width="180px" show-overflow-tooltip />
-      <el-table-column label="退货销售仓库编码" prop="return_wsm_code" width="180px" show-overflow-tooltip />
-      <el-table-column label="退货销售仓库负责人" width="130px" prop="return_contactor_name" show-overflow-tooltip />
-      <el-table-column width="130px">
-        <template slot="header">
-          <span style="color:red;margin-right:2px">*</span>销售仓入库数量
-        </template>
-        <template slot-scope="scope">
-          <digital-input
-            :values="list[scope.$index].can_sell_num"
-            :placeholder="'销售仓入库数量'"
-            :min="0"
-            :disabled="false"
-            :max="100000000000"
-            :position="'right'"
-            :precision="0"
-            :size="'mini'"
-            :controls="false"
-            :append="''"
-            @reschange="onNumberChange($event, scope.$index,'can_sell_num')"
-          />
-        </template>
-      </el-table-column>
+    <el-form>
+      <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-tooltip />
+        <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
+        <el-table-column label="发货仓库所在供应商名称" prop="send_supplierName" width="170px" show-overflow-tooltip />
+        <el-table-column label="发货仓库所在供应商编码" prop="send_supplierNo" width="170px" show-overflow-tooltip />
+        <el-table-column prop="send_wsm_name" label="发货仓库名称" width="170px" show-overflow-tooltip />
+        <el-table-column prop="send_wsm_code" label="发货仓库编码" width="170px" show-overflow-tooltip />
+        <el-table-column prop="send_contactor_name" 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="发货数量" show-overflow-tooltip />
+        <el-table-column label="退货仓库所在供应商名称" prop="return_supplierName" width="180px" show-overflow-tooltip />
+        <el-table-column label="退货仓库所在供应商编码" prop="return_supplierNo" width="190px" show-overflow-tooltip />
+        <el-table-column label="退货数量" prop="return_num" width="110px" show-overflow-tooltip />
+        <el-table-column label="退货销售仓库名称" prop="return_wsm_name" width="180px" show-overflow-tooltip />
+        <el-table-column label="退货销售仓库编码" prop="return_wsm_code" width="180px" show-overflow-tooltip />
+        <el-table-column label="退货销售仓库负责人" width="130px" prop="return_contactor_name" show-overflow-tooltip />
+        <el-table-column width="130px">
+          <template slot="header">
+            <span style="color:red;margin-right:2px">*</span>销售仓入库数量
+          </template>
+          <template slot-scope="scope">
+            <el-form-item>
+              <digital-input
+                :values="list[scope.$index].can_sell_num"
+                :placeholder="'销售仓入库数量'"
+                :min="0"
+                :disabled="false"
+                :max="100000000000"
+                :position="'right'"
+                :precision="0"
+                :size="'mini'"
+                :controls="false"
+                :append="''"
+                @reschange="onNumberChange($event, scope.$index,'can_sell_num')"
+              />
+            </el-form-item>
+          </template>
+        </el-table-column>
 
-      <el-table-column width="130px">
-        <template slot="header">
-          <span style="color:red;margin-right:2px">*</span>次品仓入库数量
-        </template>
-        <template slot-scope="scope">
-          <digital-input
-            :values="list[scope.$index].defective_num"
-            :placeholder="'次品仓入库数量'"
-            :min="0"
-            :disabled="false"
-            :max="100000000000"
-            :position="'right'"
-            :precision="0"
-            :size="'mini'"
-            :controls="false"
-            :append="''"
-            @reschange="onNumberChange($event, scope.$index,'defective_num')"
-          />
-        </template>
-      </el-table-column>
+        <el-table-column width="130px">
+          <template slot="header">
+            <span style="color:red;margin-right:2px">*</span>次品仓入库数量
+          </template>
+          <template slot-scope="scope">
+            <el-form-item>
+              <digital-input
+                :values="list[scope.$index].defective_num"
+                :placeholder="'次品仓入库数量'"
+                :min="0"
+                :disabled="false"
+                :max="100000000000"
+                :position="'right'"
+                :precision="0"
+                :size="'mini'"
+                :controls="false"
+                :append="''"
+                @reschange="onNumberChange($event, scope.$index,'defective_num')"
+              />
+            </el-form-item>
+          </template>
+        </el-table-column>
 
-      <el-table-column width="130px">
-        <template slot="header">
-          <span style="color:red;margin-right:2px">*</span>丢失数量
-        </template>
-        <template slot-scope="scope">
-          <digital-input
-            :values="list[scope.$index].loss_num"
-            :placeholder="'loss_num'"
-            :min="0"
-            :disabled="false"
-            :max="100000000000"
-            :position="'right'"
-            :precision="0"
-            :size="'mini'"
-            :controls="false"
-            :append="''"
-            @reschange="onNumberChange($event, scope.$index,'loss_num')"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column width="130px">
+          <template slot="header">
+            <span style="color:red;margin-right:2px">*</span>丢失数量
+          </template>
+          <template slot-scope="scope">
+            <el-form-item>
+              <digital-input
+                :values="list[scope.$index].loss_num"
+                :placeholder="'loss_num'"
+                :min="0"
+                :disabled="false"
+                :max="100000000000"
+                :position="'right'"
+                :precision="0"
+                :size="'mini'"
+                :controls="false"
+                :append="''"
+                @reschange="onNumberChange($event, scope.$index,'loss_num')"
+              />
+            </el-form-item>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
     <el-button class="fr" style="margin:10px 0px" size="mini" type="primary" @click="onSetOrderReturnChild">保存</el-button>
   </div>
 </template>
@@ -100,10 +106,9 @@ export default {
   mounted() {
     this.$nextTick(async() => {
       const { data, code, message } = await asyncRequest.afterChild({ returnCode: this.sitem.returnCode })
-      console.log(data)
       switch (code) {
         case 0:
-          this.list = data.list
+          this.list = data.list.map(item => ({ ...item, can_sell_num: 0, defective_num: 0, loss_num: 0 }))
           break
         default:
           this.$message.warning(message)
@@ -119,23 +124,7 @@ export default {
       })
     },
     async onSetOrderReturnChild() {
-      const canErrors = []
-      const defErrors = []
-      const lossErrors = []
-
-      const list = this.list.map(({ id, can_sell_num, defective_num, loss_num }, index) => {
-        if (!can_sell_num) {
-          canErrors.push(index)
-        }
-
-        if (!defective_num) {
-          defErrors.push(index)
-        }
-
-        if (!loss_num) {
-          lossErrors.push(index)
-        }
-
+      const list = this.list.map(({ id, can_sell_num, defective_num, loss_num }) => {
         return ({
           id,
           loss_num,
@@ -144,24 +133,10 @@ export default {
         })
       })
 
-      // if (canErrors.length !== 0) {
-      //   this.$message.warning('第' + canErrors.map(row => row + 1).join(',') + '行，销售仓入库数量不能为空！')
-      //   return
-      // }
-
-      // if (defErrors.length !== 0) {
-      //   this.$message.warning('第' + defErrors.map(row => row + 1).join(',') + '行，次品仓入库数量不能为空！')
-      //   return
-      // }
-
-      // if (lossErrors.length !== 0) {
-      //   this.$message.warning('第' + lossErrors.map(row => row + 1).join(',') + '行，丢失数量不能为空！')
-      //   return
-      // }
-
       this.subLoading = true
       const { code, message } = await asyncRequest.deliveryOrderReturnChild({ list, returnCode: this.sitem.returnCode })
       this.subLoading = false
+
       switch (code) {
         case 0:
           this.$emit('reload')

src/views/sellOut/sellAfterApply/detail.vue

@@ -180,7 +180,6 @@
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
-
         
         <el-tab-pane label="审批记录" name="2">
           <process-time-line
@@ -324,7 +323,7 @@ export default {
     isHasPermission({ status, process }){
       return (
         status === String(this.sitem.status) 
-        // && this.ppowers.includes(process) && !this.isSupertube
+        && this.ppowers.includes(process) && !this.isSupertube
       )
     
     },

src/views/sellOut/sellReturn/components/approval-results.vue

@@ -3,7 +3,7 @@
     <el-form-item label="审核状态" prop="status">
       <el-select v-model="formData.status" style="width:100%">
         <el-option label="修改供应商审批结果" value="10" />
-        <el-option label="认同供应商审批结果" value="4" />
+        <el-option label="认同供应商审批结果" value="11" />
       </el-select>
     </el-form-item>
 
@@ -60,7 +60,7 @@ export default {
   computed: {
     displayExpressField() {
       console.log(this.sitem)
-      return this.formData.status === '4'
+      return this.formData.status === '11'
     },
     rules() {
       const { status } = this.formData

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

@@ -1,65 +1,71 @@
 <template>
   <div class="work-order__wrapper">
     <template v-if="isSalesWarehouselist">
-      <el-table size="mini" border :data="list">
-        <el-table-column label="销售订单" />
-        <el-table-column label="发货申请单" width="110px" />
-        <el-table-column label="提退时发货申请单状态" width="150px" />
-        <el-table-column label="发货工单" />
-        <el-table-column label="发货仓库所在供应商名称" width="160px" />
-        <el-table-column label="发货仓库所在供应商编码" width="160px" />
-        <el-table-column label="发货仓库名称" width="100px" />
-        <el-table-column label="发货仓库编码" width="100px" />
-        <el-table-column label="发货仓库负责人" width="110px" />
-        <el-table-column label="发货数量" />
-        <el-table-column width="110px">
-          <template slot="header">
-            <span style="color:red;margin-right:2px">*</span>退货数量
-          </template>
-          <template slot-scope="scope">
-            <digital-input
-              :values="list[scope.$index].num"
-              :placeholder="'退货数量'"
-              :min="0"
-              :disabled="false"
-              :max="100000000000"
-              :position="'right'"
-              :precision="0"
-              :size="'mini'"
-              :controls="false"
-              :append="''"
-              @reschange="onNumberChange($event, scope.$index)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column label="退货仓库所在供应商名称" width="160px" />
-        <el-table-column label="退货仓库所在供应商编码" width="160px" />
-        <el-table-column width="160px">
-          <template slot="header">
-            <span style="color:red;margin-right:2px">*</span>退货仓库编码
-          </template>
-          <template slot-scope="scope">
-            <search-stock
-              :is-detail="false"
-              :size="'mini'"
-              :value="list[scope.$index].wsmCode"
-              :placeholder="'仓库名称'"
-              :is-relation="true"
-              :wsmtype="'5'"
-              :company-no="currentCompany"
-              :disbaled="!currentCompany"
-              :names="''"
-              @searchChange="onStockChange($event, scope.$index)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column label="退货仓库负责人" width="110px" />
-      </el-table>
+      <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 label="发货仓库所在供应商名称" prop="supplierName" 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 />
+          <el-table-column prop="num" label="发货数量" show-overflow-tooltip />
+          <el-form>
+            <el-table-column width="110px" 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_num`" :rules="paramsRules.return_num">
+                  <digital-input
+                    :values="list[scope.$index].return_num"
+                    :placeholder="'退货数量'"
+                    :disabled="false"
+                    :max="100000000000"
+                    :position="'right'"
+                    :precision="0"
+                    :size="'mini'"
+                    :controls="false"
+                    :append="''"
+                    @reschange="onNumberChange($event, scope.$index)"
+                  />
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column 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="false"
+                    :size="'mini'"
+                    :value="list[scope.$index].return_wsm_code"
+                    :placeholder="'仓库名称'"
+                    :is-relation="true"
+                    :wsmtype="'5'"
+                    :company-no="currentCompany"
+                    :disbaled="!currentCompany"
+                    :names="''"
+                    @searchChange="onStockChange($event, scope.$index)"
+                  />
+                </el-form-item>
+              </template>
+            </el-table-column>
+          </el-form>
+          <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 />
+        </el-table>
+      </el-form>
     </template>
 
     <template v-else>
       <el-form :model="formData" :rules="rules">
-        <el-form-item prop="wsmCode" label="销售仓" style="display:flex">
+        <el-form-item prop="return_wsm_code" label="销售仓" style="display:flex">
           <search-stock
             style="width:300px"
             :is-detail="false"
@@ -77,11 +83,12 @@
       </el-form>
     </template>
 
-    <el-button class="fr" style="margin:10px 0px" size="mini" type="primary">保存</el-button>
+    <el-button class="fr" style="margin:10px 0px" size="mini" type="primary" :loading="subLoading" @click="onSetOrderReturnChild">保存</el-button>
   </div>
 </template>
 
 <script>
+import asyncRequest from '@/apis/service/sellOut/sellAfterApply'
 import companyHelper from '@/mixins/companyHelper'
 import resToken from '@/mixins/resToken'
 export default {
@@ -89,15 +96,10 @@ export default {
   mixins: [resToken, companyHelper],
   props: ['sitem'],
   data: () => ({
-    rules: {
-      wsmCode: [{ required: true, type: 'array', message: '请选择销售仓', trigger: 'change' }]
-    },
-    formData: {
-      wsmCode: ''
-    },
-    list: [
-      { wsmCode: '', num: 0 }
-    ]
+    list: [],
+    loading: false,
+    subLoading: false,
+    companyNo: ''
   }),
   computed: {
     state() {
@@ -115,25 +117,80 @@ export default {
       // 有地址 && 不是库存品
       if (isHasAddr && !isStock) return true
       return false
+    },
+    paramsRules() {
+      return ({
+        return_wsm_code: [{
+          required: true,
+          message: '请选择退货仓库',
+          trigger: 'change'
+        }],
+        return_num: [{
+          required: false
+        }]
+      })
+    }
+  },
+  watch: {
+    sitem: {
+      handler() {
+        if (!this.sitem) return
+        this.onRequestSendList()
+      },
+      immediate: true
     }
   },
   methods: {
-    onStockChange(e, index, isForm) {
-      const { code } = e
-      if (isForm) {
-        this.formData.wsmCode = code ? [code] : ''
-        return
+    async onRequestSendList() {
+      const { data, code, message } = await asyncRequest.sendList({ orderCode: this.sitem.orderCode })
+      switch (code) {
+        case 0:
+          this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
+          break
+        default:
+          this.$message.warning(message)
+          break
       }
-
+    },
+    onStockChange({ code, supplierName, supplierNo, contactor } = {}, index) {
       this.$set(this.list, index, {
         ...this.list[index],
-        wsmCode: code ? [code] : ''
+        return_wsm_code: code ? [code] : '',
+        returnSupplierName: supplierName,
+        returnSupplierNo: supplierNo,
+        returnSupplierNameContactor: contactor
       })
+
+      this.$nextTick(() => this.$refs.formRef.validate())
     },
-    onNumberChange(num, index) {
+    onNumberChange(return_num, index) {
       this.$set(this.list, index, {
         ...this.list[index],
-        num
+        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_wsm_code: Array.isArray(return_wsm_code) ? return_wsm_code[0] : return_wsm_code,
+          outChildCode,
+          return_num
+        }))
+
+        const salesWarehouseParams = { list, type: '1', returnCode: this.sitem.returnCode }
+        const params = { list: [{ ...this.formData }], type: '1', returnCode: this.sitem.returnCode }
+        const { code, message } = await asyncRequest.reorderChildAdd(this.isSalesWarehouselist ? salesWarehouseParams : params)
+        this.subLoading = false
+        switch (code) {
+          case 0:
+            this.$emit('reload')
+            break
+          default:
+            this.$message.warning(message)
+            break
+        }
       })
     }
   }

src/views/sellOut/sellReturn/detail.vue

@@ -146,7 +146,7 @@
               />
             </el-collapse-item>
  
-            <el-collapse-item title="业务审核" name="3" v-if="hasPermission({status:'1', process:'1'})">
+            <el-collapse-item title="业务审核" name="3" v-if="isHasPermission({status:'1', process:'1'})">
               <exam-form
                 v-if="newTime"
                 :statusList="statusList"
@@ -157,7 +157,7 @@
               />
             </el-collapse-item>
 
-            <el-collapse-item title="供应商审核" name="4" v-if="hasPermission({status:'9', process:'9'})">
+            <el-collapse-item title="供应商审核" name="4" v-if="isHasPermission({status:'9', process:'9'})">
               <exam-form
                 v-if="newTime"
                 :statusList="statusList"
@@ -168,11 +168,11 @@
               />
             </el-collapse-item>
 
-            <el-collapse-item title="供应商已驳回,待采购审核" name="5" v-if="hasPermission({status:'8', process:'8'})">
+            <el-collapse-item title="供应商已驳回,待采购审核" name="5" v-if="isHasPermission({status:'8', process:'8'})">
               <approval-results :sitem="sitem" @changeStatus="handlePurchaseExam" />
             </el-collapse-item>
 
-            <el-collapse-item title="业务公司修改待供应商确认" name="6" v-if="hasPermission({status:'10', process:'10'})">
+            <el-collapse-item title="业务公司修改待供应商确认" name="6" v-if="isHasPermission({status:'10', process:'10'})">
               <exam-form
                 v-if="newTime"
                 :statusList="statusList"
@@ -183,8 +183,8 @@
               />
             </el-collapse-item>
 
-            <el-collapse-item title="待设置工单" name="7">
-              <set-work-order :sitem="sitem" />
+            <el-collapse-item title="待设置工单" name="7" v-if="isHasPermission({status:'11',process:'11'})">
+              <set-work-order :sitem="sitem" @reload="initData()" />
             </el-collapse-item>
 
           </el-collapse>
@@ -249,15 +249,18 @@ export default {
       activeTabs: "1",
       showColumns: showColumns,
       statusOptions: [
-        { value: "1", label: "待业务审批" },
+      { value: "1", label: "待业务审批" },
+        // {value:"2", label: "带专员审批"}, 该节点废除
+        // {value:"3", label: "带主管审批"}, 该节点废除
         { value: "4", label: "退货完成" },
         { value: "5", label: "业务驳回" },
-        { value: '8', label: '供应商驳回,待供应商负责人审核'},
-        { value: '9', label: '待供应商审核'},
-        { value: '10',label: '业务公司修改待供应商确认'},
-        // { value: '10',label: '待设置工单'},
-        // { value: '10',label: '待库管收货'},
-        // { value: '10',label: '完成退货'}
+        // { value: "6", label: "采购驳回" }, 该节点废除
+        // { value: "7", label: "专员审批不通过" }, 该节点废除
+        { value: '8', label:'供应商已驳回,待采购审核'},
+        { value: '9', label:'待供应商审核'},
+        { value: '10', label:'业务公司修改,待供应商确认'},
+        { value: '11', label:'待设置工单'},
+        { value: '12', label:'待库管发货'}
       ],
       xs_order_type_options,
       sitem: null, //传给组件
@@ -376,8 +379,9 @@ export default {
       }
     },
 
-    hasPermission({status, process}){
-      return !this.isSupertube && String(this.sitem.status) === status && this.ppowers.includes(process)
+    isHasPermission({status, process}){
+      // && this.ppowers.includes(process) && !this.isSupertube
+      return String(this.sitem.status) === status 
     },
     
     async initData() {

src/views/sellOut/sellReturn/index.vue

@@ -261,7 +261,8 @@
     </div>
   </div>
 </template>
-   <script>
+
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import columns from "./columns";
@@ -297,11 +298,17 @@ export default {
       // 状态
       statusOptions: [
         { value: "1", label: "待业务审批" },
+        // {value:"2", label: "带专员审批"}, 该节点废除
+        // {value:"3", label: "带主管审批"}, 该节点废除
         { value: "4", label: "退货完成" },
         { value: "5", label: "业务驳回" },
-        { value: '8', label:'供应商驳回,待供应商负责人审核'},
+        // { value: "6", label: "采购驳回" }, 该节点废除
+        // { value: "7", label: "专员审批不通过" }, 该节点废除
+        { value: '8', label:'供应商已驳回,待采购审核'},
         { value: '9', label:'待供应商审核'},
         { value: '10', label:'业务公司修改,待供应商确认'},
+        { value: '11', label:'待设置工单'},
+        { value: '12', label:'待库管发货'}
       ],
       loading: false,
       showModel: false,

src/views/serviceParam/goldPrice/components/addEdit.vue

@@ -28,7 +28,7 @@
               <search-metal-kind
                 :value="ruleForm.type"
                 :disabled="id !== '003'"
-                :isDetail="false"
+                :is-detail="false"
                 :placeholder="'金属类型'"
                 @searchChange="noble_metalsearchChange"
               />
@@ -50,8 +50,11 @@
           </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
-          <el-button v-if="id !== '007'" type="primary" @click="submitForm"
-            >保 存
+          <el-button
+            v-if="id !== '007'"
+            type="primary"
+            @click="submitForm"
+          >保 存
           </el-button>
           <el-button @click="showModelThis = false">{{
             id == "007" ? "关 闭" : "取 消"
@@ -62,126 +65,126 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/serviceParam/goldPrice";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/service/serviceParam/goldPrice'
+import resToken from '@/mixins/resToken'
 export default {
-  name: "goldPrice",
-  props: ["showModel", "id", "sitem"],
+  name: 'GoldPrice',
   mixins: [resToken],
+  props: ['showModel', 'id', 'sitem'],
   data() {
     return {
       loading: false,
-      title: "添加实时金价",
+      title: '添加实时金价',
       showModelThis: this.showModel,
 
       actionList: [],
       ruleForm: {
-        id: "",
+        id: '',
         price: 0,
-        type: "",
+        type: ''
       },
       rulesThis: this.rules,
       rules: {
-        price: [{ required: true, message: "最新价格不能为空", trigger: "blur" }],
-        type: [{ required: true, message: "金属类型不能为空", trigger: "chenge" }],
-      },
-    };
+        price: [{ required: true, message: '最新价格不能为空', trigger: 'blur' }],
+        type: [{ required: true, message: '金属类型不能为空', trigger: 'chenge' }]
+      }
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
     async initForm() {
-      this.loading = true;
-      if (this.id === "003") {
-        this.title = "添加实时金价";
-        this.rulesThis = this.rules;
-      } else if (this.id === "005") {
-        this.title = "修改实时金价";
-        this.rulesThis = this.rules;
+      this.loading = true
+      if (this.id === '003') {
+        this.title = '添加实时金价'
+        this.rulesThis = this.rules
+      } else if (this.id === '005') {
+        this.title = '修改实时金价'
+        this.rulesThis = this.rules
       } else {
-        this.title = "实时金价详情";
-        this.rulesThis = {};
+        this.title = '实时金价详情'
+        this.rulesThis = {}
       }
-      await this.resetForm();
-      this.loading = false;
+      await this.resetForm()
+      this.loading = false
     },
 
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          const { id, price, type } = this.sitem;
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+          const { id, price, type } = this.sitem
           this.ruleForm = {
-            id: id || "",
-            price: price || "0",
-            type: type || "",
-          };
+            id: id || '',
+            price: price || '0',
+            type: type || ''
+          }
         }
-      });
+      })
     },
-    //贵金属种类选择
+    // 贵金属种类选择
     noble_metalsearchChange(e) {
-      console.log(e);
-      const { id, code, label } = e;
-      this.ruleForm.type = id ? id : "";
-      this.$refs.ruleForm.validateField("type");
+      console.log(e)
+      const { id, code, label } = e
+      this.ruleForm.type = id || ''
+      this.$refs.ruleForm.validateField('type')
     },
     reschange(e) {
-      this.ruleForm.price = e;
-      this.$refs.ruleForm.validateField("price");
+      this.ruleForm.price = e
+      this.$refs.ruleForm.validateField('price')
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (!this.loading) {
-            this.loading = true;
-            let model = JSON.parse(JSON.stringify(this.ruleForm));
-            model.price += "";
-            model.type += "";
-            let res = {};
-            if (this.id === "003") {
-              delete model["id"];
-              res = await asyncRequest.add(model);
+            this.loading = true
+            const model = JSON.parse(JSON.stringify(this.ruleForm))
+            model.price += ''
+            model.type += ''
+            let res = {}
+            if (this.id === '003') {
+              delete model['id']
+              res = await asyncRequest.add(model)
             } else {
-              res = await asyncRequest.update(model);
+              res = await asyncRequest.update(model)
             }
-            this.loading = false;
+            this.loading = false
             if (res && res.code === 0) {
-              const title = this.id === "add" ? "添加成功!" : "修改成功!";
+              const title = this.id === 'add' ? '添加成功!' : '修改成功!'
               this.$notify.success({
                 title,
-                message: "",
-              });
-              this.showModelThis = false;
+                message: ''
+              })
+              this.showModelThis = false
               // 刷新
-              this.$emit("refresh");
+              this.$emit('refresh')
             } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
+              await this.logout()
             } else {
-              this.$message.warning(res.message);
+              this.$message.warning(res.message)
             }
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/supplierSellOut/supplierSellAfterApply/components/set-work-order.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="work-order__wrapper">
-    <el-form>
+    <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 />
@@ -12,49 +12,53 @@
         <el-table-column prop="wsm_code" label="发货仓库编码" width="170px" show-overflow-tooltip />
         <el-table-column prop="contactor_name" label="发货仓库负责人" width="110px" show-overflow-tooltip />
         <el-table-column prop="num" label="发货数量" how-overflow-tooltip />
-        <el-table-column width="110px" show-overflow-tooltip>
-          <template slot="header">
-            <span style="color:red;margin-right:2px">*</span>退货数量
-          </template>
-          <template slot-scope="scope">
-            <el-form-item required>
-              <digital-input
-                :values="list[scope.$index].return_num"
-                :placeholder="'退货数量'"
-                :disabled="false"
-                :max="100000000000"
-                :position="'right'"
-                :precision="0"
-                :size="'mini'"
-                :controls="false"
-                :append="''"
-                @reschange="onNumberChange($event, scope.$index)"
-              />
-            </el-form-item>
-          </template>
-        </el-table-column>
-        <el-table-column width="160px">
-          <template slot="header">
-            <span style="color:red;margin-right:2px">*</span>退货仓库编码
-          </template>
-          <template slot-scope="scope">
-            <search-stock
-              :is-detail="false"
-              :size="'mini'"
-              :value="list[scope.$index].return_wsm_code"
-              :placeholder="'仓库名称'"
-              :is-relation="true"
-              :wsmtype="'5'"
-              :company-no="currentCompany"
-              :disbaled="!currentCompany"
-              :names="''"
-              @searchChange="onStockChange($event, scope.$index)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column label="退货仓库所在供应商名称" prop="returnSupplierName" width="160px" how-overflow-tooltip />
-        <el-table-column label="退货仓库所在供应商编码" prop="returnSupplierNo" width="160px" how-overflow-tooltip />
-        <el-table-column label="退货仓库负责人" width="110px" prop="returnSupplierNameContactor" how-overflow-tooltip />
+        <el-form>
+          <el-table-column width="110px" 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_num`" :rules="paramsRules.return_num">
+                <digital-input
+                  :values="list[scope.$index].return_num"
+                  :placeholder="'退货数量'"
+                  :disabled="false"
+                  :max="100000000000"
+                  :position="'right'"
+                  :precision="0"
+                  :size="'mini'"
+                  :controls="false"
+                  :append="''"
+                  @reschange="onNumberChange($event, scope.$index)"
+                />
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column 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="false"
+                  :size="'mini'"
+                  :value="list[scope.$index].return_wsm_code"
+                  :placeholder="'仓库名称'"
+                  :is-relation="true"
+                  :wsmtype="'5'"
+                  :company-no="currentCompany"
+                  :disbaled="!currentCompany"
+                  :names="''"
+                  @searchChange="onStockChange($event, scope.$index)"
+                />
+              </el-form-item>
+            </template>
+          </el-table-column>
+        </el-form>
+        <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 />
       </el-table>
     </el-form>
 
@@ -73,15 +77,29 @@ export default {
   data: () => ({
     list: [],
     loading: false,
-    subLoading: false
+    subLoading: false,
+    companyNo: ''
   }),
+  computed: {
+    paramsRules() {
+      return ({
+        return_wsm_code: [{
+          required: true,
+          message: '请选择退货仓库',
+          trigger: 'change'
+        }],
+        return_num: [{
+          required: false
+        }]
+      })
+    }
+  },
   async mounted() {
     this.$nextTick(async() => {
       const { data, code, message } = await asyncRequest.sendList({ outCode: this.sitem.outCode })
-      console.log(data)
       switch (code) {
         case 0:
-          this.list = data.list
+          this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
           break
         default:
           this.$message.warning(message)
@@ -98,6 +116,8 @@ export default {
         returnSupplierNo: supplierNo,
         returnSupplierNameContactor: contactor
       })
+
+      this.$nextTick(() => this.$refs.formRef.validate())
     },
     onNumberChange(return_num, index) {
       this.$set(this.list, index, {
@@ -106,46 +126,27 @@ export default {
       })
     },
     async onSetOrderReturnChild() {
-      const numErrors = []
-      const codeErrors = []
-      const list = this.list.map(({ outChildCode, return_num, return_wsm_code }, index) => {
-        if (!return_num) {
-          numErrors.push(index)
-        }
+      this.$refs.validate(async isValid => {
+        if (!isValid) return
 
-        if (!return_wsm_code || !return_wsm_code.length) {
-          codeErrors.push(index)
-        }
-
-        return ({
+        const list = this.list.map(({ outChildCode, return_num, return_wsm_code }) => ({
           return_wsm_code: Array.isArray(return_wsm_code) ? return_wsm_code[0] : return_wsm_code,
           outChildCode,
           return_num
-        })
-      })
-
-      // if (numErrors.length !== 0) {
-      //   this.$message.warning('第' + numErrors.map(row => row + 1).join(',') + '行，退货数量不能为空！')
-      //   return
-      // }
-
-      if (codeErrors.length !== 0) {
-        this.$message.warning('第' + codeErrors.map(row => row + 1).join(',') + '行，仓库不能为空！')
-        return
-      }
+        }))
 
-      this.subLoading = true
-      const { code, message } = await asyncRequest.setOrderReturnChild({ list, returnCode: this.sitem.returnCode })
-      this.subLoading = false
+        const { code, message } = await asyncRequest.setOrderReturnChild({ list, returnCode: this.sitem.returnCode })
+        this.subLoading = false
 
-      switch (code) {
-        case 0:
-          this.$emit('reload')
-          break
-        default:
-          this.$message.warning(message)
-          break
-      }
+        switch (code) {
+          case 0:
+            this.$emit('reload')
+            break
+          default:
+            this.$message.warning(message)
+            break
+        }
+      })
     }
   }
 }