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

src/App.vue

@@ -48,4 +48,7 @@ export default {
 .el-divider--horizontal {
     margin: 0 0 3px 0;
 }
-</style>
+.el-input.is-disabled .el-input__inner {
+    color: #000000 !important;
+}
+</style>

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -3108,6 +3108,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "13",
+          label: "fLocalcntrno",
+          name: "库内箱号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList2: [],
       getRowList2: [],

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -2196,6 +2196,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "13",
+          label: "fLocalcntrno",
+          name: "库内箱号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList2: [],
       getRowList2: [],

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -3576,6 +3576,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "13",
+          label: "fLocalcntrno",
+          name: "库内箱号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList2: [],
       getRowList2: [],

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -3505,6 +3505,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "13",
+          label: "fLocalcntrno",
+          name: "库内箱号",
+          checked: 0,
+          width: 100,
+        },
       ],
       setRowList2: [],
       getRowList2: [],

src/views/finance/contrast/index.vue

@@ -3308,7 +3308,7 @@ export default {
         if (this.selection.length == 0) {
           if (index === 0) {
             sums[index] = "合计";
-          } else if (column.label == "金额" || column.label == "本次金额") {
+          } else if (column.label == "金额" || column.label == "本次金额"||column.label == "费用金额") {
             const values = data.map((item) => Number(item[column.property]));
             if (!values.every((value) => isNaN(value))) {
               sums[index] = values.reduce((prev, curr) => {

src/views/fleet/fleetStatistics/index.vue

@@ -289,7 +289,7 @@
         :fixed="item.fixed"
       />
     </el-table>
-    <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
+    <el-dialog title="自定义列显示" :visible.sync="showSetting2" width="700px">
       <div>配置排序列数据（拖动调整顺序）</div>
       <div style="margin-left: 17px">
         <el-checkbox
@@ -1028,8 +1028,7 @@ export default {
     /** 查询订单主列表 */
     getList() {
       if (!this.queryParams.acceptDateList) {
-        this.$message.error("请选择接单时间");
-        return false;
+        return this.$message.error("请选择接单时间");
       }
       this.loading = true;
       queryLedgerList(this.queryParams).then((response) => {
@@ -1064,15 +1063,13 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        stlStatus: null,
-        accchkStatus: null,
-        invStatus: null,
-      };
-      this.handleQuery();
+      this.queryParams = this.$options.data().queryParams;
+      this.loading = true;
+      setTimeout(() => {
+        this.loading = false;
+        this.tabularData =[];
+        this.total = 0;
+      }, 400);
     },
   },
 };

src/views/track/cabinet/AddOrUpdate.vue

@@ -637,9 +637,9 @@
         <el-form ref="carsTable" :model="carsTable" label-width="110px">
           <el-row>
             <el-col :span="6">
-              <el-form-item label="客户名称" prop="fCorpId">
+              <el-form-item label="客户名称" prop="corpName">
                 <el-select
-                  v-model="carsTable.fCorpId"
+                  v-model="carsTable.corpName"
                   placeholder="请输入客户名称"
                   :clearable="true"
                   filterable
@@ -701,9 +701,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="装车地点" prop="tLoadAddr">
+              <el-form-item label="装车地点" prop="loadAddr">
                 <el-input
-                  v-model="carsTable.tLoadAddr"
+                  v-model="carsTable.loadAddr"
                   placeholder="请输入装车地点"
                   :disabled="true"
                   size="small"
@@ -714,7 +714,7 @@
             <el-col :span="6">
               <el-form-item label="卸车地点" prop="unLoadAddr">
                 <el-input
-                  v-model="carsTable.tUnLoadAddr"
+                  v-model="carsTable.unLoadAddr"
                   placeholder="请输入卸车地点"
                   :disabled="true"
                   size="small"

src/views/track/cabinet/index.vue

@@ -588,6 +588,11 @@ export default {
         mdLoadAddr: null,
         unLoadAddr: null,
         cLoadDate: null,
+        billKind:null,
+        carregNo:null,
+        mBillNo:null,
+        orderNo:null,
+        acceptDateList:null,
       },
       showSetting: false,
       drag: false,
@@ -1177,7 +1182,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams=this.$options.data().queryParams;
       this.handleQuery();
     },
     // 监听 子组件弹窗关闭后触发，有子组件调用