Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/finance/applyForInvoice/chargeInvoice/index.vue

@@ -28,7 +28,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="结算1单位" prop="fCorpid">
+        <el-form-item label="结算单位" prop="fCorpid">
           <el-select
             v-model="tableFilter.fCorpid"
             filterable
@@ -1836,8 +1836,7 @@ export default {
       resetModule(this.data).then(res => {
         if (res.code == 200) {
           this.showSetting = false;
-          this.setRowList = this.tableDate;
-          this.getRowList = this.tableDate;
+          this.setRowList = this.getRowList = this.$options.data().tableDate
         }
       });
     },
@@ -1900,8 +1899,7 @@ export default {
       resetModule(this.data).then((res) => {
         if (res.code == 200) {
           this.showSetting2 = false;
-          this.setRowList2 = this.tableDate2;
-          this.getRowList2 = this.tableDate2;
+          this.setRowList2 = this.getRowList2 = this.$options.data().tableDate2
         }
       });
     },
@@ -1965,8 +1963,7 @@ export default {
       resetModule(this.data).then((res) => {
         if (res.code == 200) {
           this.showSetting3 = false;
-          this.setRowList3 = this.tableDate3;
-          this.getRowList3 = this.tableDate3;
+          this.setRowList3 = this.getRowList3 = this.$options.data().tableDate3
         }
       });
     },
@@ -2679,6 +2676,7 @@ export default {
         if (this.selection.length == "0") {
           this.$message.error("未选择导入行");
         } else {
+          let Num = []
           for (let item in this.selection) {
             this.empty.push(this.selection[item].fMblno);
             this.nothing.push(this.selection[item].fName);
@@ -2765,7 +2763,7 @@ export default {
                   this.chargeList_s = [];
                   this.queryParameter = {
                     fCorpid: "",
-                    fToCorpid: "",
+                    fToCorpid: this.queryParams.fCorpid,
                     fMblno: "",
                     fStatementNo: "",
                     fFeeid: "",
@@ -2780,11 +2778,17 @@ export default {
                   this.increase_s = result;
                 } else {
                   let i = Number(item) + 1;
-                  this.$message.error("行号为" + i + "重复");
+                  Num += i + '、'
                 }
               }
             }
           }
+          MessageBox.confirm("第" + (Num).slice(0,Num.length-1) + "行重复，请重新选择",{
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }
+          )
         }
       } else if (this.state_s == false) {
         this.$message.error("本次金额不能大于原定金额");

src/views/finance/contrast/index.vue

@@ -808,7 +808,7 @@
               </el-select>
             </template>
           </el-form-item>
-          <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1">
+          <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1 || typevalue == 3">
             <el-select
               v-model="TWareHouseFees.fBilltype"
               size="small"
@@ -844,7 +844,7 @@
           <el-form-item
             label="审核日期"
             prop="timeExamine"
-            v-if="typevalue == 1"
+            v-if="typevalue == 1 || typevalue == 3"
           >
             <el-date-picker
               style="width: 240px"
@@ -1876,17 +1876,36 @@ export default {
     },
     // 撤销审批
     backApproval() {
-      let data = {
-        id: this.queryParams.fId,
-        actId: this.contrastId,
-        billId: this.queryParams.fId,
-      };
-      RevocationApproval(data).then((response) => {
-        this.msgSuccess("撤销审批成功");
-        this.disappear = true;
-        this.open = false;
-        this.getList();
-      });
+      if(Cookies.get("sysType") == 3){
+        let data = {
+          id: this.queryParams.fId,
+          actId: 430,
+          billId: this.queryParams.fId,
+        };
+        RevocationApproval(data).then((response) => {
+          if(response.code === 200){
+            this.msgSuccess("撤销审批成功");
+            console.log("11")
+            this.disappear = true;
+            this.mainTable = false
+            this.open = false;
+            this.getList();
+          }
+        });
+      }else{
+        let data = {
+          id: this.queryParams.fId,
+          actId: this.contrastId,
+          billId: this.queryParams.fId,
+        };
+        RevocationApproval(data).then((response) => {
+          this.msgSuccess("撤销审批成功");
+          this.disappear = true;
+          this.open = false;
+          this.getList();
+        });
+
+      }
     },
     returnData() {
       this.addOrUpdateVisib = false;
@@ -1900,7 +1919,12 @@ export default {
     goApproval() {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(this.queryParams.fId, this.contrastId);
+        if(Cookies.get("sysType") == 3){
+          this.$refs.ApprovalComments.init(this.queryParams.fId, 430);
+
+        }else{
+          this.$refs.ApprovalComments.init(this.queryParams.fId, this.contrastId);
+        }
       });
     },
     // 查看审批流
@@ -1914,7 +1938,11 @@ export default {
         id = this.queryParams.id;
       }
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id, this.contrastId);
+        if(Cookies.get("sysType") == 3) {
+          this.$refs.addOrUpdate.init(id, 430);
+        }else{
+          this.$refs.addOrUpdate.init(id, this.contrastId);
+        }
       });
     },
     // 撤销对账
