修改

src/views/MLargeScreen/components/startOrderReceiving/index.vue

@@ -33,10 +33,16 @@ export default {
                 if(res.length == 0){
                     this.loadData2();
                 }else{
-                    this.showDe = true;
-                    this.btnShow1 = true;
-                    this.btnShow2 = false;
-                    this.carDestination = res[0].destination;
+                    httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
+                        if(resSon1.code == 200){
+                            if(resSon1.data.content[0].workStatus == 0){
+                                this.showDe = true;
+                                this.btnShow1 = true;
+                                this.btnShow2 = false;
+                                this.carDestination = res[0].destination;
+                            }
+                        }
+                    });
                 }
             });
         }, 20000)
@@ -49,10 +55,16 @@ export default {
                     if(res.length == 0){
                         this.loadData2();
                     }else{
-                        this.showDe = true;
-                        this.btnShow1 = true;
-                        this.btnShow2 = false;
-                        this.carDestination = res[0].destination;
+                        httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
+                            if(resSon1.code == 200){
+                                if(resSon1.data.content[0].workStatus == 0){
+                                    this.showDe = true;
+                                    this.btnShow1 = true;
+                                    this.btnShow2 = false;
+                                    this.carDestination = res[0].destination;
+                                }
+                            }
+                        });
                     }
                 });
 			})
@@ -85,9 +97,9 @@ export default {
                     putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,number:this.carnumber,workStatus:1,weightStatus:2}).then((res) => {});
                 }
             });
-            httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,number:this.carnumber}).then((res) => {
+            httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
                 if(res.code == 200){
-                    putForJson(manualSchedulingQuery,{id:res.data.content[0].id,number:this.carnumber,status:1}).then((res) => {});
+                    putForJson(manualSchedulingQuery,{id:res.data.content[0].id,carNo:this.carnumber,status:1}).then((res) => {});
                 }
             });
         },
@@ -100,9 +112,9 @@ export default {
                     putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,number:this.carnumber,oddStatus:1,workStatus:0}).then((res) => {});
                 }
             });
-            httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,number:this.carnumber}).then((res) => {
+            httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
                 if(res.code == 200){
-                    putForJson(manualSchedulingQuery,{id:res.data.content[0].id,number:this.carnumber,status:0}).then((res) => {});
+                    putForJson(manualSchedulingQuery,{id:res.data.content[0].id,carNo:this.carnumber,status:0}).then((res) => {});
                 }
             });
         },
@@ -115,12 +127,12 @@ export default {
                     putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,number:this.carnumber,workStatus:0,weightStatus:0}).then((res) => {});
                 }
             });
-            httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,number:this.carnumber}).then((res) => {
+            httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
                 if(res.code == 200){
-                    putForJson(manualSchedulingQuery,{id:res.data.content[0].id,number:this.carnumber,status:0}).then((res) => {});
+                    putForJson(manualSchedulingQuery,{id:res.data.content[0].id,carNo:this.carnumber,status:0}).then((res) => {});
                 }
             });
-            httpDelForJson(dingDanBiaoCaoZuo,{number:this.carnumber}).then((res) => {});
+            httpDelForJson(dingDanBiaoCaoZuo,{carNo:this.carnumber}).then((res) => {});
         },
         //获取当前时间
         currentTime(){

src/views/MLargeScreen/index.vue

@@ -56,9 +56,9 @@
 		<personalCenter ref="personalCenterMethod" v-show="selectFunction == 6"/>
 		<smallWindow ref="smallWindowMethod" v-show="selectFunction == 7"/>
 		<!-- 地图区域 -->
-		<!-- <div id="centerDiv" class="mapcontainer">
+		<div id="centerDiv" class="mapcontainer">
 			<mars3dViewerMap :url="configUrl" @onload="onMapload"/>
-		</div> -->
+		</div>
 		<!-- 电铲待装车辆列表 -->
 		<div class="waitingtrucksView" v-if="carclass == '电铲'">
 			<div class="waitingtrucksView_title">待装卡车列表</div>
@@ -75,7 +75,14 @@
 
 <script>
 import { httpGet, httpPostForJson, putForJson, httpDelForJson} from "@/common/httpBean.js"
-import {personalCenterInforQuery,vehicleInformationQuery,waitingtrucksQuery,vehicleInformationUpdate} from "@/axios/api.js"
+import {
+	personalCenterInforQuery,
+	vehicleInformationQuery,
+	waitingtrucksQuery,
+	vehicleInformationUpdate,
+	dingDanBiaoCaoZuo,
+	manualSchedulingQuery
+} from "@/axios/api.js"
 import startOrderReceiving from './components/startOrderReceiving/index.vue' //接受派单
 import voiceApplication from './components/voiceApplication/index.vue' //语音申请
 import failureDeclaration from './components/failureDeclaration/index.vue' //故障申报
@@ -325,7 +332,20 @@ export default {
 		},
 		//完成装车
 		wanchengzhuangcheFn(number){
-			//putForJson(vehicleInformationUpdate,{number:number,workStatus:1}).then((res) => {});
+			//删除
+			httpDelForJson(dingDanBiaoCaoZuo,{carNo:number}).then((res) => {});
+			//改订单状态
+			httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:number}).then((res) => {
+                if(res.code == 200){
+                    putForJson(manualSchedulingQuery,{id:res.data.content[0].id,carNo:number,status:0}).then((res) => {});
+                }
+            });
+			//车辆信息状态修改
+			httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => {
+                if(res.code == 200){
+                    putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,number:this.carnumber,workStatus:0,weightStatus:1,oddStatus:1}).then((res) => {});
+                }
+            });
 		},
 		//地图构造完成回调
 		onMapload(map) {