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

src/api/finance/contrast.js

@@ -152,4 +152,13 @@ export function importFleet(params) {
     method: 'get',
     params:params
   })
-}
+}
+
+//车队提交
+export function confirmFleet(data) {
+  return request({
+    url: '/finances/contrast/confirm',
+    method:'post',
+    data:data
+  })
+}

src/views/finance/charge/index.vue

@@ -317,6 +317,7 @@
         align="center"
         class-name="small-padding fixed-width"
         min-width="180"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -333,7 +334,10 @@
             icon="el-icon-view"
             @click="check(scope.row, 1)"
             v-hasPermi="['finance:contrast:edit']"
-            v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
+             v-if="
+              scope.row.fBillstatus == '提交审核' ||
+              scope.row.fBillstatus == '审核中'
+            "
             >审批进度</el-button
           >
           <el-button
@@ -342,7 +346,11 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['finance:charge:edit']"
-            v-if="scope.row.fBillstatus <= 3"
+             v-if="
+              scope.row.fBillstatus == '保存' ||
+              scope.row.fBillstatus == '暂存' ||
+              scope.row.fBillstatus == '审批驳回'
+            "
             >修改
           </el-button>
           <el-button
@@ -351,7 +359,11 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['finance:charge:remove']"
-            v-if="scope.row.fBillstatus <= 3"
+            v-if="
+              scope.row.fBillstatus == '保存' ||
+              scope.row.fBillstatus == '暂存' ||
+              scope.row.fBillstatus == '审批驳回'
+            "
             >删除
           </el-button>
           <!--            <el-button-->
@@ -547,12 +559,12 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="业务类型">
+        <el-form-item label="业务类型" prop="fSystemType">
           <el-select
-            v-model="typevalue"
+            v-model="queryParams.fSystemType"
             placeholder="请选择业务类型"
             size="small"
-            :disabled="notChange"
+            disabled
             style="width: 200px"
           >
             <el-option
@@ -583,7 +595,7 @@
           >确认收费</el-button
         >
         <el-button type="warning" size="small" @click="handleExportItems"
-        >导出</el-button
+          >导出</el-button
         >
         <el-button
           type="success"
@@ -1050,7 +1062,7 @@ import {
   delCharge_ss,
   backCharge,
   revocation,
-  exportWarehousebillsitems
+  exportWarehousebillsitems,
 } from "@/api/finance/charge";
 import { listFees } from "@/api/basicdata/fees";
 import print from "print-js";
