From ba7690e0893a4067afbf5ff7d5309986f76bde14 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 15 Aug 2024 08:30:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=8F=91=E6=96=99=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 8 +- src/mycomponents/query/balanceQuery.vue | 257 ++++++++++++++++++ src/mycomponents/query/showListItem.vue | 84 ++++++ src/pages/issue/record/directIssue.vue | 38 +-- .../job/productionReceiptDetail.vue | 39 +-- .../uni-pagination/uni-pagination.vue | 8 +- 6 files changed, 383 insertions(+), 51 deletions(-) create mode 100644 src/mycomponents/query/balanceQuery.vue create mode 100644 src/mycomponents/query/showListItem.vue diff --git a/src/api/request2.js b/src/api/request2.js index 1bd4066d..f654afbd 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -548,7 +548,7 @@ export function getBasicItemByCode(itemCode) { } return request({ url: baseApi + "/wms/itembasic/page", - method: "post", + method: "get", data: params, }); } @@ -562,7 +562,7 @@ export function getBasicItemByCodeSenior(itemCode) { var params = { filters: [{ - column: "column", + column: "code", action: "like", value: itemCode }], @@ -570,8 +570,8 @@ export function getBasicItemByCodeSenior(itemCode) { pageSize: 1000 } return request({ - url: baseApi + "/wms/itembasic/page", - method: "get", + url: baseApi + "/wms/itembasic/senior", + method: "post", data: params, }); } diff --git a/src/mycomponents/query/balanceQuery.vue b/src/mycomponents/query/balanceQuery.vue new file mode 100644 index 00000000..0a3bee4d --- /dev/null +++ b/src/mycomponents/query/balanceQuery.vue @@ -0,0 +1,257 @@ + + + + + \ No newline at end of file diff --git a/src/mycomponents/query/showListItem.vue b/src/mycomponents/query/showListItem.vue new file mode 100644 index 00000000..b0d21c0c --- /dev/null +++ b/src/mycomponents/query/showListItem.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue index 86dad12a..a9f1c41f 100644 --- a/src/pages/issue/record/directIssue.vue +++ b/src/pages/issue/record/directIssue.vue @@ -48,7 +48,7 @@ - + @@ -99,8 +99,8 @@ import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue' import balanceSelect from '@/mycomponents/balance/balanceSelect.vue' import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue' - import balanceQuery from '@/mycomponents/query/balanceQuery.vue' - + // import balanceQuery from '@/mycomponents/query/balanceQuery.vue' + export default { components: { @@ -114,7 +114,7 @@ recordDetailCard, balanceSelect, winComScanBalance, - balanceQuery + // balanceQuery }, data() { return { @@ -160,13 +160,14 @@ // } }, - + //返回首页 onNavigationBarButtonTap(e) { if (e.index === 0) { goHome(); } else if (e.index == 1) { - this.$refs.refBalanceQuery.showDrawer(); + // this.$refs.refBalanceQuery.showDrawer(); + // this.closeScanPopup(); } }, //拦截返回按钮事件 @@ -177,27 +178,10 @@ mounted() {}, methods: { - showDrawer() { - this.$refs.showRight.open(); - }, - closeDrawer() { - this.$refs.showRight.close(); - }, - - showDrawer() { - this.$refs.showRight.open(); - }, - closeDrawer() { - this.$refs.showRight.close(); - }, - - showDrawer() { - this.$refs.showRight.open(); - }, - closeDrawer() { - this.$refs.showRight.close(); - }, - + // showDrawer() { + // this.$refs.showRight.open(); + // }, + getBusinessType() { getBusinessType(this.businessTypeCode, res => { if (res.success) { diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index faa85925..1e246e2a 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -218,28 +218,33 @@ autoCommit(){ //判断数量是否相等 var noCommitInfo=null - for (var i = 0; i < this.detailSource.length; i++) { - var sub =this.detailSource[i].subList - for(var j=0;j { + item.subList.forEach(cur => { + if (cur.qty != cur.handleQty) { + var tempHandleQty =0 + if(cur.handleQty){ + tempHandleQty=cur.handleQty + }else { + tempHandleQty =0 + } + str += `包装号【${cur.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n` } - } - } - //数量不相等，提示 - if(noCommitInfo){ - var handQty =noCommitInfo.handleQty?noCommitInfo.handleQty:0 - this.showQuestionMessage("扫描数量["+handQty+"]任务数量["+noCommitInfo.qty+"]不一致,是否提交?",res=>{ - if(res){ + }) + }) + + if (str) { + str = '任务明细未全部完成,是否提交?\n'+str + this.$refs.comMessage.showQuestionMessage1(str, 'red', res => { + if (res) { this.commit() } - }) - }else { - //提交 + }); + } else { this.commit() } + }, //继续扫描 diff --git a/src/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue b/src/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue index 71350340..8d29656b 100644 --- a/src/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue +++ b/src/uni_modules/uni-pagination/components/uni-pagination/uni-pagination.vue @@ -16,9 +16,10 @@ + :hover-stay-time="70" @click="clickLeft" + style="margin-right: 70rpx;">