修改禅道3730

src/views/iosBasicData/ComputationCenter/index.vue

@@ -162,7 +162,7 @@ export default {
       selectionList: [], // 多选的数据
       isShow: true,
       editSave: false, // 详情是否禁用
-      tabsValue: "CHK", // tabs切换
+      tabsValue: "CHK-D", // tabs切换
       // 动画
       loading: false,
       // 分页
@@ -856,6 +856,9 @@ export default {
       this.page.total = data.total;
       this.data = data.records;
       this.loading = false;
+      this.amountSubSum = 0;
+      this.amountSubUsdSum = 0;
+      this.$refs.crud.toggleSelection();
       this.$refs.crud.refreshTable();
     },
     //自定义列保存

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -2630,15 +2630,18 @@ export default {
                 this.$message.success("操作成功");
               });
             }
-            if (arr.length == 0) {
-              this.$message.warning("当前检索暂无数据！");
-            }
+            // if (arr.length == 0) {
+            //   this.$message.warning("当前检索暂无数据！");
+            // }
             this.queryData = [];
             for (let item of arr) {
               if (this.tableData.filter(row => row.accBillNo == item.accBillNo).length == 0) {
                 this.queryData.push(item);
               }
             }
+            if (this.queryData.length == 0) {
+              this.$message.warning("当前检索暂无数据！");
+            }
           }
         });
       } else {
@@ -2719,15 +2722,18 @@ export default {
                 this.$message.success("操作成功");
               });
             }
-            if (arr.length == 0) {
-              this.$message.warning("当前检索暂无数据！");
-            }
+            // if (arr.length == 0) {
+            //   this.$message.warning("当前检索暂无数据！");
+            // }
             this.queryData = [];
             for (let item of arr) {
               if (this.tableData.filter(row => row.accBillNo == item.accBillNo).length == 0) {
                 this.queryData.push(item);
               }
             }
+            if (this.queryData.length == 0) {
+              this.$message.warning("当前检索暂无数据！");
+            }
           }
         });
       }
@@ -3123,7 +3129,7 @@ export default {
 /deep/.el-dialog .el-dialog__body {
   padding: 0px 20px;
 }
-::v-deep .el-form-item__error{
+::v-deep .el-form-item__error {
   display: none;
 }
 </style>

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -452,21 +452,21 @@ export default {
         }
       }
     },
-    ausdChange(row) {
-      if (Number(row.amount - row.reconciliationAmount) > 0) {
+        ausdChange(row) {
+      if (Number(row.amount - row.reconciliationAmountUsd) > 0) {
         if (Number(row.currentStlAmountUSD) < 0) {
           return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
-      if (Number(row.amount - row.reconciliationAmount) < 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) < 0) {
         if (row.currentStlAmountUSD >= 0) {
           return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
     },

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems2.vue

@@ -435,7 +435,7 @@ export default {
       const end = start + this.page.pageSize;
       this.pageData = this.tableData.slice(start, end);
     },
-   armbChange(row) {
+    armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountRMB) < 0) {
           return this.$message.error("本次金额不能输入负数");
@@ -454,20 +454,20 @@ export default {
       }
     },
     ausdChange(row) {
-      if (Number(row.amount - row.reconciliationAmount) > 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) > 0) {
         if (Number(row.currentStlAmountUSD) < 0) {
           return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
-      if (Number(row.amount - row.reconciliationAmount) < 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) < 0) {
         if (row.currentStlAmountUSD >= 0) {
           return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
     },

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -1322,15 +1322,18 @@ export default {
                 this.$message.success("操作成功");
               });
             }
-            if (arr.length == 0) {
-              this.$message.warning("当前检索暂无数据！");
-            }
+            // if (arr.length == 0) {
+            //   this.$message.warning("当前检索暂无数据！");
+            // }
             this.queryData = [];
             for (let item of arr) {
               if (this.tableData.filter(row => row.accBillNo == item.accBillNo).length == 0) {
                 this.queryData.push(item);
               }
             }
+            if (this.queryData.length == 0) {
+              this.$message.warning("当前检索暂无数据！");
+            }
           }
         });
       } else {
@@ -1400,15 +1403,18 @@ export default {
                 this.$message.success("操作成功");
               });
             }
-            if (arr.length == 0) {
-              this.$message.warning("当前检索暂无数据！");
-            }
+            // if (arr.length == 0) {
+            //   this.$message.warning("当前检索暂无数据！");
+            // }
             this.queryData = [];
             for (let item of arr) {
               if (this.tableData.filter(row => row.accBillNo == item.accBillNo).length == 0) {
                 this.queryData.push(item);
               }
             }
+            if (this.queryData.length == 0) {
+              this.$message.warning("当前检索暂无数据！");
+            }
           }
         });
       }

