diff --git a/pages.json b/pages.json
index c70dc36..d241153 100644
--- a/pages.json
+++ b/pages.json
@@ -48,6 +48,12 @@
"navigationStyle": "custom"
}
}
+ ,{
+ "path" : "pages/ProductManage/EmptyPipeOutStore",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ }
,{
"path" : "pages/ProductManage/ZjCasing",
"style": {
@@ -141,7 +147,16 @@
"disableScroll": true
}
}
-],
+ ,{
+ "path" : "pages/ProductManage/EmptyPipeOutStore",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ],
"globalStyle": {
// "pageOrientation": "landscape",
"navigationBarTextStyle": "white",
diff --git a/pages/ProductManage/EmptyPipeInStore.vue b/pages/ProductManage/EmptyPipeInStore.vue
index 309baf4..ce36e59 100644
--- a/pages/ProductManage/EmptyPipeInStore.vue
+++ b/pages/ProductManage/EmptyPipeInStore.vue
@@ -87,8 +87,8 @@
};
},
created () {
- this._queryProductArea()
- this._queryMaterialInfo()
+ // this._queryProductArea()
+ // this._queryMaterialInfo()
},
methods: {
/** 选择器 */
@@ -102,7 +102,7 @@
},
/** 初始化查询 */
async _queryMaterialInfo () {
- let res = await queryMaterialInfo1(this.val1, this.val2, this.index)
+ let res = await queryMaterialInfo1(this.val1, this.val2, this.index, '2')
this.dataList = [...res.data]
},
/** 确认 */
@@ -113,7 +113,7 @@
return
}
try {
- let res = await emptyConfirm(this.pkObj, this.qty, this.val1)
+ let res = await emptyConfirm(this.pkObj, this.qty, this.val1, '2')
uni.showToast({
title: res.message,
icon: 'none'
diff --git a/pages/ProductManage/EmptyPipeOutStore.vue b/pages/ProductManage/EmptyPipeOutStore.vue
new file mode 100644
index 0000000..b3e6078
--- /dev/null
+++ b/pages/ProductManage/EmptyPipeOutStore.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+ 点位
+
+
+
+
+
+
+ 物料
+
+
+
+
+
+ 区域
+
+
+
+
+
+ 数量
+
+
+
+
+
+
+
+
+
+
+ | 序号 |
+ 点位 |
+ 物料编码 |
+ 物料名称 |
+ 数量 |
+
+
+
+
+ | {{Number(i) + 1}} |
+ {{e.point_code}} |
+ {{e.material_code}} |
+ {{e.material_name}} |
+ {{e.qty}} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/home/home.vue b/pages/home/home.vue
index ac0d168..5137b80 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,7 +24,7 @@
export default {
data() {
return {
- menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '生产入库'}, {url: '/pages/WarehouseManage/ProdDeliveryConfirm', name: '生产区发货确认'}, {url: '/pages/WarehouseManage/XuniDelivery', name: '虚拟区发货'}, {url: '/pages/WarehouseManage/EmptyInStore', name: '空载具入库'}, {url: '/pages/WarehouseManage/EmptyOutStore', name: '空载具出库'}]
+ menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/EmptyPipeOutStore', name: '空管出库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '生产入库'}, {url: '/pages/WarehouseManage/ProdDeliveryConfirm', name: '生产区发货确认'}, {url: '/pages/WarehouseManage/XuniDelivery', name: '虚拟区发货'}, {url: '/pages/WarehouseManage/EmptyInStore', name: '空载具入库'}, {url: '/pages/WarehouseManage/EmptyOutStore', name: '空载具出库'}]
};
},
mounted () {
diff --git a/utils/getData2.js b/utils/getData2.js
index eec2eaf..2451c62 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -9,21 +9,23 @@ export const queryProductArea = () => request({
data: {}
})
// 1.2空纸管库设备物料初始化查询
-export const queryMaterialInfo1 = (code, mcode, area) => request({
+export const queryMaterialInfo1 = (code, mcode, area, option) => request({
url:'api/pda/empty/queryMaterialInfo',
data: {
point_code: code,
material_code: mcode,
- product_area: area
+ product_area: area,
+ option: option
}
})
// 1.3入库确认
-export const emptyConfirm = (jo, qty, code) => request({
+export const emptyConfirm = (jo, qty, code, option) => request({
url:'api/pda/empty/confirm',
data: {
raw_jo: jo,
qty: qty,
- material_code: code
+ material_code: code,
+ option: option
}
})