@@ -1464,6 +1476,7 @@ export default {
     ApprovalComments,
   },
   created() {
+    this.typevalue = Cookies.get("sysType");
     this.getList();
     this.register();
     this.getDicts("st_in_type").then((response) => {
@@ -1524,14 +1537,14 @@ export default {
           this.getRowList = res.data.filter((e) => e.checked == 0);
           this.setRowList = res.data;
           this.setRowList = this.setRowList.reduce((res, item) => {
-             res.push({
-                surface: item.surface,
-                label: item.label,
-                name: item.name,
-                checked: item.checked,
-                width: item.width,
-                fixed: item.fixed,
-              });
+            res.push({
+              surface: item.surface,
+              label: item.label,
+              name: item.name,
+              checked: item.checked,
+              width: item.width,
+              fixed: item.fixed,
+            });
             return res;
           }, []);
         }
@@ -1746,21 +1759,46 @@ export default {
     // 查看按钮
     check(row, res) {
       this.notChange = true;
-      //大木
-      getCharge(row.fId).then((response) => {
-        this.Operator = response.data.tFee.createBy;
-        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.open = true;
-        this.title = "收费列表";
-        this.tablefilter = true;
-        if (res == 1) {
-          this.notChange = true;
-          if (this.Operator == this.Lander) {
-            this.tablefilter = false;
+      if (Cookies.get("sysType") == 1) {
+        //大木
+        getCharge(row.fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          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.open = true;
+          this.title = "收费列表";
+          this.tablefilter = true;
+          if (res == 1) {
+            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) => {
+                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.open = true;
+              });
+            } else {
+              this.notChange = true;
+              // this.$message.error('未知异常，请联系管理员')
+            }
+          } else {
+            this.notChange = true;
             this.reset();
             this.pass = {
               fAmtdr: 0, //应收合计
@@ -1779,91 +1817,69 @@ export default {
               this.fMblnoOptions = response.data.corps;
               this.open = true;
             });
+          }
+        });
+      } else if (Cookies.get("sysType") == 2) {
+        //车队
+        getCharges(row.fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          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.open = true;
+          this.title = "收费列表";
+          this.tablefilter = true;
+          if (res == 1) {
+            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;
+              getCharges(fId).then((response) => {
+                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.open = true;
+              });
+            } else {
+              this.notChange = true;
+              // this.$message.error('未知异常，请联系管理员')
+            }
           } else {
             this.notChange = true;
-            // this.$message.error('未知异常，请联系管理员')
+            this.reset();
+            this.pass = {
+              fAmtdr: 0, //应收合计
+              fAmtcr: 0, //应付合计
+              fMblno: "", //提单号
+              fName: "", //货权方
+              fFeesName: "", //结算单位
+              fCorpid: "", //结算单位ID
+            };
+            const fId = row.fId || this.ids;
+            getCharges(fId).then((response) => {
+              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.open = true;
+            });
           }
-        } 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) => {
-            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.open = true;
-          });
-        }
-      });
-      //车队
-      // getCharges(row.fId).then((response) => {
-      //   this.Operator = response.data.tFee.createBy;
-      //   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.open = true;
-      //   this.title = "收费列表";
-      //   this.tablefilter = true;
-      //   if (res == 1) {
-      //     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;
-      //       getCharges(fId).then((response) => {
-      //         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.open = 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;
-      //     getCharges(fId).then((response) => {
-      //       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.open = true;
-      //     });
-      //   }
-      // });
+        });
+      }
     },
     //打印功能
     printing() {
@@ -1905,7 +1921,7 @@ export default {
             formDate.append("tFee", JSON.stringify(this.queryParams));
             formDate.append("tFeeDo", JSON.stringify(this.increase_s));
 
-            if (this.typevalue == 1) {
+            if (Cookies.get("sysType") == 1) {
               collectFee(formDate).then((response) => {
                 this.open = false;
                 this.msgSuccess("操作成功");
@@ -1925,7 +1941,7 @@ export default {
       });
     },
     charGe() {
-      if (!this.typevalue) {
+      if (!Cookies.get("sysType")) {
         return this.$message("请先选择业务类型");
       }
       this.queryParameter = {
@@ -2059,20 +2075,23 @@ export default {
       this.getDicts("approval_process").then((response) => {
         this.options = response.data;
       });
-      //大木
-      listCharge(this.tableFilter).then(response => {
-        console.log(response)
-        this.chargeList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
-      //车队
-      // listCharges(this.tableFilter).then((response) => {
-      //   console.log(response);
-      //   this.chargeList = response.rows;
-      //   this.total = response.total;
-      //   this.loading = false;
-      // });
+      if (Cookies.get("sysType") == 1) {
+        //大木
+        listCharge(this.tableFilter).then((response) => {
+          console.log(response);
+          this.chargeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      } else if (Cookies.get("sysType") == 2) {
+        //车队
+        listCharges(this.tableFilter).then((response) => {
+          console.log(response);
+          this.chargeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
     },
     // 取消按钮
     cancel() {
@@ -2115,7 +2134,7 @@ export default {
       if (this.queryParameter.fStatementNo) {
         this.rules = {};
 
-        if (this.typevalue == 1) {
+        if (Cookies.get("sysType") == 1) {
           search(this.queryParameter).then((response) => {
             this.chargeList_s = response.rows;
             this.$message.success("查询成功");
@@ -2142,7 +2161,7 @@ export default {
         if (this.rules) {
           this.$refs["form"].validate((valid) => {
             if (valid) {
-              if (this.typevalue == 1) {
+              if (Cookies.get("sysType") == 1) {
                 search(this.queryParameter).then((response) => {
                   this.chargeList_s = response.rows;
                   if (this.chargeList_s.length !== 0) {
@@ -2259,6 +2278,7 @@ export default {
         invoiceNo: null,
         bank: null,
         waterBillNo: null,
+        fSystemType: Cookies.get("sysType"),
       };
       this.resetForm("queryParams");
       this.open = true;
@@ -2279,38 +2299,41 @@ export default {
         fCorpid: "", //结算单位ID
       };
       const fId = row.fId || this.ids;
-      //大木
-      getCharge(fId).then((response) => {
-        this.Operator = response.data.tFee.createBy;
-        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.open = true;
-        this.title = "修改收费列表";
-        if (this.DzfeeList) {
-          this.doNot = true;
-        } else {
-          this.doNot = false;
-        }
-      });
-      //车队
-    //   getCharges(fId).then((response) => {
-    //     this.Operator = response.data.tFee.createBy;
-    //     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.open = true;
-    //     this.title = "修改收费列表";
-    //     if (this.DzfeeList) {
-    //       this.doNot = true;
-    //     } else {
-    //       this.doNot = false;
-    //     }
-    //   });
+      if (Cookies.get("sysType") == 1) {
+        //大木
+        getCharge(fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          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.open = true;
+          this.title = "修改收费列表";
+          if (this.DzfeeList) {
+            this.doNot = true;
+          } else {
+            this.doNot = false;
+          }
+        });
+      } else if (Cookies.get("sysType") == 2) {
+        //车队
+        getCharges(fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          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.open = true;
+          this.title = "修改收费列表";
+          if (this.DzfeeList) {
+            this.doNot = true;
+          } else {
+            this.doNot = false;
+          }
+        });
+      }
     },
     /** 提交按钮 */
     submitForm() {
@@ -2322,7 +2345,7 @@ export default {
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));
-            if (this.typevalue == 1) {
+            if (Cookies.get("sysType") == 1) {
               addCharge(formData).then((response) => {
                 let feeBills = response.data.tFee;
                 this.$set(this.queryParams, "fId", response.data.tFee.fId);
@@ -2362,50 +2385,53 @@ export default {
     handleDelete(row) {
       const fIds = row.fId || this.ids;
       let tips = "";
-      //大木
-      delCharge_s(fIds).then((data) => {
-        switch (data.msg) {
-          case "0": {
-            this.$message.error("当前数据已被其他操作员操作请刷新页面");
-            break;
-          }
-          case "1": {
-            tips = "当前主表有数据从表无数据是否删除";
-            this.delete_S(fIds, tips);
-            break;
-          }
-          case "2": {
-            tips = "当前主表有数据从表有数据是否删除";
-            this.delete_S(fIds, tips);
-            break;
+      if (Cookies.get("sysType") == 1) {
+        //大木
+        delCharge_s(fIds).then((data) => {
+          switch (data.msg) {
+            case "0": {
+              this.$message.error("当前数据已被其他操作员操作请刷新页面");
+              break;
+            }
+            case "1": {
+              tips = "当前主表有数据从表无数据是否删除";
+              this.delete_S(fIds, tips);
+              break;
+            }
+            case "2": {
+              tips = "当前主表有数据从表有数据是否删除";
+              this.delete_S(fIds, tips);
+              break;
+            }
+            default: {
+              return this.$message.error("未知错误，无状态");
+            }
           }
-          default: {
-            return this.$message.error("未知错误，无状态");
+        });
+      } else if (Cookies.get("sysType") == 2) {
+        // 车队;
+        delCharge_ss(fIds).then((data) => {
+          switch (data.msg) {
+            case "0": {
+              this.$message.error("当前数据已被其他操作员操作请刷新页面");
+              break;
+            }
+            case "1": {
+              tips = "当前主表有数据从表无数据是否删除";
+              this.delete_S(fIds, tips);
+              break;
+            }
+            case "2": {
+              tips = "当前主表有数据从表有数据是否删除";
+              this.delete_S(fIds, tips);
+              break;
+            }
+            default: {
+              return this.$message.error("未知错误，无状态");
+            }
           }
-        }
-      });
-      //车队
-      // delCharge_ss(fIds).then((data) => {
-      //   switch (data.msg) {
-      //     case "0": {
-      //       this.$message.error("当前数据已被其他操作员操作请刷新页面");
-      //       break;
-      //     }
-      //     case "1": {
-      //       tips = "当前主表有数据从表无数据是否删除";
-      //       this.delete_S(fIds, tips);
-      //       break;
-      //     }
-      //     case "2": {
-      //       tips = "当前主表有数据从表有数据是否删除";
-      //       this.delete_S(fIds, tips);
-      //       break;
-      //     }
-      //     default: {
-      //       return this.$message.error("未知错误，无状态");
-      //     }
-      //   }
-      // });
+        });
+      }
     },
     delete_S(fIds, tips) {
       this.$confirm(tips, "警告", {
@@ -2414,8 +2440,11 @@ export default {
         type: "warning",
       })
         .then(function () {
-          // return delCharge(fIds);
-          return delCharges(fIds);
+          if (Cookies.get("sysType") == 1) {
+            return delCharge(fIds);
+          } else if (Cookies.get("sysType") == 2) {
+            return delCharges(fIds);
+          }
         })
         .then(() => {
           this.getList();

src/views/finance/contrast/index.vue

@@ -250,6 +250,7 @@
         align="center"
         class-name="small-padding fixed-width"
         min-width="180"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -438,7 +439,7 @@
             v-model="queryParams.fSystemType"
             placeholder="请选择业务类型"
             size="small"
-            :disabled="notChange"
+            disabled
             style="width: 200px"
           >
             <el-option
@@ -997,6 +998,7 @@ import {
   getFleet,
   delFleet,
   detailFleet,
+  confirmFleet,
 } from "@/api/finance/contrast";
 import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
@@ -1641,11 +1643,19 @@ export default {
             let formDate = new window.FormData();
             formDate.append("tFee", JSON.stringify(this.queryParams));
             formDate.append("tFeeDo", JSON.stringify(this.DzfeeList));
-            Cfee(formDate).then((response) => {
-              this.open = false;
-              this.msgSuccess("操作成功");
-              this.getList();
-            });
+            if (Cookies.get("sysType") == 1) {
+              Cfee(formDate).then((response) => {
+                this.open = false;
+                this.msgSuccess("操作成功");
+                this.getList();
+              });
+            } else if (Cookies.get("sysType") == 2) {
+              confirmFleet(formDate).then((response) => {
+                this.open = false;
+                this.msgSuccess("操作成功");
+                this.getList();
+              });
+            }
           } else {
             this.$message.error("表单为空不允许操作");
           }

src/views/finance/payment/index.vue

@@ -232,6 +232,7 @@
         align="center"
         class-name="small-padding fixed-width"
         min-width="180"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -248,7 +249,10 @@
             icon="el-icon-view"
             @click="check(scope.row, 1)"
             v-hasPermi="['finance:payment:edit']"
-            v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
+            v-if="
+              scope.row.fBillstatus == '提交审核' ||
+              scope.row.fBillstatus == '审核中'
+            "
             >审批进度</el-button
           >
           <el-button
@@ -257,7 +261,11 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['finance:payment:edit']"
-            v-if="scope.row.fBillstatus <= 3"
+             v-if="
+              scope.row.fBillstatus == '保存' ||
+              scope.row.fBillstatus == '暂存' ||
+              scope.row.fBillstatus == '审批驳回'
+            "
             >修改
           </el-button>
           <el-button
@@ -266,7 +274,11 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['finance:payment:remove']"
-            v-if="scope.row.fBillstatus <= 3"
+             v-if="
+              scope.row.fBillstatus == '保存' ||
+              scope.row.fBillstatus == '暂存' ||
+              scope.row.fBillstatus == '审批驳回'
+            "
             >删除
           </el-button>
           <!--            <el-button-->
@@ -461,12 +473,12 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="业务类型">
+         <el-form-item label="业务类型" prop="fSystemType">
           <el-select
-            v-model="typevalue"
+            v-model="queryParams.fSystemType"
             placeholder="请选择业务类型"
             size="small"
-            :disabled="notChange"
+            disabled
             style="width: 200px"
           >
             <el-option
@@ -497,7 +509,7 @@
           >确认付费</el-button
         >
         <el-button type="warning" size="small" @click="handleExportItems"
-        >导出</el-button
+          >导出</el-button
         >
         <el-button
           type="success"
@@ -989,7 +1001,7 @@ import {
   delCharge_ss,
   backCharge,
   revocation,
-  exportWarehousebillsitems
+  exportWarehousebillsitems,
 } from "@/api/finance/payment";
 import { listFees } from "@/api/basicdata/fees";
 import print from "print-js";
@@ -997,6 +1009,7 @@ import AddOrUpdate from "@/views/viewApproval";
 import ApprovalComments from "@/views/startApproval";
 import { queryUserVal } from "@/api/warehouseBusiness/agreement";
 import Global from "@/layout/components/global";
+import Cookies from "js-cookie";
 import Vue from "vue";
 Vue.directive("dialogDrag", {
   bind(el, binding, vnode, oldVnode) {
@@ -1204,6 +1217,7 @@ export default {
     ApprovalComments,
   },
   created() {
+    this.typevalue = Cookies.get("sysType");
     this.getList();
     this.register();
     this.getDicts("st_in_type").then((response) => {
@@ -1353,28 +1367,31 @@ export default {
           fFeesName: "", //结算单位
           fCorpid: "", //结算单位ID
         };
-        //大木
-        getCharge(this.approval.billId).then((response) => {
-          this.Operator = response.data.tFee.createBy;
-          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.open = true;
-          this.title = "修改付费列表";
-        });
-        //车队
-        // getCharges(this.approval.billId).then((response) => {
-        //   this.Operator = response.data.tFee.createBy;
-        //   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.open = true;
-        //   this.title = "修改付费列表";
-        // });
+        if (Cookies.get("sysType") == 1) {
+          //大木
+          getCharge(this.approval.billId).then((response) => {
+            this.Operator = response.data.tFee.createBy;
+            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.open = true;
+            this.title = "修改付费列表";
+          });
+        } else if (Cookies.get("sysType") == 2) {
+          //车队
+          getCharges(this.approval.billId).then((response) => {
+            this.Operator = response.data.tFee.createBy;
+            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.open = true;
+            this.title = "修改付费列表";
+          });
+        }
       }
     },
     homePage() {
@@ -1441,21 +1458,46 @@ export default {
     // 查看按钮
     check(row, res) {
       this.notChange = true;
-      //大木
-      getCharge(row.fId).then((response) => {
-        this.Operator = response.data.tFee.createBy;
-        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.open = true;
-        this.title = "付费列表";
-        this.tablefilter = true;
-        if (res == 1) {
-          this.notChange = true;
-          if (this.Operator == this.Lander) {
-            this.tablefilter = false;
+      if (Cookies.get("sysType") == 1) {
+        //大木
+        getCharge(row.fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          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.open = true;
+          this.title = "付费列表";
+          this.tablefilter = true;
+          if (res == 1) {
+            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) => {
+                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.open = true;
+              });
+            } else {
+              this.notChange = true;
+              // this.$message.error('未知异常，请联系管理员')
+            }
+          } else {
+            this.notChange = true;
             this.reset();
             this.pass = {
               fAmtdr: 0, //应收合计
@@ -1474,91 +1516,69 @@ export default {
               this.fMblnoOptions = response.data.corps;
               this.open = true;
             });
+          }
+        });
+      } else if (Cookies.get("sysType") == 2) {
+        //车队
+        getCharges(row.fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          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.open = true;
+          this.title = "付费列表";
+          this.tablefilter = true;
+          if (res == 1) {
+            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;
+              getCharges(fId).then((response) => {
+                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.open = true;
+              });
+            } else {
+              this.notChange = true;
+              // this.$message.error('未知异常，请联系管理员')
+            }
           } else {
             this.notChange = true;
-            // this.$message.error('未知异常，请联系管理员')
+            this.reset();
+            this.pass = {
+              fAmtdr: 0, //应收合计
+              fAmtcr: 0, //应付合计
+              fMblno: "", //提单号
+              fName: "", //货权方
+              fFeesName: "", //结算单位
+              fCorpid: "", //结算单位ID
+            };
+            const fId = row.fId || this.ids;
+            getCharges(fId).then((response) => {
+              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.open = true;
+            });
           }
-        } 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) => {
-            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.open = true;
-          });
-        }
-      });
-      //车队
-      // getCharges(row.fId).then((response) => {
-      //   this.Operator = response.data.tFee.createBy;
-      //   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.open = true;
-      //   this.title = "付费列表";
-      //   this.tablefilter = true;
-      //   if (res == 1) {
-      //     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;
-      //       getCharges(fId).then((response) => {
-      //         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.open = 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;
-      //     getCharges(fId).then((response) => {
-      //       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.open = true;
-      //     });
-      //   }
-      // });
+        });
+      }
     },
     //打印功能
     printing() {
@@ -1599,7 +1619,7 @@ export default {
             let formDate = new window.FormData();
             formDate.append("tFee", JSON.stringify(this.queryParams));
             formDate.append("tFeeDo", JSON.stringify(this.increase_s));
-            if (this.typevalue == 1) {
+            if (Cookies.get("sysType") == 1) {
               collectFee(formDate).then((response) => {
                 this.msgSuccess("操作成功");
                 this.open = false;
@@ -1619,7 +1639,7 @@ export default {
       });
     },
     charGe() {
-      if (!this.typevalue) {
+      if (!Cookies.get("sysType")) {
         return this.$message("请先选择业务类型");
       }
       this.queryParameter = {
@@ -1752,18 +1772,21 @@ export default {
       this.getDicts("approval_process").then((response) => {
         this.options = response.data;
       });
-      //大木
-      listCharge(this.tableFilter).then(response => {
-        this.chargeList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
-      //车队
-      // listCharges(this.tableFilter).then((response) => {
-      //   this.chargeList = response.rows;
-      //   this.total = response.total;
-      //   this.loading = false;
-      // });
+      if (Cookies.get("sysType") == 1) {
+        //大木
+        listCharge(this.tableFilter).then((response) => {
+          this.chargeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      } else if (Cookies.get("sysType") == 2) {
+        //车队
+        listCharges(this.tableFilter).then((response) => {
+          this.chargeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
     },
     // 取消按钮
     cancel() {
@@ -1805,7 +1828,7 @@ export default {
       this.chargeList_s = [];
       if (this.queryParameter.fStatementNo) {
         this.rules = {};
-        if (this.typevalue == 1) {
+        if (Cookies.get("sysType") == 1) {
           search(this.queryParameter).then((response) => {
             this.chargeList_s = response.rows;
             this.$message.success("查询成功");
@@ -1832,7 +1855,7 @@ export default {
         if (this.rules) {
           this.$refs["form"].validate((valid) => {
             if (valid) {
-              if (this.typevalue == 1) {
+              if (Cookies.get("sysType") == 1) {
                 search(this.queryParameter).then((response) => {
                   this.chargeList_s = response.rows;
                   if (this.chargeList_s.length !== 0) {
@@ -1949,6 +1972,7 @@ export default {
         invoiceNo: null,
         bank: null,
         waterBillNo: null,
+        fSystemType: Cookies.get("sysType"),
       };
       this.resetForm("queryParams");
       this.open = true;
@@ -1969,28 +1993,31 @@ export default {
         fCorpid: "", //结算单位ID
       };
       const fId = row.fId || this.ids;
-      //车队
-      // getCharges(fId).then((response) => {
-      //   this.Operator = response.data.tFee.createBy;
-      //   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.open = true;
-      //   this.title = "修改付费列表";
-      // });
-      //大木
+      if (Cookies.get("sysType") == 1) {
+        //大木
         getCharge(fId).then((response) => {
-        this.Operator = response.data.tFee.createBy;
-        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.open = true;
-        this.title = "修改付费列表";
-      });
+          this.Operator = response.data.tFee.createBy;
+          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.open = true;
+          this.title = "修改付费列表";
+        });
+      } else if (Cookies.get("sysType") == 2) {
+        //车队
+        getCharges(fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          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.open = true;
+          this.title = "修改付费列表";
+        });
+      }
     },
     /** 提交按钮 */
     submitForm() {
@@ -2002,7 +2029,7 @@ export default {
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));
-            if (this.typevalue == 1) {
+            if (Cookies.get("sysType") == 1) {
               addCharge(formData).then((response) => {
                 this.msgSuccess("新增成功");
                 // this.increase_s = []
@@ -2032,7 +2059,7 @@ export default {
             let formData = new window.FormData();
             formData.append("tFee", JSON.stringify(this.queryParams));
             formData.append("tFeeDo", JSON.stringify(this.increase_s));
-            if (this.typevalue == 1) {
+            if (Cookies.get("sysType") == 1) {
               addCharge(formData).then((response) => {
                 this.msgSuccess("修改成功");
                 // this.increase_s = []
@@ -2055,50 +2082,53 @@ export default {
     handleDelete(row) {
       const fIds = row.fId || this.ids;
       let tips = "";
-      //大木
-      delCharge_s(fIds).then((data) => {
-        switch (data.msg) {
-          case "0": {
-            this.$message.error("当前数据已被其他操作员操作请刷新页面");
-            break;
-          }
-          case "1": {
-            tips = "当前主表有数据从表无数据是否删除";
-            this.delete_S(fIds, tips);
-            break;
-          }
-          case "2": {
-            tips = "当前主表有数据从表有数据是否删除";
-            this.delete_S(fIds, tips);
-            break;
+      if (Cookies.get("sysType") == 1) {
+        //大木
+        delCharge_s(fIds).then((data) => {
+          switch (data.msg) {
+            case "0": {
+              this.$message.error("当前数据已被其他操作员操作请刷新页面");
+              break;
+            }
+            case "1": {
+              tips = "当前主表有数据从表无数据是否删除";
+              this.delete_S(fIds, tips);
+              break;
+            }
+            case "2": {
+              tips = "当前主表有数据从表有数据是否删除";
+              this.delete_S(fIds, tips);
+              break;
+            }
+            default: {
+              return this.$message.error("未知错误，无状态");
+            }
           }
-          default: {
-            return this.$message.error("未知错误，无状态");
+        });
+      } else if (Cookies.get("sysType") == 2) {
+        //车队
+        delCharge_ss(fIds).then((data) => {
+          switch (data.msg) {
+            case "0": {
+              this.$message.error("当前数据已被其他操作员操作请刷新页面");
+              break;
+            }
+            case "1": {
+              tips = "当前主表有数据从表无数据是否删除";
+              this.delete_S(fIds, tips);
+              break;
+            }
+            case "2": {
+              tips = "当前主表有数据从表有数据是否删除";
+              this.delete_S(fIds, tips);
+              break;
+            }
+            default: {
+              return this.$message.error("未知错误，无状态");
+            }
           }
-        }
-      });
-      //车队
-      // delCharge_ss(fIds).then((data) => {
-      //   switch (data.msg) {
-      //     case "0": {
-      //       this.$message.error("当前数据已被其他操作员操作请刷新页面");
-      //       break;
-      //     }
-      //     case "1": {
-      //       tips = "当前主表有数据从表无数据是否删除";
-      //       this.delete_S(fIds, tips);
-      //       break;
-      //     }
-      //     case "2": {
-      //       tips = "当前主表有数据从表有数据是否删除";
-      //       this.delete_S(fIds, tips);
-      //       break;
-      //     }
-      //     default: {
-      //       return this.$message.error("未知错误，无状态");
-      //     }
-      //   }
-      // });
+        });
+      }
     },
     delete_S(fIds, tips) {
       this.$confirm(tips, "警告", {
@@ -2107,8 +2137,11 @@ export default {
         type: "warning",
       })
         .then(function () {
-          // return delCharge(fIds);
-          return delCharges(fIds);
+          if (Cookies.get("sysType") == 1) {
+            return delCharge(fIds);
+          } else if (Cookies.get("sysType") == 2) {
+            return delCharges(fIds);
+          }
         })
         .then(() => {
           this.getList();

src/views/track/cabinet/AddOrUpdate.vue

@@ -1179,7 +1179,7 @@
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="submitForm('acceptDate')">接 单</el-button>
       <el-button type="primary" @click="submitForm('loadDate')">提 箱</el-button>
-      <el-button type="primary" @click="submitForm('mdLoadDate')">还卸货</el-button>
+      <el-button type="primary" @click="submitForm('mdLoadDate')">装卸货</el-button>
       <el-button type="primary" @click="submitForm('unLoadDate')">还卸柜</el-button>
       <el-button type="primary" @click="submitForm('waybillDate')">回 单</el-button>
       <el-button type="success" @click="submitAllowChanges">修 改</el-button>
@@ -1429,7 +1429,6 @@ export default {
             if (response.code == 200) {
               this.msgSuccess("提交成功");
               this.$parent.getList();
-              this.showDialog = false;
             }
           });
         }

src/views/track/cabinet/index.vue

@@ -210,19 +210,17 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-badge :value="buttonValue.acceptDate" style="margin-right:10px">
           <el-button size="mini" @click="handleQuery(null)">全 部</el-button>
-        </el-badge>
       </el-col>
       <el-col :span="1.5">
-        <el-badge :value="buttonValue.acceptDate"  style="margin-right:10px">
+        <el-badge :value="buttonValue.acceptDate" type="warning" style="margin-right:10px">
           <el-button size="mini" @click="handleQuery('acceptDate')"
             >接 单</el-button
           >
         </el-badge></el-col
       >
       <el-col :span="1.5"
-        ><el-badge :value="buttonValue.loadDate"  style="margin-right:10px"
+        ><el-badge :value="buttonValue.loadDate" type="warning" style="margin-right:10px"
           ><el-button size="mini" @click="handleQuery('loadDate')"
             >提 箱</el-button
           ></el-badge
@@ -230,21 +228,21 @@
       >
 
       <el-col :span="1.5"
-        ><el-badge :value="buttonValue.mdLoadDate"  style="margin-right:10px">
+        ><el-badge :value="buttonValue.mdLoadDate" type="warning"  style="margin-right:10px">
           <el-button size="mini" @click="handleQuery('mdLoadDate')"
             >还卸货</el-button
           ></el-badge
         >
       </el-col>
       <el-col :span="1.5"
-        ><el-badge :value="buttonValue.unLoadDate"  style="margin-right:10px"
+        ><el-badge :value="buttonValue.unLoadDate" type="warning" style="margin-right:10px"
           ><el-button size="mini" @click="handleQuery('unLoadDate')"
             >还卸柜</el-button
           ></el-badge
         ></el-col
       >
       <el-col :span="1.5"
-        ><el-badge :value="buttonValue.waybillDate"
+        ><el-badge :value="buttonValue.waybillDate" type="warning"
           ><el-button size="mini" @click="handleQuery('waybillDate')"
             >回 单</el-button
           ></el-badge