修改

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

@@ -51,13 +51,14 @@ export default {
       this.$router.go(-1);
     },
     makeSure() {
+      console.log("form",this.form.resultVoidNumber-this.form.resultApproveNumber);
       if(!this.form.resultDate ||
       !this.form.resultApproveNumber||
       !this.form.resultVoidNumber||
       !this.form.resultRealNumber){
         this.$message.warning("存在空值!");
         return;
-      }else if(this.form.resultVoidNumber>this.form.resultApproveNumber){
+      }else if(this.form.resultVoidNumber-this.form.resultApproveNumber>0){
         this.$message.warning("落空车数不能超过批复车数!");
         return;
       }

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

@@ -59,7 +59,7 @@ export default {
       !this.form.resultRealNumber){
         this.$message.warning("存在空值!");
         return;
-      }else if(this.form.resultVoidNumber>this.form.resultApproveNumber){
+      }else if(this.form.resultVoidNumber-this.form.resultApproveNumber>0){
         this.$message.warning("落空车数不能超过批复车数!");
         return;
       }

src/views/sale/components/offSiteTransportation/checkGPS.vue

@@ -509,6 +509,7 @@ export default {
           if (res.data.data == "-1") {
             this.$message.error("运输订单未关闭,自提车辆无权查看!");
           } else if (res.data.data.startAndEndRoutes) {
+            console.log("res.data.data:",res.data.data);
             that.listPath = res.data.data.startAndEndRoutes;
             that.initMap([105.602725, 37.076636]);
           } else {
@@ -534,7 +535,7 @@ export default {
         that.initThreeMarker();
         //初始化当前点标记
         //that.initCustomMarkes(that.carNumber+"("+that.listPath[0].miled+")",that.listPath[0].currentPointName,that.listPath[0].currentPoint.lon,that.listPath[0].currentPoint.lat)
-        //that.initEndline();
+        that.initEndline();
       });
     },
     //结束点
@@ -569,11 +570,11 @@ export default {
           element.endPoint != "" &&
           element.endPoint != null
         ) {
-          // that.initMarkes(20,35,require('@/assets/img/end.png'),element.endPoint.lon,element.endPoint.lat,'终点');
+          that.initMarkes(20,35,require('@/assets/img/end.png'),element.endPoint.lon,element.endPoint.lat,'终点');
           //终点名称
           that.getEndPointName([element.endPoint.lon, element.endPoint.lat]);
         } else {
-          // that.initMarkes(20,35,require('@/assets/img/end.png'),element.runRoute[element.runRoute.length-1].lon,element.runRoute[element.runRoute.length-1].lat,'终点');
+          that.initMarkes(20,35,require('@/assets/img/end.png'),element.runRoute[element.runRoute.length-1].lon,element.runRoute[element.runRoute.length-1].lat,'终点');
           //终点名称
           that.getEndPointName([
             element.runRoute[element.runRoute.length - 1].lon,
@@ -604,6 +605,7 @@ export default {
     //初始化预计轨迹
     initPolyline(path, color) {
       let that = this;
+      console.log("path:",path);
       //预计轨迹
       var endLine = new AMap.Polyline({
         map: that.map, //地图组件