@@ -1926,6 +1954,7 @@ export default {
       backFee(formDate).then((response) => {
         this.msgSuccess("撤回成功");
         this.open = false;
+        this.mainTable = false
         this.reset();
         this.getList();
       });
@@ -1977,6 +2006,14 @@ export default {
                 this.msgSuccess("操作成功");
                 this.getList();
               });
+            }else if(Cookies.get("sysType") == 3){
+              formDate.append('billsType','KHDZ')
+              Cfee(formDate).then((response) => {
+                this.open = false;
+                this.msgSuccess("操作成功");
+                this.getList();
+                this.handleAdd()
+              });
             }
           } else {
             this.$message.error("表单为空不允许操作");
@@ -2115,6 +2152,7 @@ export default {
         if (this.selection.length == "0") {
           this.$message.error("未选择导入行");
         } else {
+          let Num = []
           for (let item in this.selection) {
             this.empty.push(this.selection[item].fMblno);
             this.nothing.push(this.selection[item].fName);
@@ -2200,7 +2238,7 @@ export default {
                   //  this.feeList = this.DzfeeList
                   this.TWareHouseFees = {
                     fCorpid: "",
-                    fToCorpid: "",
+                    fToCorpid: this.queryParams.fCorpid,
                     fMblno: "",
                     fStatementNo: "",
                     fFeeid: "",
@@ -2214,11 +2252,17 @@ export default {
                   this.DzfeeList = result;
                 } else {
                   let i = Number(item) + 1;
-                  this.$message.error("行号为" + i + "重复");
+                  Num += i + '、'
                 }
               }
             }
           }
+          MessageBox.confirm("第" + (Num).slice(0,Num.length-1) + "行重复，请重新选择",{
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }
+          )
         }
       } else if (this.state_s == false) {
         this.$message.error("本次金额不能大于原定金额");
@@ -2257,7 +2301,7 @@ export default {
                 this.$message.error("暂无数据");
               }
             });
-          } else {
+          } else if(type == 2){
             importFleet(this.TWareHouseFees).then((response) => {
               this.feeList = response.rows;
               if (this.feeList.length !== 0) {
@@ -2277,6 +2321,29 @@ export default {
                 this.$message.error("暂无数据");
               }
             });
+          }else if(type == 3){
+            this.TWareHouseFees.fSystemType = this.queryParams.fSystemType
+            importFee(this.TWareHouseFees).then((response) => {
+              this.feeList = response.rows;
+              if (this.feeList.length !== 0) {
+                this.$message.success("查询成功");
+                this.totAL = 0;
+                this.Ttime = 0;
+                for (let item in this.feeList) {
+                  this.totAL += Number(this.feeList[item].fAmt);
+                  this.Ttime += Number(this.feeList[item].fAmtdr);
+                  if(this.feeList[item].fBsdate){
+                    this.$set(
+                      this.feeList[item],
+                      "fBsdate",
+                      this.feeList[item].fBsdate.substring(0, 10)
+                    );
+                  }
+                }
+              } else {
+                this.$message.error("暂无数据");
+              }
+            });
           }
         }
       });
@@ -2305,6 +2372,13 @@ export default {
           this.total = response.total;
           this.loading = false;
         });
+      }else if(Cookies.get("sysType") == 3){
+        this.tablefilter.fBilltype = 'KHDZ'
+        listFee(this.tablefilter).then((response) => {
+          this.contrastList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
       }
     },
 
@@ -2710,6 +2784,129 @@ export default {
             });
           }
         });
