asdasdd

build/utils.js

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

config/index.js

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

src/views/appoint/components/inward/addTransPrice.vue

@@ -239,8 +239,8 @@ export default {
       this.newsArr.forEach(e => {
         console.log(e.materialName);
         var addmap = {
-          materialName: e.materialName,
-          materialId: e.materialId
+          materialName: e.materialTypeName,
+          materialId: e.materialTypeId
         };
         this.selectionList.push(addmap);
       });
@@ -319,12 +319,12 @@ export default {
       };
       this.axios.post("/api/v1/ams/insertInwardPrice", mapValue).then(res => {
         if (res.data.code == "200") {
-          this.$router.go(-1);
+          // this.$router.go(-1);
+          this.$message({
+            type: "success",
+            message: "新增运输单价成功!"
+          });
         }
-        this.$message({
-          type: "success",
-          message: "新增运输单价成功!"
-        });
       });
     },
     // 取消

src/views/inward/components/truckOrder/addPurInwardOrder.vue

@@ -250,7 +250,7 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
-      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3";
+      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=1";
       this.option.requestUrl =
         "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2&carrierSsoId=" +
         getCookie("userId");
@@ -260,7 +260,7 @@ export default {
         "&con=" +
         "铁专线精煤";
       this.line.requestUrl =
-        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" +
+        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=1" +
         "&con=" +
         "采购内转";
       this.option.requestUrl =
@@ -268,7 +268,7 @@ export default {
     } else {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
-      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3";
+      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=1";
       this.option.requestUrl =
         "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2";
     }
@@ -276,23 +276,33 @@ export default {
   methods: {
     //点击确定按钮的事件
     makeSure() {
+      console.log(this.orderType);
       this.disabled = true;
       if (this.planId == null) {
         this.$message.error("未勾选计划");
         this.disabled = false;
         return;
-      } else if (this.lineId == null) {
-        if (this.orderType == 10 || this.orderType == 20) {
+      }
+      if (this.lineId == null) {
+        if (
+          this.orderType == 10 ||
+          this.orderType == 20 ||
+          this.orderType == 23 ||
+          this.orderType == 24
+        ) {
           this.$message.error("未选择路线");
           this.disabled = false;
           return;
         }
-      } else if (this.selectionList.length == 0) {
+      }
+      if (this.selectionList.length == 0) {
         this.$message.error("未选择车辆");
         this.disabled = false;
         return;
-      } else if (this.orderType == null) {
+      }
+      if (this.orderType == null) {
         this.$message.error("请选择订单类型");
+        this.disabled = false;
         return;
       }
       this.axios
@@ -402,13 +412,13 @@ export default {
       } else {
         this.lineDrawer = true;
         this.line.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=1&i=" + new Date();
       }
     },
     //线路表格的框计算
     selectClick() {
       this.line.requestUrl =
-        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.lineText;
+        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=1&con=" + this.lineText;
     }
   }
 };

src/views/inward/components/truckOrder/addPurInwardOrderCon.vue

@@ -247,20 +247,20 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
-      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3";
+      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=1";
     } else if (getCookie("orgCode") == "biemeierchejian") {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=929059510763524096" +
         "&con=" +
         "铁专线精煤";
       this.line.requestUrl =
-        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" +
+        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=1" +
         "&con=" +
         "采购内转";
     } else {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
-      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3";
+      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=1";
     }
   },
   methods: {
@@ -269,19 +269,28 @@ export default {
       this.materialId = res.list[0].materialId;
     },
     makeSure() {
+      console.log(typeof this.orderType);
       this.disabled = true;
       if (this.lineId == null) {
-        if (this.orderType == 10 || this.orderType == 20) {
+        if (
+          this.orderType == 10 ||
+          this.orderType == 20 ||
+          this.orderType == 23 ||
+          this.orderType == 24
+        ) {
           this.$message.error("未选择路线");
           this.disabled = false;
           return;
         }
-      } else if (this.selectionList.length == 0) {
+      }
+      if (this.selectionList.length == 0) {
         this.$message.error("未选择车辆");
         this.disabled = false;
         return;
-      } else if (this.orderType == null) {
+      }
+      if (this.orderType == null || this.orderType == "null") {
         this.$message.error("请选择订单类型");
+        this.disabled = false;
         return;
       }
       this.axios
@@ -385,13 +394,13 @@ export default {
       } else {
         this.lineDrawer = true;
         this.line.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=1&i=" + new Date();
       }
     },
     //线路表格的框计算
     selectClick() {
       this.line.requestUrl =
-        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.lineText;
+        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=1&con=" + this.lineText;
     }
   }
 };