指令

pages/management/ZlOperate.vue

@@ -57,9 +57,9 @@
 			</view>
 			<view class="confirm-button-wrap">
 				<button class="confirm-button" @tap="toSearch()">查询</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('1')">取消</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('2')">完成</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure('3')">重发</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure('8')">取消</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure('7')">完成</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure('5')">重发</button>
 				<button class="confirm-button" :disabled="disabled" @tap="toSure('4')">WCS取消</button>
 			</view>
 		</view>
@@ -86,8 +86,8 @@
 						</td>
 						<td>{{e.instructoperate_num}}</td>
 						<td>{{e.mes_no}}</td>
-						<td>{{e.startwcsdevice_code}}</td>
-						<td>{{e.nextwcsdevice_code}}</td>
+						<td>{{e.startpoint_code}}</td>
+						<td>{{e.nextpoint_code}}</td>
 						<td>{{e.invehicle_code}}</td>
 						<td>{{e.outvehicle_code}}</td>
 						<td>{{e.status_name}}</td>
@@ -182,7 +182,7 @@
 			},
 			async _instStatusQuery (id) {
 				let res = await instStatusQuery(id)
-				this.options1 = [...res.result]
+				this.options1 = [...res]
 			},
 			toSearch () {
 				this.dataList = []
@@ -204,9 +204,9 @@
 					end_date: this.endDate || ''
 				}
 				let res = await instPageQuery(form)
-				this.totalCount = res.size
-				if (res.size > 0) {
-					const dataMap = res.data
+				this.totalCount = res.totalElements
+				if (res.totalElements > 0) {
+					const dataMap = res.content
 					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
 					this.reload = false
 				} else {
@@ -243,7 +243,7 @@
 			},
 			async _instOperation (type) {
 				let res = await instOperation(type)
-				this.dataList = [...res.data]
+				this.dataList = [...res]
 			},
 			toRadio (e) {
 			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
@@ -255,5 +255,5 @@
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .grid-wrap
-	height calc(100% - 526rpx)
+	height: calc(100% - 337px); /** 42+ 15*8+ 35*5 */
 </style>