+      }else if(Cookies.get("sysType") == 3){
+        getFee(row.fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          if (response.data.feeDoList != 0) {
+            response.data.feeDoList.map((e) => {
+              if (e.fBillingDeadline) {
+                e.fBillingDeadline = e.fBillingDeadline.slice(0, 10);
+              }
+              if (e.fBsdate) {
+                e.fBsdate = e.fBsdate.slice(0, 10);
+              }
+              if (e.fChargedate) {
+                e.fChargedate = e.fChargedate.slice(0, 10);
+              }
+              if (e.fSrcdc) {
+                if (e.fSrcdc == "D") {
+                  e.fSrcdc = "收";
+                } else {
+                  e.fSrcdc = "付";
+                }
+              }
+            });
+          }
+          this.DzfeeList = response.data.feeDoList;
+          this.fWbuOptions = response.data.feesList;
+          this.queryParams = response.data.tFee;
+          // this.queryParams.fSystemType = response.data.tFee.fsystemType;
+          // this.fWbuOptions = response.data.feesList;
+          this.fMblnoOptions = response.data.corps;
+          this.mainTable = true;
+          this.disappear = true;
+          this.title = "修改财务数据主";
+          if (res == 1) {
+            this.notChange = true;
+            if (this.Operator == this.Lander) {
+              console.log("111")
+              this.disappear = false;
+              this.reset();
+              this.pass = {
+                fAmtdr: "", //应收合计
+                fAmtcr: "", //应付合计
+                fMblno: "", //提单号
+                fName: "", //货权方
+                fFeesName: "", //结算单位
+                fCorpid: "", //结算单位ID
+              };
+              const fId = row.fId || this.ids;
+              getFee(fId).then((response) => {
+                if (response.data.feeDoList != 0) {
+                  response.data.feeDoList.map((e) => {
+                    if (e.fBillingDeadline) {
+                      e.fBillingDeadline = e.fBillingDeadline.slice(0, 10);
+                    }
+                    if (e.fBsdate) {
+                      e.fBsdate = e.fBsdate.slice(0, 10);
+                    }
+                    if (e.fChargedate) {
+                      e.fChargedate = e.fChargedate.slice(0, 10);
+                    }
+                    if (e.fSrcdc) {
+                      if (e.fSrcdc == "D") {
+                        e.fSrcdc = "收";
+                      } else {
+                        e.fSrcdc = "付";
+                      }
+                    }
+                  });
+                }
+                this.DzfeeList = response.data.feeDoList;
+                this.fWbuOptions = response.data.feesList;
+                this.queryParams = response.data.tFee;
+                // this.queryParams.fSystemType = response.data.tFee.fsystemType;
+                this.fMblnoOptions = response.data.corps;
+                this.mainTable = true;
+              });
+            } else {
+              this.notChange = true;
+            }
+          }
+              else {
+            this.notChange = true;
+            this.reset();
+            this.pass = {
+              fAmtdr: "", //应收合计
+              fAmtcr: "", //应付合计
+              fMblno: "", //提单号
+              fName: "", //货权方
+              fFeesName: "", //结算单位
+              fCorpid: "", //结算单位ID
+            };
+            const fId = row.fId || this.ids;
+            getFee(fId).then((response) => {
+              if (response.data.feeDoList != 0) {
+                response.data.feeDoList.map((e) => {
+                  if (e.fBillingDeadline) {
+                    e.fBillingDeadline = e.fBillingDeadline.slice(0, 10);
+                  }
+                  if (e.fBsdate) {
+                    e.fBsdate = e.fBsdate.slice(0, 10);
+                  }
+                  if (e.fChargedate) {
+                    e.fChargedate = e.fChargedate.slice(0, 10);
+                  }
+                  if (e.fSrcdc) {
+                    if (e.fSrcdc == "D") {
+                      e.fSrcdc = "收";
+                    } else {
+                      e.fSrcdc = "付";
+                    }
+                  }
+                });
+              }
+              this.DzfeeList = response.data.feeDoList;
+              this.fWbuOptions = response.data.feesList;
+              this.queryParams = response.data.tFee;
+              // this.queryParams.fSystemType = response.data.tFee.fsystemType;
+              // this.fWbuOptions = response.data.feesList;
+              this.fMblnoOptions = response.data.corps;
+              this.mainTable = true;
+              this.disappear = true
+            });
+          }
+        });
       }
     },
     /** 修改按钮操作 */
@@ -2798,6 +2995,43 @@ export default {
             this.doNot = false;
           }
         });
+      }else if(Cookies.get("sysType") == 3){
+        getFee(fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          if (response.data.feeDoList != 0) {
+            response.data.feeDoList.map((e) => {
+              if (e.fBillingDeadline) {
+                e.fBillingDeadline = e.fBillingDeadline.slice(0, 10);
+              }
+              if (e.fBsdate) {
+                e.fBsdate = e.fBsdate.slice(0, 10);
+              }
+              if (e.fChargedate) {
+                e.fChargedate = e.fChargedate.slice(0, 10);
+              }
+              if (e.fSrcdc) {
+                if (e.fSrcdc == "D") {
+                  e.fSrcdc = "收";
+                } else {
+                  e.fSrcdc = "付";
+                }
+              }
+            });
+          }
+          this.DzfeeList = response.data.feeDoList;
+          this.fWbuOptions = response.data.feesList;
+          this.queryParams = response.data.tFee;
+          // this.queryParams.fSystemType = response.data.tFee.fsystemType;
+          this.fMblnoOptions = response.data.corps;
+          this.mainTable = true;
+          this.title = "修改财务数据主";
+          if (this.DzfeeList) {
+            this.doNot = true;
+          } else {
+            this.doNot = false;
+          }
+        });
+
       }
     },
     /** 远程模糊查询用户 */
@@ -2830,7 +3064,7 @@ export default {
                 // this.open = false;
                 this.getList();
               });
-            } else {
+            } else if(type == 2){
               addFleet(formData).then((response) => {
                 console.log(response);
                 this.queryParams = response.data.tFee;
@@ -2839,6 +3073,14 @@ export default {
                 // this.open = false;
                 this.getList();
               });
+            }else if(type == 3){
+              formData.append("billsType", 'KHDZ');
+              updateFee(formData).then((response) => {
+                console.log(response);
+                this.queryParams = response.data.tFee;
+                this.msgSuccess("新增成功");
+                this.getList();
+              });
             }
           } else {
             this.pass.fAmtcr = 0;
@@ -2860,11 +3102,17 @@ export default {
                 this.msgSuccess("修改成功");
                 this.getList();
               });
