From bf1f8c866ec1d3be3afd1ada407c8d59bcc6efce Mon Sep 17 00:00:00 2001 From: "juncheng.li" Date: Sat, 15 Apr 2023 09:58:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=EF=BC=8C=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20=20=E5=9B=9E=E6=94=B6=E6=96=99=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PDA/pages.js | 2 +- fe/PDA/pages/message/details.vue | 8 ++++ fe/PDA/pages/message/index.vue | 5 --- fe/PDA/pages/task/deliver_detail.vue | 59 ++++++++++++++++++---------- fe/PDA/pages/task/issue_detail.vue | 1 + fe/PDA/pages/task/receipt.vue | 1 - fe/PDA/pages/task/receipt_check.vue | 3 +- fe/PDA/static/config.json | 2 +- 8 files changed, 51 insertions(+), 30 deletions(-) diff --git a/fe/PDA/pages.js b/fe/PDA/pages.js index fea8dac56..391366115 100644 --- a/fe/PDA/pages.js +++ b/fe/PDA/pages.js @@ -38,7 +38,7 @@ module.exports = () => ({ "path": "pages/message/index", "style": { "navigationBarTitleText": "消息", - "enablePullDownRefresh": true + "enablePullDownRefresh": false } }, diff --git a/fe/PDA/pages/message/details.vue b/fe/PDA/pages/message/details.vue index 3d4c51ab6..6f01e7d7f 100644 --- a/fe/PDA/pages/message/details.vue +++ b/fe/PDA/pages/message/details.vue @@ -18,7 +18,15 @@ import { messages } from '@/api/index.js'; + import { + goHome + } from '@/common/basic.js'; export default { + onNavigationBarButtonTap(e) { + if (e.index === 0) { + goHome(); + } + }, data() { return { id: '', diff --git a/fe/PDA/pages/message/index.vue b/fe/PDA/pages/message/index.vue index 109cfdd49..4c4f0d66e 100644 --- a/fe/PDA/pages/message/index.vue +++ b/fe/PDA/pages/message/index.vue @@ -61,11 +61,6 @@ } from '@/common/basic.js'; export default { - onNavigationBarButtonTap(e) { - if (e.index === 0) { - goHome(); - } - }, data() { return { allMessageList: [], diff --git a/fe/PDA/pages/task/deliver_detail.vue b/fe/PDA/pages/task/deliver_detail.vue index 7e6c7a830..29891f337 100644 --- a/fe/PDA/pages/task/deliver_detail.vue +++ b/fe/PDA/pages/task/deliver_detail.vue @@ -72,7 +72,8 @@ {{ item.recommendLocationCode }} - {{ item.handledFromLocationCode }} + + {{ item.handledFromLocationCode }} @@ -274,13 +275,30 @@ item.handledLot = that.balancesItem.lot; item.handledFromLocationArea = that.balancesItem.locationCode; item.handledQty = that.balancesItem.qty; - - // "toLocationCode": "string", - // "toLocationArea": "string", - // "toLocationGroup": "string", - // "toLocationErpCode": "string", - // "toWarehouseCode": "string", - // "onTheWayLocationCode": "string" + + + // ================================== + // item.recommendFromLocationCode = string; + // item.recommendFromLocationArea = string; + // item.recommendFromLocationGroup = string; + // item.recommendFromLocationErpCode = string; + // item.recommendFromWarehouseCode = string; + // item.uom = string; + // item.recommendQty = 0; + // item.handledFromLocationCode = string; + // item.handledFromLocationArea = string; + // item.handledFromLocationGroup = string; + // item.handledFromLocationErpCode = string; + // item.handledFromWarehouseCode = string; + // item.handledQty = that.balancesItem.qty; + // item.toLocationCode = string; + // item.toLocationArea = string; + // item.toLocationGroup = string; + // item.toLocationErpCode = string; + // item.toWarehouseCode = string; + // item.onTheWayLocationCode = string; + + this.getScanCount(); this.closeScanPopup(); that.$forceUpdate(); @@ -343,21 +361,20 @@ title: "提交中..." }); - that.datacontent.company = localStorage.company; let params = JSON.stringify(that.datacontent); console.log(params); - finshDeliverJob(that.id, params) - .then(res => { - uni.hideLoading(); - if (res != null) { - that.showCommitSuccessMessage(); - that.backJobList(1000); - } - }) - .catch(err => { - this.showMessage(err.message); - uni.hideLoading(); - }); + // finshDeliverJob(that.id, params) + // .then(res => { + // uni.hideLoading(); + // if (res != null) { + // that.showCommitSuccessMessage(); + // that.backJobList(1000); + // } + // }) + // .catch(err => { + // this.showMessage(err.message); + // uni.hideLoading(); + // }); }, //返回任务列表页 diff --git a/fe/PDA/pages/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue index eb5c3b503..9bf1905a7 100644 --- a/fe/PDA/pages/task/issue_detail.vue +++ b/fe/PDA/pages/task/issue_detail.vue @@ -420,6 +420,7 @@ item.handledFromLocationArea = balanceItem.locationArea; item.handledFromLocationGroup = balanceItem.locationErpCode; item.handledFromLocationErpCode = balanceItem.locationGroup; + item.handledFromWarehouseCode = balanceItem.warehouseCode; item.toLocationArea =balanceItem.locationArea; item.toLocationGroup= balanceItem.locationGroup; diff --git a/fe/PDA/pages/task/receipt.vue b/fe/PDA/pages/task/receipt.vue index 7bfaebe94..8d113c10a 100644 --- a/fe/PDA/pages/task/receipt.vue +++ b/fe/PDA/pages/task/receipt.vue @@ -138,7 +138,6 @@ }, getList(type) { - this.isToday=false; let that = this; uni.showLoading({ title: "加载中....", diff --git a/fe/PDA/pages/task/receipt_check.vue b/fe/PDA/pages/task/receipt_check.vue index f4223e695..9c0cabc37 100644 --- a/fe/PDA/pages/task/receipt_check.vue +++ b/fe/PDA/pages/task/receipt_check.vue @@ -188,6 +188,7 @@ //保存 save() { let files = this.$refs.uploadImage.getFiles(); + console.log("文件个数",files.length) if (files.length > 0) { // this.readImageBuffer(files); if (this.dataContent.failedReason || this.dataContent.failedReason.length > 0) { @@ -204,7 +205,7 @@ } } else //零件保存为合格 { - if (this.dataContent.purchaseReceiptInspectStatus == 3) { + if (this.dataContent.purchaseReceiptInspectStatus == 2||this.dataContent.purchaseReceiptInspectStatus == 3) { showConfirmMsg('是否要将零件的状态改为合格?', confirm => { if (confirm) { this.saveResultPass(); diff --git a/fe/PDA/static/config.json b/fe/PDA/static/config.json index 7e9d3b7f5..f42a7f445 100644 --- a/fe/PDA/static/config.json +++ b/fe/PDA/static/config.json @@ -27,7 +27,7 @@ "putawayInventoryStatus": "2", "dev": "http://dev.ccwin-in.com:21093", "print_url": "http://dev.ccwin-in.com:59095", - "version_update_url": "http://dev.ccwin-in.com:59081", + "version_update_url": "http://dev.ccwin-in.com:21381", "isScrapScanToLocation": false, "isReceiptToday": true, "scrapReason": "ScrapReason",