From 112c938513c8d04b0a1ed59496574c3475c20ab2 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 7 Oct 2023 09:48:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E9=A1=B5=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=89=A9=E6=96=99=E5=85=A5=E5=BA=93=E3=80=81=E6=89=98?=
 =?UTF-8?q?=E7=9B=98=E7=BB=91=E5=AE=9A=E3=80=81=E5=8C=85=E8=A3=85=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  18 +++-
 pages/home/home.vue                           |  13 ++-
 pages/modules/package-instore.vue             | 102 ++++++++++++++++++
 .../{man-sort-operate.vue => pallet-bind.vue} |   6 +-
 ...{man-sort-schedue.vue => sort-schedue.vue} |   2 +-
 pages/modules/surplus-mater-instore.vue       | 102 ++++++++++++++++++
 6 files changed, 232 insertions(+), 11 deletions(-)
 create mode 100644 pages/modules/package-instore.vue
 rename pages/modules/{man-sort-operate.vue => pallet-bind.vue} (94%)
 rename pages/modules/{man-sort-schedue.vue => sort-schedue.vue} (98%)
 create mode 100644 pages/modules/surplus-mater-instore.vue

diff --git a/pages.json b/pages.json
index 31d0daa..eb435df 100644
--- a/pages.json
+++ b/pages.json
@@ -38,14 +38,14 @@
             
         }
         ,{
-            "path" : "pages/modules/man-sort-operate",
+            "path" : "pages/modules/pallet-bind",
             "style": {
             	"navigationStyle": "custom"
             }
             
         }
         ,{
-            "path" : "pages/modules/man-sort-schedue",
+            "path" : "pages/modules/sort-schedue",
             "style": {
             	"navigationStyle": "custom"
             }
@@ -72,6 +72,20 @@
             }
             
         }
