From 69a6d9fdf0e21525430fa15926f2a0a67db53309 Mon Sep 17 00:00:00 2001 From: "juncheng.li" Date: Fri, 24 Mar 2023 11:16:45 +0800 Subject: [PATCH] =?UTF-8?q?pda=20=E6=81=A2=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PDA/pages.json | 70 +-- fe/PDA/{views => pages}/demo/demo.vue | 0 fe/PDA/{views => pages}/index/index.vue | 0 .../inventory/comTransfer.vue | 0 fe/PDA/{views => pages}/inventory/scrap.vue | 0 .../inventory/transferByLocation.vue | 2 +- .../inventory/transferDiffLocation.vue | 2 +- fe/PDA/pages/login/index.vue | 410 ++++++++++++++++++ fe/PDA/{views => pages}/message/details.vue | 0 fe/PDA/{views => pages}/message/index.vue | 0 .../putaway/purchasePutaway.vue | 0 .../{views => pages}/putaway/rapReceipt.vue | 0 .../{views => pages}/putaway/semiPutaway.vue | 0 fe/PDA/{views => pages}/query/item.vue | 0 fe/PDA/{views => pages}/query/location.vue | 0 .../return/productionReturn.vue | 0 .../return/productionReturn_detail.vue | 0 .../return/purchaseReturn.vue | 0 .../return/purchaseReturn_detail.vue | 0 .../return/returnBeforPutaway.vue | 0 .../return/returnToWarehouse.vue | 0 fe/PDA/{views => pages}/setter/index.vue | 4 +- .../{views => pages}/setter/passwordpage.vue | 0 .../{views => pages}/setter/setterDetail.vue | 0 fe/PDA/{views => pages}/store/deliverRaw.vue | 0 fe/PDA/{views => pages}/store/issueDirect.vue | 0 fe/PDA/{views => pages}/task/count.vue | 0 fe/PDA/{views => pages}/task/count_detail.vue | 0 fe/PDA/{views => pages}/task/deliver.vue | 0 .../{views => pages}/task/deliver_detail.vue | 0 .../{views => pages}/task/deliver_items.vue | 0 fe/PDA/{views => pages}/task/issue.vue | 0 fe/PDA/{views => pages}/task/issueByFIFO.vue | 0 fe/PDA/{views => pages}/task/issue_detail.vue | 0 fe/PDA/{views => pages}/task/receipt.vue | 1 + .../{views => pages}/task/receipt_check.vue | 0 .../{views => pages}/task/receipt_detail.vue | 4 +- fe/PDA/router/my_router.js | 2 +- fe/PDA/views/login/index.vue | 182 +++----- 39 files changed, 519 insertions(+), 158 deletions(-) rename fe/PDA/{views => pages}/demo/demo.vue (100%) rename fe/PDA/{views => pages}/index/index.vue (100%) rename fe/PDA/{views => pages}/inventory/comTransfer.vue (100%) rename fe/PDA/{views => pages}/inventory/scrap.vue (100%) rename fe/PDA/{views => pages}/inventory/transferByLocation.vue (93%) rename fe/PDA/{views => pages}/inventory/transferDiffLocation.vue (93%) create mode 100644 fe/PDA/pages/login/index.vue rename fe/PDA/{views => pages}/message/details.vue (100%) rename fe/PDA/{views => pages}/message/index.vue (100%) rename fe/PDA/{views => pages}/putaway/purchasePutaway.vue (100%) rename fe/PDA/{views => pages}/putaway/rapReceipt.vue (100%) rename fe/PDA/{views => pages}/putaway/semiPutaway.vue (100%) rename fe/PDA/{views => pages}/query/item.vue (100%) rename fe/PDA/{views => pages}/query/location.vue (100%) rename fe/PDA/{views => pages}/return/productionReturn.vue (100%) rename fe/PDA/{views => pages}/return/productionReturn_detail.vue (100%) rename fe/PDA/{views => pages}/return/purchaseReturn.vue (100%) rename fe/PDA/{views => pages}/return/purchaseReturn_detail.vue (100%) rename fe/PDA/{views => pages}/return/returnBeforPutaway.vue (100%) rename fe/PDA/{views => pages}/return/returnToWarehouse.vue (100%) rename fe/PDA/{views => pages}/setter/index.vue (95%) rename fe/PDA/{views => pages}/setter/passwordpage.vue (100%) rename fe/PDA/{views => pages}/setter/setterDetail.vue (100%) rename fe/PDA/{views => pages}/store/deliverRaw.vue (100%) rename fe/PDA/{views => pages}/store/issueDirect.vue (100%) rename fe/PDA/{views => pages}/task/count.vue (100%) rename fe/PDA/{views => pages}/task/count_detail.vue (100%) rename fe/PDA/{views => pages}/task/deliver.vue (100%) rename fe/PDA/{views => pages}/task/deliver_detail.vue (100%) rename fe/PDA/{views => pages}/task/deliver_items.vue (100%) rename fe/PDA/{views => pages}/task/issue.vue (100%) rename fe/PDA/{views => pages}/task/issueByFIFO.vue (100%) rename fe/PDA/{views => pages}/task/issue_detail.vue (100%) rename fe/PDA/{views => pages}/task/receipt.vue (99%) rename fe/PDA/{views => pages}/task/receipt_check.vue (100%) rename fe/PDA/{views => pages}/task/receipt_detail.vue (99%) diff --git a/fe/PDA/pages.json b/fe/PDA/pages.json index 6b1bbe431..022b99358 100644 --- a/fe/PDA/pages.json +++ b/fe/PDA/pages.json @@ -1,7 +1,7 @@ { "pages": [{ - "path": "views/index/index", + "path": "pages/index/index", "style": { "navigationBarTitleText": "WMS仓库管理系统-移动端", "titleNView": { @@ -11,7 +11,7 @@ } }, { - "path": "views/login/index", + "path": "pages/login/index", "style": { "navigationBarTitleText": "登录", "titleNView": { @@ -21,7 +21,7 @@ } }, { - "path": "views/setter/index", + "path": "pages/setter/index", "style": { "navigationBarTitleText": "个人资料", "enablePullDownRefresh": true @@ -29,14 +29,14 @@ } }, { - "path": "views/setter/passwordpage", + "path": "pages/setter/passwordpage", "style": { "navigationBarTitleText": "修改密码", "enablePullDownRefresh": true } }, { - "path": "views/setter/setterDetail", + "path": "pages/setter/setterDetail", "style": { "navigationBarTitleText": "参数设置详情", "enablePullDownRefresh": true @@ -44,7 +44,7 @@ }, { - "path": "views/message/index", + "path": "pages/message/index", "style": { "navigationBarTitleText": "消息", "enablePullDownRefresh": true @@ -52,7 +52,7 @@ }, { - "path": "views/message/details", + "path": "pages/message/details", "style": { "navigationBarTitleText": "消息详情", "enablePullDownRefresh": true @@ -60,21 +60,21 @@ }, { - "path": "views/demo/demo", + "path": "pages/demo/demo", "style": { "navigationBarTitleText": "组件", "enablePullDownRefresh": true } }, { - "path": "views/putaway/purchasePutaway", + "path": "pages/putaway/purchasePutaway", "style": { "navigationBarTitleText": "采购上架", "enablePullDownRefresh": false } }, { - "path": "views/task/receipt", + "path": "pages/task/receipt", "style": { "navigationBarTitleText": "采购收货", "enablePullDownRefresh": true, @@ -98,70 +98,70 @@ } }, { - "path": "views/task/receipt_detail", + "path": "pages/task/receipt_detail", "style": { "navigationBarTitleText": "收货任务详情", "enablePullDownRefresh": true } }, { - "path": "views/return/returnBeforPutaway", + "path": "pages/return/returnBeforPutaway", "style": { "navigationBarTitleText": "上架前退货", "enablePullDownRefresh": false } }, { - "path": "views/return/purchaseReturn", + "path": "pages/return/purchaseReturn", "style": { "navigationBarTitleText": "上架后退货", "enablePullDownRefresh": true } }, { - "path": "views/return/purchaseReturn_detail", + "path": "pages/return/purchaseReturn_detail", "style": { "navigationBarTitleText": "退货任务详情", "enablePullDownRefresh": true } }, { - "path": "views/inventory/scrap", + "path": "pages/inventory/scrap", "style": { "navigationBarTitleText": "原料报废", "enablePullDownRefresh": false } }, { - "path": "views/store/deliverRaw", + "path": "pages/store/deliverRaw", "style": { "navigationBarTitleText": "原料直发", "enablePullDownRefresh": false } }, { - "path": "views/task/issueByFIFO", + "path": "pages/task/issueByFIFO", "style": { "navigationBarTitleText": "发料", "enablePullDownRefresh": true } }, { - "path": "views/task/issue_detail", + "path": "pages/task/issue_detail", "style": { "navigationBarTitleText": "发料任务详情", "enablePullDownRefresh": false } }, { - "path": "views/store/issueDirect", + "path": "pages/store/issueDirect", "style": { "navigationBarTitleText": "直接发料", "enablePullDownRefresh": false } }, { - "path": "views/query/item", + "path": "pages/query/item", "style": { "enablePullDownRefresh": true, // 是否配置下拉刷新的功能 "navigationBarTitleText": "按零件查询库存", @@ -172,7 +172,7 @@ } }, { - "path": "views/query/location", + "path": "pages/query/location", "style": { "navigationBarTitleText": "按库位查询库存", "enablePullDownRefresh": true, @@ -183,77 +183,77 @@ } }, { - "path": "views/inventory/transferByLocation", + "path": "pages/inventory/transferByLocation", "style": { "navigationBarTitleText": "储位内移库", "enablePullDownRefresh": true } }, { - "path": "views/inventory/transferDiffLocation", + "path": "pages/inventory/transferDiffLocation", "style": { "navigationBarTitleText": "储位调拨", "enablePullDownRefresh": true } }, { - "path": "views/task/count", + "path": "pages/task/count", "style": { "navigationBarTitleText": "盘点任务", "enablePullDownRefresh": true } }, { - "path": "views/task/count_detail", + "path": "pages/task/count_detail", "style": { "navigationBarTitleText": "盘点任务详情", "enablePullDownRefresh": true } }, { - "path": "views/return/returnToWarehouse", + "path": "pages/return/returnToWarehouse", "style": { "navigationBarTitleText": "直接退库", "enablePullDownRefresh": false } }, { - "path": "views/return/productionReturn", + "path": "pages/return/productionReturn", "style": { "navigationBarTitleText": "生产退库", "enablePullDownRefresh": true } }, { - "path": "views/return/productionReturn_detail", + "path": "pages/return/productionReturn_detail", "style": { "navigationBarTitleText": "生产退库详情", "enablePullDownRefresh": true } }, { - "path": "views/putaway/rapReceipt", + "path": "pages/putaway/rapReceipt", "style": { "navigationBarTitleText": "回收料收货", "enablePullDownRefresh": false } }, { - "path": "views/putaway/semiPutaway", + "path": "pages/putaway/semiPutaway", "style": { "navigationBarTitleText": "半成品上架", "enablePullDownRefresh": false } }, { - "path": "views/task/deliver", + "path": "pages/task/deliver", "style": { "navigationBarTitleText": "发货任务", "enablePullDownRefresh": true } }, { - "path": "views/task/deliver_detail", + "path": "pages/task/deliver_detail", "style": { "navigationBarTitleText": "发货任务详情", "enablePullDownRefresh": true @@ -291,18 +291,18 @@ "backgroundColor": "#ffffff", "list": [ { - "pagePath": "views/index/index", + "pagePath": "pages/index/index", "iconPath": "static/bar/sy.png", "selectedIconPath": "static/bar/sya.png", "text": "首页" }, { - "pagePath": "views/message/index", + "pagePath": "pages/message/index", "iconPath": "static/bar/xx.png", "selectedIconPath": "static/bar/xxa.png", "text": "消息" }, { - "pagePath": "views/setter/index", + "pagePath": "pages/setter/index", "iconPath": "static/bar/sz.png", "selectedIconPath": "static/bar/sza.png", "text": "设置" diff --git a/fe/PDA/views/demo/demo.vue b/fe/PDA/pages/demo/demo.vue similarity index 100% rename from fe/PDA/views/demo/demo.vue rename to fe/PDA/pages/demo/demo.vue diff --git a/fe/PDA/views/index/index.vue b/fe/PDA/pages/index/index.vue similarity index 100% rename from fe/PDA/views/index/index.vue rename to fe/PDA/pages/index/index.vue diff --git a/fe/PDA/views/inventory/comTransfer.vue b/fe/PDA/pages/inventory/comTransfer.vue similarity index 100% rename from fe/PDA/views/inventory/comTransfer.vue rename to fe/PDA/pages/inventory/comTransfer.vue diff --git a/fe/PDA/views/inventory/scrap.vue b/fe/PDA/pages/inventory/scrap.vue similarity index 100% rename from fe/PDA/views/inventory/scrap.vue rename to fe/PDA/pages/inventory/scrap.vue diff --git a/fe/PDA/views/inventory/transferByLocation.vue b/fe/PDA/pages/inventory/transferByLocation.vue similarity index 93% rename from fe/PDA/views/inventory/transferByLocation.vue rename to fe/PDA/pages/inventory/transferByLocation.vue index 1c2da3715..c9b90c78a 100644 --- a/fe/PDA/views/inventory/transferByLocation.vue +++ b/fe/PDA/pages/inventory/transferByLocation.vue @@ -11,7 +11,7 @@ goHome } from '@/common/basic.js'; - import comTransfer from '/views/inventory/comTransfer.vue' + import comTransfer from '/pages/inventory/comTransfer.vue' export default { name: 'transfer', components: { diff --git a/fe/PDA/views/inventory/transferDiffLocation.vue b/fe/PDA/pages/inventory/transferDiffLocation.vue similarity index 93% rename from fe/PDA/views/inventory/transferDiffLocation.vue rename to fe/PDA/pages/inventory/transferDiffLocation.vue index be5718a15..93dfcb029 100644 --- a/fe/PDA/views/inventory/transferDiffLocation.vue +++ b/fe/PDA/pages/inventory/transferDiffLocation.vue @@ -11,7 +11,7 @@ goHome } from '@/common/basic.js'; - import comTransfer from '/views/inventory/comTransfer.vue' + import comTransfer from '/pages/inventory/comTransfer.vue' export default { name: 'transferNoLoacation', components: { diff --git a/fe/PDA/pages/login/index.vue b/fe/PDA/pages/login/index.vue new file mode 100644 index 000000000..5fbc2325b --- /dev/null +++ b/fe/PDA/pages/login/index.vue @@ -0,0 +1,410 @@ + + + + + diff --git a/fe/PDA/views/message/details.vue b/fe/PDA/pages/message/details.vue similarity index 100% rename from fe/PDA/views/message/details.vue rename to fe/PDA/pages/message/details.vue diff --git a/fe/PDA/views/message/index.vue b/fe/PDA/pages/message/index.vue similarity index 100% rename from fe/PDA/views/message/index.vue rename to fe/PDA/pages/message/index.vue diff --git a/fe/PDA/views/putaway/purchasePutaway.vue b/fe/PDA/pages/putaway/purchasePutaway.vue similarity index 100% rename from fe/PDA/views/putaway/purchasePutaway.vue rename to fe/PDA/pages/putaway/purchasePutaway.vue diff --git a/fe/PDA/views/putaway/rapReceipt.vue b/fe/PDA/pages/putaway/rapReceipt.vue similarity index 100% rename from fe/PDA/views/putaway/rapReceipt.vue rename to fe/PDA/pages/putaway/rapReceipt.vue diff --git a/fe/PDA/views/putaway/semiPutaway.vue b/fe/PDA/pages/putaway/semiPutaway.vue similarity index 100% rename from fe/PDA/views/putaway/semiPutaway.vue rename to fe/PDA/pages/putaway/semiPutaway.vue diff --git a/fe/PDA/views/query/item.vue b/fe/PDA/pages/query/item.vue similarity index 100% rename from fe/PDA/views/query/item.vue rename to fe/PDA/pages/query/item.vue diff --git a/fe/PDA/views/query/location.vue b/fe/PDA/pages/query/location.vue similarity index 100% rename from fe/PDA/views/query/location.vue rename to fe/PDA/pages/query/location.vue diff --git a/fe/PDA/views/return/productionReturn.vue b/fe/PDA/pages/return/productionReturn.vue similarity index 100% rename from fe/PDA/views/return/productionReturn.vue rename to fe/PDA/pages/return/productionReturn.vue diff --git a/fe/PDA/views/return/productionReturn_detail.vue b/fe/PDA/pages/return/productionReturn_detail.vue similarity index 100% rename from fe/PDA/views/return/productionReturn_detail.vue rename to fe/PDA/pages/return/productionReturn_detail.vue diff --git a/fe/PDA/views/return/purchaseReturn.vue b/fe/PDA/pages/return/purchaseReturn.vue similarity index 100% rename from fe/PDA/views/return/purchaseReturn.vue rename to fe/PDA/pages/return/purchaseReturn.vue diff --git a/fe/PDA/views/return/purchaseReturn_detail.vue b/fe/PDA/pages/return/purchaseReturn_detail.vue similarity index 100% rename from fe/PDA/views/return/purchaseReturn_detail.vue rename to fe/PDA/pages/return/purchaseReturn_detail.vue diff --git a/fe/PDA/views/return/returnBeforPutaway.vue b/fe/PDA/pages/return/returnBeforPutaway.vue similarity index 100% rename from fe/PDA/views/return/returnBeforPutaway.vue rename to fe/PDA/pages/return/returnBeforPutaway.vue diff --git a/fe/PDA/views/return/returnToWarehouse.vue b/fe/PDA/pages/return/returnToWarehouse.vue similarity index 100% rename from fe/PDA/views/return/returnToWarehouse.vue rename to fe/PDA/pages/return/returnToWarehouse.vue diff --git a/fe/PDA/views/setter/index.vue b/fe/PDA/pages/setter/index.vue similarity index 95% rename from fe/PDA/views/setter/index.vue rename to fe/PDA/pages/setter/index.vue index 267dc1a47..06cb9e088 100644 --- a/fe/PDA/views/setter/index.vue +++ b/fe/PDA/pages/setter/index.vue @@ -9,9 +9,9 @@ - - diff --git a/fe/PDA/views/setter/passwordpage.vue b/fe/PDA/pages/setter/passwordpage.vue similarity index 100% rename from fe/PDA/views/setter/passwordpage.vue rename to fe/PDA/pages/setter/passwordpage.vue diff --git a/fe/PDA/views/setter/setterDetail.vue b/fe/PDA/pages/setter/setterDetail.vue similarity index 100% rename from fe/PDA/views/setter/setterDetail.vue rename to fe/PDA/pages/setter/setterDetail.vue diff --git a/fe/PDA/views/store/deliverRaw.vue b/fe/PDA/pages/store/deliverRaw.vue similarity index 100% rename from fe/PDA/views/store/deliverRaw.vue rename to fe/PDA/pages/store/deliverRaw.vue diff --git a/fe/PDA/views/store/issueDirect.vue b/fe/PDA/pages/store/issueDirect.vue similarity index 100% rename from fe/PDA/views/store/issueDirect.vue rename to fe/PDA/pages/store/issueDirect.vue diff --git a/fe/PDA/views/task/count.vue b/fe/PDA/pages/task/count.vue similarity index 100% rename from fe/PDA/views/task/count.vue rename to fe/PDA/pages/task/count.vue diff --git a/fe/PDA/views/task/count_detail.vue b/fe/PDA/pages/task/count_detail.vue similarity index 100% rename from fe/PDA/views/task/count_detail.vue rename to fe/PDA/pages/task/count_detail.vue diff --git a/fe/PDA/views/task/deliver.vue b/fe/PDA/pages/task/deliver.vue similarity index 100% rename from fe/PDA/views/task/deliver.vue rename to fe/PDA/pages/task/deliver.vue diff --git a/fe/PDA/views/task/deliver_detail.vue b/fe/PDA/pages/task/deliver_detail.vue similarity index 100% rename from fe/PDA/views/task/deliver_detail.vue rename to fe/PDA/pages/task/deliver_detail.vue diff --git a/fe/PDA/views/task/deliver_items.vue b/fe/PDA/pages/task/deliver_items.vue similarity index 100% rename from fe/PDA/views/task/deliver_items.vue rename to fe/PDA/pages/task/deliver_items.vue diff --git a/fe/PDA/views/task/issue.vue b/fe/PDA/pages/task/issue.vue similarity index 100% rename from fe/PDA/views/task/issue.vue rename to fe/PDA/pages/task/issue.vue diff --git a/fe/PDA/views/task/issueByFIFO.vue b/fe/PDA/pages/task/issueByFIFO.vue similarity index 100% rename from fe/PDA/views/task/issueByFIFO.vue rename to fe/PDA/pages/task/issueByFIFO.vue diff --git a/fe/PDA/views/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue similarity index 100% rename from fe/PDA/views/task/issue_detail.vue rename to fe/PDA/pages/task/issue_detail.vue diff --git a/fe/PDA/views/task/receipt.vue b/fe/PDA/pages/task/receipt.vue similarity index 99% rename from fe/PDA/views/task/receipt.vue rename to fe/PDA/pages/task/receipt.vue index 10fa4ccce..f6a621961 100644 --- a/fe/PDA/views/task/receipt.vue +++ b/fe/PDA/pages/task/receipt.vue @@ -78,6 +78,7 @@ }, onShow() { + console.log(uni.$u.config.v); if (this.$isReceiptToday) { this.isToday = this.$isReceiptToday; } diff --git a/fe/PDA/views/task/receipt_check.vue b/fe/PDA/pages/task/receipt_check.vue similarity index 100% rename from fe/PDA/views/task/receipt_check.vue rename to fe/PDA/pages/task/receipt_check.vue diff --git a/fe/PDA/views/task/receipt_detail.vue b/fe/PDA/pages/task/receipt_detail.vue similarity index 99% rename from fe/PDA/views/task/receipt_detail.vue rename to fe/PDA/pages/task/receipt_detail.vue index c48606c39..d722e7b28 100644 --- a/fe/PDA/views/task/receipt_detail.vue +++ b/fe/PDA/pages/task/receipt_detail.vue @@ -19,7 +19,7 @@ --------------------------------- --> - + @@ -70,7 +70,7 @@ import comMessage from '@/mycomponents/common/comMessage.vue' import winScanButton from '@/mycomponents/wincom/scanCom/winScanButton.vue' import winScanPack from '@/mycomponents/wincom/scanCom/winScanPack.vue' - import receiptCheck from '/views/task/receipt_check.vue' + import receiptCheck from '/pages/task/receipt_check.vue' import comJobScanDetail from '@/mycomponents/comjob/comJobScanDetail.vue' import winRecommendSimple from '@/mycomponents/wincom/unitCom/winRecommendSimple.vue' import winJobScanCount from '@/mycomponents/wincom/basicCom/winJobScanCount.vue' diff --git a/fe/PDA/router/my_router.js b/fe/PDA/router/my_router.js index aa4727dd0..f53143d4c 100644 --- a/fe/PDA/router/my_router.js +++ b/fe/PDA/router/my_router.js @@ -17,7 +17,7 @@ uni.addInterceptor('navigateTo', { invoke (e) { if(!hasPermission(e.url)){ uni.reLaunch({ - url: '/views/login/index' + url: '/pages/login/index' }) return false } diff --git a/fe/PDA/views/login/index.vue b/fe/PDA/views/login/index.vue index a8c5bb56d..0115c7a62 100644 --- a/fe/PDA/views/login/index.vue +++ b/fe/PDA/views/login/index.vue @@ -8,7 +8,7 @@