From 05d3bf14b6a21cb18fdc0888a19d14e71e754989 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 23 Mar 2023 15:42:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=BA=BF=E5=87=BA=E7=AE=B1?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/management/AgvOutError.vue | 129 +++++++++++++++----------------
 pages/management/HcxOutError.vue | 128 ++++++++++++++----------------
 pages/management/ZlOperate.vue   |  31 +++-----
 3 files changed, 132 insertions(+), 156 deletions(-)

diff --git a/pages/management/AgvOutError.vue b/pages/management/AgvOutError.vue
index 6b47954..f988347 100644
--- a/pages/management/AgvOutError.vue
+++ b/pages/management/AgvOutError.vue
@@ -1,50 +1,51 @@
 <template>
 	<view class="content">
 		<nav-bar title="AGV出箱异常"></nav-bar>
-		<view class="search-wrap">
-			<view class="search-item">
-				<label class="search-label">缓存线</label>
-				<input type="text" class="search-input" v-model="keyword">
+		<view class="search-confirm-wrap">
+			<view class="search-wrap">
+				<view class="search-item">
+					<label class="search-label">缓存线</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">料箱码</label>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
 			</view>
-			<view class="search-item">
-				<label class="search-label">料箱码</label>
-				<input type="text" class="search-input" v-model="startPoint">
+			<view class="confirm-button-wrap">
+				<button class="confirm-button" @tap="toSearch()">查询</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure()">倒料</button>
 			</view>
 		</view>
-		<view class="confirm-button-wrap">
-			<button class="confirm-button" :disabled="disabled0" @click="toSearch()">查询</button>
-			<button class="confirm-button" :disabled="disabled1" @click="toSure">确认</button>
-		</view>
 		<view class="grid-wrap">
 			<table class="grid-table">
 				<thead>
 					<tr>
 						<th>选择</th>
-						<th>指令号</th>
-						<th>任务号</th>
+						<th>指令编号</th>
+						<th>设备编号</th>
 						<th>起点</th>
-						<th>终点</th>
-						<th>状态</th>
-						<th>agv车号</th>
-						<th>物料类型</th>
-						<th>优先级</th>
-						<th>时间</th>
+						<th>目的</th>
+						<th>目的2</th>
 					</tr>
 				</thead>
 				<tbody>
-					<tr v-for="e in dataList" :key="e.inst_uuid"  @click="toRadio(e)">
+					<tr v-for="e in dataList" :key="e.instruct_uuid"  @click="toRadio(e)">
 						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.inst_uuid}"></view>
+							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.instruct_uuid}"></view>
 						</td>
-						<td>{{e.inst_no}}</td>
-						<td>{{e.task_no}}</td>
-						<td>{{e.start_devicecode}}</td>
-						<td>{{e.next_devicecode}}</td>
-						<td>{{e.inst_status_name}}</td>
-						<td>{{e.carno}}</td>
-						<td>{{e.material_type_name}}</td>
-						<td>{{e.priority}}</td>
-						<td>{{e.create_time}}</td>
+						<td>{{e.instructorder_no}}</td>
+						<td>{{e.wcsdevice_code}}</td>
+						<td>{{e.startpoint_code}}</td>
+						<td>{{e.nextpoint_code}}</td>
+						<td>{{e.nextpoint_code2}}</td>
 					</tr>
 				</tbody>
 			</table>
