diff --git a/common/style/layout.styl b/common/style/layout.styl
index 35fdbfe..a0ce9a2 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -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);
diff --git a/pages.json b/pages.json
index e672f21..4a7c1a5 100644
--- a/pages.json
+++ b/pages.json
@@ -82,6 +82,14 @@
}
}
+ ,{
+ "path" : "pages/manage/call-mater",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index f360ecb..7f20c79 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -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: []
diff --git a/pages/manage/call-mater.vue b/pages/manage/call-mater.vue
new file mode 100644
index 0000000..4e6eda4
--- /dev/null
+++ b/pages/manage/call-mater.vue
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+ 点位
+
+
+
+
+
+
+
+ 工序
+
+
+
+
+
+
+
+
+
+
+
+ | 载具号 |
+ 订单号 |
+ 工序 |
+ 物料数量 |
+ 交期时间 |
+
+
+
+
+ | {{e.vehicle_code}} |
+ {{e.order_code}} |
+ {{e.region_code}} |
+ {{e.material_qty}} |
+ {{e.due_date}} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 订单号 |
+ 交期时间 |
+ 物料数量 |
+ 工序 |
+
+
+
+
+ | {{e.order_code}} |
+ {{e.due_date}} |
+ {{e.material_qty}} |
+ {{e.region_code}} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/manage/modify-process.vue b/pages/manage/modify-process.vue
index 2ef7164..c9dc730 100644
--- a/pages/manage/modify-process.vue
+++ b/pages/manage/modify-process.vue
@@ -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) {
diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png
index 5f06944..af989ff 100644
Binary files a/static/image/menu/RF04.png and b/static/image/menu/RF04.png differ
diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png
new file mode 100644
index 0000000..b48d6da
Binary files /dev/null and b/static/image/menu/RF09.png differ
diff --git a/utils/getData2.js b/utils/getData2.js
index 73b39e3..63b1f0e 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -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}
+})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 27b9eef..8af7d96 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -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
}
\ No newline at end of file