暂存

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

@@ -211,7 +211,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "zxAfterSaleOrderDetail"
+          (item) => item.menu_route == "returnOrderDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;

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

@@ -1,140 +1,112 @@
 <template>
-  <el-row class="returnCheck">
+  <el-row class="addForm">
     <el-col :span="24">
       <el-form
         :model="tableForm"
         :rules="tableFormThis"
         ref="tableForm"
         :size="'mini'"
-        class="demo-tableForm errorlist"
+        class="demo-tableForm product_go"
       >
- 
-          <el-table
-            :data="tableForm.errorlist"
-            border
-            :size="'mini'"
-            row-key="key"
-          >
-            <el-table-column label="异常数量">
-              <template slot-scope="scope">
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :prop="'errorlist.' + scope.$index + '.anomalous_numbers'"
-                >
-                  <p>
-                    {{ scope.row.anomalous_numbers }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="异常原因">
-              <template slot-scope="scope">
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :prop="'errorlist.' + scope.$index + '.anomalous_reason'"
-                >
-                  <p>{{ scope.row.anomalous_reason }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="异常备注">
-              <template slot-scope="scope">
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :prop="'errorlist.' + scope.$index + '.anomalous_remark'"
+        <el-table
+          :data="tableForm.product_go"
+          border
+          :size="'mini'"
+          row-key="key"
+        >
+          <el-table-column label="异常数量" prop="anomalous_numbers" />
+          <el-table-column label="异常原因" prop="anomalous_reason" />
+          <el-table-column label="异常备注" prop="anomalous_remark" />
+          <el-table-column label="审核情况" prop="check_value">
+            <template slot-scope="scope">
+              <el-form-item
+                :style="!scope.row.edit ? 'margin:0' : ''"
+                :size="'mini'"
+                :prop="'product_go.' + scope.$index + '.check_value'"
+                :rules="tableFormThis.check_value"
+              >
+                <el-select
+                  :disabled="!scope.row.edit"
+                  style="width: 100%"
+                  v-model="scope.row.check_value"
+                  placeholder="审核情况"
                 >
-                  <p>{{ scope.row.anomalous_remark }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="审核情况">
-              <template slot-scope="scope">
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :prop="'errorlist.' + scope.$index + '.check_value'"
-                >
-                  <el-select
-                    :disabled="!scope.row.edit"
-                    style="width: 100%"
-                    v-model="scope.row.check_value"
-                    placeholder="审核情况"
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
                   >
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="审核备注">
-              <template slot-scope="scope">
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :prop="'errorlist.' + scope.$index + '.check_remark'"
-                  :rules="{
-                    required: true,
-                    message: '审核备注不能为空',
-                    trigger: 'blur',
-                  }"
-                >
-                  <el-input
-                    :disabled="!scope.row.edit"
-                    v-model="scope.row.check_remark"
-                  ></el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核备注" prop="check_remark">
+            <template slot-scope="scope">
+              <el-form-item
+                :style="!scope.row.edit ? 'margin:0' : ''"
+                :size="'mini'"
+                :prop="'product_go.' + scope.$index + '.check_remark'"
+                :rules="tableFormThis.check_remark"
+              >
+                <el-input
+                  :disabled="!scope.row.edit"
+                  v-model="scope.row.check_remark"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
 
-            <el-table-column fixed="right" label="操作" width="80">
-              <template slot-scope="scope">
-                <el-tooltip
-                  effect="dark"
-                  content="编辑"
-                  v-if="!scope.row.edit"
-                  placement="top"
-                >
-                  <i
-                    class="el-icon-edit tb-icon"
-                    @click="editRow(scope.$index)"
-                  ></i>
-                </el-tooltip>
-
-                <el-tooltip
-                  effect="dark"
-                  content="保存"
-                  v-if="scope.row.edit"
-                  placement="top"
-                >
-                  <i
-                    class="el-icon-circle-check tb-icon"
-                    @click="checkRow(scope.$index)"
-                  ></i>
-                </el-tooltip>
+          <el-table-column
+            fixed="right"
+            label="操作"
+            width="80"
+            v-if="status === '2' && powers.some((item) => item == '042')"
+          >
+            <template slot-scope="scope">
+              <el-tooltip
+                effect="dark"
+                content="编辑"
+                v-if="!scope.row.edit"
+                placement="top"
+              >
+                <i
+                  class="el-icon-edit tb-icon"
+                  @click="editRow(scope.$index)"
+                ></i>
+              </el-tooltip>
 
-                <el-tooltip effect="dark" content="重置" placement="top">
-                  <i
-                    v-if="scope.row.edit"
-                    class="el-icon-refresh-left tb-icon"
-                    @click="resetRow(scope.$index)"
-                  ></i>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-          </el-table>
+              <el-tooltip
+                effect="dark"
+                content="保存"
+                v-if="scope.row.edit"
+                placement="top"
+              >
+                <i
+                  class="el-icon-circle-check tb-icon"
+                  @click="checkRow(scope.$index)"
+                ></i>
+              </el-tooltip>
 
-          <el-col :span="24" style="text-align: right; padding: 30px 0 10px 0">
-            <el-button
-              v-if="status == '2'"
-              type="primary"
-              :size="'mini'"
-              @click="submitForm"
-              >保 存
-            </el-button>
-          </el-col>
+              <el-tooltip effect="dark" content="重置" placement="top">
+                <i
+                  class="el-icon-refresh-left tb-icon"
+                  @click="resetRow(scope.$index)"
+                ></i>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-col
+          :span="24"
+          style="text-align: right; padding: 30px 0 10px 0"
+          v-if="status === '2' && powers.some((item) => item == '042')"
+        >
+          <el-button type="primary" :size="'mini'" @click="submitForm"
+            >保 存
+          </el-button>
+        </el-col>
       </el-form>
     </el-col>
   </el-row>
@@ -142,10 +114,9 @@
    <script>
 import asyncRequest from "@/apis/service/sellOut/returnOrder";
 import resToken from "@/mixins/resToken";
-import { isnumber } from "@/utils/validate";
 import config from "./columns"; //表格列参数
 export default {
-  name: "return-check",
+  name: "zxAfterSaleOrderDetail",
   props: ["id", "newTime", "sitem"],
 
   mixins: [resToken],
@@ -153,7 +124,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "return-check"
+          (item) => item.menu_route == "zxAfterSaleOrderDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -166,10 +137,10 @@ export default {
     return {
       thNo: "",
       options: [
-        {
-          value: "0",
-          label: "待审核",
-        },
+        // {
+        //   value: "0",
+        //   label: "待审核",
+        // },
         {
           value: "1",
           label: "同意",
@@ -182,7 +153,7 @@ export default {
       status: "",
       loading: false,
       tableForm: {
-        errorlist: [],
+        product_go: [],
       },
       tableFormThis: config.tableFormThis,
       voList: [],
@@ -202,6 +173,7 @@ export default {
   methods: {
     async initForm() {
       this.loading = true;
+      this.columns = [];
       await this.resetForm();
       this.loading = false;
     },
@@ -209,11 +181,14 @@ export default {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.tableForm) {
+          this.voList = [];
+          this.tableForm.product_go = [];
           this.$refs.tableForm.resetFields();
           this.$refs.tableForm.clearValidate();
           let { child, thNo, status } = this.sitem;
           this.status = status;
           this.thNo = thNo;
+
           child.map((ele) => {
             let obj = {
               id: ele.id,
@@ -221,15 +196,16 @@ export default {
               anomalous_reason: ele.error_code,
               anomalous_reason_code: ele.error_code, //异常原因code
               anomalous_remark: ele.error_remark,
-              check_value: ele.status,
-              check_remark: "",
+              check_value: ele.status === "0" ? "1" : ele.status,
+              check_remark: ele.exam_remark,
+              is_del: "0",
             };
             this.voList.push(obj);
           });
           let list = JSON.parse(JSON.stringify(this.voList));
           list.forEach((v) => {
             v.edit = false;
-            this.tableForm.errorlist.push(v);
+            this.tableForm.product_go.push(v);
           });
         }
       });
@@ -237,7 +213,7 @@ export default {
 
     async submitForm() {
       let index = -1;
-      this.tableForm.errorlist.forEach((v, i) => {
+      this.tableForm.product_go.forEach((v, i) => {
         if (v.edit && index === -1) {
           index = i;
         }
@@ -248,7 +224,7 @@ export default {
       }
       let arr = [];
       let model = JSON.parse(JSON.stringify(this.tableForm));
-      model.errorlist.map((ele) => {
+      model.product_go.map((ele) => {
         let obj = {
           id: ele.id,
           remark: ele.anomalous_remark,
@@ -256,12 +232,13 @@ export default {
         };
         arr.push(obj);
       });
-      model.thNo = this.thNo;
-      model.errorlist = arr;
-      model.status = "3"; //1待验货2待验货审核3待业务审核4完成 this.status + 1
-      const res = await asyncRequest.check(model); //验货审核orderbce
+      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) {
-        console.log("submit");
         this.$notify.success({
           title: res.message,
           message: "",
@@ -276,26 +253,35 @@ export default {
     //异常原因筛选
     //保存某一行
     checkRow(rowIndex) {
-      const { check_value, check_remark } = this.tableForm.errorlist[rowIndex];
-      if (check_value != "" && check_remark != "") {
-        this.tableForm.errorlist[rowIndex].edit = false;
-      } else {
-        this.$message.warning("审核情况或审核备注不能为空");
+      const { check_value, check_remark } = this.tableForm.product_go[rowIndex];
+      if (check_value!=="1"&&check_value!=="2") {
+        this.$message.warning("审核情况不能为空!");
+        return;
+      }
+      if (check_value === "2" && check_remark === "") {
+        this.$message.warning("审核备注不能为空!");
+        return;
+      }
+      if (check_value === "1") {
+        this.tableForm.product_go[rowIndex].edit = false;
+      }
+      if (check_value === "2" && check_remark !== "") {
+        this.tableForm.product_go[rowIndex].edit = false;
       }
     },
     //编辑某一行
     editRow(rowIndex) {
-      let index = this.tableForm.errorlist.findIndex((v) => v.edit);
+      let index = this.tableForm.product_go.findIndex((v) => v.edit);
       if (index !== -1) {
         this.$message.warning("请完成其他行的编辑！");
         return;
       } else {
-        this.tableForm.errorlist[rowIndex].edit = true;
+        this.tableForm.product_go[rowIndex].edit = true;
       }
     },
     resetRow(rowIndex) {
-      this.tableForm.errorlist[rowIndex].check_remark = "";
-      this.tableForm.errorlist[rowIndex].check_value = "agree";
+      this.tableForm.product_go[rowIndex].check_remark = "";
+      this.tableForm.product_go[rowIndex].check_value = "1";
     },
   },
 };

src/views/sellOut/returnOrder/detail.vue

@@ -20,9 +20,9 @@
           ></return-record>
         </el-collapse-item>
 
-        <el-collapse-item title="退货验收审核" name="1">
+        <el-collapse-item title="退货验收审核" name="1" v-if="status == '2'||status == '3'||status == '4'">
           <return-check
-            v-if="newTime != '' && status == '2'"
+            v-if="newTime != '' "
             :newTime="newTime"
             :sitem="sitem"
             @refresh="initData"
@@ -31,11 +31,9 @@
         <el-collapse-item
           title="业务审核"
           name="2"
-          v-if="powers.some((item) => item == '001')"
+          v-if="status == '3'&&powers.some((item) => item == '042')"
         >
-          {{ status }}
           <exam-form
-            v-if="status == '3'"
             :statusList="statusList"
             :newTime="newTime"
             :disabled="false"
@@ -95,12 +93,6 @@ export default {
         { value: "3", label: "退货业务审核" },
 
         { value: "4", label: "退货完成" },
-
-        // { id: "0", label: "待申请" },
-        // { id: "1", label: "待验收" },
-        // { id: "2", label: "待验收审核" },
-        // { id: "3", label: "待业务审核" },
-        // { id: "4", label: "完成退货" },
       ],
       sitem: null, //传给组件
       // --
@@ -179,7 +171,7 @@ export default {
       if (res && res.code === 0 && res.data) {
         this.status = res.data.status;
         this.sitem = res.data;
-        this.orderCode =res.data.orderCode;
+        this.orderCode = res.data.orderCode;
         this.getNewTime();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();

src/views/sellOut/salesOrder/addEdit.vue

@@ -13,10 +13,7 @@
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
   >
-    <p>id：{{ id }} isDetail：{{ isDetail }}</p>
-    <p>{{ showModel }}</p>
-    <!-- <p>sitem:{{ sitem }}</p> -->
-    <el-card>
+    <el-card style="margin:-20px 0 0 0">
       <add-edit-form
         v-if="showModel"
         :showModel="showModel"

src/views/sellOut/salesOrder/addEditForm.vue

@@ -1,42 +1,24 @@
 <template>
   <el-row :gutter="10">
-    <!-- <p>{{ sitem }}</p> -->
-    <p>{{ id }}--id</p>
-    <p>isDetail--{{ isDetail }}</p>
-    <p>showModel--{{ showModel }}</p>
-    <p>{{ showModelThis }}--showModelThis</p>
     <el-col :span="24">
       <el-form
         :model="ruleForm"
         status-icon
         :rules="rulesThis"
         ref="ruleForm"
-        label-width="110px"
+        label-width="95px"
         class="demo-ruleForm"
       >
-        <el-form-item
-          label="退货原因"
-          prop="errorCode"
-          v-if="id === 'add' || isDetail"
-        >
-          <el-select
-            :disabled="isDetail"
-            style="width: 100%"
-            v-model="ruleForm.errorCode"
-            placeholder="退换货原因"
-          >
-            <el-option
-              v-for="item in reason_options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
+        <el-form-item label="退换货原因" prop="errorCode">
+          <abnormal-cause
+            :value="ruleForm.errorCode"
+            :placeholder="'退换货原因'"
+            :type="'5'"
+            @searchChange="errorCode_change"
+          />
         </el-form-item>
 
         <el-form-item label="退货备注" prop="remark">
-          <!-- <el-input v-model="ruleForm.tel" :disabled="isDetail"></el-input> -->
           <el-input
             :disabled="isDetail"
             type="textarea"
@@ -46,7 +28,7 @@
             v-model="ruleForm.remark"
           />
         </el-form-item>
-        <el-form-item label="仓库信息">
+        <el-form-item label="仓库信息" :size="'mini'" required>
           <el-table
             :data="tableForm.product_go"
             border
@@ -54,93 +36,31 @@
             row-key="key"
             v-if="!isDetail"
           >
-            <el-table-column label="商品总数量" width="100">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.num }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="已发货数量" width="100">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>
-                    {{ scope.row.send_num }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="未发货数量" width="100">
+            <el-table-column
+              label="仓库名称"
+              min-width="300"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.wsend_num }}</p>
-                </el-form-item>
+                {{ scope.row.wsm_supplier }}{{ scope.row.wsm_name }}
               </template>
             </el-table-column>
-            <el-table-column label="退货数量">
+            <el-table-column label="下单总数量" width="100" prop="num" />
+            <el-table-column label="已发货数量" width="100" prop="send_num" />
+            <el-table-column label="未发货数量" width="100" prop="wsend_num" />
+            <el-table-column label="退货数量" width="120">
               <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.return_num'" -->
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :rules="{
-                    required: true,
-                    message: '退货数量不能为空',
-                    trigger: 'blur',
-                  }"
-                >
+                <el-form-item style="margin: 0">
                   <el-input
                     :disabled="!scope.row.edit"
-                    v-model="ruleForm.return_num"
+                    :size="'mini'"
+                    v-model="scope.row.return_num"
                   ></el-input>
-                  <!-- <p></p> -->
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="采购订单编号" width="180">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.orderCode }}</p>
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="仓库名称" width="150">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsm_name'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.wsm_name }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="仓库供应商" width="220">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.wsm_supplier }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="仓库编码" width="200">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.wsm_code }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-
-            <!-- <el-table-column label="仓库供应商">
-                  <template slot-scope="scope">
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.wsm_supplierNo }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column> -->
 
-            <el-table-column fixed="right" label="操作" width="80">
+            <el-table-column fixed="right" label="操作" width="50">
               <template slot-scope="scope">
                 <el-tooltip
                   effect="dark"
@@ -150,7 +70,7 @@
                 >
                   <i
                     class="el-icon-edit tb-icon"
-                    @click="editRow(scope.$index, 'return')"
+                    @click="editRow(scope.$index, 0)"
                   ></i>
                 </el-tooltip>
 
@@ -162,238 +82,50 @@
                 >
                   <i
                     class="el-icon-circle-check tb-icon"
-                    @click="checkRow(scope.$index, 'return')"
-                  ></i>
-                </el-tooltip>
-
-                <el-tooltip effect="dark" content="重置" placement="top">
-                  <i
-                    v-if="scope.row.edit"
-                    class="el-icon-refresh-left tb-icon"
-                    @click="resetRow(scope.$index)"
+                    @click="checkRow(scope.$index, 0)"
                   ></i>
                 </el-tooltip>
               </template>
             </el-table-column>
           </el-table>
-
-          <el-table
-            disabled="true"
-            :data="tableForm.product_go"
-            border
-            :size="'mini'"
-            row-key="key"
-            v-if="isDetail"
-          >
-            <el-table-column label="退货单编号" width="180" disabled="true">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p :disabled="true">{{ scope.row.returnCode }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="采购订单编号" width="180">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.orderCode }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-
-            <el-table-column label="退货数量" width="80">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>
-                    {{ scope.row.return_num }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="发货数量" width="80">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.total_num }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="采购编码" width="180">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.orderCode }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="仓库名称" width="150">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsm_name'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.wsm_name }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="仓库编码" width="200">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.wsm_code }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="仓库名称" width="220">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.wsm_name }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="仓库所属公司" width="200">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.wsm_supplier }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="仓库所属公司编码" width="200">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.wsm_supplierNo }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <!-- <el-table-column fixed="right" label="操作" width="80">
-              <template slot-scope="scope">
-                <el-tooltip
-                  effect="dark"
-                  content="编辑"
-                  v-if="!scope.row.edit"
-                  placement="top"
-                >
-                  <i
-                    class="el-icon-edit tb-icon"
-                    @click="editRow(scope.$index, 'return')"
-                  ></i>
-                </el-tooltip>
-
-                <el-tooltip
-                  effect="dark"
-                  content="保存"
-                  v-if="scope.row.edit"
-                  placement="top"
-                >
-                  <i
-                    class="el-icon-circle-check tb-icon"
-                    @click="checkRow(scope.$index, 'return')"
-                  ></i>
-                </el-tooltip>
-
-                <el-tooltip effect="dark" content="重置" placement="top">
-                  <i
-                    v-if="scope.row.edit"
-                    class="el-icon-refresh-left tb-icon"
-                    @click="resetRow(scope.$index)"
-                  ></i>
-                </el-tooltip>
-              </template>
-            </el-table-column> -->
-          </el-table>
         </el-form-item>
-        <el-form-item label="收货信息">
+        <el-form-item label="收货信息" :size="'mini'" required>
           <el-table
             :data="tableForm.get_product_go"
             border
             :size="'mini'"
             row-key="key"
-            v-if="!isDetail"
           >
-            <el-table-column label="收货总数量">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>
-                    {{ scope.row.receipt_quantity }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="已发货数量">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>
-                    {{ scope.row.send_num }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="未发货数量">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.wsend_num }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="退货数量">
+            <el-table-column
+              label="收货人-联系电话-地址"
+              min-width="300"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.return_num'" -->
-                <el-form-item
-                  :style="!scope.row.edit ? 'margin:0' : ''"
-                  :rules="{
-                    required: true,
-                    message: '退货数量不能为空',
-                    trigger: 'blur',
-                  }"
-                >
+                {{ scope.row.contactor }}-{{ scope.row.mobile }}-{{
+                  scope.row.addr_info
+                }}{{ scope.row.addr }}
+              </template></el-table-column
+            >
+            <el-table-column
+              label="收货总数量"
+              prop="receipt_quantity"
+              width="100"
+            />
+            <el-table-column label="已发货数量" prop="send_num" width="100" />
+            <el-table-column label="未发货数量" prop="wsend_num" width="100" />
+            <el-table-column label="退货数量" width="120">
+              <template slot-scope="scope">
+                <el-form-item style="margin: 0" :size="'mini'">
                   <el-input
                     :disabled="!scope.row.edit"
-                    v-model="ruleForm.get_return_num"
+                    v-model="scope.row.return_num"
                   ></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="采购编码" width="200">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>
-                    {{ scope.row.orderCode }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <!-- <el-table-column label="仓库供应商">
-                  <template slot-scope="scope">
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.wsm_supplierNo }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column> -->
-            <el-table-column label="收货联系人 ">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsm_name'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.contactor }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="联系方式" width="120">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsm_name'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.mobile }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
 
-            <el-table-column fixed="right" label="操作" width="80">
+            <el-table-column fixed="right" label="操作" width="50">
               <template slot-scope="scope">
                 <el-tooltip
                   effect="dark"
@@ -403,7 +135,7 @@
                 >
                   <i
                     class="el-icon-edit tb-icon"
-                    @click="editRow(scope.$index, 'get')"
+                    @click="editRow(scope.$index, 1)"
                   ></i>
                 </el-tooltip>
 
@@ -415,117 +147,9 @@
                 >
                   <i
                     class="el-icon-circle-check tb-icon"
-                    @click="checkRow(scope.$index, 'get')"
+                    @click="checkRow(scope.$index, 1)"
                   ></i>
                 </el-tooltip>
-
-                <el-tooltip effect="dark" content="重置" placement="top">
-                  <i
-                    v-if="scope.row.edit"
-                    class="el-icon-refresh-left tb-icon"
-                    @click="resetRow(scope.$index)"
-                  ></i>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-          </el-table>
-
-          <el-table
-            :data="tableForm.get_product_go"
-            border
-            :size="'mini'"
-            row-key="key"
-            v-if="isDetail"
-          >
-            <el-table-column label="退货单编号" width="180">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>
-                    {{ scope.row.returnCode }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="采购订单编号" width="180">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>
-                    {{ scope.row.orderCode }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="收货数量">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.send_num }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="退货数量">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.return_num }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="联系人 ">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsm_name'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.contactor }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="联系方式" width="120">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.wsm_name'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>{{ scope.row.mobile }}</p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="物流费" width="200">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>
-                    {{ scope.row.post_fee }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <!-- <el-table-column label="收货时间" width="200">
-              <template slot-scope="scope">
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>
-                    {{ scope.row.addive_time }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column> -->
-            <el-table-column label="客户编码" width="200">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>
-                    {{ scope.row.customer_code }}
-                  </p>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="客户名称" min-width="250">
-              <template slot-scope="scope">
-                <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                  <p>
-                    {{ scope.row.customer_name }}
-                  </p>
-                </el-form-item>
               </template>
             </el-table-column>
           </el-table>
@@ -533,12 +157,10 @@
       </el-form>
     </el-col>
     <el-col :span="24" style="text-align: right">
-      <el-button type="primary" @click="submitForm" v-if="!isDetail"
-        >保 存
-      </el-button>
-      <el-button @click="showModelThis = false" v-if="!isDetail">{{
-        isDetail ? "关 闭" : "取 消"
-      }}</el-button>
+      <el-button type="primary" @click="submitForm">保 存 </el-button>
+      <el-button @click="showModelThis = false" v-if="!isDetail"
+        >关 闭</el-button
+      >
     </el-col>
   </el-row>
 </template>
@@ -546,99 +168,19 @@
    <script>
 import asyncRequest from "@/apis/service/sellOut/sellReturnList";
 import resToken from "@/mixins/resToken";
-import {
-  isnumber,
-  isMobile,
-  validEmail,
-  isAlphanumeric,
-  isChinese,
-  isEmoticon,
-  validAlphabets,
-} from "@/utils/validate";
+import { isnumber } from "@/utils/validate";
 export default {
   name: "sellReturnList",
   props: ["showModel", "id", "isDetail", "sitem", "showModelThis", "newTime"],
   mixins: [resToken],
   data() {
-    const validateusername = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("账号不能为空！"));
-      } else {
-        if (value.length < 6 || value.length > 18) {
-          callback(new Error("账号规则为6~18位数字与字母组合！"));
-        } else {
-          if (isnumber(value)) {
-            callback(new Error("账号规则为6~18位数字与字母组合！"));
-          } else if (validAlphabets(value)) {
-            callback(new Error("账号规则为6~18位数字与字母组合！"));
-          } else if (!isAlphanumeric(value)) {
-            callback(new Error("账号规则为6~18位数字与字母组合！"));
-          } else {
-            callback();
-          }
-        }
-      }
-    };
-    const validatename = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("真实姓名不能为空！"));
-      } else {
-        if (value.length < 2 || value.length > 12) {
-          callback(new Error("真实姓名规则为2~12位汉字！"));
-        } else {
-          if (!isChinese(value)) {
-            callback(new Error("真实姓名规则为2~12位汉字！"));
-          } else if (isEmoticon(value)) {
-            callback(new Error("真实姓名规则为2~12位汉字！"));
-          } else {
-            callback();
-          }
-        }
-      }
-    };
-    const validatemobile = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("手机号不能为空！"));
-      } else {
-        if (!isMobile(value)) {
-          callback(new Error("手机号格式不正确！"));
-        } else {
-          callback();
-        }
-      }
-    };
-
-    const validateEmail = (rule, value, callback) => {
-      if (value === "") {
-        callback();
-      } else {
-        if (!validEmail(value)) {
-          callback(new Error("邮箱格式不正确！"));
-        } else {
-          callback();
-        }
-      }
-    };
     return {
-      totalReturnNum: "", //仓库总退货数量
-      totalReturnNumbers: "", //收货总退货数量
-
-      noSendNumbers: "", //收货-未发货数量
-      noSendNum: "", //销售-未发货数量
-      reason_options: [], //退换货原因备选项
       loading: false,
-      title: "添加销售退货单",
       showModelThis: this.showModel,
       ruleForm: {
-        get_return_num: "",
         orderCode: "", //出库单编号
         remark: "", //退货备注
-        return_num: "", //退货数量
         errorCode: "", //退货原因
-        // email: "",
-        // role_id: "",
-        // status: "1",
-        // item: [],
       },
       rulesThis: this.rules,
       rules: {
@@ -646,17 +188,9 @@ export default {
           {
             required: true,
             message: "请选择退货原因",
-            // type: "array",
             trigger: "change",
           },
         ],
-        return_num: [
-          {
-            required: true,
-            validator: validatemobile,
-            trigger: "blur",
-          },
-        ],
         remark: [
           {
             required: true,
@@ -675,125 +209,53 @@ export default {
     this.initForm();
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
-      if (val) {
-        this.initForm();
-      }
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      }
-    },
     newTime: function (val) {
       if (val) {
         this.initForm();
       }
     },
-    id: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
   },
 
   methods: {
-    
-    // 获取退换货原因
-    async getReason() {
-      this.loading = true;
-      let model = {
-        page: 1,
-        size: 15,
-        type: "5",
-      };
-      this.reason_options = [];
-      const res = await asyncRequest.getReason(model);
-      if (res && res.code === 0 && res.data) {
-        res.data.list.forEach((element) => {
-          let obj = {
-            value: element.result_code,
-            label: element.result,
-            id: element.id,
-          };
-          this.reason_options.push(obj);
-        });
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.tableData = [];
-        this.pageInfo.total = 0;
-      }
-      this.loading = false;
+    errorCode_change(e) {
+      this.ruleForm.errorCode = e && e.code ? e.code : "";
+      this.$refs.ruleForm.validateField("errorCode");
     },
     async initForm() {
       this.loading = true;
-      if (this.id === "add") {
-        this.title = "添加销售退货单";
-        this.rulesThis = this.rules;
-        await this.resetForm();
-      } else {
-        if (this.isDetail) {
-          this.title = "添加销售退货单详情";
-          this.rulesThis = {};
-        } else {
-          this.title = "修改添加销售退货单";
-          this.rulesThis = this.rules;
-        }
-        // await this.getReason();
-        await this.initData();
-      }
-    
-      this.getReason(); //获取退还货原因
-
+      this.rulesThis = this.rules;
+      await this.resetForm();
       this.loading = false;
     },
-    async initData() {
-      let model = JSON.parse(JSON.stringify(this.sitem));
-      this.ruleForm = {
-        get_return_num: model.addrinfo,
-        orderCode: "", //出库单编号
-        remark: model.remark, //退货备注
-        return_num: model.num, //退货数量
-        errorCode: [model.error_msg], //退货原因
-      };
-      let { addrinfo, wsminfo } = model;
-      this.tableForm.product_go = wsminfo;
-      this.tableForm.get_product_go = addrinfo;
-    },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          this.orderCode = this.sitem.orderCode;
-          const { info, addrs } = this.sitem;
-          info.forEach((ele) => {
-            this.noSendNum += ele.wsend_num;
-          });
+          const { info, addrs, orderCode } = this.sitem;
           let list = JSON.parse(JSON.stringify(info)); //
           list.map((v) => {
             v.edit = false;
+            v.return_num = v.return_num || "0";
             return v;
           });
           this.tableForm.product_go = [].concat(...list);
-
-          addrs.forEach((ele) => {
-            this.noSendNumbers += ele.wsend_num;
-          });
           let l_list = JSON.parse(JSON.stringify(addrs));
           l_list.map((ele) => {
             ele.edit = false;
+            ele.return_num = ele.return_num || "0";
             return ele;
           });
-          this.tableForm.get_product_go = [].concat(...l_list);
           this.ruleForm = {
+            orderCode: orderCode || "",
             remark: "", //退货备注
-            return_num: "", //退货数量
             errorCode: "", //退货原因
           };
+          this.tableForm = {
+            product_go: [].concat(...list),
+            get_product_go: [].concat(...l_list),
+          };
         }
       });
     },
@@ -802,42 +264,55 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.loading = true;
-          const model = JSON.parse(JSON.stringify(this.ruleForm));
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
           let arr = JSON.parse(JSON.stringify(this.tableForm.product_go));
-          //收货信息列表入参
+          let arr1 = JSON.parse(JSON.stringify(this.tableForm.get_product_go));
+          let wsm_code_edit = false,
+            addr_edit = false,
+            wsm_code_total = 0,
+            addr_total = 0;
           let list = [];
-          arr.map((e) => {
+          arr.forEach((e) => {
+            if (e.edit) {
+              wsm_code_edit = true;
+            }
             let obj = {
               wsm_code: e.wsm_code,
-              return_num: model.return_num,
+              return_num: e.return_num,
             };
+            wsm_code_total += e.return_num;
             list.push(obj);
           });
-          // 地址列表入参
-          let arr1 = JSON.parse(JSON.stringify(this.tableForm.get_product_go));
           let addr = [];
-          arr1.map((e) => {
+          arr1.forEach((e) => {
+            if (e.edit) {
+              addr_edit = true;
+            }
             let obj = {
               addrid: e.id,
-              return_num: model.get_return_num,
+              return_num: e.return_num,
             };
+            addr_total += e.return_num;
             addr.push(obj);
           });
           model.list = list;
           model.addr = addr;
-          model.orderCode = this.orderCode;
-          delete model["get_return_num"];
-          if (Number(model.return_num) > Number(this.noSendNum)) {
-            this.$message.warning("退货数量不能大于未发货数量");
+          if (wsm_code_edit) {
+            this.$message.warning("仓库信息正在编辑，请保存后再试！");
+            this.loading = false;
             return;
           }
-          let res = {};
-          if (this.id === "add") {
-            delete model["id"];
-            res = await asyncRequest.add(model);
-          } else {
-            res = await asyncRequest.update(model);
+          if (addr_edit) {
+            this.$message.warning("地址信息正在编辑，请保存后再试！");
+            this.loading = false;
+            return;
+          }
+          if (wsm_code_total !== addr_total) {
+            this.$message.warning("仓库退货总数不等于收货地址总数！");
+            this.loading = false;
+            return;
           }
+          let res = await asyncRequest.add(model);
           this.loading = false;
           if (res && res.code === 0) {
             const title = this.id === "add" ? "添加成功" : "修改成功";
@@ -859,64 +334,55 @@ export default {
         }
       });
     },
-    //异常原因筛选
     //保存某一行
-    checkRow(rowIndex, name) {
-      if (name == "return") {
-        const model = JSON.parse(JSON.stringify(this.ruleForm));
-        if (Number(model.return_num) > Number(this.noSendNum)) {
-          this.$message.warning("退货数量不能大于未发货数量");
+    checkRow(rowIndex, type) {
+      if (type === 0) {
+        const { wsend_num, return_num } = this.tableForm.product_go[rowIndex];
+        if (!isnumber(return_num)) {
+          this.$message.warning("退货数量不规范！");
           return;
         }
-        const { check_value, check_remark } =
-          this.tableForm.product_go[rowIndex];
-        if (check_value != "" && check_remark != "") {
-          this.tableForm.product_go[rowIndex].edit = false;
-        } else {
-          this.$message.warning("审核情况或审核备注不能为空");
-        }
-      } else if (name == "get") {
-        const model = JSON.parse(JSON.stringify(this.ruleForm));
-        if (Number(model.get_return_num) > Number(this.noSendNum)) {
-          this.$message.warning("退货数量不能大于未发货数量");
+        if (parseInt(wsend_num) < parseInt(return_num)) {
+          this.$message.warning("退货数量不能大于未发货总数量！");
           return;
         }
-        const { check_value, check_remark } =
-          this.tableForm.get_product_go[rowIndex];
-        if (check_value != "" && check_remark != "") {
-          this.tableForm.get_product_go[rowIndex].edit = false;
-        } else {
-          this.$message.warning("审核情况或审核备注不能为空");
-        }
+        this.tableForm.product_go[rowIndex].edit = false;
       }
-    },
-    //编辑某一行
-    editRow(rowIndex, name) {
-      if (name == "return") {
-        let index = this.tableForm.product_go.findIndex((v) => {
-          v.edit;
-        });
-        if (index !== -1) {
-          this.$message.warning("请完成其他行的编辑！");
+
+      if (type === 1) {
+        const { wsend_num, return_num } =
+          this.tableForm.get_product_go[rowIndex];
+        if (!isnumber(return_num)) {
+          this.$message.warning("退货数量不规范！");
           return;
-        } else {
-          this.tableForm.product_go[rowIndex].edit = true;
         }
-      } else if (name == "get") {
-        let index = this.tableForm.product_go.findIndex((v) => {
-          v.edit;
-        });
-        if (index !== -1) {
-          this.$message.warning("请完成其他行的编辑！");
+        if (parseInt(wsend_num) < parseInt(return_num)) {
+          this.$message.warning("退货数量不能大于未发货总数量！");
           return;
-        } else {
-          this.tableForm.get_product_go[rowIndex].edit = true;
         }
+        this.tableForm.get_product_go[rowIndex].edit = false;
       }
     },
-    resetRow(rowIndex) {
-      this.tableForm.product_go[rowIndex].check_remark = "";
-      this.tableForm.product_go[rowIndex].check_value = "agree";
+    //编辑某一行
+    editRow(rowIndex, type) {
+      let list = JSON.parse(
+        JSON.stringify(
+          type === 0 ? this.tableForm.product_go : this.tableForm.get_product_go
+        )
+      );
+      let index = list.findIndex((v) => {
+        v.edit;
+      });
+      if (index !== -1) {
+        this.$message.warning("请完成其他行的编辑！");
+        return;
+      }
+
+      if (type === 0) {
+        this.tableForm.product_go[rowIndex].edit = true;
+      } else {
+        this.tableForm.get_product_go[rowIndex].edit = true;
+      }
     },
   },
 };

src/views/sellOut/salesOrder/detail.vue

@@ -4,8 +4,10 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-    <p><span> {{ status }}----{{ powers }}</span></p>
-      <div class="tl" style="height:60px; padding: 15px 0 0 0">
+      <p>
+        <span> {{ status }}----{{ powers }}</span>
+      </p>
+      <div class="tl" style="height: 60px; padding: 15px 0 0 0">
         <span>销售订单编号：</span>
         <span v-if="sitem">{{ sitem.orderCode }}</span>
         <el-button
@@ -24,13 +26,13 @@
           >作废该条信息</el-button
         >
         <el-button
-          v-if="status !== '0'"
+          v-if="status === '4' && powers.some((item) => item == '051')"
           style="margin: 0 0 0 10px"
           class="fr"
           type="primary"
           plain
           :size="'mini'"
-          @click="openModal('add', false, 'sell')"
+          @click="openModal()"
           >新建销售退货单
         </el-button>
       </div>
@@ -133,14 +135,14 @@
           />
         </el-collapse-item>
       </el-collapse>
-      <!-- <add-edit
+      <add-edit
         :id="modelId"
         :sitem="s_sitem"
         :show-model="showModel"
         :is-detail="isDetail"
         @refresh="searchList"
         @cancel="showModel = false"
-      /> -->
+      />
       <!-- <edit-add
         :id="modelId"
         :sitem="sitem"
@@ -162,12 +164,12 @@ import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
 import addForm from "./components/addForm";
 import feedbackForm from "./components/feedback-form";
 import orderOutTable from "./components/order-out-table";
-// import addEdit from "./addEdit";
+import addEdit from "./addEdit";
 export default {
   name: "salesOrderDetail",
   mixins: [mixinPage, resToken],
   components: {
-    // addEdit,
+    addEdit,
     addForm,
     feedbackForm,
     orderOutTable,
@@ -292,18 +294,10 @@ export default {
       }
       this.loading = false;
     },
-    openModal(id, isDetail, sitem) {
-      if (sitem == "sell") {
-        this.showModel = true;
-      } else {
-        this.showModell = true;
-      }
-
-      this.modelId = id;
-      this.isDetail = isDetail;
-      // this.sitem = sitem;
-      // this.sitem.info[0].edit = false;
+    openModal() {
+      this.modelId = "add";
       this.s_sitem = this.sitem;
+      this.showModel = true;
     },
   },
 };

src/views/sheetOrder/zxAfterSaleOrder/components/return-record.vue

@@ -137,7 +137,7 @@
   </el-form>
 </template>
 <script>
-import asyncRequest from "@/apis/service/sellOut/returnOrder";
+import asyncRequest from "@/apis/service/sheetOrder/zxAfterSaleOrder";
 import resToken from "@/mixins/resToken";
 import { isnumber } from "@/utils/validate";
 import abnormalConditionModal from "@/components/abnormal-condition-modal";

src/views/sheetOrder/zxAfterSaleOrder/components/returnCheck.vue

@@ -12,7 +12,7 @@
           :data="tableForm.product_go"
           border
           :size="'mini'"
-         row-key="key"
+          row-key="key"
         >
           <el-table-column label="异常数量" prop="anomalous_numbers" />
           <el-table-column label="异常原因" prop="anomalous_reason" />
@@ -61,7 +61,7 @@
           <el-table-column
             fixed="right"
             label="操作"
-            width="50"
+            width="80"
             v-if="status === '2' && powers.some((item) => item == '042')"
           >
             <template slot-scope="scope">
@@ -91,7 +91,6 @@
 
               <el-tooltip effect="dark" content="重置" placement="top">
                 <i
-                  v-if="scope.row.edit"
                   class="el-icon-refresh-left tb-icon"
                   @click="resetRow(scope.$index)"
                 ></i>
@@ -113,7 +112,7 @@
   </el-row>
 </template>
    <script>
-import asyncRequest from "@/apis/service/sellOut/returnOrder";
+import asyncRequest from "@/apis/service/sheetOrder/zxAfterSaleOrder";
 import resToken from "@/mixins/resToken";
 import config from "./columns"; //表格列参数
 export default {
@@ -255,7 +254,7 @@ export default {
     //保存某一行
     checkRow(rowIndex) {
       const { check_value, check_remark } = this.tableForm.product_go[rowIndex];
-      if (check_value) {
+      if (check_value !== "1" && check_value !== "2") {
         this.$message.warning("审核情况不能为空!");
         return;
       }