src/views/iosBasicData/cashier/index.vue

@@ -647,7 +647,6 @@ export default {
     },
     // 列表获取数据
     async onLoad(page, params = {}) {
-      console.log(this.query.cashierStatus);
       this.loading = true;
       let res = {};
       if (this.tabsValue == "对账收费") {
@@ -687,6 +686,9 @@ export default {
       this.page.total = data.total;
       this.data = data.records;
       this.loading = false;
+      this.$refs.crud.toggleSelection();
+      this.amountSubSum = 0;
+      this.amountSubUsdSum = 0;
       this.$refs.crud.refreshTable();
     },
     //自定义列保存

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -1522,15 +1522,18 @@ export default {
             //     this.$message.success("操作成功");
             //   });
             // }
-            if (arr.length == 0) {
-              this.$message.warning("当前检索暂无数据！");
-            }
+            // if (arr.length == 0) {
+            //   this.$message.warning("当前检索暂无数据！");
+            // }
             this.queryData = [];
             for (let item of arr) {
               if (this.tableData.filter(row => row.accBillNo == item.accBillNo).length == 0) {
                 this.queryData.push(item);
               }
             }
+            if (this.queryData.length == 0) {
+              this.$message.warning("当前检索暂无数据！");
+            }
           }
         });
       } else {
@@ -1582,9 +1585,9 @@ export default {
             //     this.$message.success("操作成功");
             //   });
             // }
-            if (arr.length == 0) {
-              this.$message.warning("当前检索暂无数据！");
-            }
+            // if (arr.length == 0) {
+            //   this.$message.warning("当前检索暂无数据！");
+            // }
             // this.tableData = arr;
             this.queryData = [];
             for (let item of arr) {
@@ -1592,6 +1595,9 @@ export default {
                 this.queryData.push(item);
               }
             }
+            if (this.queryData.length == 0) {
+              this.$message.warning("当前检索暂无数据！");
+            }
           }
         });
       }

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -296,20 +296,20 @@ export default {
       }
     },
     ausdChange(row) {
-      if (Number(row.amount - row.reconciliationAmount) > 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) > 0) {
         if (Number(row.currentAmountUSD) < 0) {
           return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentAmountUSD) > Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
-      if (Number(row.amount - row.reconciliationAmount) < 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) < 0) {
         if (row.currentAmountUSD >= 0) {
           return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentAmountUSD) < Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
     },

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems2.vue

@@ -315,8 +315,8 @@ export default {
       const end = start + this.page.pageSize;
       this.pageData = this.tableData.slice(start, end);
     },
