导航页，新增剩料入库、托盘绑定、包装入库
This commit is contained in:
18
pages.json
18
pages.json
@@ -38,14 +38,14 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
,{
|
,{
|
||||||
"path" : "pages/modules/man-sort-operate",
|
"path" : "pages/modules/pallet-bind",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
,{
|
,{
|
||||||
"path" : "pages/modules/man-sort-schedue",
|
"path" : "pages/modules/sort-schedue",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationStyle": "custom"
|
"navigationStyle": "custom"
|
||||||
}
|
}
|
||||||
@@ -72,6 +72,20 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
,{
|
||||||
|
"path" : "pages/modules/surplus-mater-instore",
|
||||||
|
"style": {
|
||||||
|
"navigationStyle": "custom"
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
,{
|
||||||
|
"path" : "pages/modules/package-instore",
|
||||||
|
"style": {
|
||||||
|
"navigationStyle": "custom"
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
],
|
],
|
||||||
"globalStyle": {
|
"globalStyle": {
|
||||||
// "pageOrientation": "landscape",
|
// "pageOrientation": "landscape",
|
||||||
|
|||||||
@@ -50,12 +50,15 @@
|
|||||||
menuList: [
|
menuList: [
|
||||||
{menu_id: '1', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []},
|
{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: '/pages/modules/equip-operate', sonTree: []},
|
||||||
{menu_id: '2', icon: 'RF02', name: '人工分拣', path: '', sonTree: [
|
{menu_id: '3', icon: 'RF02', name: '人工分拣', path: '', sonTree: [
|
||||||
{menu_id: '1', icon: 'RF03', name: '分拣排产', path: '/pages/modules/man-sort-schedue'}
|
{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: 'RF05', name: '人工组盘', path: '/pages/modules/man-group', sonTree: []},
|
||||||
{menu_id: '4', icon: 'RF06', name: '混碾搬运', path: '/pages/modules/hunnian-carry', sonTree: []},
|
{menu_id: '5', icon: 'RF06', name: '混碾搬运', path: '/pages/modules/hunnian-carry', sonTree: []},
|
||||||
{menu_id: '5', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []}
|
{menu_id: '6', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []}
|
||||||
],
|
],
|
||||||
show: false,
|
show: false,
|
||||||
secM: []
|
secM: []
|
||||||
|
|||||||
102
pages/modules/package-instore.vue
Normal file
102
pages/modules/package-instore.vue
Normal file
@@ -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>
|
||||||
@@ -1,17 +1,17 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="zd_container">
|
<view class="zd_container">
|
||||||
<nav-bar title="人工分拣操作"></nav-bar>
|
<nav-bar title="托盘绑定"></nav-bar>
|
||||||
<view class="zd_content">
|
<view class="zd_content">
|
||||||
<view class="zd_wrapper">
|
<view class="zd_wrapper">
|
||||||
<view class="filter_item">
|
<view class="filter_item">
|
||||||
<view class="filter_label">设备号</view>
|
<view class="filter_label">木托盘编码</view>
|
||||||
<view class="filter_input_wraper">
|
<view class="filter_input_wraper">
|
||||||
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
|
<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="filter_item">
|
<view class="filter_item">
|
||||||
<view class="filter_label_wraper">
|
<view class="filter_label_wraper">
|
||||||
<span class="filter_label">动作</span>
|
<span class="filter_label">钢托盘编码</span>
|
||||||
</view>
|
</view>
|
||||||
<view class="filter_input_wraper">
|
<view class="filter_input_wraper">
|
||||||
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
|
<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="zd_container">
|
<view class="zd_container">
|
||||||
<nav-bar title="人工分拣排产"></nav-bar>
|
<nav-bar title="分拣排产"></nav-bar>
|
||||||
<view class="zd_content">
|
<view class="zd_content">
|
||||||
<view class="zd_wrapper grid-wraper">
|
<view class="zd_wrapper grid-wraper">
|
||||||
<view class="slide_new">
|
<view class="slide_new">
|
||||||
102
pages/modules/surplus-mater-instore.vue
Normal file
102
pages/modules/surplus-mater-instore.vue
Normal file
@@ -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>
|
||||||
Reference in New Issue
Block a user