From 05fc8db3f8b7c42b58bfff6556f67b33f35cfd77 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Fri, 5 Sep 2025 14:26:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PopupConfirm/index.vue       |  2 +-
 src/pages/back/backCode.vue                 |  8 +++++++-
 src/pages/back/backNum.vue                  | 14 +++++++++++---
 src/pages/back/detail.vue                   |  6 ++++++
 src/pages/devicesSearch/ScanQrCode.vue      |  4 ----
 src/pages/picking/outbound/num-outbound.vue |  2 +-
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/components/PopupConfirm/index.vue b/src/components/PopupConfirm/index.vue
index cd00711..911c920 100644
--- a/src/components/PopupConfirm/index.vue
+++ b/src/components/PopupConfirm/index.vue
@@ -23,7 +23,7 @@ import { ref } from 'vue'
 
 const props = defineProps({
   title: { type: String, default: '提示' },
-  content: { type: String, default: '是否确定？' },
+  content: { type: String, default: '是否确定提交？' },
   showClose: { type: Boolean, default: true },
   leftBtn: { type: String, default: '取 消' },
   rightBtn: { type: String, default: '确 定' },
diff --git a/src/pages/back/backCode.vue b/src/pages/back/backCode.vue
index 3e07735..27dc43c 100644
--- a/src/pages/back/backCode.vue
+++ b/src/pages/back/backCode.vue
@@ -244,6 +244,7 @@
             <button class="btn-cont" @click="submitCode">确认</button>
         </div> -->
     </view>
+    <PopupConfirm ref="popupConfirm" />
 </template>
 
 <script setup>
@@ -262,6 +263,8 @@ import { baseURL } from '@/utils/http'
 import eselect from '@/components/tree-select/eselect.vue'
 import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
 import PreviewImg from '@/components/PreviewImg/index.vue'
+import PopupConfirm from '@/components/PopupConfirm'
+
 const taskInfo = ref({})
 const maId = ref('') //编码
 const maCode = ref('') //编码
@@ -287,6 +290,7 @@ const keyWord = ref('')
 const total = ref(0)
 const remark = ref('')
 const isRadioCheck = ref(true)
+const popupConfirm = ref()
 
 const leftClick = () => {
     // 返回
@@ -699,13 +703,15 @@ const onCodeIdentify = () => {
     })
 }
 //提交
-const submitCode = () => {
+const submitCode = async () => {
     console.log(taskInfo.value)
     if (selectCodeList.value.length == 0) {
         uni.showToast({ title: '请添加退料设备！', icon: 'none' })
     } else if (apDetection.value == '不合格' && bmFileInfos.value.length == 0) {
         uni.showToast({ title: '请上传附件！', icon: 'none' })
     } else {
+        const { data: confirm } = await popupConfirm.value.openPopup()
+        if (!confirm) return
         let obj = {
             // maId: maId.value,
             // maCode: maCode.value,
diff --git a/src/pages/back/backNum.vue b/src/pages/back/backNum.vue
index 10f9407..714e76f 100644
--- a/src/pages/back/backNum.vue
+++ b/src/pages/back/backNum.vue
@@ -158,6 +158,7 @@
             <button class="btn-cont" @click="submitNum">确认</button>
         </div>
     </view>
+    <PopupConfirm ref="popupConfirm" />
 </template>
 
 <script setup>
@@ -165,8 +166,9 @@ import { ref, reactive } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'  
 import { getUseType,insertApp } from '../../services/back.js';
 import eselect from '@/components/tree-select/eselect.vue'
-const taskInfo = ref({})    
+import PopupConfirm from '@/components/PopupConfirm'
 
+const taskInfo = ref({})    
 const maTypeSelectList = ref([])
 const typeId = ref()//类型
 const maCodeSelectList = ref([])
@@ -174,6 +176,7 @@ const typeCode = ref("")//规格型号
 const typeList = ref([])    
 const isExpanded = ref(false)
 const treeSelect = ref()
+const popupConfirm = ref()
 
 const leftClick = () => { 
     // 返回
@@ -263,7 +266,7 @@ const selectMaCode = (e) => {
   treeSelect.value.showLabel = '' // 清空下拉框的显示文本
 } 
 //提交
-const submitNum = () => {
+const submitNum = async () => {
     console.log(taskInfo.value)
     console.log(typeList.value)
     // 校验 preNum 必须大于 0
@@ -284,6 +287,8 @@ const submitNum = () => {
             return
         }
     }
+    const { data: confirm } = await popupConfirm.value.openPopup()
+    if (!confirm) return
     let obj = {
         "backApplyInfo":taskInfo.value,
         "backApplyDetailsList":typeList.value
@@ -295,7 +300,10 @@ const submitNum = () => {
 			uni.showToast({ title: '编辑成功', icon: 'none' })
             const pages = getCurrentPages()
             console.log('🚀 ~ submitNum ~ pages:', pages)
-            uni.redirectTo({ url: '/pages/back/index' })
+            // uni.redirectTo({ url: '/pages/back/index' })
+            uni.navigateBack({
+                delta: 1, // 返回到已存在的页面
+            })
 		}else{
 			uni.showToast({ title: res.msg, icon: 'none' })
 		}
diff --git a/src/pages/back/detail.vue b/src/pages/back/detail.vue
index 1a24283..cfc084f 100644
--- a/src/pages/back/detail.vue
+++ b/src/pages/back/detail.vue
@@ -71,12 +71,15 @@
 
         </div>
     </view>
+    <PopupConfirm ref="popupConfirm" />
 </template>
 
 <script setup>
 import { ref, reactive } from 'vue'
 import { getBackInfo,deleteNumType, submitBackApply } from '@/services/back.js';
 import { onLoad,onShow } from '@dcloudio/uni-app'
+import PopupConfirm from '@/components/PopupConfirm'
+
 const keyWord = ref('')
 const id = ref('') 
 const taskId = ref('')
@@ -86,6 +89,7 @@ const tableList = ref([])
 const taskInfo = ref({})
 const swipeRef = ref()
 const isNew = ref(false)
+const popupConfirm = ref()
 
 // 右滑按钮组
 const options = ref([
@@ -188,6 +192,8 @@ const onClick = (e, item, itemIndex) => {
 
 const isSubmit = ref(false)
 const submit = async () => {
+    const { data: confirm } = await popupConfirm.value.openPopup()
+    if (!confirm) return
     if (isSubmit.value) return
     isSubmit.value = true
     let param = {
diff --git a/src/pages/devicesSearch/ScanQrCode.vue b/src/pages/devicesSearch/ScanQrCode.vue
index 552366c..5082ccb 100644
--- a/src/pages/devicesSearch/ScanQrCode.vue
+++ b/src/pages/devicesSearch/ScanQrCode.vue
@@ -5,11 +5,7 @@
 
 <script setup>
 import { onMounted } from 'vue'
-import VConsole from 'vconsole'
 
-if (process.env.NODE_ENV === 'development') {
-  new VConsole()
-}
 // 定义自定义事件
 const emit = defineEmits(['scanSuccess', 'scanError'])
 
diff --git a/src/pages/picking/outbound/num-outbound.vue b/src/pages/picking/outbound/num-outbound.vue
index 08ac141..2d2831b 100644
--- a/src/pages/picking/outbound/num-outbound.vue
+++ b/src/pages/picking/outbound/num-outbound.vue
@@ -34,7 +34,7 @@
                         type="number"
                         :clearable="false"
                         placeholder="出库数量"
-                        @change="onChangeNumber"
+                        @input="onChangeNumber"
                     />
                 </uni-forms-item>
                 <!-- <uni-forms-item label="出库数量：">