-            } else {
+            } else if (type == 2){
               addFleet(formData).then((response) => {
                 this.msgSuccess("修改成功");
                 this.getList();
               });
+            }else if(type == 3){
+              formData.append("billsType", 'KHDZ');
+              addFee(formData).then((response) => {
+                this.msgSuccess("修改成功");
+                this.getList();
+              });
             }
           }
         }

src/views/finance/payment/index.vue

@@ -829,7 +829,7 @@
               </el-select>
             </template>
           </el-form-item>
-          <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1">
+          <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1 || typevalue == 3">
             <el-select
               v-model="queryParameter.fBilltype"
               size="small"
@@ -864,7 +864,7 @@
           <el-form-item
             label="审核日期"
             prop="timeExamine"
-            v-if="typevalue == 1"
+            v-if="typevalue == 1 || typevalue == 3"
           >
             <el-date-picker
               size="small"
@@ -882,7 +882,7 @@
             label="出入库日期"
             label-width="85px"
             prop="fAccbilldate"
-            v-if="typevalue == 1"
+            v-if="typevalue == 1 || typevalue == 3"
           >
             <el-date-picker
               size="small"
@@ -2414,18 +2414,35 @@ export default {
       return sums;
     },
     approvalRevocation() {
-      let data = {
-        id: this.queryParams.fId,
-        actId: this.contrastId,
-        billId: this.queryParams.fId,
-      };
-      revocation(data).then((data) => {
-        if (data.code === 200) {
-          this.$message.success("撤销成功");
-          this.open = false;
-          this.getList();
-        }
-      });
+      if(Cookies.get("sysType") == 3){
+        let data = {
+          id: this.queryParams.fId,
+          actId: 450,
+          billId: this.queryParams.fId,
+        };
+        revocation(data).then((data) => {
+          if (data.code === 200) {
+            this.$message.success("撤销成功");
+            this.mainTable = false
+            this.open = false;
+            this.getList();
+          }
+        });
+      }else{
+        let data = {
+          id: this.queryParams.fId,
+          actId: this.contrastId,
+          billId: this.queryParams.fId,
+        };
+        revocation(data).then((data) => {
+          if (data.code === 200) {
+            this.$message.success("撤销成功");
+            this.mainTable = false
+            this.open = false;
+            this.getList();
+          }
+        });
+      }
     },
     changefBilltype() {
       this.businessTypeOption = [];
@@ -2476,6 +2493,7 @@ export default {
     adoPt() {
       this.approval = this.$route.query.data;
       if (this.approval) {
+        this.doNot = true
         this.Xbutton = false;
         this.approval = JSON.parse(this.approval);
         this.hide = false;
@@ -2544,6 +2562,31 @@ export default {
             this.mainTable = true;
             this.title = "修改付费列表";
           });
+        }else if(Cookies.get("sysType") == 3){
+          getCharge(this.approval.billId).then((response) => {
+            this.Operator = response.data.tFee.createBy;
+            if (response.data.feeDoList != 0) {
+              response.data.feeDoList.map((e) => {
+                if (e.fBsdate) {
+                  e.fBsdate = e.fBsdate.slice(0, 10);
+                }
+                if (e.fSrcdc) {
+                  if (e.fSrcdc == "D") {
+                    e.fSrcdc = "收";
+                  } else {
+                    e.fSrcdc = "付";
+                  }
+                }
+              });
+            }
+            this.increase_s = response.data.feeDoList;
+            this.fWbuOptions = response.data.feesList;
+            this.queryParams = response.data.tFee;
+            this.fWbuOptions = response.data.feesList;
+            this.fMblnoOptions = response.data.corps;
+            this.mainTable = true;
+            this.title = "修改付费列表";
+          });
         }
       }
     },
@@ -2578,10 +2621,17 @@ export default {
     immediateApproval() {
       this.addOrUpdateVisib = true;
       this.$nextTick(() => {
-        this.$refs.ApprovalComments.init(
-          this.approval.billId,
-          this.approval.actId
-        );
+        if(Cookies.get("sysType") == 3){
+          this.$refs.ApprovalComments.init(
+            this.approval.billId,
+            450
+          );
+        }else{
+          this.$refs.ApprovalComments.init(
+            this.approval.billId,
+            this.approval.actId
+          );
+        }
       });
     },
     // 查看审批流
@@ -2591,7 +2641,11 @@ export default {
       let id = "448";
       let actId = "110";
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(this.queryParams.fId, this.contrastId);
+        if(Cookies.get("sysType") == 3){
+          this.$refs.addOrUpdate.init(this.queryParams.fId, 450);
+        }else{
+          this.$refs.addOrUpdate.init(this.queryParams.fId, this.contrastId);
+        }
       });
     },
 
@@ -2603,6 +2657,7 @@ export default {
       formDate.append("tFeeDo", JSON.stringify(this.increase_s));
       backCharge(formDate).then((response) => {
         this.open = false;
+        this.mainTable = false
         this.msgSuccess("操作成功");
         this.getList();
       });
@@ -2817,6 +2872,111 @@ export default {
             });
           }
         });
