diff --git a/pages.json b/pages.json
index 274b66c..60d4c0f 100644
--- a/pages.json
+++ b/pages.json
@@ -409,6 +409,14 @@
}
}
+ ,{
+ "path" : "pages/SecondPhase/PackRelation",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/PackRelation.vue b/pages/SecondPhase/PackRelation.vue
new file mode 100644
index 0000000..3647969
--- /dev/null
+++ b/pages/SecondPhase/PackRelation.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+ 销售订单号*
+
+
+
+
+
+
+ {{$t('grid.sub-roll-number')}}*
+
+
+
+
+
+
+ 客户编号*
+
+
+
+
+
+ {{$t('grid.customer-name')}}*
+
+
+
+
+
+ {{$t('grid.product-code')}}*
+
+
+
+
+
+ {{$t('grid.product-description')}}*
+
+
+
+
+
+ {{$t('grid.net-weight')}}*
+
+
+
+
+
+ 产品厚度(mm)*
+
+
+
+
+
+ 物料类型*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/SecondPhase/production/ManmadeBake.vue b/pages/SecondPhase/production/ManmadeBake.vue
index 9122032..78c6b35 100644
--- a/pages/SecondPhase/production/ManmadeBake.vue
+++ b/pages/SecondPhase/production/ManmadeBake.vue
@@ -33,7 +33,7 @@
- {{$t('filter.time')}}
+ {{$t('filter.time')}}({{$t('unit.minute')}})
diff --git a/utils/getData3.js b/utils/getData3.js
index ae33157..f32d401 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -610,4 +610,21 @@ export const confirmWeight = (cname, weight) => request({
container_name: cname,
weight: weight
}
+})
+/**
+ * 包装关系维护
+ */
+export const packagerelation = (sn, cname, cn, cd, product, desc, weight, think, type) => request({
+ url:'api/pdmBiSubpackagerelation/packagerelation',
+ data: {
+ sale_order_name: sn,
+ container_name: cname,
+ customer_name: cn,
+ customer_description: cd,
+ product_name: product,
+ product_description: desc,
+ net_weight: weight,
+ thickness: think,
+ material_type: type
+ }
})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 9c51de0..e3ba340 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -55,7 +55,8 @@ export const allAuthority = () => {
{menu_id: '10', path: 'RF15', title: '打包间管理', sonTree: [
{menu_id: '1', title: '子卷包装解绑', path: '/pages/SecondPhase/SubRollPackUnbind'},
{menu_id: '1', title: '装箱口木箱回库', path: '/pages/SecondPhase/BoxReturn'},
- {menu_id: '1', title: '人工点维护', path: '/pages/SecondPhase/ManMaintain'}
+ {menu_id: '1', title: '人工点维护', path: '/pages/SecondPhase/ManMaintain'},
+ {menu_id: '1', title: '包装关系维护', path: '/pages/SecondPhase/PackRelation'}
]},
{menu_id: '6', path: 'RF04', title: '点位管理', sonTree: [
{menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},