diff --git a/manifest.json b/manifest.json
index 70035d9..393c427 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "海亮铜箔",
"appid" : "__UNI__3A002CD",
"description" : "海亮铜箔二期手持系统",
- "versionName" : "1.4.2",
- "versionCode" : 142,
+ "versionName" : "1.4.3",
+ "versionCode" : 143,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 77eb7cb..f37b48a 100644
--- a/pages.json
+++ b/pages.json
@@ -734,6 +734,14 @@
}
}
+ ,{
+ "path" : "pages/SecondPhase/finished/RelabelOut",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+
+ }
],
"globalStyle": {
// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/finished/RelabelOut.vue b/pages/SecondPhase/finished/RelabelOut.vue
new file mode 100644
index 0000000..e50df81
--- /dev/null
+++ b/pages/SecondPhase/finished/RelabelOut.vue
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+ 木箱号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/SecondPhase/finished/abnorToStore.vue b/pages/SecondPhase/finished/abnorToStore.vue
index fa7944e..b94a4d1 100644
--- a/pages/SecondPhase/finished/abnorToStore.vue
+++ b/pages/SecondPhase/finished/abnorToStore.vue
@@ -55,7 +55,7 @@
data() {
return {
title: '',
- options: [{value: '1', text: '返检入库'}, {value: '2', text: '改切入库'}, {value: '0001', text: '生产入库'}, {value: '0009', text: '手工入库'}],
+ options: [{value: '1', text: '返检入库'}, {value: '2', text: '改切入库'}, {value: '0001', text: '生产入库'}, {value: '0012', text: '换标入库'}, {value: '0009', text: '手工入库'}],
index: '',
val1: '',
val2: '',
diff --git a/utils/getData3.js b/utils/getData3.js
index bcaee1e..07995ea 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -633,4 +633,11 @@ export const emptyTubeVehicleOut = (point, code) => request({
export const getTubeVehicleInfo = (point) => request({
url:'api/pda/slitter/getTubeVehicleInfo',
data: {point_code: point}
+})
+/**
+ * 换标出库
+ */
+export const vehicleRelabel = (code) => request({
+ url:'api/twoPda/vehicle/relabel',
+ data: {box_no: code}
})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index de1caf8..3d6862d 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -127,7 +127,8 @@ export const allAuthority = () => {
{menu_id: '7', path: 'RF06', title: '成品入库', sonTree: [
{menu_id: '1', title: '退货口入库', path: '/pages/SecondPhase/finished/ReturnToStore'},
{menu_id: '2', title: '异常口入库', path: '/pages/SecondPhase/finished/abnorToStore'},
- {menu_id: '3', title: '木箱称重', path: '/pages/SecondPhase/finished/BoxWeight'}
+ {menu_id: '3', title: '木箱称重', path: '/pages/SecondPhase/finished/BoxWeight'},
+ {menu_id: '4', title: '换标出库', path: '/pages/SecondPhase/finished/RelabelOut'}
]},
{menu_id: '8', path: 'RF13', title: '立库库存', sonTree: [
{menu_id: '1', title: '空木箱库存', path: '/pages/SecondPhase/lvt/EmptyBox'}