添加五个按钮

src/store/modules/user.js

@@ -63,6 +63,7 @@ const user = {
           resolve(res)
           Cookies.set("userType",res.user.userType)
           Cookies.set("userName",res.user.userName)
+          Cookies.set("sysType",res.user.userSystem)
         }).catch(error => {
           reject(error)
         })

src/views/finance/contrast/index.vue

@@ -209,7 +209,7 @@
     >
       <el-table-column width="100" align="center" type="selection" />
       <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
-      <el-table-column label="行号" align="center" type="index" />
+      <el-table-column label="行号" align="center" type="index" fixed="left" />
 
       <el-table-column
         v-for="(item, index) in getRowList"
@@ -266,7 +266,10 @@
             icon="el-icon-view"
             @click="check(scope.row, 1)"
             v-hasPermi="['finance:contrast:edit']"
-            v-if="scope.row.fBillstatus == '提交审核'  || scope.row.fBillstatus == '审核中' "
+            v-if="
+              scope.row.fBillstatus == '提交审核' ||
+              scope.row.fBillstatus == '审核中'
+            "
             >审批进度</el-button
           >
           <el-button
@@ -277,7 +280,7 @@
             v-hasPermi="['finance:contrast:edit']"
             v-if="
               scope.row.fBillstatus == '保存' ||
-              scope.row.fBillstatus == '暂存'  ||
+              scope.row.fBillstatus == '暂存' ||
               scope.row.fBillstatus == '审批驳回'
             "
           >
@@ -292,7 +295,7 @@
             v-hasPermi="['finance:contrast:remove']"
             v-if="
               scope.row.fBillstatus == '保存' ||
-              scope.row.fBillstatus == '暂存'  ||
+              scope.row.fBillstatus == '暂存' ||
               scope.row.fBillstatus == '审批驳回'
             "
             >删除</el-button
@@ -334,7 +337,17 @@
             ></span>
           </span>
           <div class="avue-crud__dialog__menu enlarge" @click="full">
-            <i  style="cursor: pointer;display: block;width:12px;height:12px;border:1px solid #909399;border-top:3px solid #909399;margin-top: -3px;"></i>
+            <i
+              style="
+                cursor: pointer;
+                display: block;
+                width: 12px;
+                height: 12px;
+                border: 1px solid #909399;
+                border-top: 3px solid #909399;
+                margin-top: -3px;
+              "
+            ></i>
           </div>
         </div>
       </template>
@@ -408,7 +421,6 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-
         <el-form-item label="录入人" prop="createBy">
           <el-input v-model="queryParams.createBy" disabled />
         </el-form-item>
@@ -421,9 +433,9 @@
             :disabled="notChange"
           />
         </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"
             style="width: 200px"
@@ -617,7 +629,17 @@
               ></span>
             </span>
             <div class="avue-crud__dialog__menu enlarge" @click="full">
-              <i  style="cursor: pointer;display: block;width:12px;height:12px;border:1px solid #909399;border-top:3px solid #909399;margin-top: -3px;"></i>
+              <i
+                style="
+                  cursor: pointer;
+                  display: block;
+                  width: 12px;
+                  height: 12px;
+                  border: 1px solid #909399;
+                  border-top: 3px solid #909399;
+                  margin-top: -3px;
+                "
+              ></i>
             </div>
           </div>
         </template>
@@ -845,8 +867,12 @@
                 <span v-else-if="scope.row.fBilltype == '1030'">司机接单</span>
                 <span v-else-if="scope.row.fBilltype == '1080'">司机出车</span>
                 <span v-else-if="scope.row.fBilltype == '1040'">司机提箱</span>
-                <span v-else-if="scope.row.fBilltype == '1050'">司机装卸柜</span>
-                <span v-else-if="scope.row.fBilltype == '1060'">司机还卸柜</span>
+                <span v-else-if="scope.row.fBilltype == '1050'"
+                  >司机装卸柜</span
+                >
+                <span v-else-if="scope.row.fBilltype == '1060'"
+                  >司机还卸柜</span
+                >
                 <span v-else-if="scope.row.fBilltype == '1070'">司机回单</span>
                 <span v-else-if="scope.row.fBilltype == '1090'">费用补充</span>
               </template>
@@ -969,7 +995,7 @@ import {
   listFleet,
   getFleet,
   delFleet,
-  detailFleet
+  detailFleet,
 } from "@/api/finance/contrast";
 import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
@@ -1382,14 +1408,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;
           }, []);
         }