@@ -54,50 +55,54 @@
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	// import {queryInstraction, instOperation} from '@/utils/api.js'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryInstraction, instOperation} from '@/utils/getData2.js'
 	export default {
 		components: {
-			NavBar
+			NavBar,
+			SearchBox
 		},
 		data() {
 			return {
+				options1: [],
+				index1: '',
+				val1: '',
 				dataList: [],
-				keyword: '',
-				startPoint: '',
-				endPoint: '',
 				pkId: '',
-				disabled0: false,
-				disabled1: false
+				disabled: false
 			};
 		},
-		mounted () {
-			this.queryInstraction(this.keyword, this.startPoint, this.endPoint)
-		},
 		methods: {
-			onNavigationBarButtonTap(e) {
-			    uni.redirectTo({
-			        url: '/pages/index/index'
-			    });
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
 			},
 			toSearch () {
-			  this.pkId = ''
 			  this.dataList = []
-			  this.disabled0 = true
-			  this.queryInstraction()
+			  this._queryInstraction()
 			},
-			toSure (type) {
-			  if (this.pkId) {
-				this.disabled1 = true
-				this.instOperation(type)
-			  } else {
+			async _queryInstraction () {
+				let res = await queryInstraction()
+				this.dataList = [...res.data]
+			},
+			toSure () {
+			  this.disabled = true
+			  if (!this.pkId) {
 				uni.showToast({
-					title: '请查询后进行选择',
+					title: '请选择',
 					icon: 'none'
 				})
+				this.disabled = false
+				return
 			  }
+			  this._instOperation()
+			},
+			async _instOperation () {
+				let res = await instOperation()
+				this.dataList = [...res.data]
 			},
 			toRadio (e) {
-			  this.pkId = this.pkId === e.inst_uuid ? '' : e.inst_uuid
+			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
 			}
 		}
 	}
@@ -105,16 +110,6 @@
 
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
-.content1
-	flex-direction column
-	justify-content flex-start
-	padding 30rpx
-	box-sizing border-box
-.icon-check
-	_wh(44rpx, 44rpx)
-	background-color #ffffff
-	border-radius 50%
-	margin 0 auto
-.icon-checked
-	background-color $red
-</style>
+.grid-wrap
+	height calc(100% - 526rpx)
+</style>
\ No newline at end of file
diff --git a/pages/management/HcxOutError.vue b/pages/management/HcxOutError.vue
index 395cba1..32f3799 100644
--- a/pages/management/HcxOutError.vue
+++ b/pages/management/HcxOutError.vue
@@ -1,54 +1,48 @@
 <template>
 	<view class="content">
 		<nav-bar title="缓存线出箱异常"></nav-bar>
-		<view class="search-wrap">
-			<view class="search-item">
-				<label class="search-label">缓存线</label>
-				<view class="filter_input_wraper">
-					<input type="text" class="search-input-l" v-model="val1">
+		<view class="search-confirm-wrap">
+			<view class="search-wrap">
+				<view class="search-item">
+					<label class="search-label">缓存线</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="search-item">
+					<label class="search-label">车号</label>
+					<view class="filter_input_wraper">
+						<input type="text" class="search-input-l" v-model="val1">
+					</view>
 				</view>
 			</view>
-			<view class="search-item">
-				<label class="search-label">车号</label>
-				<view class="filter_input_wraper">
-					<input type="text" class="search-input-l" v-model="val2">
-				</view>
+			<view class="confirm-button-wrap">
+				<button class="confirm-button" @tap="toSearch()">查询</button>
+				<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
 			</view>
 		</view>
-		<view class="confirm-button-wrap">
-			<button class="confirm-button" :disabled="disabled0" @click="toSearch()">查询</button>
-			<button class="confirm-button" :disabled="disabled1" @click="toSure">确认</button>
-		</view>
 		<view class="grid-wrap">
 			<table class="grid-table">
 				<thead>
 					<tr>
 						<th>选择</th>
-						<th>指令号</th>
-						<th>任务号</th>
+						<th>指令编号</th>
+						<th>设备编号</th>
 						<th>起点</th>
-						<th>终点</th>
-						<th>状态</th>
-						<th>agv车号</th>
-						<th>物料类型</th>
-						<th>优先级</th>
-						<th>时间</th>
+						<th>目的</th>
+						<th>目的2</th>
 					</tr>
 				</thead>
 				<tbody>
-					<tr v-for="e in dataList" :key="e.inst_uuid"  @click="toRadio(e)">
+					<tr v-for="e in dataList" :key="e.instruct_uuid"  @click="toRadio(e)">
 						<td>
-							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.inst_uuid}"></view>
+							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.instruct_uuid}"></view>
 						</td>
-						<td>{{e.inst_no}}</td>
-						<td>{{e.task_no}}</td>
-						<td>{{e.start_devicecode}}</td>
-						<td>{{e.next_devicecode}}</td>
-						<td>{{e.inst_status_name}}</td>
-						<td>{{e.carno}}</td>
-						<td>{{e.material_type_name}}</td>
-						<td>{{e.priority}}</td>
-						<td>{{e.create_time}}</td>
+						<td>{{e.instructorder_no}}</td>
+						<td>{{e.wcsdevice_code}}</td>
+						<td>{{e.startpoint_code}}</td>
+						<td>{{e.nextpoint_code}}</td>
+						<td>{{e.nextpoint_code2}}</td>
 					</tr>
 				</tbody>
 			</table>
