From 07eba43f0a3f61192bf6ded1cd89a4b941d05459 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 29 七月 2025 09:49:06 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/gongxuIn/form.vue |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/pages/gongxuIn/form.vue b/pages/gongxuIn/form.vue
index 44737b7..2ba6c79 100644
--- a/pages/gongxuIn/form.vue
+++ b/pages/gongxuIn/form.vue
@@ -924,9 +924,9 @@
             		        console.log(1,res);
 							uni.hideLoading()
             				if(res.data.count == 1){
-								let pages = getCurrentPages();
-								let prePage = pages[pages.length - 2]; 
-								prePage.$vm.getList()
+								// let pages = getCurrentPages();
+								// let prePage = pages[pages.length - 2]; 
+								// prePage.$vm.getList()
 								if(this.isEdit){
 									setTimeout(()=>{
 										uni.redirectTo({
@@ -934,15 +934,26 @@
 										})
 									},1000)
 								}else{
-									setTimeout(()=>{
-										uni.navigateBack()
-									},1000)
+									uni.showModal({
+									    title: '鎻愮ず',
+									    content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+									    success: (res) => {
+									        if (res.confirm) {
+									            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+												uni.redirectTo({
+													url:'/pages/gongxuIn/form?OperationType=1'
+												})
+									        } else if (res.cancel) {
+									            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+												setTimeout(()=>{
+													uni.navigateBack();
+												},50)
+									        }
+									    }
+									});
 								}
             				}
-            				uni.showToast({
-            					title:res.data.Message,
-            					icon:'none'
-            				})
+
             			},
             			fail: (res) => {
             				console.log(res);

--
Gitblit v1.9.1