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

config/index.js

@@ -66,6 +66,7 @@ let proxyTable = {
   "/api/v1": {
     target: "http://172.16.33.166:8080",
     // target: "http://localhost:8080",
+    // target: "http://localhost:8019",
     // target: "http://192.168.1.107:8080",
     ws: true,
     pathRewrite: {

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

@@ -246,6 +246,7 @@
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
+import { checkTel } from "@/utils/validator.js";
 export default {
   components: { PageTitle },
   data() {
@@ -536,7 +537,16 @@ export default {
           this.$message.error("请填写联系电话")
           this.disabled = false
           return
+      }else{
+        let reg = /^1[3|4|5|7|8][0-9]{9}$/;
+        if(!reg.test(this.form.Tel)){
+          // 当校验失败时
+           this.$message.error("联系电话格式填写有误，请重新填写")
+          this.disabled = false
+          return
+        }
       }
+
       var i=0
       this.tableData.forEach((e) =>{
         if(e.requirementPlatformId&&e.requirementUnloadUnitId){
@@ -558,7 +568,18 @@ export default {
       if(this.DueTime==null){
         DueTime = null;
       }else{
-        DueTime = sjTime(this.DueTime);
+        // 判断当前用户填写的截止日期是否大于当前时间
+        let date2 = new Date();
+        if(date2.getTime()>this.DueTime.getTime()){
+          this.$message.warning("截止日期必须大于当前时间！");
+          this.disabled = false
+          return
+        }else{
+          DueTime = sjTime(this.DueTime);
+        }
+      }
+      if(this.form.capacityType==undefined){
+        this.form.capacityType=""
       }
       let requiremnet = {
         requirementEstimatedDuration: this.form.requirementEstimatedDuration,

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

@@ -79,6 +79,11 @@
           </el-table-column> 
             </dilTable>
           </el-tab-pane>
+          
+          <el-tab-pane label="已完成" name="four">
+            <dilTable v-bind.sync="four" ref="table3">
+            </dilTable>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </template>
@@ -105,6 +110,9 @@ export default {
         requestUrl:
           "" 
       },
+      four:{
+        requestUrl:""
+      },
       activeName: "second",
       tableData: [],
     };
@@ -114,10 +122,12 @@ export default {
         this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + getCookie("userId")
         this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + getCookie("userId")
         this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + getCookie("userId")
+        this.four.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4&carrierId=" + getCookie("userId")
       }else{
         this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1"
         this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2"
         this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3"
+        this.four.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4"
       } 
   },
   methods: {
@@ -131,10 +141,12 @@ export default {
         this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + getCookie("userId") + "&i=" + new Date()
         this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + getCookie("userId") + "&i=" + new Date()
         this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + getCookie("userId") + "&i=" + new Date()
+        this.four.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4&carrierId=" + getCookie("userId") + "&i=" + new Date()
       }else{
         this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1" + "&i=" + new Date()
         this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2" + "&i=" + new Date()
         this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3" + "&i=" + new Date()
+        this.four.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4" + "&i=" + new Date()
       } 
     },
     receiver(scope) {