+      }else if(Cookies.get("sysType") == 3){
+        getCharge(row.fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          if (response.data.feeDoList != 0) {
+            response.data.feeDoList.map((e) => {
+              if (e.fBsdate) {
+                e.fBsdate = e.fBsdate.slice(0, 10);
+              }
+              if (e.fSrcdc) {
+                if (e.fSrcdc == "D") {
+                  e.fSrcdc = "收";
+                } else {
+                  e.fSrcdc = "付";
+                }
+              }
+            });
+          }
+          this.increase_s = response.data.feeDoList;
+          this.fWbuOptions = response.data.feesList;
+          this.queryParams = response.data.tFee;
+          this.fWbuOptions = response.data.feesList;
+          this.fMblnoOptions = response.data.corps;
+          this.mainTable = true;
+          this.mainTable = true
+          this.title = "付费列表";
+          this.tablefilter = true;
+          if (res == 1) {
+            console.log(this.Operator)
+            console.log(this.Lander)
+            this.notChange = true;
+            if (this.Operator == this.Lander) {
+              this.tablefilter = false;
+              this.reset();
+              this.pass = {
+                fAmtdr: 0, //应收合计
+                fAmtcr: 0, //应付合计
+                fMblno: "", //提单号
+                fName: "", //货权方
+                fFeesName: "", //结算单位
+                fCorpid: "", //结算单位ID
+              };
+              const fId = row.fId || this.ids;
+              getCharge(fId).then((response) => {
+                if (response.data.feeDoList != 0) {
+                  response.data.feeDoList.map((e) => {
+                    if (e.fBsdate) {
+                      e.fBsdate = e.fBsdate.slice(0, 10);
+                    }
+                    if (e.fSrcdc) {
+                      if (e.fSrcdc == "D") {
+                        e.fSrcdc = "收";
+                      } else {
+                        e.fSrcdc = "付";
+                      }
+                    }
+                  });
+                }
+                this.increase_s = response.data.feeDoList;
+                this.fWbuOptions = response.data.feesList;
+                this.queryParams = response.data.tFee;
+                this.fWbuOptions = response.data.feesList;
+                this.fMblnoOptions = response.data.corps;
+                this.mainTable = true;
+              });
+            } else {
+              this.notChange = true;
+              // this.$message.error('未知异常，请联系管理员')
+            }
+          } else {
+            this.notChange = true;
+            this.reset();
+            this.pass = {
+              fAmtdr: 0, //应收合计
+              fAmtcr: 0, //应付合计
+              fMblno: "", //提单号
+              fName: "", //货权方
+              fFeesName: "", //结算单位
+              fCorpid: "", //结算单位ID
+            };
+            const fId = row.fId || this.ids;
+            getCharge(fId).then((response) => {
+              if (response.data.feeDoList != 0) {
+                response.data.feeDoList.map((e) => {
+                  if (e.fBsdate) {
+                    e.fBsdate = e.fBsdate.slice(0, 10);
+                  }
+                  if (e.fSrcdc) {
+                    if (e.fSrcdc == "D") {
+                      e.fSrcdc = "收";
+                    } else {
+                      e.fSrcdc = "付";
+                    }
+                  }
+                });
+              }
+              this.increase_s = response.data.feeDoList;
+              this.fWbuOptions = response.data.feesList;
+              this.queryParams = response.data.tFee;
+              this.fWbuOptions = response.data.feesList;
+              this.fMblnoOptions = response.data.corps;
+              this.mainTable = true;
+              this.tablefilter = true;
+            });
+          }
+        });
       }
     },
     //打印功能
@@ -2864,12 +3024,39 @@ export default {
                 this.open = false;
                 this.getList();
               });
