root/hht-ximenzi-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add呼叫物料

Browse Source
This commit is contained in:
蔡玲
2024-09-23 17:09:16 +08:00
parent 2bde1e46a8
commit 81643ba83a
9 changed files with 211 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/style/layout.styl
View File

@@ -33,6 +33,12 @@ uni-button:after {
margin-bottom: 20rpx;
box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
}
.pop_content {
width: 100%;
height: 100%;
overflow-y: auto;
padding: 20rpx 14rpx 140rpx 14rpx;
}
.filter_wrapper {
position relative
left -14rpx
@@ -274,7 +280,7 @@ uni-button:after {
bottom: 0;
left: 0;
width: 100%;
z-index: 30;
z-index: 40;
background-color: #fff;
padding: 14rpx;
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);

8
pages.json
View File

@@ -82,6 +82,14 @@
}
}
,{
"path" : "pages/manage/call-mater",
"style" :
{
"navigationStyle": "custom"
}
}
],
"globalStyle": {
// "pageOrientation": "landscape",

11
pages/home/home.vue
View File

@@ -33,13 +33,14 @@
userName: '',
menuList: [
{title: '物料入库', icon: 'RF03', path: '/pages/manage/mater-in-storage'},
{title: '笼框补仓', icon: 'RF01', path: '/pages/manage/empty-tray-back'},
{title: '笼框补仓', icon: 'RF04', path: '/pages/manage/empty-tray-back'},
// {title: '外协区空料架送回', icon: 'RF05', path: '/pages/manage/empty-material-racks-back'},
// {title: '物料转运', icon: 'RF02', path: '/pages/manage/material-transfer'},
{title: '区域锁定', icon: 'RF06', path: '/pages/manage/area-lock'},
{title: '路线锁定', icon: 'RF08', path: '/pages/manage/route-lock'},
{title: '呼叫空框', icon: 'RF04', path: '/pages/manage/fill-tray'},
{title: '修改订单工序', icon: 'RF07', path: '/pages/manage/modify-process'}
{title: '区域锁定', icon: 'RF08', path: '/pages/manage/area-lock'},
{title: '路线锁定', icon: 'RF06', path: '/pages/manage/route-lock'},
{title: '呼叫空框', icon: 'RF01', path: '/pages/manage/fill-tray'},
{title: '修改订单工序', icon: 'RF07', path: '/pages/manage/modify-process'},
{title: '呼叫物料', icon: 'RF09', path: '/pages/manage/call-mater'}
],
show: false,
secM: []

164
pages/manage/call-mater.vue Normal file
View File

@@ -0,0 +1,164 @@
<template>
<view class="zd_container">
<nav-bar :title="title"></nav-bar>
<view class="zd_content">
<view class="zd_wrapper">
<view class="zd-row border-bottom">
<view class="zd-col-5">
<span class="filter_label">点位</span>
</view>
<view class="zd-col-19">
<search-box
v-model="val1"
/>
</view>
</view>
<view class="zd-row">
<view class="zd-col-5">
<span class="filter_label">工序</span>
</view>
<view class="zd-col-19 filter_select">
<uni-data-select v-model="index" :localdata="options"></uni-data-select>
</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" @click="toCheck(e)" :class="{'checked': e.vehicle_code === pkId}">
<td>{{e.vehicle_code}}</td>
<td>{{e.order_code}}</td>
<td>{{e.region_code}}</td>
<td>{{e.material_qty}}</td>
<td>{{e.due_date}}</td>
</tr>
</tbody>
</table>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-11 button-default" @tap="clearUp">清空</button>
<button class="zd-col-11 button-primary" @tap="_selectOrderByRegion">查询</button>
</view>
<view class="msg_wrapper" :class="show ? 'popshow' : 'pophide'">
<view class="pop_content">
<view class="zd_wrapper grid-wraper">
<view class="slide_new">
<table>
<thead>
<tr>
<th>订单号</th>
<th>交期时间</th>
<th>物料数量</th>
<th>工序</th>
</tr>
</thead>
<tbody>
<tr v-for="(e, i) in popList" :key="i">
<td>{{e.order_code}}</td>
<td>{{e.due_date}}</td>
<td>{{e.material_qty}}</td>
<td>{{e.region_code}}</td>
</tr>
</tbody>
</table>
</view>
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-11 button-default" @tap="pkId = '', show = false, popList = []">取消</button>
<button class="zd-col-11 button-primary" :class="{'button-info': !popList.length}" :disabled="disabled" @tap="_callMater">叫料</button>
</view>
</view>
<view v-show="show" class="msg_mask"></view>
</view>
</template>
<script>
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
// import {regionList, selectOrderByRegion, fabMaterial} from '@/utils/mork2.js'
import {regionList, selectOrderByRegion, fabMaterial, callMater} from '@/utils/getData2.js'
export default {
components: {
NavBar,
SearchBox
},
data() {
return {
title: '',
val1: '',
options: [],
index: '',
disabled: false,
dataList: [],
pkId: '',
show: false,
popList: []
};
},
onLoad (options) {
this.title = options.title
this._regionList()
},
methods: {
async _regionList () {
let res = await regionList()
this.options = [...res.content]
this.options.map(el => {
this.$set(el, 'text', el.label)
})
},
clearUp () {
this.val1 = ''
this.index = ''
this.dataList = []
this.disabled = false
},
async _selectOrderByRegion () {
let res = await selectOrderByRegion(this.index, this.val1)
this.dataList = [...res.content]
},
toCheck (e) {
this.pkId = e.vehicle_code
this._fabMaterial(this.pkId)
this.show = true
},
async _fabMaterial (e) {
let res = await fabMaterial(e)
this.popList = [...res]
},
async _callMater () {
this.disabled = true
if (!this.popList.length) {
this.disabled = false
return
}
try {
let res = await callMater(this.popList, this.val1, this.index)
this.clearUp()
uni.showToast({
title: res.msg,
icon: 'none'
})
} catch (e) {
this.disabled = false
}
}
}
}
</script>
<style lang="stylus">
</style>

4
pages/manage/modify-process.vue
View File

@@ -87,7 +87,9 @@
})
},
async _fabOrders () {
let res = await fabOrders(this.val1)
let arr = []
arr.push(this.val1)
let res = await fabOrders(arr)
this.dataList = [...res]
},
selectChange (val) {

BIN
static/image/menu/RF04.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
static/image/menu/RF09.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

13
utils/getData2.js
View File

@@ -78,3 +78,16 @@ export const updateRouteStatus = (type, status) => request({
url:'api/handheld/updateRouteStatus',
data: {type: type, status: status}
})
// 呼叫物料
export const selectOrderByRegion = (code, code1) => request({
url:'api/fab/selectOrderByRegion?regionCode=' + code + '&deviceCode=' + code1,
method: 'GET'
})
export const fabMaterial = (code) => request({
url:'api/fab/material',
data: {vehicle_code: code}
})
export const callMater = (mater, code, vcode) => request({
url:'api/fab/callMater',
data: {mater: mater, device_code: code, vehicle_code: vcode}
})

10
utils/mork2.js
View File

@@ -25,4 +25,14 @@ export const updateRouteStatus = (data) => {
message: 'ok'
}
return res
}
export const selectOrderByRegion = (code, code1) => {
let res = {
content: [{ vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }]
}
return res
}
export const fabMaterial = (code, code1) => {
let res = [{ vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }, { vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }, { vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }, { vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }]
return res
}