From d24b6fe16b7fa9aa608be207f6c9ab158d4e1196 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 12 九月 2023 16:32:22 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev
---
minipro_standard/pages.json | 87 +++++++++++++++++++++++++++++++------------
1 files changed, 62 insertions(+), 25 deletions(-)
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 58b5fa3..4361238 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -108,8 +108,22 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/OutOperation/OutOperation",
+ "style": {
+ "navigationBarTitleText": "鍑哄簱鎿嶄綔",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/InOperation/InOperation",
+ "style": {
+ "navigationBarTitleText": "鍏ュ簱鎿嶄綔",
+ "enablePullDownRefresh": false
+ }
+
}
- ],
+ ],
"subPackages": [{
"root": "pages_adjust",
"pages": [{
@@ -127,30 +141,17 @@
}
},
{
+ "path" : "pages/forgotPassword/forgotPassword",
+ "style" :
+ {
+ "navigationBarTitleText": "蹇樿瀵嗙爜",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
"path": "pages/newTransfer/newTransfer",
"style": {
"navigationBarTitleText": "鏂板缓杞簱",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/manualFeed/manualFeed",
- "style": {
- "navigationBarTitleText": "鎵嬪姩鎶曟枡",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/OrderDetail/OrderDetail",
- "style": {
- "navigationBarTitleText": "宸ュ崟璇︽儏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/workOrderReporting/workOrderReporting",
- "style": {
- "navigationBarTitleText": "宸ュ崟鎶ュ伐",
"enablePullDownRefresh": false
}
},
@@ -185,7 +186,7 @@
{
"path": "pages/warehousingDetails/warehousingDetails",
"style": {
- "navigationBarTitleText": "鍏ュ簱璇︽儏",
+ "navigationBarTitleText": "杞簱璇︽儏",
"enablePullDownRefresh": false
}
},
@@ -223,12 +224,41 @@
"navigationBarTitleText": "搴撳瓨閲忔煡璇�",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path": "pages/reportingForWork/reportingForWork",
+ "style": {
+ "navigationBarTitleText": "涓�閿姤宸�",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/processPlan/processPlan",
+ "style": {
+ "navigationBarTitleText": "閫夋嫨宸ュ簭璁″垝",
+ "enablePullDownRefresh": false
+ }
+ }, {
+ "path": "pages/workOrder/workOrder",
+ "style": {
+ "navigationBarTitleText": "鐢熶骇宸ュ崟",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/spotCheck/spotCheck",
+ "style": {
+ "navigationBarTitleText": "鐢熶骇鐐规",
+ "enablePullDownRefresh": false
+ }
+
}
]
},
{
"root": "pages_inspect",
- "pages": [{
+ "pages": [
+ {
"path": "pages/InspectionRecords/InspectionRecords",
"style": {
"navigationBarTitleText": "妫�楠岃褰�",
@@ -239,6 +269,13 @@
"path": "pages/InspectionDetails/InspectionDetails",
"style": {
"navigationBarTitleText": "妫�楠岃鎯�",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/equipmentInspection/equipmentInspection",
+ "style": {
+ "navigationBarTitleText": "璁惧宸℃",
"enablePullDownRefresh": false
}
}
@@ -277,4 +314,4 @@
]
},
"uniIdRouter": {}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3