From a89fe32c353040bbb95d7519cf7bafc4b5934f10 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期三, 06 九月 2023 09:54:14 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages.json | 70 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 3670c91..26a231a 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -108,6 +108,20 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/OutOperation/OutOperation",
+ "style": {
+ "navigationBarTitleText": "鍑哄簱鎿嶄綔",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/InOperation/InOperation",
+ "style": {
+ "navigationBarTitleText": "鍏ュ簱鎿嶄綔",
+ "enablePullDownRefresh": false
+ }
+
}
],
"subPackages": [{
@@ -127,34 +141,13 @@
}
},
{
-<<<<<<< HEAD
"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
- }
-=======
+ },
+ {
"path": "pages/manualFeed/manualFeed",
"style": {
"navigationBarTitleText": "鎵嬪姩鎶曟枡",
@@ -174,7 +167,6 @@
"navigationBarTitleText": "宸ュ崟鎶ュ伐",
"enablePullDownRefresh": false
}
->>>>>>> a52f13d719ee9cd53f129f4c59dcad783977fce9
},
{
"path": "pages/transferList/transferList",
@@ -186,7 +178,7 @@
{
"path": "pages/warehousingDetails/warehousingDetails",
"style": {
- "navigationBarTitleText": "鍏ュ簱璇︽儏",
+ "navigationBarTitleText": "杞簱璇︽儏",
"enablePullDownRefresh": false
}
},
@@ -224,6 +216,34 @@
"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
+ }
+
}
]
},
--
Gitblit v1.9.3