@@ -1613,7 +1639,6 @@ 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("操作成功");
@@ -1646,7 +1671,7 @@ export default {
     },
     // 对账按钮功能
     reconciliation() {
-      if (!this.typevalue) {
+      if (!this.queryParams.fSystemType) {
         return this.$message("请先选择业务类型");
       }
       this.queryParameter = {
@@ -1888,7 +1913,11 @@ export default {
                 for (let item in this.feeList) {
                   this.totAL += Number(this.feeList[item].fAmt);
                   this.Ttime += Number(this.feeList[item].fAmtdr);
-                  this.$set(this.feeList[item], 'fBsdate', this.feeList[item].fBsdate.substring(0, 10))
+                  this.$set(
+                    this.feeList[item],
+                    "fBsdate",
+                    this.feeList[item].fBsdate.substring(0, 10)
+                  );
                 }
               } else {
                 this.$message.error("暂无数据");
@@ -1904,7 +1933,11 @@ export default {
                 for (let item in this.feeList) {
                   this.totAL += Number(this.feeList[item].fAmt);
                   this.Ttime += Number(this.feeList[item].fAmtdr);
-                  this.$set(this.feeList[item], 'fBsdate', this.feeList[item].fBsdate.substring(0, 10))
+                  this.$set(
+                    this.feeList[item],
+                    "fBsdate",
+                    this.feeList[item].fBsdate.substring(0, 10)
+                  );
                 }
               } else {
                 this.$message.error("暂无数据");
@@ -1926,17 +1959,19 @@ export default {
         // this.feeList = response.rows;
         this.options = response.data;
       });
-
-      // listFee(this.tablefilter).then((response) => {
-      //   this.contrastList = response.rows;
-      //   this.total = response.total;
-      //   this.loading = false;
-      // });
-      listFee(this.tablefilter).then((response) => {
-        this.contrastList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      if (Cookies.get("sysType") == 1) {
+        listFee(this.tablefilter).then((response) => {
+          this.contrastList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      } else if (Cookies.get("sysType") == 2) {
+        listFleet(this.tablefilter).then((response) => {
+          this.contrastList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
     },
 
     // 取消按钮
@@ -1945,7 +1980,7 @@ export default {
       // this.feeList = []
       this.reset();
       this.getList();
-      this.typevalue = "";
+      this.queryParams.fSystemType = "";
     },
     // 表单重置
     reset() {
@@ -2050,7 +2085,7 @@ export default {
       queryUserVal().then((response) => {
         this.queryParams.createBy = response.user.userName;
       });
-      this.typevalue = "";
+      this.queryParams.fSystemType = "";
       this.doNot = false;
       this.notChange = false;
       this.hide = true;
@@ -2083,84 +2118,51 @@ export default {
         fDeptid: null,
         createBy: null,
         timeReconci: null,
+        fSystemType: Cookies.get("sysType"),
       };
     },
     // 查看按钮
     check(row, res) {
       this.doNot = true;
       this.notChange = true;
-      //  getFee(row.fId).then((response) => {
-      //   this.Operator = response.data.tFee.createBy;
-      //   this.DzfeeList = 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.disappear = true;
-      //   this.title = "修改财务数据主";
-      //   if (res == 1) {
-      //     this.notChange = true;
-      //     if (this.Operator == this.Lander) {
-      //       this.disappear = false;
-      //       this.reset();
-      //       this.pass = {
-      //         fAmtdr: "", //应收合计
-      //         fAmtcr: "", //应付合计
-      //         fMblno: "", //提单号
-      //         fName: "", //货权方
-      //         fFeesName: "", //结算单位
-      //         fCorpid: "", //结算单位ID
-      //       };
-      //       const fId = row.fId || this.ids;
-      //       getFee(fId).then((response) => {
-      //         this.DzfeeList = 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;
-      //     }
-      //   } 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) => {
-      //       this.DzfeeList = 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.open = true;
-      //     });
-      //   }
-      // });
-      getFleet(row.fId).then((response) => {
-        this.Operator = response.data.tFee.createBy;
-        this.DzfeeList = 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.disappear = true;
-        this.title = "修改财务数据主";
-        if (res == 1) {
-          this.notChange = true;
-          if (this.Operator == this.Lander) {
-            this.disappear = false;
+      if (Cookies.get("sysType") == 1) {
+        getFee(row.fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          this.DzfeeList = 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.disappear = true;
+          this.title = "修改财务数据主";
+          if (res == 1) {
+            this.notChange = true;
+            if (this.Operator == this.Lander) {
+              this.disappear = false;
+              this.reset();
+              this.pass = {
+                fAmtdr: "", //应收合计
+                fAmtcr: "", //应付合计
+                fMblno: "", //提单号
+                fName: "", //货权方
+                fFeesName: "", //结算单位
+                fCorpid: "", //结算单位ID
+              };
+              const fId = row.fId || this.ids;
+              getFee(fId).then((response) => {
+                this.DzfeeList = 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;
+            }
+          } else {
+            this.notChange = true;
             this.reset();
             this.pass = {
               fAmtdr: "", //应收合计
@@ -2171,40 +2173,77 @@ export default {
               fCorpid: "", //结算单位ID
             };
             const fId = row.fId || this.ids;
-            getFleet(fId).then((response) => {
+            getFee(fId).then((response) => {
               this.DzfeeList = 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.open = true;
             });
+          }
+        });
+      } else if (Cookies.get("sysType") == 2) {
+        getFleet(row.fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          this.DzfeeList = 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.disappear = true;
+          this.title = "修改财务数据主";
+          if (res == 1) {
+            this.notChange = true;
+            if (this.Operator == this.Lander) {
+              this.disappear = false;
+              this.reset();
+              this.pass = {
+                fAmtdr: "", //应收合计
+                fAmtcr: "", //应付合计
+                fMblno: "", //提单号
+                fName: "", //货权方
+                fFeesName: "", //结算单位
+                fCorpid: "", //结算单位ID
+              };
+              const fId = row.fId || this.ids;
+              getFleet(fId).then((response) => {
+                this.DzfeeList = 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;
+            }
           } else {
             this.notChange = true;
+            this.reset();
+            this.pass = {
+              fAmtdr: "", //应收合计
+              fAmtcr: "", //应付合计
+              fMblno: "", //提单号
+              fName: "", //货权方
+              fFeesName: "", //结算单位
+              fCorpid: "", //结算单位ID
+            };
+            const fId = row.fId || this.ids;
+            getFleet(fId).then((response) => {
+              this.DzfeeList = 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.open = true;
+            });
           }
-        } else {
-          this.notChange = true;
-          this.reset();
-          this.pass = {
-            fAmtdr: "", //应收合计
-            fAmtcr: "", //应付合计
-            fMblno: "", //提单号
-            fName: "", //货权方
-            fFeesName: "", //结算单位
-            fCorpid: "", //结算单位ID
-          };
-          const fId = row.fId || this.ids;
-          getFleet(fId).then((response) => {
-            this.DzfeeList = 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.open = true;
-          });
-        }
-      });
+        });
+      }
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -2220,34 +2259,37 @@ export default {
         fCorpid: "", //结算单位ID
       };
       const fId = row.fId || this.ids;
-      // getFee(fId).then((response) => {
-      //   this.Operator = response.data.tFee.createBy;
-      //   this.DzfeeList = response.data.feeDoList;
-      //   this.fWbuOptions = response.data.feesList;
-      //   this.queryParams = response.data.tFee;
-      //   this.fMblnoOptions = response.data.corps;
-      //   this.open = true;
-      //   this.title = "修改财务数据主";
-      //   if (this.DzfeeList) {
-      //     this.doNot = true;
-      //   } else {
-      //     this.doNot = false;
-      //   }
-      // });
-      getFleet(fId).then((response) => {
-        this.Operator = response.data.tFee.createBy;
-        this.DzfeeList = response.data.feeDoList;
-        this.fWbuOptions = response.data.feesList;
-        this.queryParams = response.data.tFee;
-        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) {
+        getFee(fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          this.DzfeeList = response.data.feeDoList;
+          this.fWbuOptions = response.data.feesList;
+          this.queryParams = response.data.tFee;
+          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) {
+        getFleet(fId).then((response) => {
+          this.Operator = response.data.tFee.createBy;
+          this.DzfeeList = response.data.feeDoList;
+          this.fWbuOptions = response.data.feesList;
+          this.queryParams = response.data.tFee;
+          this.fMblnoOptions = response.data.corps;
+          this.open = true;
+          this.title = "修改财务数据主";
+          if (this.DzfeeList) {
+            this.doNot = true;
+          } else {
+            this.doNot = false;
+          }
+        });
+      }
     },
     /** 远程模糊查询用户 */
     corpsRemoteMethod(name) {
@@ -2277,7 +2319,6 @@ export default {
                 // this.DzfeeList = []
                 // this.open = false;
                 this.getList();
-                this.typevalue = "";
               });
             } else {
               addFleet(formData).then((response) => {
@@ -2287,7 +2328,6 @@ export default {
                 // this.DzfeeList = []
                 // this.open = false;
                 this.getList();
-                this.typevalue = "";
               });
             }
           } else {
@@ -2311,7 +2351,7 @@ export default {
                 this.getList();
               });
             } else {
-               addFleet(formData).then((response) => {
+              addFleet(formData).then((response) => {
                 this.msgSuccess("修改成功");
                 this.getList();
               });
@@ -2324,48 +2364,51 @@ export default {
     handleDelete(row) {
       const fIds = row.fId || this.ids;
       let tips = "";
-      detailFleet(fIds).then((res) => {
-        switch (res.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) {
+        detailFee(fIds).then((res) => {
+          switch (res.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) {
+        detailFleet(fIds).then((res) => {
+          switch (res.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("未知错误，无状态");
+            }
           }
-        }
-      });
-      //  detailFee(fIds).then((res) => {
-      //   switch (res.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, "警告", {

src/views/index.vue

@@ -1,12 +1,231 @@
 <template>
-  <div class="app-container home" v-if="sysType == 1">
-    <div class="home-fleet">
+  <div class="app-container home">
+    <ul class="block" v-if="sysType == 1">
+      <li @click="jump('/business/inStock')">
+        <div>
+          <i
+            class="el-icon-download"
+            style="font-size: 50px; text-align: center"
+          ></i>
+          <p>入库</p>
+        </div>
+      </li>
+      <li @click="jump('/business/outStock')">
+        <div>
+          <i
+            class="el-icon-upload2"
+            style="font-size: 50px; text-align: center"
+          ></i>
+          <p>出库</p>
+        </div>
+      </li>
+      <li @click="jump('/basicdata/corps')">
+        <div>
+          <i
+            class="el-icon-s-custom"
+            style="font-size: 50px; text-align: center"
+          ></i>
+          <p>新增用户</p>
+        </div>
+      </li>
+      <li @click="jump('/basicdata/goods')">
+        <div>
+          <i
+            class="el-icon-s-cooperation"
+            style="font-size: 50px; text-align: center"
+          ></i>
+          <p>新增商品</p>
+        </div>
+      </li>
+      <li @click="jump('/business/stockTransfer')">
+        <div>
+          <i
+            class="el-icon-connection"
+            style="font-size: 50px; text-align: center"
+          ></i>
+          <p>调拨</p>
+        </div>
+      </li>
+      <li @click="jump('/finance/charge')">
+        <div>
+          <i
+            class="el-icon-wallet"
+            style="font-size: 50px; text-align: center"
+          ></i>
+          <p>收款</p>
+        </div>
+      </li>
+      <li @click="jump('/finance/payment')">
+        <div>
+          <i
+            class="el-icon-money"
+            style="font-size: 50px; text-align: center"
+          ></i>
+          <p>付款</p>
+        </div>
+      </li>
+      <li @click="jump('/finance/contrast')">
+        <div>
+          <i
+            class="el-icon-s-management"
+            style="font-size: 50px; text-align: center"
+          ></i>
+          <p>对账</p>
+        </div>
+      </li>
+      <li @click="jump('/business/goodsTransfer')">
+        <div>
+          <i
+            class="el-icon-takeaway-box"
+            style="font-size: 50px; text-align: center"
+          ></i>
+          <p>货转</p>
+        </div>
+      </li>
+      <li @click="jump('/agreement/agreementStorage')">
+        <div>
+          <i
+            class="el-icon-s-order"
+            style="font-size: 50px; text-align: center"
+          ></i>
+          <p>协议</p>
+        </div>
+      </li>
+    </ul>
+    <div style="width: 30%; float: right" v-if="sysType == 1">
+      <div style="display: flex">
+        <div id="box" style="width: 100%; height: 350px"></div>
+
+        <el-select
+          v-model="select"
+          slot="prepend"
+          size="mini"
+          :select="query()"
+          placeholder="点击切换仓库"
+          style="position: absolute; width: 8%; right: 1%"
+        >
+          <div v-for="(item, index) in warehouse" :key="index">
+            <el-option
+              :label="item.fName"
+              :value="item.fWarehouseid"
+            ></el-option>
+          </div>
+        </el-select>
+      </div>
+    </div>
+    <div style="width: 100%; margin-bottom: 50px" v-if="sysType == 1">
+      <el-table
+        :data="tableData"
+        :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }"
+        :cell-style="cellStyle"
+        style="width: 67.5%; float: left"
+      >
+        <el-table-column
+          prop="refno1"
+          :show-overflow-tooltip="true"
+          label="委托方"
+        ></el-table-column>
+        <el-table-column
+          prop="auditItem"
+          :show-overflow-tooltip="true"
+          label="日期"
+        >
+          <template slot-scope="scope">
+            <span v-if="!scope.row.auditItem">无时间</span>
+            <span v-else>{{ scope.row.auditItem.slice(0, 10) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="refno3"
+          :show-overflow-tooltip="true"
+          label="提单号"
+        ></el-table-column>
+        <el-table-column
+          prop="refno2"
+          :show-overflow-tooltip="true"
+          label="业务类型"
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.refno2 === 'SJRK'">入库</span>
+            <span v-else-if="scope.row.refno2 === 'SJCK'">出库</span>
+            <span v-else-if="scope.row.refno2 === 'HQZY'">货转</span>
+            <span v-else-if="scope.row.refno2 === 'CKDB'">调拨</span>
+            <span v-else-if="scope.row.refno2 === 'CCF'">仓储费</span>
+            <span v-else-if="scope.row.refno2 === 'HWTG'">货物通关</span>
+            <span v-else-if="scope.row.refno2 === 'ZYF'">作业费</span>
+            <span v-else-if="scope.row.refno2 === 'SF'">收费</span>
+            <span v-else-if="scope.row.refno2 === 'DZ'">对账</span>
+            <span v-else-if="scope.row.refno2 === 'FF'">付费</span>
+            <span v-else-if="scope.row.refno2 === 'JSCCF'">计算仓储费</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label="操作" width="80">
+          <template slot-scope="scope">
+            <span style="cursor: pointer" @click="approval(scope.row)"
+              >查看详情</span
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-table
+        :data="tableDataTwo"
+        :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }"
+        :cell-style="cellStyle"
+        style="width: 30%; float: right; margin-left: 20px"
+      >
+        <el-table-column
+          prop="noticeTitle"
+          :show-overflow-tooltip="true"
+          label="消息中心"
+        />
+        <el-table-column prop="address" label="操作" width="80">
+          <template slot-scope="scope">
+            <span
+              @click="querytoDo(scope.row.noticeContent)"
+              style="cursor: pointer"
+              >查看详情</span
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div style="width: 100%; float: left; margin-top: 20px" v-if="sysType == 1">
+      <div style="display: flex">
+        <div
+          id="commoDity"
+          style="width: 68%; height: 350px; margin-left: 40px"
+        ></div>
+        <div id="cargoOwner" style="width: 30%; height: 350px"></div>
+      </div>
+    </div>
+    <el-dialog
+      v-if="sysType == 1"
+      title="消息提示"
+      :visible.sync="dialogVisible"
+      width="80%"
+      :before-close="handleClose"
+      :close-on-click-modal="false"
+    >
+      <span
+        v-html="text"
+        class="text"
+        style="max-width: 100%; height: auto"
+      ></span>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false"
+          >关 闭</el-button
+        >
+      </span>
+    </el-dialog>
+    <div class="home-fleet" v-if="sysType == 2">
       <div class="home-left">
         <chi-card title="业务看板" iconName="el-icon-s-cooperation">
           <div slot="content">
             <div class="content-top">
               <div class="content-top-left">
-                <div style="display: flex; align-self: center;margin-left: 5px">
+                <div
+                  style="display: flex; align-self: center; margin-left: 5px"
+                >
                   <div style="align-self: center">
                     <svg
                       t="1616396514864"
@@ -36,7 +255,12 @@
                   </div>
                 </div>
                 <div
-                  style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
+                  style="
+                    font-size: 36px;
+                    align-self: center;
+                    font-weight: 600;
+                    color: #014da1;
+                  "
                 >
                   {{ upperLeftCntrs.planQuantity }}
                 </div>
@@ -47,7 +271,7 @@
                     display: flex;
                     align-self: center;
                     min-width: 120px;
-                    margin-left: 5px
+                    margin-left: 5px;
                   "
                 >
                   <div style="align-self: center">
@@ -78,14 +302,19 @@
                   </div>
                 </div>
                 <div
-                  style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
+                  style="
+                    font-size: 36px;
+                    align-self: center;
+                    font-weight: 600;
+                    color: #014da1;
+                  "
                 >
                   {{ upperLeftCntrs.surplusQuantity }}
                 </div>
               </div>
             </div>
             <div class="content-bottom">
-              <div style="display: flex; align-self: center;margin-left: 5px">
+              <div style="display: flex; align-self: center; margin-left: 5px">
                 <div style="align-self: center">
                   <svg
                     t="1616402886142"
@@ -119,7 +348,12 @@
                 </div>
               </div>
               <div
-                style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
+                style="
+                  font-size: 36px;
+                  align-self: center;
+                  font-weight: 600;
+                  color: #014da1;
+                "
               >
                 {{ fleetData.upperLeftCarQuantity }}
               </div>
@@ -127,7 +361,12 @@
             </div>
             <div class="content-bottom">
               <div
-                style="display: flex; align-self:center; min-width: 120px;margin-left: 5px"
+                style="
+                  display: flex;
+                  align-self: center;
+                  min-width: 120px;
+                  margin-left: 5px;
+                "
               >
                 <div style="align-self: center">
                   <svg
@@ -158,7 +397,12 @@
                 </div>
               </div>
               <div
-                style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
+                style="
+                  font-size: 36px;
+                  align-self: center;
+                  font-weight: 600;
+                  color: #014da1;
+                "
               >
                 {{ fleetData.upperLeftOldCarQuantity }}
               </div>
@@ -220,14 +464,18 @@
               <div style="width: 30%" class="single_line">FK221516485645</div>
               <div style="width: 20%" class="single_line">运费运费运费</div>
               <div style="width: 15%" class="single_line">李刚</div>
-              <div style="width: 15%; color: #67c23a" class="single_line">待审批</div>
+              <div style="width: 15%; color: #67c23a" class="single_line">
+                待审批
+              </div>
               <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
-            <div style="font-size: 14px; display: flex; margin: 4px 15px;">
+            <div style="font-size: 14px; display: flex; margin: 4px 15px">
               <div style="width: 30%" class="single_line">FK221516485645</div>
               <div style="width: 20%" class="single_line">运费运费运费</div>
               <div style="width: 15%" class="single_line">李刚</div>
-              <div style="width: 15%; color: #67c23a" class="single_line">待审批</div>
+              <div style="width: 15%; color: #67c23a" class="single_line">
+                待审批
+              </div>
               <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
           </div>
@@ -248,11 +496,13 @@
               <div style="width: 15%; color: #67c23a">待审批</div>
               <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
-            <div style="font-size: 14px; display: flex; margin: 4px 15px;">
+            <div style="font-size: 14px; display: flex; margin: 4px 15px">
               <div style="width: 30%" class="single_line">FK221516485645</div>
               <div style="width: 20%" class="single_line">运费运费运费</div>
               <div style="width: 15%" class="single_line">李刚</div>
-              <div style="width: 15%; color: #67c23a" class="single_line">待审批</div>
+              <div style="width: 15%; color: #67c23a" class="single_line">
+                待审批
+              </div>
               <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
           </div>
@@ -260,224 +510,6 @@
       </div>
     </div>
   </div>
-  <div class="app-container home" v-else>
-    <ul class="block">
-      <li @click="jump('/business/inStock')">
-        <div>
-          <i
-            class="el-icon-download"
-            style="font-size: 50px; text-align: center"
-          ></i>
-          <p>入库</p>
-        </div>
-      </li>
-      <li @click="jump('/business/outStock')">
-        <div>
-          <i
-            class="el-icon-upload2"
-            style="font-size: 50px; text-align: center"
-          ></i>
-          <p>出库</p>
-        </div>
-      </li>
-      <li @click="jump('/basicdata/corps')">
-        <div>
-          <i
-            class="el-icon-s-custom"
-            style="font-size: 50px; text-align: center"
-          ></i>
-          <p>新增用户</p>
-        </div>
-      </li>
-      <li @click="jump('/basicdata/goods')">
-        <div>
-          <i
-            class="el-icon-s-cooperation"
-            style="font-size: 50px; text-align: center"
-          ></i>
-          <p>新增商品</p>
-        </div>
-      </li>
-      <li @click="jump('/business/stockTransfer')">
-        <div>
-          <i
-            class="el-icon-connection"
-            style="font-size: 50px; text-align: center"
-          ></i>
-          <p>调拨</p>
-        </div>
-      </li>
-      <li @click="jump('/finance/charge')">
-        <div>
-          <i
-            class="el-icon-wallet"
-            style="font-size: 50px; text-align: center"
-          ></i>
-          <p>收款</p>
-        </div>
-      </li>
-      <li @click="jump('/finance/payment')">
-        <div>
-          <i
-            class="el-icon-money"
-            style="font-size: 50px; text-align: center"
-          ></i>
-          <p>付款</p>
-        </div>
-      </li>
-      <li @click="jump('/finance/contrast')">
-        <div>
-          <i
-            class="el-icon-s-management"
-            style="font-size: 50px; text-align: center"
-          ></i>
-          <p>对账</p>
-        </div>
-      </li>
-      <li @click="jump('/business/goodsTransfer')">
-        <div>
-          <i
-            class="el-icon-takeaway-box"
-            style="font-size: 50px; text-align: center"
-          ></i>
-          <p>货转</p>
-        </div>
-      </li>
-      <li @click="jump('/agreement/agreementStorage')">
-        <div>
-          <i
-            class="el-icon-s-order"
-            style="font-size: 50px; text-align: center"
-          ></i>
-          <p>协议</p>
-        </div>
-      </li>
-    </ul>
-    <div style="width: 30%; float: right">
-      <div style="display: flex">
-        <div id="box" style="width: 100%; height: 350px"></div>
-
-        <el-select
-          v-model="select"
-          slot="prepend"
-          size="mini"
-          :select="query()"
-          placeholder="点击切换仓库"
-          style="position: absolute; width: 8%; right: 1%"
-        >
-          <div v-for="(item, index) in warehouse" :key="index">
-            <el-option
-              :label="item.fName"
-              :value="item.fWarehouseid"
-            ></el-option>
-          </div>
-        </el-select>
-      </div>
-    </div>
-    <div style="width: 100%; margin-bottom: 50px">
-      <el-table
-        :data="tableData"
-        :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }"
-        :cell-style="cellStyle"
-        style="width: 67.5%; float: left"
-      >
-        <el-table-column
-          prop="refno1"
-          :show-overflow-tooltip="true"
-          label="委托方"
-        ></el-table-column>
-        <el-table-column
-          prop="auditItem"
-          :show-overflow-tooltip="true"
-          label="日期"
-        >
-          <template slot-scope="scope">
-            <span v-if="!scope.row.auditItem">无时间</span>
-            <span v-else>{{ scope.row.auditItem.slice(0, 10) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="refno3"
-          :show-overflow-tooltip="true"
-          label="提单号"
-        ></el-table-column>
-        <el-table-column
-          prop="refno2"
-          :show-overflow-tooltip="true"
-          label="业务类型"
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.refno2 === 'SJRK'">入库</span>
-            <span v-else-if="scope.row.refno2 === 'SJCK'">出库</span>
-            <span v-else-if="scope.row.refno2 === 'HQZY'">货转</span>
-            <span v-else-if="scope.row.refno2 === 'CKDB'">调拨</span>
-            <span v-else-if="scope.row.refno2 === 'CCF'">仓储费</span>
-            <span v-else-if="scope.row.refno2 === 'HWTG'">货物通关</span>
-            <span v-else-if="scope.row.refno2 === 'ZYF'">作业费</span>
-            <span v-else-if="scope.row.refno2 === 'SF'">收费</span>
-            <span v-else-if="scope.row.refno2 === 'DZ'">对账</span>
-            <span v-else-if="scope.row.refno2 === 'FF'">付费</span>
-            <span v-else-if="scope.row.refno2 === 'JSCCF'">计算仓储费</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="address" label="操作" width="80">
-          <template slot-scope="scope">
-            <span style="cursor: pointer" @click="approval(scope.row)"
-              >查看详情</span
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-table
-        :data="tableDataTwo"
-        :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }"
-        :cell-style="cellStyle"
-        style="width: 30%; float: right; margin-left: 20px"
-      >
-        <el-table-column
-          prop="noticeTitle"
-          :show-overflow-tooltip="true"
-          label="消息中心"
-        />
-        <el-table-column prop="address" label="操作" width="80">
-          <template slot-scope="scope">
-            <span
-              @click="querytoDo(scope.row.noticeContent)"
-              style="cursor: pointer"
-              >查看详情</span
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div style="width: 100%; float: left; margin-top: 20px">
-      <div style="display: flex">
-        <div
-          id="commoDity"
-          style="width: 68%; height: 350px; margin-left: 40px"
-        ></div>
-        <div id="cargoOwner" style="width: 30%; height: 350px"></div>
-      </div>
-    </div>
-    <el-dialog
-      title="消息提示"
-      :visible.sync="dialogVisible"
-      width="80%"
-      :before-close="handleClose"
-      :close-on-click-modal="false"
-    >
-      <span
-        v-html="text"
-        class="text"
-        style="max-width: 100%; height: auto"
-      ></span>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogVisible = false"
-          >关 闭</el-button
-        >
-      </span>
-    </el-dialog>
-  </div>
 </template>
 
 <script>
@@ -489,6 +521,7 @@ import {
   warehouse,
   inquiry,
 } from "../../src/api/index";
+import Cookies from "js-cookie";
 export default {
   name: "index",
   data() {
@@ -510,7 +543,7 @@ export default {
       fleetData: "",
       upperLeftCntrs: {},
       sysType: "",
-      upperRights:[]
+      upperRights: [],
     };
   },
   filters: {
@@ -548,14 +581,13 @@ export default {
   created() {
     queryHomeInfo().then((response) => {
       this.fleetData = response.data;
-      if(response.data.upperRight.length>0){
-         this.upperRights=response.data.upperRight.slice(0 , 10)
+      if (response.data.upperRight.length > 0) {
+        this.upperRights = response.data.upperRight.slice(0, 10);
       }
       this.upperLeftCntrs = response.data.upperLeftCntrs;
     });
-    this.getConfigKey("sys.index.systype").then((response) => {
-      this.sysType = response.msg;
-    });
+    this.sysType = Cookies.get("sysType");
+    console.log(this.sysType);
   },
   activated() {
     this.getList();
@@ -1155,7 +1187,7 @@ export default {
     padding: 10px 0;
     height: 260px;
   }
-   .upper-right2 {
+  .upper-right2 {
     padding: 10px 0;
     height: 130px;
   }

src/views/track/cabinet/AddOrUpdate.vue

@@ -1177,7 +1177,11 @@
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">提 交</el-button>
+      <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('unLoadDate')">还卸柜</el-button>
+      <el-button type="primary" @click="submitForm('waybillDate')">回 单</el-button>
       <el-button type="success" @click="submitAllowChanges">修 改</el-button>
       <el-button type="info" @click="submitSave">保 存</el-button>
       <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
@@ -1403,7 +1407,8 @@ export default {
       this.collapses = [];
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm(butType) {
+      console.log(butType)
       this.$refs["form"].validate((valid) => {
         if (valid) {
           this.DList.map((e) => {
@@ -1419,7 +1424,7 @@ export default {
             "fees",
             JSON.stringify(this.DList.concat(this.CList))
           );
-          formData.append("operationType", "unLoadDate");
+          formData.append("operationType", butType);
           insertDriverFtmsorderbillscars(formData).then((response) => {
             if (response.code == 200) {
               this.msgSuccess("提交成功");

src/views/track/cabinet/index.vue

@@ -209,6 +209,49 @@
           >导出</el-button
         >
       </el-col>
+      <el-col :span="1.5"
+        ><el-button type="primary" size="mini" @click="handleQuery(null)"
+          >全 部</el-button
+        ></el-col
+      >
+      <el-col :span="1.5"
+        ><el-button
+          type="primary"
+          size="mini"
+          @click="handleQuery('acceptDate')"
+          >接 单</el-button
+        ></el-col
+      >
+      <el-col :span="1.5"
+        ><el-button type="primary" size="mini" @click="handleQuery('loadDate')"
+          >提 箱</el-button
+        ></el-col
+      >
+
+      <el-col :span="1.5"
+        ><el-button
+          type="primary"
+          size="mini"
+          @click="handleQuery('mdLoadDate')"
+          >还卸货</el-button
+        ></el-col
+      >
+      <el-col :span="1.5"
+        ><el-button
+          type="primary"
+          size="mini"
+          @click="handleQuery('unLoadDate')"
+          >还卸柜</el-button
+        ></el-col
+      >
+      <el-col :span="1.5"
+        ><el-button
+          type="primary"
+          size="mini"
+          @click="handleQuery('waybillDate')"
+          >回 单</el-button
+        ></el-col
+      >
       <div class="tabSetting">
         <div style="margin-right: 20px">
           <el-button
@@ -408,7 +451,7 @@ export default {
       showSearch: true,
       // 订单主表格数据
       ftmsorderbillscarsList: [],
-      relevantAttachments:[],
+      relevantAttachments: [],
       // 总条数
       total: 0,
       // 查询参数
@@ -427,8 +470,8 @@ export default {
       },
       showSetting: false,
       drag: false,
-      setRowList:[],
-      getRowList:[],
+      setRowList: [],
+      getRowList: [],
       tableDate: [
         {
           surface: "1",
@@ -749,20 +792,20 @@ 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;
           }, []);
         }
       });
     },
-       delRow() {
+    delRow() {
       this.data = {
         tableName: "状态跟踪",
         userId: Cookies.get("userName"),
@@ -802,7 +845,7 @@ export default {
     getList() {
       this.loading = true;
       listFtmsorderbillscars(this.queryParams).then((response) => {
-        response.rows.map((e) => {
+        response.dataTable.rows.map((e) => {
           if (e.orderStatus == 10) {
             e.orderStatus = "车队安排";
           }
@@ -843,8 +886,8 @@ export default {
             e.waybillDate = e.waybillDate.substring(0, 10);
           }
         });
-        this.ftmsorderbillscarsList = response.rows;
-        this.total = response.total;
+        this.ftmsorderbillscarsList = response.dataTable.rows;
+        this.total = response.dataTable.total;
         this.loading = false;
       });
     },
@@ -912,7 +955,7 @@ export default {
       };
       this.disabled = false;
       this.resetForm("form");
-      this.relevantAttachments=[]
+      this.relevantAttachments = [];
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -940,12 +983,12 @@ export default {
           this.DList = [];
           this.CList = [];
         }
-        if (response.data.cars.orderStatus >= 60) {
-          this.disabled = true;
-        }
+        // if (response.data.cars.orderStatus >= 60) {
+        //   this.disabled = true;
+        // }
         this.title = "查看装卸柜";
         this.form = response.data.cars;
-        this.relevantAttachments=response.data.attach;
+        this.relevantAttachments = response.data.attach;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },
@@ -990,8 +1033,9 @@ export default {
         });
     },
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery(Status) {
       this.queryParams.pageNum = 1;
+      this.queryParams.carStatus = Status;
       this.getList();
     },
     /** 重置按钮操作 */