-            } else {
+            } else if(Cookies.get("sysType") == 2){
               collectFees(formDate).then((response) => {
                 this.msgSuccess("操作成功");
                 this.open = false;
                 this.getList();
               });
+            }else if(Cookies.get("sysType") == 3){
+              formDate.append('billsType','KHFF')
+              collectFee(formDate).then((response) => {
+                this.msgSuccess("操作成功");
+                this.getList();
+                this.queryParams = {
+                  fId: null,
+                    pageNum: 1,
+                    pageSize: 10,
+                    fBillno: null,
+                    fCtrlcorpid: null,
+                    fCorpid: null,
+                    tMblno: null,
+                    fAmtdr: null,
+                    fAmtcr: null,
+                    fBilltype: null,
+                    fBillstatus: null,
+                    fRemarks: null,
+                    fAccbilldate: null,
+                    fDeptid: null,
+                    chargingMethod: null,
+                    invoiceNo: null,
+                    bank: null,
+                    waterBillNo: null,
+                }
+                this.increase_s = []
+              });
             }
           } else {
             this.$message.error("表单为空不允许操作");
@@ -2952,55 +3139,126 @@ export default {
     },
     //确认导入
     confirmImport() {
-      this.doNot = true;
       this.hide = true;
+      this.pass.fAmtdr = 0;
+      this.pass.fAmtcr = 0;
       for (let item in this.selection) {
+        this.pass.fAmtcr = Number(this.pass.fAmtcr);
+        this.pass.fAmtdr = Number(this.pass.fAmtdr);
         this.pass.fAmtcr += Number(this.selection[item].fAmt);
         this.pass.fAmtdr += Number(this.selection[item].fAmtdr);
       }
-      console.log(this.pass.fAmtcr);
       if (this.state_s == true) {
         if (this.selection.length == "0") {
           this.$message.error("未选择导入行");
         } else {
+          let Num = []
           for (let item in this.selection) {
             this.empty.push(this.selection[item].fMblno);
             this.nothing.push(this.selection[item].fName);
-          }
-          //去重提单号
-          this.empty = new Set(this.empty);
-          this.empty = Array.from(this.empty);
-          //去重货权方
-          this.nothing = new Set(this.nothing);
-          this.nothing = Array.from(this.nothing);
+            if (this.increase_s.length === 0) {
+              this.increase_s = this.increase_s.concat(this.selection);
+              //去重提单号
+              this.empty = new Set(this.empty);
+              this.empty = Array.from(this.empty);
+              //去重货权方
+              this.nothing = new Set(this.nothing);
+              this.nothing = Array.from(this.nothing);
 
-          if (this.empty.length <= 1) {
-            this.pass.fMblno = this.empty[0];
-          } else {
-            this.pass.fMblno = this.empty[0] + "...";
-          }
-          if (this.nothing.length <= 1) {
-            this.pass.fName = this.nothing[0];
-          } else {
-            this.pass.fName = this.nothing[0] + "...";
+              if (this.empty.length <= 1) {
+                this.pass.fMblno = this.empty[0];
+              } else {
+                this.pass.fMblno = this.empty[0] + "...";
+              }
+              if (this.nothing.length <= 1) {
+                this.pass.fName = this.nothing[0];
+              } else {
+                this.pass.fName = this.nothing[0] + "...";
+              }
+              this.queryParams.tMblno = this.pass.fMblno; //提单号
+              this.queryParams.fCtrlcorpid = this.pass.fName;
+              this.queryParams.fCorpid = this.queryParameter.fToCorpid;
+              this.queryParams.fAmtcr = this.pass.fAmtcr;
+              this.queryParams.fAmtdr = this.pass.fAmtdr;
+              this.innerVisible = false;
+              this.chargeList_s = [];
+              this.queryParameter = {
+                fCorpid: "",
+                fToCorpid: this.queryParams.fCorpid,
+                fMblno: "",
+                fStatementNo: "",
+                fFeeid: "",
+                timeExamine: "",
+                timeInterval: "",
+                fSystemType: Cookies.get("sysType")
+              };
+              return
+            }else{
+              for (let li in this.increase_s) {
+                if (this.selection[item].fSrcid !== this.increase_s[li].fSrcid) {
+                  this.Fee = this.increase_s.concat(this.selection);
+                  console.log(this.Fee);
+                  let result = [];
+                  let obj = {};
+                  for (let lis in this.Fee) {
+                    if (!obj[this.Fee[lis].fSrcid]) {
+                      result.push(this.Fee[lis]);
+                      obj[this.Fee[lis].fSrcid] = true;
+                    }
+                  }
+                  //去重提单号
+                  this.empty = new Set(this.empty);
+                  this.empty = Array.from(this.empty);
+                  //去重货权方
+                  this.nothing = new Set(this.nothing);
+                  this.nothing = Array.from(this.nothing);
+
+                  if (this.empty.length <= 1) {
+                    this.pass.fMblno = this.empty[0];
+                  } else {
+                    this.pass.fMblno = this.empty[0] + "...";
+                  }
+                  if (this.nothing.length <= 1) {
+                    this.pass.fName = this.nothing[0];
+                  } else {
+                    this.pass.fName = this.nothing[0] + "...";
+                  }
+                  // this.increase_s = this.increase_s.concat(this.selection);
+                  this.queryParams.tMblno = this.pass.fMblno; //提单号
+                  this.queryParams.fCtrlcorpid = this.pass.fName;
+                  this.queryParams.fCorpid = this.queryParameter.fToCorpid;
+                  this.queryParams.fAmtcr = Number(this.pass.fAmtcr).toFixed(2);
+                  this.queryParams.fAmtdr = Number(this.pass.fAmtdr).toFixed(2);
+                  this.innerVisible = false;
+                  this.chargeList_s = [];
+                  this.queryParameter = {
+                    fCorpid: "",
+                    fToCorpid: this.queryParams.fCorpid,
+                    fMblno: "",
+                    fStatementNo: "",
+                    fFeeid: "",
+                    fBilltype: "",
+                    fBusinessType: "",
+                    fVslid: "",
+                    fVoyid: "",
+                    timeExamine: "",
+                    timeInterval: "",
+                    fSystemType: Cookies.get("sysType")
+                  };
+                  this.increase_s = result;
+                } else {
+                  let i = Number(item) + 1;
+                  Num += i + '、'
+                }
+              }
+            }
           }
-          this.increase_s = this.increase_s.concat(this.selection);
-          this.queryParams.tMblno = this.pass.fMblno; //提单号
-          this.queryParams.fCtrlcorpid = this.pass.fName;
-          this.queryParams.fCorpid = this.queryParameter.fToCorpid;
-          this.queryParams.fAmtcr = this.pass.fAmtcr;
-          this.queryParams.fAmtdr = this.pass.fAmtdr;
-          this.innerVisible = false;
-          this.chargeList_s = [];
-          this.queryParameter = {
-            fCorpid: "",
-            fToCorpid: "",
-            fMblno: "",
-            fStatementNo: "",
-            fFeeid: "",
-            timeExamine: "",
-            timeInterval: "",
-          };
+          MessageBox.confirm("第" + (Num).slice(0,Num.length-1) + "行重复，请重新选择",{
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }
+          )
         }
       } else if (this.state_s == false) {
         this.$message.error("本次金额不能大于原定金额");
@@ -3031,6 +3289,13 @@ export default {
           this.total = response.total;
           this.loading = false;
         });
+      }else if(Cookies.get("sysType") == 3){
+        this.tableFilter.fBilltype = 'KHFF'
+        listCharge(this.tableFilter).then((response) => {
+          this.chargeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
       }
     },
     // 取消按钮
@@ -3094,7 +3359,7 @@ export default {
               this.Ttime += Number(this.chargeList_s[item].fAmtdr);
             }
           });
