Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/inward/components/inwardSettlement/countDetailOrder.vue

@@ -98,22 +98,22 @@ export default {
     options1GetRequestUrl(){
     if(getCookie("orgCode") == "chengyunshang"){
       this.ssoId=getCookie('userId');
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&carrierSsoId="+ getCookie('userId');
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&carrierSsoId="+ getCookie('userId');
     }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0"
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0"
     }else{
-      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&userId=" + getCookie("orgCode");
+      this.options1.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&userId=" + getCookie("orgCode");
     }
     },
     //已结算数据
     options2GetRequestUrl(){
      if(getCookie("orgCode") == "chengyunshang"){
       this.ssoId=getCookie('userId');
-      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&carrierSsoId="+ getCookie('userId');
+      this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&carrierSsoId="+ getCookie('userId');
       }else if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"||getCookie("orgCode")=="wuliuchuyunzhongxin"){
-        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1"
+        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1"
       }else{
-        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&userId=" + getCookie("orgCode");
+        this.options2.requestUrl = "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&userId=" + getCookie("orgCode");
       }
     },
     onclick() {
@@ -133,7 +133,7 @@ export default {
             getCookie("orgCode") == "wuliuchuyunzhongxin"
           ) {
             this.options1.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0" +
               "&startTime=" +
               startTime +
               "&endTime=" +
@@ -141,7 +141,7 @@ export default {
               "&i" +
               new Date();
             this.options2.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1" +
               "&startTime=" +
               startTime +
               "&endTime=" +
@@ -150,7 +150,7 @@ export default {
               new Date();
           } else if (getCookie("orgCode") == "chengyunshang") {
             this.options1.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&carrierSsoId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&carrierSsoId=" +
               getCookie("userId") +
               "&startTime=" +
               startTime +
@@ -159,7 +159,7 @@ export default {
               "&i" +
               new Date();
             this.options2.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&carrierSsoId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&carrierSsoId=" +
               getCookie("userId") +
               "&startTime=" +
               startTime +
@@ -169,7 +169,7 @@ export default {
               new Date();
           } else {
             this.options1.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=0&userId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=0&userId=" +
               getCookie("orgCode") +
               "&startTime=" +
               startTime +
@@ -178,7 +178,7 @@ export default {
               "&i" +
               new Date();
             this.options2.requestUrl =
-              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=465&orderType=26&detailStatus=1&userId=" +
+              "/api/v1/bms/getInwardWeightDetailsOrder?apiId=515&orderType=26&detailStatus=1&userId=" +
               getCookie("orgCode") +
               "&startTime=" +
               startTime +

src/views/inward/components/truckAppoint/addPlan.vue

@@ -128,7 +128,7 @@ export default {
       console.log(this.mapList);
     },
     // 新增
-    makeSure() {
+    async makeSure() {
       console.log(typeof this.planTruckNumber);
       if (this.carrierId == null || this.state2 == "") {
         this.$alert("请输入承运商！");
@@ -142,18 +142,23 @@ export default {
         planTruckNumber: Number(this.planTruckNumber),
         carrierId: this.carrierId
       };
-      this.axios.post("/api/v1/ams/addTruckPlan", plan).then(res => {
-        console.log(res);
-        if (res.data.code == 200) {
-          this.$message({
-            type: "success",
-            message: "新增成功!"
-          });
-          this.$router.go(-1);
-        } else {
-          this.$message.error("新增失败！");
-        }
-      });
+      try {
+        await this.axios.post("/api/v1/ams/addTruckPlan", plan, {timeout: 45000}).then(res => {
+          console.log(res);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!"
+            });
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败！");
+          }
+        });
+      }catch (e) {
+        console.log(e)
+        Message.error('网络异常，请刷新页面')
+      }
     },
     // 返回
     cancel() {

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -813,7 +813,7 @@ export default {
       }
     },
     // 新增
-    makeSure() {
+    async makeSure() {
       // console.log(this.form.isMineral);
       // // 判断当前装机是否选择了装机必填
       // console.log("进来了");
@@ -906,8 +906,8 @@ export default {
       }
       if (this.DueTime == null && this.isOpenDueTime == false) {
         //默认选择明天0点
-        var dd=new Date(this.form.requirementTruckTime);
-        dd.setDate(dd.getDate()+1);//获取AddDayCount天后的日期
+        var dd = new Date(this.form.requirementTruckTime);
+        dd.setDate(dd.getDate() + 1);//获取AddDayCount天后的日期
         dd.setHours(null);
         dd.setMinutes(null);
         dd.setSeconds(null);
@@ -934,20 +934,25 @@ export default {
         orgCode: getCookie("orgCode"),
         remark: this.form.Tel + this.capacityTypeName + this.form.typeRemarks
       };
-      this.axios
-        .post("/api/v1/ams/addTruckRequirement", requiremnet)
-        .then(res => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!"
-            });
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败！");
-            this.disabled = false;
-          }
-        });
+      try {
+        await this.axios
+          .post("/api/v1/ams/addTruckRequirement", requiremnet,{timeout: 45000})
+          .then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!"
+              });
+              this.$router.go(-1);
+            } else {
+              this.$message.error("新增失败！");
+              this.disabled = false;
+            }
+          });
+      } catch (e) {
+        console.log(e)
+        Message.error('网络异常，请刷新页面')
+      }
     },
     func(res) {
       console.log(res);