页面调整

pages/dl_cmaterial/index.vue

@@ -32,7 +32,7 @@
 			<button class="cu-btn bg-gradual-orange wid22" @tap="lockingbt()">锁定</button>
 			<button class="cu-btn bg-gradual-black wid22" style="background-color: #666;color: #fff;" @tap="deactivate('停用')">停用</button>
 		</view>
-		<view class="padding flex align-center bg-white justify-around" v-if="gwObj.status==4">
+		<view class="padding flex align-center bg-white justify-around" v-if="gwObj.status=='4' ">
 			<button class="cu-btn bg-gradual-orange " @tap="deactivate('启用')">启用</button>
 		</view>
 		<view class="padding flex align-center bg-white justify-around" v-if="gwObj.status=='L'">
@@ -120,18 +120,18 @@
 			},
 			getstatus: function(e) {
 				let ztList = {
-					"1": "正常",
-					"2": "已占用",
-					"3": "锁定",
+					"E": "正常",
+					"U": "已占用",
+					"L": "锁定",
 					"4": "停用"
 				};
 				return ztList[e]
 			},
 			getColor: function(e) {
 				let ztList = {
-					"1": "bg-green",
-					"2": "bg-red",
-					"3": "bg-orange",
+					"E": "bg-green",
+					"U": "bg-red",
+					"L": "bg-orange",
 					"4": "bg-red"
 				};
 				return ztList[e]
@@ -146,9 +146,9 @@
 			},
 			ztTrans: function(a) {
 				const ztList = {
-					"1": "空闲",
-					"2": "已占用",
-					"3": "锁定",
+					"E": "空闲",
+					"U": "已占用",
+					"L": "锁定",
 					"4": "停用"
 				};
 				return ztList[a]
@@ -177,8 +177,8 @@
 						this.formData.gwid = this.gwObj.id;
 						
 					}
-					if(this.gwinfor[this.gwSelcetdIndex].status!=1){
-						queryAgvInfo({gwid:this.gwinfor[this.gwSelcetdIndex].id}).then(e => {
+					if(this.gwinfor[this.gwSelcetdIndex].status!="E"){
+						queryAgvInfo({gwid:this.gwinfor[this.gwSelcetdIndex].mapdatacode}).then(e => {
 							this.agvinfo = e.records
 						})
 					}
@@ -273,7 +273,7 @@
 							lockMaterials({}).then(e=>{
 								if(e){
 									that.$tip.toast("锁定成功")
-									that.gwinfor[that.gwSelcetdIndex].status=3
+									that.gwinfor[that.gwSelcetdIndex].status="L"
 									that.wlinfor={}
 								}
 							})
@@ -295,7 +295,7 @@
 						if (res.confirm) {
 							deactivate({id:that.gwinfor[that.gwSelcetdIndex].id}).then(e=>{
 								if(e){
-									if(that.gwinfor[that.gwSelcetdIndex].status!=4){
+									if(that.gwinfor[that.gwSelcetdIndex].status != "4"){
 										that.$tip.toast("停用成功")
 									}else{
 										that.$tip.toast("启用成功")
@@ -323,7 +323,7 @@
 							unlockMaterials({}).then(e=>{
 								if(e){
 									that.$tip.toast("解锁成功")
-									that.gwinfor[that.gwSelcetdIndex].status=1
+									that.gwinfor[that.gwSelcetdIndex].status="E"
 									that.wlinfor={}
 								}
 							})
@@ -337,7 +337,7 @@
 				this.$Router.push({
 					path: '/pages/dl_tray_adjust/index',
 					query: {
-						tpcode: this.gwinfor[this.gwSelcetdIndex].id
+						code: this.gwinfor[this.gwSelcetdIndex].id
 					},
 				})
 			},
@@ -364,7 +364,7 @@
 			},
 			// 选择生产订单跳转
 			nextTo() {
-				if(this.gwinfor[this.gwSelcetdIndex].status!=1){
+				if(this.gwinfor[this.gwSelcetdIndex].status != "E"){
 					this.$tip.toast("当前工位非正常状态")
 					return
 				}
@@ -385,12 +385,12 @@
 				_self.gwSelcetdIndex = e;
 				_self.gwObj = _self.gwinfor[e];
 				_self.formData.gwid = _self.gwObj.id;
-				if (this.status != 1) {
-					queryAgvInfo({gwid:this.gwinfor[this.gwSelcetdIndex].id}).then(e => {
+				if (this.status != "E") {
+					queryAgvInfo({gwid:this.gwinfor[this.gwSelcetdIndex].mapdatacode}).then(e => {
 						this.agvinfo = e.records
 					})
 				} else if (
-					this.status == 1
+					this.status == "E"
 				) {
 					
 					this.agvinfo = {}