-        } else {
+        } else if(Cookies.get("sysType") == 2){
           searchs(this.queryParameter).then((response) => {
             this.chargeList_s = response.rows;
             this.$message.success("查询成功");
@@ -3103,6 +3368,16 @@ export default {
               this.Ttime += Number(this.chargeList_s[item].fAmtdr);
             }
           });
+        }else if(Cookies.get("sysType") == 3){
+          this.queryParameter.fSystemType = this.queryParams.fSystemType
+          search(this.queryParameter).then((response) => {
+            this.chargeList_s = response.rows;
+            this.$message.success("查询成功");
+            for (let item in this.chargeList_s) {
+              this.totAL += Number(this.chargeList_s[item].fAmt);
+              this.Ttime += Number(this.chargeList_s[item].fAmtdr);
+            }
+          });
         }
       } else {
         this.rules = {
@@ -3127,7 +3402,7 @@ export default {
                     this.$message.error("暂无数据");
                   }
                 });
-              } else {
+              } else if(Cookies.get("sysType") == 2){
                 searchs(this.queryParameter).then((response) => {
                   this.chargeList_s = response.rows;
                   if (this.chargeList_s.length !== 0) {
@@ -3142,6 +3417,22 @@ export default {
                     this.$message.error("暂无数据");
                   }
                 });
+              }else if(Cookies.get("sysType") == 3){
+                this.queryParameter.fSystemType = this.queryParams.fSystemType
+                search(this.queryParameter).then((response) => {
+                  this.chargeList_s = response.rows;
+                  if (this.chargeList_s.length !== 0) {
+                    this.$message.success("查询成功");
+                    this.totAL = 0;
+                    this.Ttime = 0;
+                    for (let item in this.chargeList_s) {
+                      this.totAL += Number(this.chargeList_s[item].fAmt);
+                      this.Ttime += Number(this.chargeList_s[item].fAmtdr);
+                    }
+                  } else {
+                    this.$message.error("暂无数据");
+                  }
+                });
               }
             }
           });
@@ -3202,16 +3493,16 @@ export default {
       this.mainTable = true
       this.hide = true;
       this.reset();
-      (this.pass = {
+      this.pass = {
         fAmtdr: 0, //应收合计
         fAmtcr: 0, //应付合计
         fMblno: "", //提单号
         fName: "", //货权方
         fFeesName: "", //结算单位
         fCorpid: "", //结算单位ID
-      }),
+      },
         // this.queryParams = []
-        (this.increase_s = []);
+        this.increase_s = [];
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
@@ -3232,6 +3523,7 @@ export default {
         waterBillNo: null,
         fSystemType: Cookies.get("sysType"),
       };
+      this.doNot = false
       this.resetForm("queryParams");
       this.mainTable = true;
       this.title = "添加财务数据主";
@@ -3303,6 +3595,31 @@ export default {
           this.mainTable = true;
           this.title = "修改付费列表";
         });
+      }else if(Cookies.get("sysType") == 3){
+        getCharge(fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          if (response.data.feeDoList != 0) {
+            response.data.feeDoList.map((e) => {
+              if (e.fBsdate) {
+                e.fBsdate = e.fBsdate.slice(0, 10);
+              }
+              if (e.fSrcdc) {
+                if (e.fSrcdc == "D") {
+                  e.fSrcdc = "收";
+                } else {
+                  e.fSrcdc = "付";
+                }
+              }
+            });
+          }
+          this.increase_s = response.data.feeDoList;
+          this.fWbuOptions = response.data.feesList;
+          this.queryParams = response.data.tFee;
+          this.fWbuOptions = response.data.feesList;
+          this.fMblnoOptions = response.data.corps;
+          this.mainTable = true;
+          this.title = "修改付费列表";
+        });
       }
     },
     /** 提交按钮 */
