tijia

build/utils.js

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

config/index.js

@@ -65,8 +65,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://172.16.33.166:80",
-    target: "http://localhost:8080",
+    target: "http://172.16.33.166:80",
+    // target: "http://localhost:8080",
     // target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {

src/views/inward/components/offsetSteel/saleSteelTruckOrder/kucunList.vue

@@ -308,6 +308,7 @@ export default {
   },
   methods: {
     handleSelectConsignee(row, index, item) {
+      console.log(row);
       this.consigneeList.forEach(e => {
         if (e.consigneeCompanyName == row.receiveName) {
           row.consigneeId = e.consigneeId;

src/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue

@@ -112,9 +112,6 @@
               :trigger-on-focus="false"
               @select="handleSelectWarehouse(scope.row, scope.$index)"
             >
-              <template slot-scope="{ item }">
-                <div class="name">{{ item.warehouseName }}</div>
-              </template>
             </el-autocomplete>
           </template>
         </el-table-column>
@@ -199,7 +196,13 @@
           align="center"
           width="150px"
         >
-          <template> </template>
+          <template slot-scope="scope">
+            <el-input
+              v-model.number="scope.row.strawMats"
+              placeholder="草垫根数"
+            >
+            </el-input>
+          </template>
         </el-table-column>
         <el-table-column
           prop="orderNum"
@@ -327,7 +330,8 @@ export default {
         "materialWeight",
         "materialNum"
       ],
-      operateName: "编辑"
+      operateName: "编辑",
+      unloadPointList: []
     };
   },
   created() {
@@ -337,8 +341,46 @@ export default {
     this.showSummariesPosition();
   },
   methods: {
+    handleSelectWarehouse(row, index, item) {
+      console.log(item);
+      this.unloadPointList.forEach(e => {
+        if (e.warehouseName == row.unloadPoint) {
+          row.unloadPointId = e.warehouseId;
+          row.unloadPoint = e.warehouseName;
+        }
+      });
+    },
     //边输边查卸货点
-
+    querySearchWarehouse(queryString, cb) {
+      if (queryString.length >= 2) {
+        this.axios
+          .post("/api/v1/uc/selectUnloadingPoint?index=" + queryString)
+          .then(res => {
+            console.log(res.data);
+            if (res.data.length > 0) {
+              console.log(res);
+              var restaurantsConsignee = res.data;
+              this.unloadPointList = res.data;
+              var results = queryString
+                ? restaurantsConsignee.filter(
+                    this.createFilterConsignee(queryString)
+                  )
+                : restaurantsConsignee;
+              // 调用 callback 返回建议列表的数据
+              cb(results);
+            }
+          });
+      }
+    },
+    createFilterConsignee(queryString) {
+      return restaurantsConsignee => {
+        return (
+          restaurantsConsignee.value
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     operate(row) {
       row.personnelSsoId = getCookie("userId");
       if (

src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue

@@ -60,9 +60,7 @@
           </el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="dispatchSome(), showDialog()"
-            >多拼派车</el-button
-          >
+          <el-button type="primary" @click="showDialog">多拼派车</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -445,15 +443,20 @@ export default {
     this.getSendStations();
   },
   methods: {
-    dispatchSome() {
-      console.log(this.tableData);
-      //首先过滤掉已派车的数据
-      let arr = this.tableData.filter(item => {
-        return item.capacityIds == 0;
-      });
-      console.log(arr);
-      this.s
-    },
+    // dispatchSome() {
+    //   console.log(this.tableData);
+    //   //首先过滤掉已派车的数据
+    //   let arr = this.tableData.filter(item => {
+    //     return item.capacityIds == 0;
+    //   });
+    //   if (arr.length == 0) {
+    //     ths.$message.error("没有符合条件的分录可供拼装");
+    //     return;
+    //   }
+    //   console.log(arr);
+    //   this.selection = arr;
+    //   this.updateMulCapacity();
+    // },
     //禁用已派车
     selectInit(row) {
       console.log(row);
@@ -646,16 +649,12 @@ export default {
       });
     },
     //多拼弹出层绑定车牌号
-    handleMulSelect(row, index) {
-      this.capacityList.forEach(item => {
-        if (item.capacityNumber === row.capacityNo) {
-          this.selection.forEach(selected => {
-            selected.newsCapacityId = item.capacityId;
-            selected.capacityNo = row.capacityNo;
-          });
-          this.newsCapacityId = item.capacityId;
-          this.capacityNo = row.capacityNo;
-          console.log("newCapacityId：", this.newsCapacityId);
+    handleMulSelect(item) {
+      console.log(item);
+      this.capacityList.forEach(e => {
+        if (item.capacityNumber === e.capacityNumber) {
+          this.capacityNumber = e.capacityNumber;
+          this.capacityId = e.capacityId;
         }
       });
     },
@@ -775,11 +774,15 @@ export default {
 
     //多拼派车
     updateMulCapacity() {
+      let i = 0;
+      if (this.capacityId == null) {
+        this.$message.error("请选择车牌号后再派发");
+        return;
+      }
       this.selection.forEach(item => {
         item.isIwardSteel = 4;
         item.saleOrderMaterialId = item.saleOrderId;
-        item.capacityId = this.capacityId;
-        item.capacityNumber = this.capacityNo;
+        item.capacityNumber = this.capacityNumber;
       });
       if (this.selection[0].sendStation == "达州站") {
         this.selection.forEach(item => {
@@ -820,16 +823,22 @@ export default {
             this.$message.success("派车成功!");
             this.getSteelReport();
             loading.close();
+            this.capacityId = null;
+            this.dialogTableVisible = false;
           } else {
             this.$message.error("派车失败,请联系管理员");
             this.getSteelReport();
             loading.close();
+            this.capacityId = null;
+            this.dialogTableVisible = false;
           }
         })
         .catch(() => {
           this.$message.error("派车失败,请联系管理员");
           this.getSteelReport();
           loading.close();
+          this.capacityId = null;
+          this.dialogTableVisible = false;
         });
     },