@@ -58,50 +52,54 @@
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	// import {queryInstraction, instOperation} from '@/utils/api.js'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryInstraction, instOperation} from '@/utils/getData2.js'
 	export default {
 		components: {
-			NavBar
+			NavBar,
+			SearchBox
 		},
 		data() {
 			return {
+				options1: [],
+				index1: '',
+				val1: '',
 				dataList: [],
-				keyword: '',
-				startPoint: '',
-				endPoint: '',
 				pkId: '',
-				disabled0: false,
-				disabled1: false
+				disabled: false
 			};
 		},
-		mounted () {
-			this.queryInstraction(this.keyword, this.startPoint, this.endPoint)
-		},
 		methods: {
-			onNavigationBarButtonTap(e) {
-			    uni.redirectTo({
-			        url: '/pages/index/index'
-			    });
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
 			},
 			toSearch () {
-			  this.pkId = ''
 			  this.dataList = []
-			  this.disabled0 = true
-			  this.queryInstraction()
+			  this._queryInstraction()
 			},
-			toSure (type) {
-			  if (this.pkId) {
-				this.disabled1 = true
-				this.instOperation(type)
-			  } else {
+			async _queryInstraction () {
+				let res = await queryInstraction()
+				this.dataList = [...res.data]
+			},
+			toSure () {
+			  this.disabled = true
+			  if (!this.pkId) {
 				uni.showToast({
-					title: '请查询后进行选择',
+					title: '请选择',
 					icon: 'none'
 				})
+				this.disabled = false
+				return
 			  }
+			  this._instOperation()
+			},
+			async _instOperation () {
+				let res = await instOperation()
+				this.dataList = [...res.data]
 			},
 			toRadio (e) {
-			  this.pkId = this.pkId === e.inst_uuid ? '' : e.inst_uuid
+			  this.pkId = this.pkId === e.instruct_uuid ? '' : e.instruct_uuid
 			}
 		}
 	}
@@ -109,16 +107,6 @@
 
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
-.content1
-	flex-direction column
-	justify-content flex-start
-	padding 30rpx
-	box-sizing border-box
-.icon-check
-	_wh(44rpx, 44rpx)
-	background-color #ffffff
-	border-radius 50%
-	margin 0 auto
-.icon-checked
-	background-color $red
-</style>
+.grid-wrap
+	height calc(100% - 526rpx)
+</style>
\ No newline at end of file
diff --git a/pages/management/ZlOperate.vue b/pages/management/ZlOperate.vue
index ac4d66c..bce2ebb 100644
--- a/pages/management/ZlOperate.vue
+++ b/pages/management/ZlOperate.vue
@@ -12,57 +12,45 @@
 				<view class="search-item">
 					<label class="search-label">指令号</label>
 					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
+						<input type="text" class="search-input-l" v-model="val1">
 					</view>
 				</view>
 				<view class="search-item">
 					<label class="search-label">AGV号</label>
 					<view class="filter_input_wraper">
-						<search-box
-						v-model="val2"
-						/>
+						<input type="text" class="search-input-l" v-model="val2">
 					</view>
 				</view>
 				<view class="search-item">
 					<label class="search-label">条码</label>
 					<view class="filter_input_wraper">
 						<search-box
-						v-model="val2"
+						v-model="val3"
 						/>
 					</view>
 				</view>
 				<view class="search-item">
 					<label class="search-label">起点</label>
 					<view class="filter_input_wraper">
-						<search-box
-						v-model="val2"
-						/>
+						<input type="text" class="search-input-l" v-model="val4">
 					</view>
 				</view>
 				<view class="search-item">
 					<label class="search-label">终点</label>
 					<view class="filter_input_wraper">
-						<search-box
-						v-model="val2"
-						/>
+						<input type="text" class="search-input-l" v-model="val5">
 					</view>
 				</view>
 				<view class="search-item">
 					<label class="search-label">开始日期</label>
 					<view class="filter_input_wraper">
-						<search-box
-						v-model="val2"
-						/>
+						<input type="text" class="search-input-l" v-model="val6">
 					</view>
 				</view>
 				<view class="search-item">
 					<label class="search-label">结束日期</label>
 					<view class="filter_input_wraper">
-						<search-box
-						v-model="val2"
-						/>
+						<input type="text" class="search-input-l" v-model="val7">
 					</view>
 				</view>
 			</view>
@@ -118,6 +106,11 @@
 				index1: '',
 				val1: '',
 				val2: '',
+				val3: '',
+				val4: '',
+				val5: '',
+				val6: '',
+				val7: '',
 				dataList: [],
 				pkId: '',
 				disabled: false