提示bug 2024/8/9

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,
 })
 </script>
 <style lang="scss" scoped>

src/pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -304,7 +304,7 @@ const commit = () => {
   })
   if (str) {
     str += '，是否确认提交?'
-    comMessageRef.value.showQuestionMessage(str, 'red', res => {
+    comMessageRef.value.showQuestionMessage1(str, 'red', res => {
       if (res) {
         submitJob()
       }

src/pages/productReceipt/job/scrapReceiptDetail.vue

@@ -246,7 +246,7 @@ const commit = () => {
   })
   if (str) {
     str += '，是否确认提交?'
-    comMessageRef.value.showQuestionMessage(str, 'red', res => {
+    comMessageRef.value.showQuestionMessage1(str, 'red', res => {
       if (res) {
         submitJob()
       }

src/pages/productRecycle/job/productRecycleJobDetail.vue

@@ -267,7 +267,7 @@ const commit = () => {
   })
   if (str) {
     str += '，是否确认提交?'
-    comMessageRef.value.showQuestionMessage(str, 'red', res => {
+    comMessageRef.value.showQuestionMessage1(str, 'red', res => {
       if (res) {
         submitJob()
       }

src/pages/productionReturn/job/returnDetail.vue

@@ -243,7 +243,7 @@ const commit = () => {
   })
   if (str) {
     str += '，是否确认提交?'
-    comMessageRef.value.showQuestionMessage(str, 'red', res => {
+    comMessageRef.value.showQuestionMessage1(str, 'red', res => {
       if (res) {
         submitJob()
       }

src/pages/scrap/job/scrapJobDetail.vue

@@ -249,7 +249,7 @@ const commit = () => {
   })
   if (str) {
     str += '，是否确认提交?'
-    comMessageRef.value.showQuestionMessage(str, 'red', res => {
+    comMessageRef.value.showQuestionMessage1(str, 'red', res => {
       if (res) {
         submitJob()
       }

src/pages/unPlanned/job/issueJobDetail.vue

@@ -244,7 +244,7 @@ const commit = () => {
   })
   if (str) {
     str += '，是否确认提交?'
-    comMessageRef.value.showQuestionMessage(str, 'red', res => {
+    comMessageRef.value.showQuestionMessage1(str, 'red', res => {
       if (res) {
         submitJob()
       }