@@ -3318,15 +3635,17 @@ export default {
             if (Cookies.get("sysType") == 1) {
               addCharge(formData).then((response) => {
                 this.msgSuccess("新增成功");
-                // this.increase_s = []
-                // this.open = false
                 this.getList();
               });
-            } else {
+            } else if(Cookies.get("sysType") == 2){
               addCharges(formData).then((response) => {
                 this.msgSuccess("新增成功");
-                // this.increase_s = []
-                // this.open = false
+                this.getList();
+              });
+            }else if(Cookies.get("sysType") == 3){
+              formData.append("billsType", 'KHFF');
+              addCharge(formData).then((response) => {
+                this.msgSuccess("新增成功");
                 this.getList();
               });
             }
@@ -3352,13 +3671,21 @@ export default {
                 // this.open = false
                 this.getList();
               });
-            } else {
+            } else if(Cookies.get("sysType") == 2){
               addCharges(formData).then((response) => {
                 this.msgSuccess("修改成功");
                 // this.increase_s = []
                 // this.open = false
                 this.getList();
               });
+            }else if(Cookies.get("sysType") == 3){
+              formData.append("billsType", 'KHFF');
+              addCharge(formData).then((response) => {
+                this.msgSuccess("修改成功");
+                // this.increase_s = []
+                // this.open = false
+                this.getList();
+              });
             }
           }
         }

src/views/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container home">
-    <div v-if="sysType == 1">
+    <div v-if="sysType == 1 || sysType == 3">
       <div style="display: flex; margin-bottom: 40px">
         <div style="width: 70%">
-          <ul class="block" v-if="sysType == 1">
+          <ul class="block" v-if="sysType == 1 || sysType == 3">
             <li @click="jump('/business/inStock')">
               <div>
                 <i
@@ -173,6 +173,10 @@
                   <span v-else-if="item.refno2 === 'DZ'">对账</span>
                   <span v-else-if="item.refno2 === 'FF'">付费</span>
                   <span v-else-if="item.refno2 === 'JSCCF'">计算仓储费</span>
+                  <span v-else-if="item.refno2 === 'KHDZ'">凯和对账</span>
+                  <span v-else-if="item.refno2 === 'KHSF'">凯和收费</span>
+                  <span v-else-if="item.refno2 === 'KHFF'">凯和付费</span>
+                  <span v-else-if="item.refno2 === 'ApplyFP'">凯和开票申请</span>
                 </div>
                 <div class="home_stock_table" @click="approval(item)">
                   查看详情
@@ -284,7 +288,7 @@
     </div>
 
     <el-dialog
-      v-if="sysType == 1"
+      v-if="sysType == 1 || sysType == 3"
       title="消息提示"
       :visible.sync="dialogVisible"
       width="80%"
@@ -784,6 +788,27 @@ export default {
           });
           break;
         }
+        case "KHDZ": {
+          this.$router.push({
+            path: "/finance/contrast",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "KHSF": {
+          this.$router.push({
+            path: "/finance/charge",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "KHFF": {
+          this.$router.push({
+            path: "/finance/payment",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
         default: {
           return this.$message.error("未知错误，无状态");
         }

src/views/morePage/stock/index.vue

@@ -656,6 +656,26 @@ export default {
                e.refno2="下单配船"
                 break;
               }
+              case "ApplyFP": {
+                e.refno2="凯合开票申请"
+                break;
+              }
+              case "KHDZ": {
+                e.refno2="凯合对账"
+                break;
+              }
+              case "KHSF": {
+                e.refno2="凯合收费"
+                break;
+              }
+              case "KHFF": {
+                e.refno2="凯合付费"
+                break;
+              }
+              case "KHDD": {
+                e.refno2="凯合订单"
+                break;
+              }
               default: {
                 return this.$message.error("未知错误，无状态");
               }
@@ -672,7 +692,8 @@ export default {
       });
     },
     approval(row) {
-      switch (row.refno2) {
+      console.log(row)
+      switch (row.refno4) {
         case "SJRK": {
           this.$router.push({
             path: "/business/inStock",
@@ -757,6 +778,34 @@ export default {
           });
           break;
         }
+        case "ApplyFP": {
+          this.$router.push({
+            path: "/finance/chargeInvoice",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "KHDZ": {
+          this.$router.push({
+            path: "/finance/contrast",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "KHSF": {
+          this.$router.push({
+            path: "/finance/charge",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
+        case "KHFF": {
+          this.$router.push({
+            path: "/finance/payment",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
         default: {
           console.log(row)
           return this.$message.error("未知错误，无状态");

src/views/system/auditConfiguration/index.vue

@@ -50,6 +50,9 @@
           <span v-if="scope.row.actId === 320">协议计划费审批流程</span>
           <span v-if="scope.row.actId === 410">下单审批流程</span>
           <span v-if="scope.row.actId === 420">配船审批流程</span>
+          <span v-if="scope.row.actId === 430">凯合对账审批流程</span>
+          <span v-if="scope.row.actId === 440">凯合收费审批流程</span>
+          <span v-if="scope.row.actId === 450">凯合付费审批流程</span>
           <span v-if="scope.row.actId === 460">凯合费用审批流程</span>
           <span v-if="scope.row.actId === 470">凯合发票申请审批流程</span>
         </template>