From cfc15c1f5301a7b59c149ada13d2f8c1f4554afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com> Date: Tue, 29 Oct 2024 10:38:19 +0800 Subject: [PATCH] =?UTF-8?q?PDA=E9=83=A8=E5=88=86=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=E4=B8=8E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=87=8F=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E9=86=92=202024/8/9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/common/comMessage.vue | 17 +++++-- src/pages/customerReturn/job/returnDetail.vue | 49 ++++++++++++------ .../inventoryMove/job/inventoryMoveDetail.vue | 32 ++++++------ .../package/job/overPackageJobDetail.vue | 6 +-- .../productReceipt/job/scrapReceiptDetail.vue | 28 ++++++---- .../job/productRecycleJobDetail.vue | 33 ++++++------ .../productionReturn/job/returnDetail.vue | 48 +++++++++++------ src/pages/scrap/job/scrapJobDetail.vue | 49 ++++++++++++------ src/pages/unPlanned/job/issueJobDetail.vue | 51 +++++++++++++------ 9 files changed, 201 insertions(+), 112 deletions(-) diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue index 7a0213dc..80fd4082 100644 --- a/src/mycomponents/common/comMessage.vue +++ b/src/mycomponents/common/comMessage.vue @@ -9,7 +9,7 @@ - + @@ -58,6 +58,8 @@ const seconds = ref(0) const success = ref(() => {}) const version = ref('') const modal = ref(null) +const textColor = ref('#000') +const count = ref(0) // onMounted(() => { // const systemInfo = uni.getSystemInfoSync() // // #ifdef H5 @@ -134,8 +136,8 @@ const showBreakMessage = (mContent, callback) => { } // 打开疑问弹框(取消+确定） -const showQuestionMessage = (mContent, callback) => { - showSelectModal('疑问', mContent, callback) +const showQuestionMessage = (mContent,textColor, callback) => { + showSelectModal('疑问', mContent, callback,textColor) } // 打开警告弹框(确定+倒计时) @@ -227,10 +229,11 @@ const showSelectWarningModal = (mContent, callback) => { } // 初始化弹框并打开(取消+确定） -const showSelectModal = (mIconType, mContent, callback) => { +const showSelectModal = (mIconType, mContent, callback,textColor) => { showModal({ iconType: mIconType, content: mContent, + textColor:textColor, success(res) { if (callback != undefined) { if (res.confirm == true) { @@ -375,7 +378,11 @@ const showModal = (data) => { } else { cancelColor.value = '#666F83' } - + if (data.textColor) { + textColor.value = data.textColor + } else { + textColor.value = '#000' + } if (data.showConfirmButton === false || data.showConfirmButton === true) { showConfirmButton.value = data.showConfirmButton } else { diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue index 52ddc3b3..c9ca2026 100644 --- a/src/pages/customerReturn/job/returnDetail.vue +++ b/src/pages/customerReturn/job/returnDetail.vue @@ -279,23 +279,42 @@ const commit = () => { if (!checkLocation()) { return } - // 扫描数量和任务数量相等，直接提交 - if (scanCount.value == subList.value.length) { + // 提交的数量和任务数量不一致提示 + let str = '' + detailSource.value.forEach((item) => { + item.subList.forEach(cur => { + if (cur.qty != cur.handleQty) { + str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致` + } + }) + }) + if (str) { + str += '，是否确认提交?' + comMessageRef.value.showQuestionMessage(str, 'red', res => { + if (res) { + submitJob() + } + }); + } else { submitJob() - } else if (scanCount.value < subList.value.length) { - // 扫描数量小于任务数量，判断是否允许部分提交 - if (jobContent.value.allowPartialComplete == 'TRUE') { - // 提交 - submitJob() - } else { - // 不允许部分提交，提示 - comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { - if (res) { - openScanPopup() - } - }) - } } + // // 扫描数量和任务数量相等，直接提交 + // if (scanCount.value == subList.value.length) { + // submitJob() + // } else if (scanCount.value < subList.value.length) { + // // 扫描数量小于任务数量，判断是否允许部分提交 + // if (jobContent.value.allowPartialComplete == 'TRUE') { + // // 提交 + // submitJob() + // } else { + // // 不允许部分提交，提示 + // comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { + // if (res) { + // openScanPopup() + // } + // }) + // } + // } } const submitJob = () => { proxy.$modal.loading('提交中...') diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index 3faf51de..0329f23e 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -293,22 +293,24 @@ const commit = () => { return } - // 扫描数量和任务数量相等，直接提交 - if (scanCount.value == subList.value.length) { + // 提交的数量和任务数量不一致提示 + let str = '' + detailSource.value.forEach((item) => { + item.subList.forEach(cur => { + if (cur.qty != cur.handleQty) { + str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致` + } + }) + }) + if (str) { + str += '，是否确认提交?' + comMessageRef.value.showQuestionMessage(str, 'red', res => { + if (res) { + submitJob() + } + }); + } else { submitJob() - } else if (scanCount.value < subList.value.length) { - // 扫描数量小于任务数量，判断是否允许部分提交 - if (jobContent.value.allowPartialComplete == 'TRUE') { - // 提交 - submitJob() - } else { - // 不允许部分提交，提示 - comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { - if (res) { - openScanPopup() - } - }) - } } } diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index a05e0758..bd61977f 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -27,14 +27,14 @@ - + + - + --> diff --git a/src/pages/productReceipt/job/scrapReceiptDetail.vue b/src/pages/productReceipt/job/scrapReceiptDetail.vue index a01a7fdb..a7c138d2 100644 --- a/src/pages/productReceipt/job/scrapReceiptDetail.vue +++ b/src/pages/productReceipt/job/scrapReceiptDetail.vue @@ -235,18 +235,24 @@ const commit = () => { if (!checkLocation()) { return } - // 扫描数量和任务数量相等，直接提交 - if (scanCount.value == subList.value.length) { + // 提交的数量和任务数量不一致提示 + let str = '' + detailSource.value.forEach((item) => { + item.subList.forEach(cur => { + if (cur.qty != cur.handleQty) { + str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致` + } + }) + }) + if (str) { + str += '，是否确认提交?' + comMessageRef.value.showQuestionMessage(str, 'red', res => { + if (res) { + submitJob() + } + }); + } else { submitJob() - } else if (scanCount.value < subList.value.length) { - // 扫描数量小于任务数量，判断是否允许部分提交 - if (jobContent.value.allowPartialComplete == 'TRUE') { - // 提交 - submitJob() - } else { - // 不允许部分提交，提示 - showMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]总共[${subList.value.length}]`) - } } } const submitJob = () => { diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue index a0d5c6e7..04e0d072 100644 --- a/src/pages/productRecycle/job/productRecycleJobDetail.vue +++ b/src/pages/productRecycle/job/productRecycleJobDetail.vue @@ -256,23 +256,24 @@ const commit = () => { showErrorMessage('扫描数为0,请先扫描') return } - // 允许部分提交 - // 扫描数量和任务数量相等，直接提交 - if (scanCount.value == subList.value.length) { + // 提交的数量和任务数量不一致提示 + let str = '' + detailSource.value.forEach((item) => { + item.subList.forEach(cur => { + if (cur.qty != cur.handleQty) { + str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致` + } + }) + }) + if (str) { + str += '，是否确认提交?' + comMessageRef.value.showQuestionMessage(str, 'red', res => { + if (res) { + submitJob() + } + }); + } else { submitJob() - } else if (scanCount.value < subList.value.length) { - // 扫描数量小于任务数量，判断是否允许部分提交 - if (jobContent.value.allowPartialComplete == 'TRUE') { - // 提交 - submitJob() - } else { - // 不允许部分提交，提示 - comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { - if (res) { - openScanPopup() - } - }) - } } } diff --git a/src/pages/productionReturn/job/returnDetail.vue b/src/pages/productionReturn/job/returnDetail.vue index 7e14ac21..9645f242 100644 --- a/src/pages/productionReturn/job/returnDetail.vue +++ b/src/pages/productionReturn/job/returnDetail.vue @@ -232,24 +232,40 @@ const commit = () => { showErrorMessage('扫描数为0,请先扫描') return } - if (!checkLocation()) { - return - } - // 扫描数量和任务数量相等，直接提交 - if (scanCount.value == subList.value.length) { + // 提交的数量和任务数量不一致提示 + let str = '' + detailSource.value.forEach((item) => { + item.subList.forEach(cur => { + if (cur.qty != cur.handleQty) { + str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致` + } + }) + }) + if (str) { + str += '，是否确认提交?' + comMessageRef.value.showQuestionMessage(str, 'red', res => { + if (res) { + submitJob() + } + }); + } else { submitJob() - } else if (scanCount.value < subList.value.length) { - // 扫描数量小于任务数量，判断是否允许部分提交 - if (jobContent.value.allowPartialComplete == 'TRUE') { - // 提交 - submitJob() - } else { - // 不允许部分提交，提示 - comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { - openScanPopup() - }) - } } + // // 扫描数量和任务数量相等，直接提交 + // if (scanCount.value == subList.value.length) { + // submitJob() + // } else if (scanCount.value < subList.value.length) { + // // 扫描数量小于任务数量，判断是否允许部分提交 + // if (jobContent.value.allowPartialComplete == 'TRUE') { + // // 提交 + // submitJob() + // } else { + // // 不允许部分提交，提示 + // comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { + // openScanPopup() + // }) + // } + // } } const submitJob = () => { diff --git a/src/pages/scrap/job/scrapJobDetail.vue b/src/pages/scrap/job/scrapJobDetail.vue index 96cca7ed..a1a63fc5 100644 --- a/src/pages/scrap/job/scrapJobDetail.vue +++ b/src/pages/scrap/job/scrapJobDetail.vue @@ -238,23 +238,42 @@ const commit = () => { showErrorMessage('扫描数为0,请先扫描') return } - // 扫描数量和任务数量相等，直接提交 - if (scanCount.value == subList.value.length) { + // 提交的数量和任务数量不一致提示 + let str = '' + detailSource.value.forEach((item) => { + item.subList.forEach(cur => { + if (cur.qty != cur.handleQty) { + str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致` + } + }) + }) + if (str) { + str += '，是否确认提交?' + comMessageRef.value.showQuestionMessage(str, 'red', res => { + if (res) { + submitJob() + } + }); + } else { submitJob() - } else if (scanCount.value < subList.value.length) { - // 扫描数量小于任务数量，判断是否允许部分提交 - if (jobContent.value.allowPartialComplete == 'TRUE') { - // 提交 - submitJob() - } else { - // 不允许部分提交，提示 - comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { - if (res) { - openScanPopup() - } - }) - } } + // // 扫描数量和任务数量相等，直接提交 + // if (scanCount.value == subList.value.length) { + // submitJob() + // } else if (scanCount.value < subList.value.length) { + // // 扫描数量小于任务数量，判断是否允许部分提交 + // if (jobContent.value.allowPartialComplete == 'TRUE') { + // // 提交 + // submitJob() + // } else { + // // 不允许部分提交，提示 + // comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { + // if (res) { + // openScanPopup() + // } + // }) + // } + // } } const submitJob = () => { diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue index 16ef424c..63b5796e 100644 --- a/src/pages/unPlanned/job/issueJobDetail.vue +++ b/src/pages/unPlanned/job/issueJobDetail.vue @@ -233,24 +233,43 @@ const commit = () => { showErrorMessage('扫描数为0,请先扫描') return } - // 允许部分提交 - // 扫描数量和任务数量相等，直接提交 - if (scanCount.value == subList.value.length) { + // 提交的数量和任务数量不一致提示 + let str = '' + detailSource.value.forEach((item) => { + item.subList.forEach(cur => { + if (cur.qty != cur.handleQty) { + str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致` + } + }) + }) + if (str) { + str += '，是否确认提交?' + comMessageRef.value.showQuestionMessage(str, 'red', res => { + if (res) { + submitJob() + } + }); + } else { submitJob() - } else if (scanCount.value < subList.value.length) { - // 扫描数量小于任务数量，判断是否允许部分提交 - if (jobContent.value.allowPartialComplete == 'TRUE') { - // 提交 - submitJob() - } else { - // 不允许部分提交，提示 - comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { - if (res) { - openScanPopup() - } - }) - } } + // // 允许部分提交 + // // 扫描数量和任务数量相等，直接提交 + // if (scanCount.value == subList.value.length) { + // submitJob() + // } else if (scanCount.value < subList.value.length) { + // // 扫描数量小于任务数量，判断是否允许部分提交 + // if (jobContent.value.allowPartialComplete == 'TRUE') { + // // 提交 + // submitJob() + // } else { + // // 不允许部分提交，提示 + // comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { + // if (res) { + // openScanPopup() + // } + // }) + // } + // } } const submitJob = () => { proxy.$modal.loading('提交中...')