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

src/views/finance/contrast/index.vue

@@ -868,8 +868,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>
@@ -992,7 +996,7 @@ import {
   listFleet,
   getFleet,
   delFleet,
-  detailFleet
+  detailFleet,
 } from "@/api/finance/contrast";
 import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
@@ -1364,7 +1368,7 @@ export default {
     ApprovalComments,
   },
   created() {
-    this.typevalue=Cookies.get("sysType");
+    this.typevalue = Cookies.get("sysType");
     this.getList();
     this.register();
     this.getDicts("data_unitfees").then((response) => {
@@ -2420,8 +2424,11 @@ export default {
         type: "warning",
       })
         .then(function () {
-          // return delFee(fIds);
-          return delFleet(fIds);
+          if (Cookies.get("sysType") == 1) {
+            return delFee(fIds);
+          } else if (Cookies.get("sysType") == 2) {
+            return delFleet(fIds);
+          }
         })
         .then(() => {
           this.getList();