-       armbChange(row) {
-       if (Number(row.amount - row.reconciliationAmount) > 0) {
+    armbChange(row) {
+      if (Number(row.amount - row.reconciliationAmount) > 0) {
         if (Number(row.currentStlAmountRMB) < 0) {
           row.currentStlAmountRMB = 0;
           return this.$message.error("本次金额不能输入负数");
@@ -338,24 +338,20 @@ export default {
       }
     },
     ausdChange(row) {
-            if (Number(row.amount - row.reconciliationAmount) > 0) {
-        if (Number(row.currentStlAmountUSD) < 0) {
-          row.currentStlAmountUSD = 0;
+      if (Number(row.amount - row.reconciliationAmountUsd) > 0) {
+        if (Number(row.currentAmountUSD) < 0) {
           return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountUSD = 0;
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentAmountUSD) > Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
-      if (Number(row.amount - row.reconciliationAmount) < 0) {
-        if (row.currentStlAmountUSD >= 0) {
-          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
+      if (Number(row.amount - row.reconciliationAmountUsd) < 0) {
+        if (row.currentAmountUSD >= 0) {
           return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          row.currentStlAmountUSD = Number(row.amount - row.reconciliationAmount);
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentAmountUSD) < Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
     },

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -7,7 +7,7 @@
         <el-button v-if="form.id && pageIds.length" type="text" @click="nextPage">下一票</el-button>
       </div>
       <div class="add-customer-btn">
-        <el-button v-if="form.status == 3" size="small" type="success" @click="allClick('指示')">指示</el-button>
+        <!-- <el-button v-if="form.status == 3" size="small" type="success" @click="allClick('指示')">指示</el-button> -->
         <el-button size="small" style="margin-right: 8px" :loading="saveLoading" :disabled="!form.id" @click="previewreportfun">预 览 </el-button>
         <el-button
           size="small"
@@ -1859,15 +1859,18 @@ export default {
             //     this.$message.success("操作成功");
             //   });
             // }
-            if (arr.length == 0) {
-              this.$message.warning("当前检索暂无数据！");
-            }
+            // if (arr.length == 0) {
+            //   this.$message.warning("当前检索暂无数据！");
+            // }
             this.queryData = [];
             for (let item of arr) {
               if (this.tableData.filter(row => row.accBillNo == item.accBillNo).length == 0) {
                 this.queryData.push(item);
               }
             }
+             if (this.queryData.length == 0) {
+              this.$message.warning("当前检索暂无数据！");
+            }
           }
         });
       } else {
@@ -1921,15 +1924,18 @@ export default {
             //     this.$message.success("操作成功");
             //   });
             // }
-            if (arr.length == 0) {
-              this.$message.warning("当前检索暂无数据！");
-            }
+            // if (arr.length == 0) {
+            //   this.$message.warning("当前检索暂无数据！");
+            // }
             this.queryData = [];
             for (let item of arr) {
               if (this.tableData.filter(row => row.accBillNo == item.accBillNo).length == 0) {
                 this.queryData.push(item);
               }
             }
+             if (this.queryData.length == 0) {
+              this.$message.warning("当前检索暂无数据！");
+            }
           }
         });
       }

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -1829,15 +1829,18 @@ export default {
             //     this.$message.success("操作成功");
             //   });
             // }
-            if (arr.length == 0) {
-              this.$message.warning("当前检索暂无数据！");
-            }
+            // if (arr.length == 0) {
+            //   this.$message.warning("当前检索暂无数据！");
+            // }
             this.queryData = [];
             for (let item of arr) {
               if (this.tableData.filter(row => row.accBillNo == item.accBillNo).length == 0) {
                 this.queryData.push(item);
               }
             }
+            if (this.queryData.length == 0) {
+              this.$message.warning("当前检索暂无数据！");
+            }
           }
         });
       } else {
@@ -1893,15 +1896,18 @@ export default {
             //     this.$message.success("操作成功");
             //   });
             // }
-            if (arr.length == 0) {
-              this.$message.warning("当前检索暂无数据！");
-            }
+            // if (arr.length == 0) {
+            //   this.$message.warning("当前检索暂无数据！");
+            // }
             this.queryData = [];
             for (let item of arr) {
               if (this.tableData.filter(row => row.accBillNo == item.accBillNo).length == 0) {
                 this.queryData.push(item);
               }
             }
+            if (this.queryData.length == 0) {
+              this.$message.warning("当前检索暂无数据！");
+            }
           }
         });
       }

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -1204,7 +1204,6 @@ export default {
           type: "申请",
           status: 3,
           billStatus: 0,
-          cashierStatus: 2
         };
       } else if (this.tabsValue == "销项") {
         obj = {

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -467,20 +467,20 @@ export default {
       }
     },
     ausdChange(row) {
-      if (Number(row.amount - row.reconciliationAmount) > 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) > 0) {
         if (Number(row.currentStlAmountUSD) < 0) {
           return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
-      if (Number(row.amount - row.reconciliationAmount) < 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) < 0) {
         if (row.currentStlAmountUSD >= 0) {
           return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
     },

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems2.vue

@@ -456,20 +456,20 @@ export default {
       }
     },
     ausdChange(row) {
-      if (Number(row.amount - row.reconciliationAmount) > 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) > 0) {
         if (Number(row.currentStlAmountUSD) < 0) {
           return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
-      if (Number(row.amount - row.reconciliationAmount) < 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) < 0) {
         if (row.currentStlAmountUSD >= 0) {
           return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
     },

src/views/iosBasicData/writeOff/assembly/finstlbillsitems.vue

@@ -411,20 +411,20 @@ export default {
       }
     },
     ausdChange(row) {
-      if (Number(row.amount - row.reconciliationAmount) > 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) > 0) {
         if (Number(row.currentStlAmountUSD) < 0) {
           return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
-      if (Number(row.amount - row.reconciliationAmount) < 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) < 0) {
         if (row.currentStlAmountUSD >= 0) {
           return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
     },

src/views/iosBasicData/writeOff/assembly/finstlbillsitems2.vue

@@ -412,20 +412,20 @@ export default {
       }
     },
     ausdChange(row) {
-      if (Number(row.amount - row.reconciliationAmount) > 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) > 0) {
         if (Number(row.currentStlAmountUSD) < 0) {
           return this.$message.error("本次金额不能输入负数");
         }
-        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) > Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
-      if (Number(row.amount - row.reconciliationAmount) < 0) {
+      if (Number(row.amount - row.reconciliationAmountUsd) < 0) {
         if (row.currentStlAmountUSD >= 0) {
           return this.$message.error("本次金额不能输入非负数");
         }
-        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmount)) {
-          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmount));
+        if (Number(row.currentStlAmountUSD) < Number(row.amount - row.reconciliationAmountUsd)) {
+          return this.$message.error("本次金额不能超过未签收金额:" + Number(row.amount - row.reconciliationAmountUsd));
         }
       }
     },