Merge branch 'sit' into dev

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

@@ -20,6 +20,8 @@ export default {
   returnCheck: (data, params) => http(api + "orderbackcheck", data, "post", params),
   // 获取异常原因
   resultlist: (data, params) => http(api + "resultlist", data, "post", params),
+  // 退货验货
+  orderbackexamnew: (data, params) => http(api + "orderbackexamnew", data, "post", params),
 
 };
    

src/assets/js/btnList.js

@@ -82,7 +82,7 @@ const btnList = [
   { code: "081", name: "添加发货申请" },
   { code: "082", name: "添加工差" },
   { code: "083", name: "设置退货仓库" },
-  // { code: "082", name: "发货申请" },
+  { code: "084", name: "BOSS审批" },
 
 ];
 export default btnList;

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -753,7 +753,11 @@
                     <div class="img-show-li-div">
                       <img :src="img" class="img-show" alt="" />
                       <i
-                        v-if="type == 'add' || type === 'editBase'|| type === 'edit'"
+                        v-if="
+                          type == 'add' ||
+                          type === 'editBase' ||
+                          type === 'edit'
+                        "
                         class="el-icon-close"
                         @click="closeImg(iindex, 'good_img')"
                       ></i>
@@ -763,7 +767,7 @@
                     class="img-show-li"
                     v-if="
                       ruleForm.good_img.length < 10 &&
-                      (type == 'add' || type === 'editBase'|| type === 'edit')
+                      (type == 'add' || type === 'editBase' || type === 'edit')
                     "
                   >
                     <div class="activity-upload">
@@ -802,7 +806,11 @@
                     <div class="img-show-li-div">
                       <img :src="img" class="img-show" alt="" />
                       <i
-                        v-if="type == 'add' || type === 'editBase'|| type === 'edit'"
+                        v-if="
+                          type == 'add' ||
+                          type === 'editBase' ||
+                          type === 'edit'
+                        "
                         class="el-icon-close"
                         @click="closeImg(iindex, 'good_info_img')"
                       ></i>
@@ -812,7 +820,7 @@
                     class="img-show-li"
                     v-if="
                       ruleForm.good_info_img.length < 10 &&
-                      (type == 'add' || type === 'editBase'|| type === 'edit')
+                      (type == 'add' || type === 'editBase' || type === 'edit')
                     "
                   >
                     <div class="activity-upload">
@@ -1237,8 +1245,14 @@ export default {
             this.loading = false;
             return;
           }
-          const { noble_weight, weight, good_type, moq, is_step } =
-            this.ruleForm;
+          const {
+            noble_weight,
+            weight,
+            good_type,
+            moq,
+            is_step,
+            is_gold_price,
+          } = this.ruleForm;
           // if (is_step === "0" && this.ladder_tableData.length > 1) {
           //   this.$message.warning("不启用阶梯成本，只能录入一条阶梯成本信息！");
           //   this.loading = false;
@@ -1251,6 +1265,21 @@ export default {
               return;
             }
           }
+          if (is_gold_price === "1" && this.is_noble) {
+            let is_p = true;
+            this.ladder_tableData.forEach((v) => {
+              if (v.nake_fee * 1 !== 0) {
+                is_p = false;
+              }
+            });
+            if (!is_p) {
+              this.$message.warning(
+                "启用实时金价的贵金属商品不能填写成本单价！"
+              );
+              this.loading = false;
+              return;
+            }
+          }
           // if (good_type === "1") {
           //   let set_num = moq * 1;
           //   let isok = true;
