From 39f172dfaa07be21cd9380249852cfbc98833670 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 26 Sep 2023 10:16:11 +0800
Subject: [PATCH] change

---
 pages/home/home.vue             |   4 +-
 pages/modules/hunnian-carry.vue | 124 ++++++++++++++++++++++++++++++--
 pages/modules/man-group.vue     | 124 ++++++++++++++++++++++++++++++--
 3 files changed, 240 insertions(+), 12 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index f993505..52f15ac 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -44,8 +44,8 @@
 					{menu_id: '2', icon: 'RF02', name: '设备操作', path: '/pages/modules/equip-operate', sonTree: []},
 					{menu_id: '3', icon: 'RF03', name: '人工分拣操作', path: '/pages/modules/man-sort-operate', sonTree: []},
 					{menu_id: '4', icon: 'RF04', name: '人工分拣排产', path: '/pages/modules/man-sort-schedue', sonTree: []},
-					{menu_id: '5', icon: 'RF05', name: '人工组盘', path: '', sonTree: []},
-					{menu_id: '6', icon: 'RF06', name: '混碾搬运', path: '', sonTree: []}
+					{menu_id: '5', icon: 'RF05', name: '人工组盘', path: '/pages/modules/man-group', sonTree: []},
+					{menu_id: '6', icon: 'RF06', name: '混碾搬运', path: '/pages/modules/hunnian-carry', sonTree: []}
 				],
 				show: false,
 				secM: []
diff --git a/pages/modules/hunnian-carry.vue b/pages/modules/hunnian-carry.vue
index 239d03a..ef9477c 100644
--- a/pages/modules/hunnian-carry.vue
+++ b/pages/modules/hunnian-carry.vue
@@ -1,19 +1,133 @@
 <template>
-	<view>
-		
+	<view class="zd_container">
+		<nav-bar title="混碾搬运"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">混碾位置</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">目的压机</span>
+					</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">物料重量</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input" v-model="val2">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
+			<button class="submit-button" @tap="toCancle">取消</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {deviceInfo, deviceStatus, deviceCheckVerify} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				val1: '',
+				val2: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				disabled1: false
 			};
+		},
+		created () {
+			this._deviceInfo()
+			this._deviceStatus()
+		},
+		methods: {
+			/** 选择器 */
+			selectChange1(e) {
+				this.index1 = e
+			},
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 获取设备下拉框 */
+			async _deviceInfo () {
+				let res = await deviceInfo()
+				this.options1 = [...res]
+			},
+			/** 获取设备状态下拉框 */
+			async _deviceStatus () {
+				let res = await deviceStatus()
+				this.options2 = [...res]
+			},
+			/** 确定 */
+			async toSure () {
+				this.disabled1 = true
+				if (!this.index1) {
+					uni.showToast({
+						title: '混碾位置不能为空',
+						icon: 'none'
+					})
+					this.disabled1 = false
+					return
+				}
+				if (!this.index2) {
+					uni.showToast({
+						title: '目的压机不能为空',
+						icon: 'none'
+					})
+					this.disabled1 = false
+					return
+				}
+				try {
+					let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : ''
+					let res = await deviceCheckVerify(this.index1, userName, this.index2)
+					this.disabled1 = false
+					this.index1 = ''
+					this.index2 = ''
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			toCancle () {
+				this.disabled1 = false
+				this.index1 = ''
+				this.index2 = ''
+			}
 		}
 	}
 </script>
 
-<style lang="stylus">
-
+<style lang="stylus" scoped>
+.filter_item_1, .filter_input_wraper_1
+	align-items: flex-start
+	height 210rpx
 </style>
diff --git a/pages/modules/man-group.vue b/pages/modules/man-group.vue
index 239d03a..ef812d7 100644
--- a/pages/modules/man-group.vue
+++ b/pages/modules/man-group.vue
@@ -1,19 +1,133 @@
 <template>
-	<view>
-		
+	<view class="zd_container">
+		<nav-bar title="混碾搬运"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">点位编码</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">所属工单</span>
+					</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">物料重量</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input" v-model="val2">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
+			<button class="submit-button" @tap="toCancle">取消</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {deviceInfo, deviceStatus, deviceCheckVerify} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				val1: '',
+				val2: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				disabled1: false
 			};
+		},
+		created () {
+			this._deviceInfo()
+			this._deviceStatus()
+		},
+		methods: {
+			/** 选择器 */
+			selectChange1(e) {
+				this.index1 = e
+			},
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 获取设备下拉框 */
+			async _deviceInfo () {
+				let res = await deviceInfo()
+				this.options1 = [...res]
+			},
+			/** 获取设备状态下拉框 */
+			async _deviceStatus () {
+				let res = await deviceStatus()
+				this.options2 = [...res]
+			},
+			/** 确定 */
+			async toSure () {
+				this.disabled1 = true
+				if (!this.index1) {
+					uni.showToast({
+						title: '混碾位置不能为空',
+						icon: 'none'
+					})
+					this.disabled1 = false
+					return
+				}
+				if (!this.index2) {
+					uni.showToast({
+						title: '目的压机不能为空',
+						icon: 'none'
+					})
+					this.disabled1 = false
+					return
+				}
+				try {
+					let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : ''
+					let res = await deviceCheckVerify(this.index1, userName, this.index2)
+					this.disabled1 = false
+					this.index1 = ''
+					this.index2 = ''
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			toCancle () {
+				this.disabled1 = false
+				this.index1 = ''
+				this.index2 = ''
+			}
 		}
 	}
 </script>
 
-<style lang="stylus">
-
+<style lang="stylus" scoped>
+.filter_item_1, .filter_input_wraper_1
+	align-items: flex-start
+	height 210rpx
 </style>