+        ,{
+            "path" : "pages/modules/surplus-mater-instore",
+            "style": {
+            	"navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/modules/package-instore",
+            "style": {
+            	"navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 68d1f56..d92bd6c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -50,12 +50,15 @@
 				menuList: [
 					{menu_id: '1', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []},
 					{menu_id: '2', icon: 'RF02', name: '设备操作', path: '/pages/modules/equip-operate', sonTree: []},
-					{menu_id: '2', icon: 'RF02', name: '人工分拣', path: '', sonTree: [
-						{menu_id: '1', icon: 'RF03', name: '分拣排产', path: '/pages/modules/man-sort-schedue'}
+					{menu_id: '3', icon: 'RF02', name: '人工分拣', path: '', sonTree: [
+						{menu_id: '1', name: '分拣排产', path: '/pages/modules/sort-schedue'},
+						{menu_id: '2', name: '剩料入库', path: '/pages/modules/surplus-mater-instore'},
+						{menu_id: '3', name: '托盘绑定', path: '/pages/modules/pallet-bind'},
+						{menu_id: '4', name: '包装入库', path: '/pages/modules/package-instore'},
 					]},
-					{menu_id: '3', icon: 'RF05', name: '人工组盘', path: '/pages/modules/man-group', sonTree: []},
-					{menu_id: '4', icon: 'RF06', name: '混碾搬运', path: '/pages/modules/hunnian-carry', sonTree: []},
-					{menu_id: '5', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []}
+					{menu_id: '4', icon: 'RF05', name: '人工组盘', path: '/pages/modules/man-group', sonTree: []},
+					{menu_id: '5', icon: 'RF06', name: '混碾搬运', path: '/pages/modules/hunnian-carry', sonTree: []},
+					{menu_id: '6', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []}
 				],
 				show: false,
 				secM: []
diff --git a/pages/modules/package-instore.vue b/pages/modules/package-instore.vue
new file mode 100644
index 0000000..f6e9cd5
--- /dev/null
+++ b/pages/modules/package-instore.vue
@@ -0,0 +1,102 @@
+<template>
+	<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">设备号</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>困料位置</th>
+								<th>设备号</th>
+								<th>静置时间</th>
+								<th>剩余静置时间</th>
+								<th>预计完成时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.group_id === pkId}">
+								<td>{{e.point_code}}</td>
+								<td>{{e.device_code}}</td>
+								<td>{{e.standing_time}}</td>
+								<td>{{e.timeDifferenceMinutes}}</td>
+								<td>{{e.estimatedCompletionTimeString}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" @tap="_forcedRestingShow">刷新</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !pkId}" :disabled="disabled" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {forcedRestingShow, forcedRestingSubmit} from '@/utils/getData2.js'
+	import {dateTimeFtt} from '@/utils/utils.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		created () {
+			this._forcedRestingShow()
+		},
+		methods: {
+			/** grid查询 */
+			async _forcedRestingShow () {
+				let res = await forcedRestingShow()
+				this.dataList = [...res]
+			},
+			/** 确认 */
+			async toSure () {
+				this.disabled = true
+				if (!this.val1 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await forcedRestingSubmit(this.val1, this.pkId)
+					this.disabled = false
+					this.pkId = ''
+					this.pkObj = {}
+					this.val1 = ''
+					this._forcedRestingShow()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/modules/man-sort-operate.vue b/pages/modules/pallet-bind.vue
similarity index 94%
rename from pages/modules/man-sort-operate.vue
rename to pages/modules/pallet-bind.vue
index 60e2f0a..dc3c7fd 100644
--- a/pages/modules/man-sort-operate.vue
+++ b/pages/modules/pallet-bind.vue
@@ -1,17 +1,17 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="人工分拣操作"></nav-bar>
+		<nav-bar title="托盘绑定"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
-					<view class="filter_label">设备号</view>
+					<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>
+						<span class="filter_label">钢托盘编码</span>
 					</view>
 					<view class="filter_input_wraper">
 						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
diff --git a/pages/modules/man-sort-schedue.vue b/pages/modules/sort-schedue.vue
similarity index 98%
rename from pages/modules/man-sort-schedue.vue
rename to pages/modules/sort-schedue.vue
index 63ea1f6..b774946 100644
--- a/pages/modules/man-sort-schedue.vue
+++ b/pages/modules/sort-schedue.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="人工分拣排产"></nav-bar>
+		<nav-bar title="分拣排产"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
diff --git a/pages/modules/surplus-mater-instore.vue b/pages/modules/surplus-mater-instore.vue
new file mode 100644
index 0000000..b5f7db3
--- /dev/null
+++ b/pages/modules/surplus-mater-instore.vue
@@ -0,0 +1,102 @@
+<template>
+	<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">设备号</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>困料位置</th>
+								<th>设备号</th>
+								<th>静置时间</th>
+								<th>剩余静置时间</th>
+								<th>预计完成时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.group_id === pkId}">
+								<td>{{e.point_code}}</td>
+								<td>{{e.device_code}}</td>
+								<td>{{e.standing_time}}</td>
+								<td>{{e.timeDifferenceMinutes}}</td>
+								<td>{{e.estimatedCompletionTimeString}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" @tap="_forcedRestingShow">刷新</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !pkId}" :disabled="disabled" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {forcedRestingShow, forcedRestingSubmit} from '@/utils/getData2.js'
+	import {dateTimeFtt} from '@/utils/utils.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		created () {
+			this._forcedRestingShow()
+		},
+		methods: {
+			/** grid查询 */
+			async _forcedRestingShow () {
+				let res = await forcedRestingShow()
+				this.dataList = [...res]
+			},
+			/** 确认 */
+			async toSure () {
+				this.disabled = true
+				if (!this.val1 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await forcedRestingSubmit(this.val1, this.pkId)
+					this.disabled = false
+					this.pkId = ''
+					this.pkObj = {}
+					this.val1 = ''
+					this._forcedRestingShow()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>