修改提货委托哦

build/utils.js

@@ -18,7 +18,10 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "appoint", "statisticalReport"];
 // let devModules = ["index", "statisticalReport", "appoint", "TMS"];
 // let devModules = ["index", "statisticalReport", "TMS", "appoint"];
-let devModules = ["index","appoint","TMS"];
+
+
+// let devModules = ["index", "appoint", "statisticalReport"];
+let devModules = ["all"];
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

config/index.js

@@ -75,7 +75,7 @@ let proxyTable = {
     }
   },
   "/views/api/v1": {
-    target: "http://localhost:8080",
+    target: "http://172.16.33.166:80",
     // target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {

src/views/TMS/components/importedMine/wagonLoad.vue

@@ -96,7 +96,7 @@ export default {
       }
     },
     btnclick() {
-      this.$router.push("/addWagonLoadCopy");
+      this.$router.push("/addWagonLoad");
     },
     click(resultId) {
       this.$router.push("/editWagonLoad/" + resultId);

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

@@ -54,6 +54,7 @@
         style="width: 100%; margin-top: 20px"
         max-height="500px"
         @cell-click="cellClik"
+        @cell-mouse-leave="cellLeaveMouse"
       >
         <el-table-column
           width="50"
@@ -104,13 +105,13 @@
         </el-table-column>
         <el-table-column
           prop="capacityNo"
+          column-key="capacityNo"
           label="车牌号"
           align="center"
           width="250px"
           :filter-multiple="true"
           :filters="filterData()"
           :filter-method="filterTag"
-          @reset="resetChange"
         >
           <template slot-scope="scope">
             <el-autocomplete
@@ -325,16 +326,21 @@ export default {
     this.getSteelReport();
   },
   methods: {
-    resetChange() {
-      console.log("wczhil");
-    },
-    filterChange() {
-      console.log("11");
+    filterChange(filters) {
+      console.log(filters);
+      var arr = this.tableData;
+      var capacityNoList = Array.from(filters.capacityNo);
+      this.tableData = [];
+      this.tableData = arr.filter((item, index) => {
+        return capacityNoList.indexOf(item.capacityNo) != -1;
+      });
+      this.getSpanArr(this.tableData);
+      console.log(this.tableData);
     },
     filterTag(value, row, column) {
-      console.log(value);
-      console.log(row);
-      console.log(column);
+      // console.log(value);
+      // console.log(row);
+      // console.log(column);
     },
     // 数组对象去重
     deWeight(arr) {
@@ -349,6 +355,7 @@ export default {
       return arr;
     },
     cellClik(row, column, cell, event) {
+      console.log(cell);
       if (column.property == "capacityNo") {
         this.$set(row, "isCapacityShow", 1);
       }
@@ -362,6 +369,20 @@ export default {
         this.$set(row, "isTelShow", 1);
       }
     },
+    cellLeaveMouse(row, column, cell, event) {
+      if (column.property == "capacityNo") {
+        this.$set(row, "isCapacityShow", 0);
+      }
+      if (column.property == "carrierName") {
+        this.$set(row, "isCarrierShow", 0);
+      }
+      if (column.property == "capacityTel") {
+        this.$set(row, "isTelShow", 0);
+      }
+      if (column.property == "capacityTel") {
+        this.$set(row, "isTelShow", 0);
+      }
+    },
     //承运商弹出层
     handleSelectCarrier(row, index, item) {
       console.log(this.carrierList);
@@ -457,6 +478,10 @@ export default {
     //修改司机电话号码
     updateDriverTel(row) {
       console.log(row.capacityTel);
+      if (row.capacityTel == null || row.capacityTel == "") {
+        this.$message.error("电话号码不能为空");
+        return;
+      }
       this.axios
         .post("/api/v1/uc/updateDriverTel", {
           orderId: parseInt(row.orderId),
@@ -542,7 +567,6 @@ export default {
           }
         }
       }
-      this.totalCapacity = data[data.length - 1].group;
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (this.columnIndexs.indexOf(columnIndex) != -1) {