From 559cf97eef670aaa8ee8778a19468f46eaa81f3f 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 11:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BAbug=202024/8/9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/common/comMessage.vue | 36 +++++++++++++++---- .../inventoryMove/job/inventoryMoveDetail.vue | 2 +- .../productReceipt/job/scrapReceiptDetail.vue | 2 +- .../job/productRecycleJobDetail.vue | 2 +- .../productionReturn/job/returnDetail.vue | 2 +- src/pages/scrap/job/scrapJobDetail.vue | 2 +- src/pages/unPlanned/job/issueJobDetail.vue | 2 +- 7 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue index 80fd4082..d90f02ee 100644 --- a/src/mycomponents/common/comMessage.vue +++ b/src/mycomponents/common/comMessage.vue @@ -136,10 +136,14 @@ const showBreakMessage = (mContent, callback) => { } // 打开疑问弹框(取消+确定） -const showQuestionMessage = (mContent,textColor, callback) => { - showSelectModal('疑问', mContent, callback,textColor) +const showQuestionMessage = (mContent, callback) => { + showSelectModal('疑问', mContent, callback) +} +// 打开疑问弹框(取消+确定） +const showQuestionMessage1 = (mContent,textColor, callback)=> { + console.log(textColor) + showSelectModal1("疑问", mContent, callback,textColor); } - // 打开警告弹框(确定+倒计时) const showWarningMessage = (mContent, callback) => { showConfirmCountdownModal('警告', mContent, callback) @@ -229,11 +233,10 @@ const showSelectWarningModal = (mContent, callback) => { } // 初始化弹框并打开(取消+确定） -const showSelectModal = (mIconType, mContent, callback,textColor) => { +const showSelectModal = (mIconType, mContent, callback) => { showModal({ iconType: mIconType, content: mContent, - textColor:textColor, success(res) { if (callback != undefined) { if (res.confirm == true) { @@ -247,7 +250,25 @@ const showSelectModal = (mIconType, mContent, callback,textColor) => { } }) } - +// 初始化弹框并打开(取消+确定） +const showSelectModal1 = (mIconType, mContent, callback,textColor)=> { + this.showModal({ + iconType: mIconType, + content: mContent, + textColor:textColor, + success: function(res) { + if (callback != undefined) { + if (res.confirm == true) { + callback(true); + console.log('用户点击确定') + } else { + callback(false); + console.log('用户点击取消') + } + } + } + }); +} // 打开疑问弹框(确定+倒计时) const showConfirmCountdownQuestionModal = (mContent, callback) => { showConfirmCountdownModal('疑问', mContent, callback) @@ -436,6 +457,7 @@ defineExpose({ showErrorMessage, showBreakMessage, showQuestionMessage, + showQuestionMessage1, showWarningMessage, showConfirmCountdownFailModal, showConfirmMessageModal, @@ -457,7 +479,7 @@ defineExpose({ showSelectCountdownWarningModal, showSelectCountdownQuestionModal, showMessage, - showModal + showModal, })