@@ -1546,35 +1575,70 @@ export default {
     },
     count_fee(e) {
       const {
-        noble_price, //贵金属实时金价
+        cgd_gold_price, //供应商采购金价
         is_gold_price, //是否启用实时金价
         noble_weight, //贵金属重量
       } = this.ruleForm;
       const {
+        nake_fee, //成本单价
         cost_fee, //工艺费
         delivery_fee, //物流费
-        nake_fee, //成本单价
+
         cert_fee, //证书费
         mark_fee, //加标费
         package_fee, //包装费
         other_fee, //其他费用
       } = e;
-      let total =
-        package_fee * 100 +
-        nake_fee * 100 +
-        mark_fee * 100 +
-        cert_fee * 100 +
-        delivery_fee * 100 +
-        other_fee * 100;
+      let XA = this.add_sum(nake_fee, delivery_fee),
+        XB = this.add_sum(package_fee, cert_fee),
+        XC = this.add_sum(mark_fee, other_fee),
+        XD = 0;
+      let total = this.add_sum(this.add_sum(XA, XB), XC);
+      // console.log(total);
       if (this.is_noble && is_gold_price === "1") {
-        let a = noble_price * 100;
-        let b = noble_weight * 1000;
-        let c = cost_fee * 100;
-        let ab = parseInt((a * b) / 1000);
-        let bc = parseInt((b * c) / 1000);
-        total += ab + bc;
+        XD = this.add_sum(
+          this.accMul(cgd_gold_price, noble_weight),
+          this.accMul(noble_weight, cost_fee)
+        );
+        total = this.add_sum(total, XD);
       }
-      return parseFloat(total / 100);
+      return total;
+    },
+    add_sum(arg1, arg2) {
+      var r1, r2, m;
+      try {
+        r1 = arg1.toString().split(".")[1].length;
+      } catch (e) {
+        r1 = 0;
+      }
+
+      try {
+        r2 = arg2.toString().split(".")[1].length;
+      } catch (e) {
+        r2 = 0;
+      }
+
+      m = Math.pow(10, Math.max(r1, r2));
+
+      return (this.accMul(arg1, m) + this.accMul(arg2, m)) / m;
+    },
+    accMul(arg1, arg2) {
+      var m = 0,
+        s1 = arg1.toString(),
+        s2 = arg2.toString();
+
+      try {
+        m += s1.split(".")[1].length;
+      } catch (e) {}
+
+      try {
+        m += s2.split(".")[1].length;
+      } catch (e) {}
+
+      return (
+        (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) /
+        Math.pow(10, m)
+      );
     },
     dataSort(key) {
       return function (a, b) {

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -1,5 +1,6 @@
 <template>
   <div v-loading="loading">
+    <!-- {{ sitem.is_gold_price }} -->
     <el-form
       :model="addrForm"
       ref="addrForm"
@@ -50,8 +51,8 @@
         </el-table-column>
         <el-table-column prop="new_sale_price" show-overflow-tooltip>
           <template slot="header" slot-scope="scope">
-            <span>系统售价（元）</span>
-            <el-popover
+            <span>系统售价</span>
+            <!-- <el-popover
               placement="top-start"
               title="计算公式:"
               width="300"
@@ -83,7 +84,7 @@
               </div>
 
               <i class="el-icon-question tb-icon" slot="reference"></i>
-            </el-popover>
+            </el-popover> -->
           </template>
 
           <template slot-scope="scope">
@@ -106,7 +107,12 @@
             <span v-show="!scope.row.edit">{{ scope.row.new_sale_price }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="sale_price" label="售价" show-overflow-tooltip>
+        <el-table-column
+          prop="sale_price"
+          label="售价"
+          show-overflow-tooltip
+          v-if="!(sitem && sitem.is_gold_price === '1'&&is_noble)"
+        >
           <template slot-scope="scope">
             <el-form-item
               v-show="scope.row.edit"
@@ -133,6 +139,65 @@
             <span v-show="!scope.row.edit">{{ scope.row.sale_price }}</span>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="new_cost_fee"
+          show-overflow-
+          v-if="sitem && sitem.is_gold_price === '1'&&is_noble"
+          label="系统工艺费"
+        >
+          <template slot-scope="scope">
+            <el-form-item
+              v-show="scope.row.edit"
+              :prop="'good_ladder.' + scope.$index + '.' + 'new_cost_fee'"
+              :rules="addrRules.new_cost_fee"
+              :size="'mini'"
+              :style="{ marginBottom: scope.row.edit ? '13px' : '0' }"
+            >
+              <el-input
+                v-loading="scope.row.loading"
+                v-model="scope.row.new_cost_fee"
+                placeholder="工艺费"
+                :disabled="true"
+                :size="'mini'"
+                maxlength="20"
+              />
+            </el-form-item>
+            <span v-show="!scope.row.edit">{{ scope.row.new_cost_fee }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="cost_fee"
+          label="工艺费"
+          show-overflow-tooltip
+          v-if="sitem && sitem.is_gold_price === '1'&&is_noble"
+        >
+          <template slot-scope="scope">
+            <el-form-item
+              v-show="scope.row.edit"
+              :prop="'good_ladder.' + scope.$index + '.' + 'cost_fee'"
+              :rules="addrRules.cost_fee"
+              :size="'mini'"
+              :style="{ marginBottom: scope.row.edit ? '13px' : '0' }"
+            >
+              <digital-input
+                :values="scope.row.cost_fee"
+                :placeholder="'工艺费'"
+                :min="0"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :controls="false"
+                :append="''"
+                :newTime="scope.row.newTime"
+                :size="'mini'"
+                :disabled="!scope.row.edit"
+                @reschange="num_change($event, 'cost_fee', scope.$index)"
+              />
+            </el-form-item>
+            <span v-show="!scope.row.edit">{{ scope.row.cost_fee }}</span>
+          </template>
+        </el-table-column>
+
         <el-table-column
           prop="market_price"
           label="市场价"
@@ -389,7 +454,6 @@
                     <p>文件格式：.xlsx,.xls,.pdf,.zip,.rar,.7z</p>
                   </div>
                 </div>
-                
               </li>
             </ul>
           </el-form-item>
@@ -472,6 +536,7 @@ export default {
     return {
       loading: false,
       showVoucher: false,
+      is_noble: false,
       video_url: "",
       img_url: "",
       other_url: "",
@@ -557,7 +622,7 @@ export default {
             trigger: "blur",
           },
         ],
-
+        new_sale_price: [{ required: false }],
         sale_price: [
           {
             required: true,
@@ -565,6 +630,18 @@ export default {
             validator: validate_num,
           },
         ],
+        cost_fee: [
+          {
+            required: true,
+            trigger: "blur",
+            validator: validate_num,
+          },
+        ],
+        new_cost_fee: [
+          {
+            required: false,
+          },
+        ],
         market_price: [
           {
             required: true,
@@ -625,10 +702,12 @@ export default {
         if (index === -1) {
           this.addrForm.good_ladder.push({
             edit: true,
-            min_num: "",
-            new_sale_price: "",
-            sale_price: "",
-            market_price: "",
+            min_num: "0",
+            new_sale_price: "0",
+            new_cost_fee: "0",
+            sale_price: "0",
+            cost_fee: "0",
+            market_price: "0",
             market_platform: "",
             status: "1",
           });
@@ -648,6 +727,7 @@ export default {
       let resModel = {
         isok: code,
         price: code === 0 ? data.sale_price : "0",
+        new_cost_fee: code === 0 ? data.new_cost_fee : "0",
         message: message,
       };
       this.addrForm.good_ladder[index].search_loading = false;
@@ -666,14 +746,18 @@ export default {
               this.$message.warning("当前已有相同起订量的销售价！");
               return;
             }
-            let { isok, price, message } = await this.get_new(rowIndex);
+            let { isok, price, message, new_cost_fee } = await this.get_new(
+              rowIndex
+            );
             if (isok === 0) {
               this.addrForm.good_ladder[rowIndex].new_sale_price = price;
+              this.addrForm.good_ladder[rowIndex].new_cost_fee = new_cost_fee;
               this.addrForm.good_ladder[rowIndex].edit = false;
             } else if (isok >= 100 && isok <= 104) {
               await this.logout();
             } else {
               this.addrForm.good_ladder[rowIndex].new_sale_price = price;
+              this.addrForm.good_ladder[rowIndex].new_cost_fee = new_cost_fee;
               this.$message.warning(message);
             }
           }
@@ -694,13 +778,17 @@ export default {
           this.addrForm.good_ladder[index].new_sale_price = "0";
         } else {
           if (!this.addrForm.good_ladder[index].search_loading) {
-            let { isok, price, message } = await this.get_new(index);
+            let { isok, price, message, new_cost_fee } = await this.get_new(
+              index
+            );
             if (isok === 0) {
               this.addrForm.good_ladder[index].new_sale_price = price;
+              this.addrForm.good_ladder[index].new_cost_fee = new_cost_fee;
             } else if (isok >= 100 && isok <= 104) {
               await this.logout();
             } else {
               this.addrForm.good_ladder[index].new_sale_price = price;
+              this.addrForm.good_ladder[index].new_cost_fee = new_cost_fee;
               this.$message.warning(message);
             }
           }
@@ -709,6 +797,7 @@ export default {
     },
 
     async resetForm() {
+      this.is_noble = false;
       // 重置
       await this.$nextTick(async () => {
         if (this.$refs.ruleForm && this.$refs.addrForm) {
@@ -716,7 +805,14 @@ export default {
           this.$refs.ruleForm.clearValidate();
           this.$refs.addrForm.resetFields();
           this.$refs.addrForm.clearValidate();
-          let { proof, ladderlist } = this.sitem;
+          let { proof, ladderlist, cat_info } = this.sitem;
+          if (cat_info && cat_info.length > 0) {
+            cat_info.forEach((e) => {
+              if (e.id === "6") {
+                this.is_noble = true;
+              }
+            });
+          }
           ladderlist.map((a) => {
             a.search_loading = false;
             a.new_sale_price = "0";
@@ -752,14 +848,16 @@ export default {
           }
           this.$refs.ruleForm.validateField("proof_url");
           for (let i = 0; i < this.addrForm.good_ladder.length; i++) {
-            let { isok, price, message } = await this.get_new(i);
+            let { isok, price, new_cost_fee, message } = await this.get_new(i);
             if (isok === 0) {
               this.addrForm.good_ladder[i].new_sale_price = price;
+              this.addrForm.good_ladder[i].new_cost_fee = new_cost_fee;
               this.addrForm.good_ladder[i].edit = false;
             } else if (isok >= 100 && isok <= 104) {
               await this.logout();
             } else {
               this.addrForm.good_ladder[i].new_sale_price = price;
+              this.addrForm.good_ladder[i].new_cost_fee = new_cost_fee;
               this.addrForm.good_ladder[i].edit = true;
               this.addrForm.good_ladder[i].newTime = new Date().valueOf() + "";
               this.$message.warning(message);
@@ -795,15 +893,19 @@ export default {
           let all_is_ok = true;
           for (let i = 0; i < this.addrForm.good_ladder; i++) {
             this.addrForm.good_ladder[i].search_loading = true;
-            let { isok, price } = await this.get_new(i);
+            let { isok, price, new_cost_fee } = await this.get_new(i);
             if (isok === 0) {
               this.addrForm.good_ladder[i].new_sale_price = price;
-              this.addrForm.good_ladder[i].edit = false;
+              this.addrForm.good_ladder[i].new_cost_fee = new_cost_fee;
+              this.addrForm.good_ladder[i].this.addrForm.good_ladder[
+                i
+              ].edit = false;
             } else if (isok >= 100 && isok <= 104) {
               await this.logout();
             } else {
               all_is_ok = false;
               this.addrForm.good_ladder[i].new_sale_price = price;
+              this.addrForm.good_ladder[i].new_cost_fee = new_cost_fee;
               this.addrForm.good_ladder[i].edit = true;
               this.addrForm.good_ladder[i].newTime = new Date().valueOf() + "";
             }

src/views/goodStore/goodsOnline/detail.vue

@@ -229,6 +229,7 @@
                   >
                     <el-table-column prop="min_num" label="起订量(>=)" />
                     <el-table-column prop="sale_price" label="售价" />
+                    <el-table-column prop="cost_fee" label="工艺费" />
                     <el-table-column prop="market_price" label="市场价" />
                     <el-table-column prop="market_platform" label="对比平台" />
                     <el-table-column prop="status" label="状态">

src/views/purchaseIn/purchaseOrder/components/tolerance.vue

@@ -1,5 +1,6 @@
 <template>
   <span>
+    <!-- {{ isshow + "" }}--{{ showBtn + "" }}--{{ order_type + "" }} -->
     <el-button
       v-show="isshow && showBtn && order_type && order_type !== '1'"
       type="primary"

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -6,10 +6,15 @@
     >
       <div
         class="detail-page-title"
-        :showBtn="status === '1' && powers.some((item) => item == '082')"
+        v-if="status === '1' && powers.some((item) => item == '082')"
       >
         <span>采购单编号：</span><span>{{ queryId }} </span>
-        <tolerance :newTime="newTime" v-if="newTime !== ''" :sitem="sitem" />
+        <tolerance
+          :newTime="newTime"
+          v-if="newTime !== ''"
+          :sitem="sitem"
+          :showBtn="status === '1' && powers.some((item) => item == '082')"
+        />
 
         <!-- 暂时注释，下版需要导出 -->
         <!-- <el-button type="primary" style="margin-left:30px;" @click="download">
@@ -237,13 +242,11 @@ export default {
   },
   methods: {
     //导出文件 （需要修改）
-    download(){
+    download() {
       if (!this.loading) {
         this.loading = true;
         // let httpType = `aplication/zip`;
-        let model = {
-          
-        };
+        let model = {};
         axios({
           method: "post",
           url: this.fileUrl + "admin/checkexport",
@@ -254,16 +257,20 @@ export default {
           // },
         })
           .then((res) => {
-            if (res && res.status == 200 && res.data) {   
-              let url = window.URL.createObjectURL(new Blob([res.data], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'}))
-              let link = document.createElement('a')
-              link.style.display = 'none'
-              link.href = url
-              let excelName = '测试.xlsx'
-              link.setAttribute('download', excelName)
-              document.body.appendChild(link)
-              link.click()
-              link.remove()
+            if (res && res.status == 200 && res.data) {
+              let url = window.URL.createObjectURL(
+                new Blob([res.data], {
+                  type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
+                })
+              );
+              let link = document.createElement("a");
+              link.style.display = "none";
+              link.href = url;
+              let excelName = "测试.xlsx";
+              link.setAttribute("download", excelName);
+              document.body.appendChild(link);
+              link.click();
+              link.remove();
               window.URL.revokeObjectURL(url); //释放掉blob对象
               this.$message.success(`${message}导出成功！`);
               setTimeout(() => {

src/views/purchaseIn/workbench/components/baseForm.vue

@@ -23,7 +23,11 @@
           >{{ title }}</span
         >
         <el-button :size="'mini'" @click="$emit('cancel')">取 消 </el-button>
-        <el-button :size="'mini'" type="primary"  v-if="type !== 'view'" @click="submitForm"
+        <el-button
+          :size="'mini'"
+          type="primary"
+          v-if="type !== 'view'"
+          @click="submitForm"
           >保 存
         </el-button>
       </el-col>
@@ -420,7 +424,7 @@
             :values="ruleForm.nake_fee"
             :placeholder="'裸价'"
             :min="0"
-            :disabled="type === 'view'"
+            :disabled="type === 'view' || is_noble"
             :max="100000000000"
             :position="'right'"
             :precision="2"
@@ -796,7 +800,10 @@ export default {
         };
 
         this.status = status;
-        console.log(this.ruleForm.origin_place);
+        if (this.is_noble) {
+          this.ruleForm.nake_fee = "0";
+        }
+        // console.log(this.ruleForm.origin_place);
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
@@ -872,8 +879,10 @@ export default {
           this.is_noble = this.askItem.is_metal;
           this.cat_id_name = this.type === "add" ? this.askItem.can_name : "";
 
-          this.brand_name = this.type === "add" ? this.askItem.brand : "";
-          this.unit_name = this.type === "add" ? this.askItem.unit_name : "";
+          this.brand_name =""
+          // this.type === "add" ? this.askItem.brand : "";
+          this.unit_name = ""
+          //this.type === "add" ? this.askItem.unit_name : "";
           this.ruleForm = {
             infoNo: this.id || "",
             cat_id: this.type === "add" ? [this.askItem.cat_id] : [],
@@ -882,11 +891,12 @@ export default {
             expire_day: "0", //有效期
             delivery_day: "0", //物流时间
             work_day: "0", //生产工期
-            brandid:
-              this.type === "add" && this.askItem.brand_id
-                ? [this.askItem.brand_id]
-                : [],
-            unit_id: this.type === "add" ? [this.askItem.unit] : [],
+            brandid:[],
+              // this.type === "add" && this.askItem.brand_id
+              //   ? [this.askItem.brand_id]
+              //   : [],
+            unit_id: [],
+            //this.type === "add" ? [this.askItem.unit] : [],
             weight: this.type === "add" ? this.askItem.total_weight : "0.000",
             tax: "",
             supply_area: "",
@@ -957,6 +967,7 @@ export default {
       this.is_noble = pid === "6";
       this.$refs.ruleForm.validateField("cat_id");
       this.setrules();
+      this.ruleForm.nake_fee = "0";
     },
     setrules() {
       let list = [

src/views/sellOut/returnOrder/components/auditForm.vue

@@ -0,0 +1,612 @@
+<template>
+  <el-form
+    ref="ruleForm"
+    :loading="loading"
+    :model="ruleForm"
+    status-icon
+    :size="'mini'"
+    :rules="rules"
+    label-width="88px"
+    style="width: 100%"
+    class="demo-ruleForm"
+  >
+    <el-row v-show="ruleForm.state == '0'">
+      <el-col :span="6"
+        ><el-form-item label="审核状态" prop="state">
+          <el-select
+            v-model="ruleForm.state"
+            placeholder="审核状态"
+            style="width: 100%"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '043'))
+            "
+            @change="stateChange"
+          >
+            <el-option
+              v-for="item in stateList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              :disabled="item.disabled"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="驳回节点" prop="rebut">
+          <el-select
+            v-model="ruleForm.rebut"
+            placeholder="驳回节点"
+            style="width: 100%"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '043'))
+            "
+          >
+            <el-option
+              v-for="item in statusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              :disabled="item.disabled"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="16">
+        <el-form-item label="审核备注" prop="status_remark">
+          <el-input
+            type="textarea"
+            placeholder="请输入审核备注"
+            v-model="ruleForm.status_remark"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '043'))
+            "
+            maxlength="250"
+            :autosize="{ minRows: 3, maxRows: 3 }"
+            show-word-limit
+          />
+        </el-form-item>
+      </el-col>
+      <el-col
+        :span="2"
+        class="fr"
+        v-if="status === '3' && powers.some((item) => item == '043')"
+      >
+        <el-form-item class="fr">
+          <el-button
+            v-if="!isDetail"
+            :size="'mini'"
+            type="primary"
+            @click="submitForm"
+            >保 存
+          </el-button>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row v-show="ruleForm.state !== '0'">
+      <el-col :span="6"
+        ><el-form-item label="审核状态" prop="state">
+          <el-select
+            v-model="ruleForm.state"
+            placeholder="审核状态"
+            style="width: 100%"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '043'))
+            "
+            @change="stateChange"
+          >
+            <el-option
+              v-for="item in stateList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              :disabled="item.disabled"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="6">
+        <el-form-item
+          label="可销售入库数量"
+          prop="can_sell_num"
+          label-width="125px"
+        >
+          <digital-input
+            :values="ruleForm.can_sell_num"
+            :placeholder="'可销售入库数量'"
+            :min="0"
+            :max="100000000000"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '043'))
+            "
+            :size="'mini'"
+            :position="'right'"
+            :precision="0"
+            :controls="false"
+            :append="''"
+            @reschange="num_change($event, 'can_sell_num')"
+          /> </el-form-item
+      ></el-col>
+      <el-col :span="6">
+        <el-form-item
+          label="次品入库数量"
+          prop="defective_num"
+          label-width="120px"
+        >
+          <digital-input
+            :values="ruleForm.defective_num"
+            :placeholder="'次品入库数量'"
+            :min="0"
+            :max="100000000000"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '043'))
+            "
+            :size="'mini'"
+            :position="'right'"
+            :precision="0"
+            :controls="false"
+            :append="''"
+            @reschange="num_change($event, 'defective_num')" /></el-form-item
+      ></el-col>
+      <el-col :span="6">
+        <el-form-item label="丢失数量" prop="loss_num">
+          <digital-input
+            :values="ruleForm.loss_num"
+            :placeholder="'丢失数量'"
+            :min="0"
+            :size="'mini'"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '043'))
+            "
+            :max="100000000000"
+            :position="'right'"
+            :precision="0"
+            :controls="false"
+            :append="''"
+            @reschange="num_change($event, 'loss_num')"
+          />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="8">
+        <el-form-item
+          label="可销售入库仓库"
+          prop="companyNo"
+          label-width="130px"
+          required
+        >
+          <search-work-company
+            :value="ruleForm.companyNo"
+            :placeholder="'业务公司'"
+            :disabled="true"
+            :size="'mini'"
+            :isDetail="false"
+            @searchChange="company_idsearchChange"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="" prop="can_sell_wsm_com" label-width="10px">
+          <search-supplier
+            :size="'mini'"
+            :value="ruleForm.can_sell_wsm_com"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '043'))
+            "
+            :placeholder="'仓库所在公司'"
+            :names="ruleForm.can_sell_wsm_com_name"
+            :isDetail="true"
+            @searchChange="supplierChange($event, 'can_sell_wsm_com')"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="can_sell_wsm" label-width="10px">
+          <search-stock
+            :size="'mini'"
+            :value="ruleForm.can_sell_wsm"
+            :placeholder="'可销售入库仓库'"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '043'))
+            "
+            :isDetail="true"
+            :isRelation="true"
+            :wsmtype="'4'"
+            :names="ruleForm.can_sell_wsm_name"
+            :companyNo="ruleForm.companyNo"
+            :companyCode="ruleForm.can_sell_wsm_com_code"
+            @searchChange="stockChange($event, 'can_sell_wsm')"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item
+          label="次品入库仓库"
+          prop="companyNo"
+          required
+          label-width="130px"
+        >
+          <search-work-company
+            :value="ruleForm.companyNo"
+            :placeholder="'业务公司'"
+            :disabled="true"
+            :size="'mini'"
+            :isDetail="true"
+            @searchChange="company_idsearchChange"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="" prop="defective_wsm_com" label-width="10px">
+          <search-supplier
+            :size="'mini'"
+            :value="ruleForm.defective_wsm_com"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '043'))
+            "
+            :placeholder="'仓库所在公司'"
+            :names="ruleForm.defective_wsm_com_name"
+            :isDetail="true"
+            @searchChange="supplierChange($event, 'defective_wsm_com')"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item prop="defective_wsm" label-width="10px">
+          <search-stock
+            :size="'mini'"
+            :value="ruleForm.defective_wsm"
+            :placeholder="'次品入库仓库'"
+            :disabled="
+              !(status === '3' && powers.some((item) => item == '043'))
+            "
+            :isDetail="true"
+            :isRelation="true"
+            :wsmtype="'5'"
+            :names="ruleForm.defective_wsm_name"
+            :companyNo="ruleForm.companyNo"
+            :companyCode="ruleForm.defective_wsm_com_code"
+            @searchChange="stockChange($event, 'defective_wsm')"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col
+        :span="24"
+        style="text-align: right; padding: 0 0 15px 0"
+        v-if="status === '3' && powers.some((item) => item == '043')"
+      >
+        <el-button type="primary" @click="submitForm" size="mini"
+          >保 存</el-button
+        >
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import asyncRequest from "@/apis/service/sellOut/returnOrder";
+import resToken from "@/mixins/resToken";
+export default {
+  name: "sellAfterApplyDetail",
+  props: ["id", "newTime", "sitem"],
+  mixins: [resToken],
+  computed: {
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "returnOrderDetail"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      status: "", //存储详情接口返的状态
+      return_num: "0",
+      stateList: [
+        {
+          value: "1",
+          label: "通过",
+        },
+        {
+          value: "0",
+          label: "驳回",
+        },
+      ],
+      statusList: [
+        { value: "1", label: "退货商品验收" },
+        { value: "2", label: "退货验收审核" },
+      ],
+      showModelThis: this.showModel,
+      return_tag: "",
+      ruleForm: {
+        thNo: "",
+        state: "1",
+        rebut: "",
+        status_remark: "",
+        companyNo: "",
+        can_sell_num: "0",
+        can_sell_wsm_com: [],
+        can_sell_wsm_com_code: "",
+        can_sell_wsm_com_name: "",
+        can_sell_wsm: [],
+        can_sell_wsm_code: "",
+        can_sell_wsm_name: "",
+        defective_num: "0",
+        defective_wsm_com: [],
+        defective_wsm_com_code: "",
+        defective_wsm_com_name: "",
+        defective_wsm: [],
+        defective_wsm_code: "",
+        defective_wsm_name: "",
+        loss_num: "0",
+      },
+      rulesThis: this.rules,
+      // 验证规则
+      rules: {
+        state: [
+          {
+            required: true,
+            trigger: "change",
+            message: "请选择审核状态",
+          },
+        ],
+        rebut: [
+          {
+            required: true,
+            trigger: "change",
+            message: "请选择驳回节点",
+          },
+        ],
+        status_remark: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入退回备注",
+          },
+        ],
+        can_sell_num: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入可销售入库数量",
+          },
+        ],
+        defective_num: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入次品入库数量",
+          },
+        ],
+        loss_num: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入丢失数量",
+          },
+        ],
+        can_sell_wsm_com: [
+          {
+            type: "array",
+            required: true,
+            trigger: "change",
+            message: "请选择可销售仓库所在公司",
+          },
+        ],
+        can_sell_wsm: [
+          {
+            type: "array",
+            required: true,
+            trigger: "change",
+            message: "请选择可销售入库仓库",
+          },
+        ],
+        defective_wsm_com: [
+          {
+            type: "array",
+            required: true,
+            trigger: "change",
+            message: "请选择次品仓库所在公司",
+          },
+        ],
+        defective_wsm: [
+          {
+            type: "array",
+            required: true,
+            trigger: "change",
+            message: "请选择次品入库仓库",
+          },
+        ],
+      },
+    };
+  },
+
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    async initForm() {
+      this.loading = true;
+      this.status = "";
+      this.rulesThis = this.rules;
+      await this.resetForm();
+      this.loading = false;
+    },
+
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          const {
+            status,
+            thNo,
+            return_wsm,
+            return_num,
+            can_sell_wsm_com,
+            companyNo,
+            can_sell_wsm_name,
+            defective_wsm,
+            can_sell_wsm,
+            can_sell_wsm_supplierNo,
+            can_sell_wsm_supplier,
+            defective_wsm_supplierNo,
+            defective_wsm_supplier,
+            can_sell_num,
+            defective_num,
+            defective_wsm_name,
+            status_remark,
+            loss_num,
+          } = this.sitem;
+
+          this.status = status;
+          this.return_num = return_num;
+          this.ruleForm = {
+            thNo: thNo || "",
+
+            state: status === "4" ? "1" : "1",
+            rebut: "",
+            status_remark: status_remark || "",
+            companyNo: companyNo || "",
+            can_sell_num: can_sell_num || "0",
+            can_sell_wsm_com: can_sell_wsm_supplierNo
+              ? [can_sell_wsm_supplierNo]
+              : [],
+            can_sell_wsm_com_code: can_sell_wsm_supplierNo || "",
+            can_sell_wsm_com_name: can_sell_wsm_supplier || "",
+            can_sell_wsm: can_sell_wsm ? [can_sell_wsm] : [],
+            can_sell_wsm_code: can_sell_wsm || "",
+            can_sell_wsm_name: can_sell_wsm_name || "",
+            defective_num: defective_num || "0",
+            defective_wsm_com: defective_wsm_supplierNo
+              ? [defective_wsm_supplierNo]
+              : [],
+            defective_wsm_com_code: defective_wsm_supplierNo || "",
+            defective_wsm_com_name: defective_wsm_supplier || "",
+            defective_wsm: defective_wsm ? [defective_wsm] : [],
+            defective_wsm_code: defective_wsm || "",
+            defective_wsm_name: defective_wsm_name || "",
+            loss_num: loss_num || "0",
+
+          };
+          // console.log(this.ruleForm);
+          this.stateChange();
+        }
+      });
+    },
+    stateChange() {
+      const { state } = this.ruleForm;
+      this.rulesThis.can_sell_num[0].required = state === "1";
+      this.rulesThis.defective_num[0].required = state === "1";
+      this.rulesThis.loss_num[0].required = state === "1";
+      this.rulesThis.can_sell_wsm_com[0].required = state === "1";
+      this.rulesThis.can_sell_wsm[0].required = state === "1";
+
+      this.rulesThis.defective_wsm_com[0].required = state === "1";
+      this.rulesThis.defective_wsm[0].required = state === "1";
+
+      this.rulesThis.rebut[0].required = state !== "1";
+      this.rulesThis.status_remark[0].required = state !== "1";
+    },
+    num_change(e, key) {
+      this.ruleForm[key] = e + "";
+      this.$refs.ruleForm.validateField(key);
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          const {
+            thNo,
+            state,
+            status_remark,
+            can_sell_wsm_code,
+            can_sell_num,
+            defective_wsm_code,
+            defective_num,
+            loss_num,
+            rebut,
+          } = this.ruleForm;
+          let model = {
+            thNo,
+            status: state === "1" ? "4" : rebut,
+            status_remark,
+            can_sell_wsm: can_sell_wsm_code,
+            defective_wsm: defective_wsm_code,
+            can_sell_num,
+            defective_num,
+            loss_num,
+          };
+
+          if (
+            (parseInt(this.return_num) !==
+            parseInt(can_sell_num) +
+              parseInt(defective_num) +
+              parseInt(loss_num))&&state === "1"
+          ) {
+            this.$message.warning(
+              "可销售数量+次品数量+丢失数量不等于总退货数！"
+            );
+            return;
+          }
+          // console.log(model);
+
+          const res = await asyncRequest.orderbackexamnew(model);
+          this.loading = false;
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "提交成功",
+              message: "",
+            });
+            this.$emit("refresh", false);
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    async company_idsearchChange(e) {
+      const { code } = e;
+      this.ruleForm.companyNo = code || "";
+    },
+    async supplierChange(e, key) {
+      const { code, label } = e;
+      this.ruleForm[key + "_name"] = label || "";
+      this.ruleForm[key + "_code"] = code || "";
+      this.ruleForm[key] = code ? [code] : [];
+      this.$refs.ruleForm.validateField(key);
+    },
+    async stockChange(e, key) {
+      const { code, label } = e;
+      this.ruleForm[key + "_name"] = label || "";
+      this.ruleForm[key + "_code"] = code || "";
+      this.ruleForm[key] = code ? [code] : [];
+      this.$refs.ruleForm.validateField(key);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/sellOut/returnOrder/components/return-record.vue

@@ -1,169 +1,174 @@
 <template>
-  <el-form
-    ref="ruleForm"
-    :loading="loading"
-    :model="ruleForm"
-    status-icon
-    :size="'mini'"
-    :rules="rulesThis"
-    label-width="115px"
-    style="width: 100%"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-col :span="8">
-        <el-form-item label="退货总数量" prop="return_num">
-          <el-input
-            disabled
-            v-model="ruleForm.return_num"
-            placeholder="退货总数量"
-             maxlength="10"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="可销售数量" prop="normal">
-          <el-input
-            :disabled="
-              !(
-                status === '1' &&
-                powers &&
-                powers.length > 0 &&
-                powers.some((item) => item == '047')
-              )
-            "
-            v-model="ruleForm.normal"
-            placeholder="可销售数量"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="16">
-        <el-form-item label="其他备注" prop="remark">
-          <el-input
-            :disabled="
-              !(
-                status === '1' &&
-                powers &&
-                powers.length > 0 &&
-                powers.some((item) => item == '047')
-              )
-            "
-            type="textarea"
-            maxlength="250"
-            :rows="3"
-            show-word-limit
-            placeholder="请填写备注"
-            v-model="ruleForm.remark"
-          >
-          </el-input>
-        </el-form-item>
-      </el-col>
-      <el-col
-        :span="24"
-        v-if="
-          status === '1' &&
-          powers &&
-          powers.length > 0 &&
-          powers.some((item) => item == '047')
-        "
-      >
-        <el-form-item label="异常情况记录" :size="'mini'">
-          <el-form
-            :model="ruleForm"
-            :rules="tableFormThis"
-            ref="ruleForm"
-            :size="'mini'"
-            class="demo-tableForm product_go"
-          >
-            <el-table
-              :data="ruleForm.product_go"
-              border
-              :size="'mini'"
-              row-key="key"
-            >
-              <el-table-column label="异常数量" prop="error_num" />
-              <el-table-column label="异常原因" prop="error_code_name" />
-              <el-table-column label="异常备注" prop="error_remark" />
-              <el-table-column
-                fixed="right"
-                label="操作"
-                width="80"
-                v-if="
+  <div v-loading="loading">
+    <el-form
+      ref="ruleForm"
+      :model="ruleForm"
+      status-icon
+      :size="'mini'"
+      :rules="rulesThis"
+      label-width="115px"
+      style="width: 100%"
+      class="demo-ruleForm"
+    >
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="退货总数量" prop="return_num">
+            <el-input
+              disabled
+              v-model="ruleForm.return_num"
+              placeholder="退货总数量"
+              maxlength="10"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="可销售数量" prop="normal">
+            <el-input
+              :disabled="
+                !(
+                  status === '1' &&
+                  powers &&
+                  powers.length > 0 &&
+                  powers.some((item) => item == '047')
+                )
+              "
+              v-model="ruleForm.normal"
+              placeholder="可销售数量"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="其他备注" prop="remark">
+            <el-input
+              :disabled="
+                !(
                   status === '1' &&
                   powers &&
                   powers.length > 0 &&
                   powers.some((item) => item == '047')
-                "
+                )
+              "
+              type="textarea"
+              maxlength="250"
+              :rows="3"
+              show-word-limit
+              placeholder="请填写备注"
+              v-model="ruleForm.remark"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col
+          :span="24"
+          v-if="
+            status === '1' &&
+            powers &&
+            powers.length > 0 &&
+            powers.some((item) => item == '047')
+          "
+        >
+          <el-form-item label="异常情况记录" :size="'mini'">
+            <el-form
+              :model="ruleForm"
+              :rules="tableFormThis"
+              ref="ruleForm"
+              :size="'mini'"
+              class="demo-tableForm product_go"
+            >
+              <el-table
+                :data="ruleForm.product_go"
+                border
+                :size="'mini'"
+                row-key="key"
               >
-                <template slot="header" slot-scope="scope">
+                <el-table-column label="异常数量" prop="error_num" />
+                <el-table-column label="异常原因" prop="error_code_name" />
+                <el-table-column label="异常备注" prop="error_remark" />
+                <el-table-column
+                  fixed="right"
+                  label="操作"
+                  width="80"
+                  v-if="
+                    status === '1' &&
+                    powers &&
+                    powers.length > 0 &&
+                    powers.some((item) => item == '047')
+                  "
+                >
+                  <template slot="header" slot-scope="scope">
+                    <!-- v-if="status == '1' || status == '0'" -->
+                    <span>操作</span>
+                    <el-tooltip
+                      class="fr"
+                      style="margin: 3px 0 0 0"
+                      effect="dark"
+                      content="添加"
+                      placement="top"
+                    >
+                      <i
+                        class="el-icon-circle-plus-outline tb-icon"
+                        style="color: #63cbe7"
+                        @click="openModal(-1)"
+                      ></i>
+                    </el-tooltip>
+                  </template>
                   <!-- v-if="status == '1' || status == '0'" -->
-                  <span>操作</span>
-                  <el-tooltip
-                    class="fr"
-                    style="margin: 3px 0 0 0"
-                    effect="dark"
-                    content="添加"
-                    placement="top"
-                  >
-                    <i
-                      class="el-icon-circle-plus-outline tb-icon"
-                      style="color: #63cbe7"
-                      @click="openModal(-1)"
-                    ></i>
-                  </el-tooltip>
-                </template>
-                <!-- v-if="status == '1' || status == '0'" -->
-                <template slot-scope="scope">
-                  <el-tooltip
-                    effect="dark"
-                    content="编辑"
-                    v-if="!scope.row.edit"
-                    placement="top"
-                  >
-                    <i
-                      class="el-icon-edit tb-icon"
-                      @click="openModal(scope.$index)"
-                    ></i>
-                  </el-tooltip>
+                  <template slot-scope="scope">
+                    <el-tooltip
+                      effect="dark"
+                      content="编辑"
+                      v-if="!scope.row.edit"
+                      placement="top"
+                    >
+                      <i
+                        class="el-icon-edit tb-icon"
+                        @click="openModal(scope.$index)"
+                      ></i>
+                    </el-tooltip>
 
-                  <el-tooltip
-                    v-if="scope.row.edit"
-                    effect="dark"
-                    content="重置"
-                    placement="top"
-                  >
-                    <i
-                      class="el-icon-delete tb-icon"
-                      @click="deleteRow(scope.$index, ruleForm.product_go)"
-                    ></i>
-                  </el-tooltip>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form>
-        </el-form-item>
-      </el-col>
-      <el-col
-        :span="24"
-        style="text-align: right; margin: -5px 0 20px 0"
-        v-if="
-          status === '1' &&
-          powers &&
-          powers.length > 0 &&
-          powers.some((item) => item == '047')
-        "
-      >
-        <el-button type="primary" class="fr" :size="'mini'" @click="submitForm"
-          >保 存
-        </el-button>
-      </el-col>
-    </el-row>
-    <abnormal-condition-modal
-      :index="index"
-      :sitem="s_item"
-      :show-model="showModel"
-      @refresh="handleValue"
-      @cancel="showModel = false"
-    />
-  </el-form>
+                    <el-tooltip
+                      v-if="scope.row.edit"
+                      effect="dark"
+                      content="重置"
+                      placement="top"
+                    >
+                      <i
+                        class="el-icon-delete tb-icon"
+                        @click="deleteRow(scope.$index, ruleForm.product_go)"
+                      ></i>
+                    </el-tooltip>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form>
+          </el-form-item>
+        </el-col>
+        <el-col
+          :span="24"
+          style="text-align: right; margin: -5px 0 20px 0"
+          v-if="
+            status === '1' &&
+            powers &&
+            powers.length > 0 &&
+            powers.some((item) => item == '047')
+          "
+        >
+          <el-button
+            type="primary"
+            class="fr"
+            :size="'mini'"
+            @click="submitForm"
+            >保 存
+          </el-button>
+        </el-col>
+      </el-row>
+      <abnormal-condition-modal
+        :index="index"
+        :sitem="s_item"
+        :show-model="showModel"
+        @refresh="handleValue"
+        @cancel="showModel = false"
+      />
+    </el-form>
+  </div>
 </template>
 <script>
 import asyncRequest from "@/apis/service/sellOut/returnOrder";
@@ -250,23 +255,28 @@ export default {
     },
   },
 
-  // mounted() {
-  //   this.initForm();
-  // },
+  mounted() {
+    console.log("mounted----------");
+    this.initForm();
+  },
   watch: {
     newTime: function (val) {
       if (val) {
+        console.log("newTime----------");
         this.initForm();
       }
     },
   },
-  mounted() {
-    this.initForm();
-  },
   methods: {
     async initForm() {
       this.loading = true;
       this.rulesThis = this.rules;
+      this.ruleForm = {
+        return_num: "", //收货总数量
+        normal: "", //可销售数量
+        remark: "", //其他备注
+        product_go: [], //表格参数
+      };
       await this.getresultlist();
       await this.resetForm();
       this.loading = false;
@@ -274,10 +284,15 @@ export default {
 
     async resetForm() {
       // 重置
+      console.log("11111" + this.newTime);
+
       await this.$nextTick(() => {
+        console.log(this.$refs.ruleForm);
+
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
+          console.log("11111" + this.newTime);
           this.status = "";
           this.arr = [];
           console.log(this.sitem);

src/views/sellOut/returnOrder/components/returnCheck.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-row class="addForm">
+  <el-row class="addForm" v-loading="loading">
     <el-col :span="24">
       <el-form
         :model="tableForm"
@@ -53,7 +53,7 @@
                 <el-input
                   :disabled="!scope.row.edit"
                   v-model="scope.row.check_remark"
-                   maxlength="100"
+                  maxlength="100"
                 ></el-input>
               </el-form-item>
             </template>
@@ -63,7 +63,12 @@
             fixed="right"
             label="操作"
             width="80"
-            v-if="status === '2' && powers && powers.length > 0 &&powers.some((item) => item == '042')"
+            v-if="
+              status === '2' &&
+              powers &&
+              powers.length > 0 &&
+              powers.some((item) => item == '042')
+            "
           >
             <template slot-scope="scope">
               <el-tooltip
@@ -102,7 +107,12 @@
         <el-col
           :span="24"
           style="text-align: right; padding: 30px 0 10px 0"
-          v-if="status === '2' &&powers && powers.length > 0 && powers.some((item) => item == '042')"
+          v-if="
+            status === '2' &&
+            powers &&
+            powers.length > 0 &&
+            powers.some((item) => item == '042')
+          "
         >
           <el-button type="primary" :size="'mini'" @click="submitForm"
             >保 存
@@ -178,11 +188,12 @@ export default {
       this.loading = false;
     },
     async resetForm() {
-      // 重置
       await this.$nextTick(() => {
         if (this.$refs.tableForm) {
           this.voList = [];
-          this.tableForm.product_go = [];
+          this.tableForm = {
+            product_go: [],
+          };
           this.$refs.tableForm.resetFields();
           this.$refs.tableForm.clearValidate();
           let { child, thNo, status } = this.sitem;
@@ -212,42 +223,48 @@ export default {
     },
 
     async submitForm() {
-      let index = -1;
-      this.tableForm.product_go.forEach((v, i) => {
-        if (v.edit && index === -1) {
-          index = i;
+      if (!this.loading) {
+        this.loading = true;
+
+        let index = -1;
+        this.tableForm.product_go.forEach((v, i) => {
+          if (v.edit && index === -1) {
+            index = i;
+          }
+        });
+        if (index !== -1) {
+          this.$message.warning("当前已有商品正在编辑！");
+          this.loading = false;
+          return;
         }
-      });
-      if (index !== -1) {
-        this.$message.warning("当前已有商品正在编辑！");
-        return;
-      }
-      let arr = [];
-      let model = JSON.parse(JSON.stringify(this.tableForm));
-      model.product_go.map((ele) => {
-        let obj = {
-          id: ele.id,
-          remark: ele.anomalous_remark,
-          status: ele.check_value,
-        };
-        arr.push(obj);
-      });
-      let _model = {
-        thNo: this.thNo,
-        errorlist: arr,
-        status: "3", //1待验货2待验货审核3待业务审核4完成 this.status + 1
-      };
-      const res = await asyncRequest.check(_model);
-      if (res && res.code === 0) {
-        this.$notify.success({
-          title: res.message,
-          message: "",
+        let arr = [];
+        let model = JSON.parse(JSON.stringify(this.tableForm));
+        model.product_go.map((ele) => {
+          let obj = {
+            id: ele.id,
+            remark: ele.anomalous_remark,
+            status: ele.check_value,
+          };
+          arr.push(obj);
         });
-        this.$emit("refresh");
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
+        let _model = {
+          thNo: this.thNo,
+          errorlist: arr,
+          status: "3", //1待验货2待验货审核3待业务审核4完成 this.status + 1
+        };
+        const res = await asyncRequest.check(_model);
+        this.loading = false;
+        if (res && res.code === 0) {
+          this.$notify.success({
+            title: res.message,
+            message: "",
+          });
+          this.$emit("refresh");
+        } else if (res && res.code >= 100 && res.code <= 104) {
+          await this.logout();
+        } else {
+          this.$message.warning(res.message);
+        }
       }
     },
     //异常原因筛选

src/views/sellOut/returnOrder/detail.vue

@@ -61,21 +61,14 @@
             <el-collapse-item
               title="业务审核"
               name="2"
-              v-if="status == '3' && powers.some((item) => item == '043')"
+              v-if="status == '3' || status == '4'"
             >
               <!----043--->
-              <exam-form
-                :statusList="[
-                  { value: '1', label: '待验货' },
-                  {
-                    value: '2',
-                    label: '待验货审核',
-                  },
-                ]"
+              <audit-form
+                v-if="newTime != ''"
                 :newTime="newTime"
-                :disabled="false"
-                :isMust="true"
-                @searchChange="examForm"
+                :sitem="sitem"
+                @refresh="initData"
               />
             </el-collapse-item>
           </el-collapse>
@@ -101,6 +94,7 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/returnOrder";
 import ReturnRecord from "./components/return-record";
 import ReturnCheck from "./components/returnCheck";
+import auditForm from "./components/auditForm";
 import ShowDataTableColumns from "./ShowDataTableColumns";
 
 export default {
@@ -109,6 +103,7 @@ export default {
   components: {
     ReturnRecord,
     ReturnCheck,
+    auditForm,
   },
   computed: {
     powers() {
@@ -130,14 +125,11 @@ export default {
       statusOptions: [
         { value: "0", label: "取消" },
         { value: "1", label: "退货商品验收" },
-        // { value: "2", label: "反馈物流费" },
         { value: "2", label: "退货验收审核" },
         { value: "3", label: "退货业务审核" },
-
         { value: "4", label: "退货已完成" },
       ],
       sitem: null, //传给组件
-      // --
       orderCode: "",
       activeNames: ["-1", "0", "1", "2"],
       status: "", //存储详情接口状态
@@ -162,11 +154,13 @@ export default {
   },
   mounted() {
     this.queryId = this.$route.query.id;
+    
     this.initData();
   },
   methods: {
     getNewTime() {
       this.newTime = new Date().valueOf();
+      console.log(this.newTime);
     },
     // 点击业务审核的保存按钮
     async examForm(e) {
@@ -206,6 +200,7 @@ export default {
         });
     },
     async initData() {
+      this.newTime=""
       let model = {
         thNo: this.queryId,
       };
@@ -227,7 +222,6 @@ export default {
       } else {
         this.$message.warning(res.message);
       }
-      // }
     },
   },
 };

src/views/sellOut/sellReturn/components/addModel.vue

@@ -150,7 +150,7 @@
                     v-model="ruleForm.good_num"
                     :disabled="true"
                     placeholder="购买数量"
-                     maxlength="10"
+                    maxlength="10"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -159,16 +159,16 @@
                   <el-input
                     v-model="ruleForm.returnT"
                     :disabled="true"
-                     maxlength="10"
+                    maxlength="10"
                     placeholder="可退数量"
                   ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6" v-show="ruleForm.return_type === '1'">
-                <el-form-item label="未发数量" prop="thnum">
+                <el-form-item label="退货数量" prop="thnum">
                   <digital-input
                     :values="ruleForm.thnum"
-                    :placeholder="'未发数量'"
+                    :placeholder="'退货数量'"
                     :min="0"
                     :disabled="false"
                     :max="ruleForm.returnT"
@@ -253,7 +253,7 @@ export default {
         thnum: [
           {
             required: true,
-            message: "请输入未发数量",
+            message: "请输入退货数量",
             trigger: "blur",
           },
         ],
@@ -304,14 +304,13 @@ export default {
       this.loading = false;
     },
     async number_change(e, key, index) {
-      if (index !== null) {
-        this.get_product_go[index][key] = e + "" || "0";
-        this.$set(this.get_product_go, index, this.get_product_go[index]);
-      } else {
+      if (index === undefined) {
         this.ruleForm[key] = e + "" || "0";
         this.$refs.ruleForm.validateField(key);
+      } else {
+        this.get_product_go[index][key] = e + "" || "0";
+        this.$set(this.get_product_go, index, this.get_product_go[index]);
       }
-      // this.get_product_go[index][key]=e + "" || "0"
     },
     return_type_change() {
       const { return_type } = this.ruleForm;
@@ -422,7 +421,7 @@ export default {
           this.loading = false;
           if (res && res.code === 0) {
             this.$notify.success({
-              title:"添加成功",
+              title: "添加成功",
               message: "",
             });
             this.showModelThis = false;