处理出库明细中批次相关显示逻辑/解决订单新增时可能出现的重复点击问题/应收明细撤销登账时对于贴息和收款类型的特殊联动处理

zkqy-ui/src/views/orderMange/components/dialogForm/OutBound.vue

@@ -110,7 +110,7 @@
       <el-table-column label="金额" prop="productAmounts"></el-table-column>
       <el-table-column label="批次状态" prop="batchState">
         <template slot-scope="scope">
-          {{ scope.row.batchState == 0 ? "正常" : "撤销登账" }}
+          {{ scope.row.batchState == 1 ? "撤销登账" : "正常" }}
         </template>
       </el-table-column>
     </el-table>
@@ -139,7 +139,7 @@ export default {
         unitName: "",
         remark: "",
         outStockDate: new Date(),
-        batchNumber: "",
+        batchNumber: null,
       },
       rules: {
         // unitName: [
@@ -183,7 +183,7 @@ export default {
     }),
     isCanRecordBatch() {
       return (
-        (this.form.batchNumber != "" ||
+        (this.form.batchNumber !== null ||
           this.tableData.some((item) => item.batchState == "1")) &&
         !this.tableData.length
       );
@@ -242,7 +242,7 @@ export default {
       // if (val) {
       this.tableData = JSON.parse(
         JSON.stringify(
-          this.allTableData.filter((v) => v.batchNumber == val) || []
+          this.allTableData.filter((v) => v.batchNumber === val) || []
         )
       );
       // }
@@ -262,8 +262,6 @@ export default {
     async getTableData(row, isRetail = true) {
       this.resetForm();
       this.row = row;
-
-      console.log(row);
       try {
         let payload = {};
         if (isRetail) {
@@ -300,7 +298,7 @@ export default {
           this.tableData = res.data;
           this.allTableData = JSON.parse(JSON.stringify(res.data));
           this.getBatchOptions(res.data); //获取批号选项数据
-          this.batchChangeHandler(""); //默认显示当前批次数据
+          this.batchChangeHandler(null); //默认显示当前批次数据
           this.isRetail = isRetail;
         }
       } catch (error) {}
@@ -308,20 +306,19 @@ export default {
     // 获取批号选项数据
     getBatchOptions(rows) {
       let batchOptions = [];
+      batchOptions.push({
+        value: null,
+        label: "当前批次",
+      });
       rows.forEach((row) => {
-        if (
-          !batchOptions.find((item) => item.value == row.batchNumber)?.value
-        ) {
+        if (!batchOptions.find((item) => item.value === row.batchNumber)) {
           batchOptions.push({
             value: row.batchNumber,
             label: row.batchNumber,
           });
         }
       });
-      batchOptions.push({
-        value: "",
-        label: "当前批次",
-      });
+
       this.batchOptions = batchOptions;
     },
     // 获取打印数据

zkqy-ui/src/views/orderMange/components/dialogForm/OutStockDetail.vue

@@ -109,7 +109,7 @@
       <el-table-column label="金额" prop="productAmounts"></el-table-column>
       <el-table-column label="批次状态" prop="batchState">
         <template slot-scope="scope">
-          {{ scope.row.batchState == 0 ? "正常" : "撤销登账" }}
+          {{ scope.row.batchState == 1 ? "撤销登账" : "正常" }}
         </template>
       </el-table-column>
 
@@ -147,7 +147,7 @@ export default {
   components: {},
   data() {
     return {
-      batchNumber: "",
+      batchNumber: null,
       allTableData: [], //所有表格数据
       batchOptions: [], //批号选项数据
       oldInventoryState: 0,
@@ -370,7 +370,13 @@ export default {
             };
           });
           this.allTableData = JSON.parse(JSON.stringify(this.tableData));
-          this.batchChangeHandler(""); //默认显示当前批次数据
+          this.batchChangeHandler(null); //默认显示当前批次数据
+          this.$nextTick(() => {
+            //关闭所有展开行
+            this.tableData.forEach((item) => {
+              this.$refs.tableRef.toggleRowExpansion(item, false);
+            });
+          });
         } else {
           this.$message.error(res.msg);
         }
@@ -382,27 +388,26 @@ export default {
     batchChangeHandler(val) {
       this.tableData = JSON.parse(
         JSON.stringify(
-          this.allTableData.filter((v) => v.batchNumber == val) || []
+          this.allTableData.filter((v) => v.batchNumber === val) || []
         )
       );
     },
     // 获取批号选项数据
     getBatchOptions(rows) {
       let batchOptions = [];
+      batchOptions.push({
+        value: null,
+        label: "当前批次",
+      });
       rows.forEach((row) => {
-        if (
-          !batchOptions.find((item) => item.value == row.batchNumber)?.value
-        ) {
+        if (!batchOptions.find((item) => item.value === row.batchNumber)) {
           batchOptions.push({
             value: row.batchNumber,
             label: row.batchNumber,
           });
         }
       });
-      batchOptions.push({
-        value: "",
-        label: "当前批次",
-      });
+
       this.batchOptions = batchOptions;
     },
   },

zkqy-ui/src/views/orderMange/index.vue

@@ -724,7 +724,13 @@
           </el-form>
         </el-row>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="editConfirm">确 定</el-button>
+          <el-button
+            type="primary"
+            @click="editConfirm"
+            :disabled="isAdding"
+            :loading="isAdding"
+            >确 定</el-button
+          >
           <el-button @click="cancel">取 消</el-button>
         </div>
       </el-dialog>
@@ -800,7 +806,8 @@
       </el-dialog>
       <!-- 出库明细 -->
       <el-dialog title="出库明细" :visible.sync="outStockShow" width="1200px">
-        <OutStock ref="outStockRef"></OutStock>
+        <!-- <OutStock ref="outStockRef"></OutStock> -->
+        <OutStockDetail ref="OutStockDetailRef"></OutStockDetail>
         <span slot="footer" class="dialog-footer">
           <el-button @click="outStockShow = false">关 闭</el-button>
           <!-- <el-button type="primary" @click="btnComfirm">确 定</el-button> -->
@@ -856,6 +863,7 @@ import outBoundPrint from "@/utils/print/outBoundPrint";
 import oldOutBoundPrint from "@/utils/print/oldOutBoundPrint";
 import { listCustomer } from "@/api/system/customer";
 import OutStock from "@/views/orderMange/components/dialogForm/OutStock.vue";
+import OutStockDetail from "@/views/orderMange/components/dialogForm/OutStockDetail.vue"; //拆分零售订单与普通订单
 import oldOutBound from "@/views/orderMange/components/dialogForm/oldOutBound.vue";
 import { numToCapital } from "@/utils/other";
 
@@ -870,9 +878,11 @@ export default {
     OutBound,
     OutStock,
     oldOutBound,
+    OutStockDetail,
   },
   data() {
     return {
+      isAdding: false,
       oldInventoryState: 0,
       totalMoney: "", //总金额 小写
       outStockShow: false, //出库详情
@@ -1917,6 +1927,7 @@ export default {
       //   this.$message.warning(tableValidate.msg);
       //   // return;
       // }
+      this.isAdding = true;
       this.$refs.formDataRef.validate(async (valid) => {
         if (valid) {
           let {
@@ -2105,9 +2116,11 @@ export default {
               addProductRes?.code === 200
             ) {
               this.$message.success("修改成功");
+              this.isAdding = false;
               this.open = false;
               this.getList();
             } else {
+              this.isAdding = false;
               this.$message.error("修改失败");
             }
           } else {
@@ -2127,16 +2140,20 @@ export default {
               productRes.code === 200
             ) {
               this.$message.success("添加成功");
+
               this.open = false;
+              this.isAdding = false;
               this.getList();
             } else {
               this.$message.error("添加失败");
+              this.isAdding = false;
             }
           }
           // Object.keys(saleValue).map((k) => {
           //   saleData.commMap[k] = saleValue[k];
           // });
         } else {
+          this.isAdding = false;
           this.$message.error("请完善表单数据");
         }
       });
@@ -3494,7 +3511,7 @@ export default {
     handleOutDetail(row) {
       this.outStockShow = true;
       this.$nextTick(() => {
-        this.$refs.outStockRef.getOutStockDetail(row, false);
+        this.$refs.OutStockDetailRef.getOutStockDetail(row, false);
       });
     },
     // 操作列回调

zkqy-ui/src/views/system/financialManage/receiveRecord.vue

@@ -220,7 +220,11 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item
                 ><el-button
-                  v-show="scope.row.status == 1 || scope.row.status == 3"
+                  v-show="
+                    scope.row.status == 1 ||
+                    scope.row.status == 3 ||
+                    scope.row.status == 5
+                  "
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
@@ -231,7 +235,11 @@
               >
               <el-dropdown-item
                 ><el-button
-                  v-show="scope.row.status == 1 || scope.row.status == 3"
+                  v-show="
+                    scope.row.status == 1 ||
+                    scope.row.status == 3 ||
+                    scope.row.status == 5
+                  "
                   size="mini"
                   type="text"
                   icon="el-icon-circle-check"
@@ -245,7 +253,8 @@
                   v-show="
                     scope.row.status == 1 ||
                     scope.row.status == 3 ||
-                    !scope.row.status
+                    !scope.row.status ||
+                    scope.row.status == 5
                   "
                   size="mini"
                   type="text"