强制静置

pages.json

@@ -65,6 +65,13 @@
             }
             
         }
+        ,{
+            "path" : "pages/modules/forced-rest",
+            "style": {
+            	"navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",

pages/home/home.vue

@@ -39,13 +39,18 @@
 		data() {
 			return {
 				userName: '',
+				// 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: '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: []}
+				// ],
 				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: 'RF05', name: '人工组盘', path: '', sonTree: []},
-					{menu_id: '3', icon: 'RF03', name: '人工分拣操作', path: '/pages/modules/man-sort-operate', sonTree: []},
+					{menu_id: '3', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', 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: []}
 				],
 				show: false,
 				secM: []

pages/modules/forced-rest.vue

@@ -0,0 +1,94 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="强制静置"></nav-bar>
+		<view class="zd_content">
+			<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.plan_start_date}}</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'
+	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>

utils/getData2.js

@@ -89,3 +89,20 @@ export const virtualprintType = (url) => request1({
 	url: `${url}/` + 'api/pda/virtual/printType',
 	data: {}
 })
+
+/**
+ * 强制静置
+ */
+// 显示静置信息
+export const forcedRestingShow = () => request({
+	url:'api/pda/forcedResting/show',
+	data: {}
+})
+// 强制静置
+export const forcedRestingSubmit = (stime, id) => request({
+	url:'api/pda/forcedResting/submit',
+	data: {
+		stand_time: stime,
+		group_id: id
+	}
+})