diff --git a/locale/en-1.json b/locale/en-1.json
index d9443ab..5170457 100644
--- a/locale/en-1.json
+++ b/locale/en-1.json
@@ -48,6 +48,7 @@
"filter.staginglocationA": "Staging location A",
"filter.staginglocationB": "Staging location B",
"filter.corespecifications": "Core specifications",
+ "filter.instorepoint": "Storage point",
"grid.bill-code": "Bill code",
"grid.bill-type": "Bill type",
"grid.warehouse-name": "Warehouse name",
diff --git a/locale/id-1.json b/locale/id-1.json
index a40f83d..f8f67a3 100644
--- a/locale/id-1.json
+++ b/locale/id-1.json
@@ -48,6 +48,7 @@
"filter.staginglocationA": "Temporary A",
"filter.staginglocationB": "Temporary B",
"filter.corespecifications": "Spesifikasi inti",
+ "filter.instorepoint": "titik penyimpanan",
"grid.bill-code": "Nomor dokumen",
"grid.bill-type": "Jenis dokumen",
"grid.warehouse-name": "Nama gudang",
diff --git a/locale/zh-Hans-1.json b/locale/zh-Hans-1.json
index b5ec22f..566f69a 100644
--- a/locale/zh-Hans-1.json
+++ b/locale/zh-Hans-1.json
@@ -48,6 +48,7 @@
"filter.axisposition": "轴上下位置",
"filter.rollposition": "卷左右位置",
"filter.corespecifications": "管芯规格",
+ "filter.instorepoint": "入库点",
"grid.bill-code": "单据号",
"grid.bill-type": "单据类型",
"grid.warehouse-name": "仓库名称",
diff --git a/pages.json b/pages.json
index 60d4c0f..80cb78f 100644
--- a/pages.json
+++ b/pages.json
@@ -385,38 +385,62 @@
}
}
- ,{
- "path" : "pages/SecondPhase/production/ControlPoint",
+ ,{
+ "path" : "pages/SecondPhase/production/ControlPoint",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/production/BakeDetail",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/BakeDetail",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/production/MjWeight",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/production/MjWeight",
"style" :
{
"navigationStyle": "custom"
}
-
- }
- ,{
- "path" : "pages/SecondPhase/PackRelation",
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/kmxk/EmptyBoxIntoStore",
"style" :
{
"navigationStyle": "custom"
}
-
- }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/kmxk/EmptyBoxSave",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/kmxk/PointSave",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
+ ,{
+ "path" : "pages/SecondPhase/PackRelation",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/kmxk/EmptyBoxIntoStore.vue b/pages/SecondPhase/kmxk/EmptyBoxIntoStore.vue
new file mode 100644
index 0000000..1f5bcbf
--- /dev/null
+++ b/pages/SecondPhase/kmxk/EmptyBoxIntoStore.vue
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+ {{$t('filter.instorepoint')}}
+
+
+
+
+
+
+
+ {{$t('filter.box-code')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/SecondPhase/kmxk/EmptyBoxSave.vue b/pages/SecondPhase/kmxk/EmptyBoxSave.vue
new file mode 100644
index 0000000..f4c1445
--- /dev/null
+++ b/pages/SecondPhase/kmxk/EmptyBoxSave.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+ {{$t('filter.box-code')}}
+
+
+
+
+
+
+
+ {{$t('grid.wooden-box-weight')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/SecondPhase/kmxk/PointSave.vue b/pages/SecondPhase/kmxk/PointSave.vue
new file mode 100644
index 0000000..5f31b0b
--- /dev/null
+++ b/pages/SecondPhase/kmxk/PointSave.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+ {{$t('filter.point')}}
+
+
+
+
+
+
+ {{$t('grid.wooden-box-specs')}}
+
+
+
+
+
+
+ {{$t('filter.box-code')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 4a1c90d..4b8f160 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -69,8 +69,8 @@
},
methods: {
async _authority () {
- let res = await authority()
- // let res = await allAuthority()
+ // let res = await authority()
+ let res = await allAuthority()
if (res.code === '1') {
this.menuList = [...res.result.rf_menu1.sonTree]
} else {
diff --git a/utils/getData4.js b/utils/getData4.js
index 26bafe5..73847c5 100644
--- a/utils/getData4.js
+++ b/utils/getData4.js
@@ -45,3 +45,33 @@ export const feedinghandleConfirm = (obj) => request({
raw_jo: obj
}
})
+// 木箱库-空木箱入库
+export const boxIn = (pcode, vcode) => request({
+ url:'api/boxStackInOut/boxIn',
+ data: {
+ point_code: pcode,
+ vehicle_code: vcode
+ }
+})
+// 木箱库-空木箱维护
+export const updateWeight = (pcode, weight) => request({
+ url:'api/boxStackInOut/updateWeight',
+ data: {
+ point_code: pcode,
+ weight: weight
+ }
+})
+// 木箱库-点位维护
+export const updatePoint = (pcode, mcode, vcode) => request({
+ url:'api/boxStackInOut/updatePoint',
+ data: {
+ point_code: pcode,
+ material_code: mcode,
+ vehicle_code: vcode
+ }
+})
+// 木箱库-查询木箱物料信息
+export const getBoxSpecInfo = (pcode, mcode, vcode) => request({
+ url:'api/boxStackInOut/getBoxSpecInfo',
+ data: {}
+})
diff --git a/utils/mork2.js b/utils/mork2.js
index 4cbcc09..1a03965 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -73,6 +73,11 @@ export const allAuthority = () => {
]},
{menu_id: '9', path: 'RF14', title: '空木箱出库', sonTree: [
{menu_id: '1', title: '空木箱出库', path: '/pages/SecondPhase/EmptyBoxOutStore'}
+ ]},
+ {menu_id: '10', path: 'RF05', title: '空木箱库', sonTree: [
+ {menu_id: '1', title: '空木箱入库', path: '/pages/SecondPhase/kmxk/EmptyBoxIntoStore'},
+ {menu_id: '2', title: '空木箱维护', path: '/pages/SecondPhase/kmxk/EmptyBoxSave'},
+ {menu_id: '3', title: '点位维护', path: '/pages/SecondPhase/kmxk/PointSave'}
]}
]
}