From 396f6abb986cb97b99c5f7c069280d514eff3f3f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 21 七月 2025 08:40:11 +0800
Subject: [PATCH] 修改页面退出逻辑
---
pages/caigourukujiaoyan/form.vue | 17 +++--
pages/qitarukujiaoyan/table.vue | 12 ++--
pages/xiaoshouchukujiaoyan/form.vue | 16 ++++
pages/qitarukujiaoyan/form.vue | 27 ++++++--
pages/shengchanbuliaojiaoyan/CacheList.vue | 8 ++
pages/weiwailingliaojiaoyan/form.vue | 12 ++++
pages/shengchanbuliaojiaoyan/form.vue | 14 ++++
pages/caigourukujiaoyan/table.vue | 6 ++
pages/weiwailingliaojiaoyan/table.vue | 6 ++
pages/weiwaibuliaojiaoyan/form.vue | 6 ++
10 files changed, 100 insertions(+), 24 deletions(-)
diff --git a/pages/caigourukujiaoyan/form.vue b/pages/caigourukujiaoyan/form.vue
index 804027a..828da3f 100644
--- a/pages/caigourukujiaoyan/form.vue
+++ b/pages/caigourukujiaoyan/form.vue
@@ -84,10 +84,10 @@
<uni-card :title="item.鐗╂枡鍚嶇О" :extra="'鏁伴噺:'+item.鏁伴噺" style="margin: 10px;" @tap="delMater(item)">
<view class="card-detail">
<view class="detail">
- <text>鍗曟嵁鍙凤細</text>{{item.鍗曟嵁鍙穧}
+ <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>鍗曟嵁鏁伴噺锛�</text>{{item.鍗曟嵁鏁伴噺}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
@@ -98,10 +98,13 @@
<view class="detail" v-if="item.杈呭姪灞炴��">
<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
</view>
- <view class="detail" v-if="item.鍗曟嵁鏁伴噺">
- <text>鍗曟嵁鏁伴噺锛�</text>{{item.鍗曟嵁鏁伴噺}}
+ <view class="detail" v-if="item.浠撳簱">
+ <text>浠撳簱锛�</text>{{item.浠撳簱}}
</view>
- <view class="detail" v-if="item.鏉＄爜涓暟">
+ <view class="detail" v-if="item.浠撲綅">
+ <text>浠撲綅锛�</text>{{item.浠撲綅}}
+ </view>
+ <view class="detail" >
<text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
</view>
</view>
@@ -777,8 +780,8 @@
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/qitachukujiaoyan/qitachukujiaoyan'
+ uni.navigateBack({
+ url: '/pages/caigourukujiaoyan/table'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/caigourukujiaoyan/table.vue b/pages/caigourukujiaoyan/table.vue
index 0050506..9a16885 100644
--- a/pages/caigourukujiaoyan/table.vue
+++ b/pages/caigourukujiaoyan/table.vue
@@ -133,6 +133,12 @@
}
},
onLoad() {
+ // //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ // this.CheckModRight()
+ // this.changeTab(0)
+ // console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ },
+ onShow() {
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
this.changeTab(0)
diff --git a/pages/qitarukujiaoyan/form.vue b/pages/qitarukujiaoyan/form.vue
index 9151e02..8e3cb4a 100644
--- a/pages/qitarukujiaoyan/form.vue
+++ b/pages/qitarukujiaoyan/form.vue
@@ -25,7 +25,7 @@
</view>
<view class="form-item">
<view class="title">浠撲綅:</view>
- <view class="right" >
+ <view class="right">
<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
</view>
@@ -76,7 +76,7 @@
</view>
</view>
<label class="checkbox" style="float: right;">
- <checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc"/>鏉＄爜鏍稿
+ <checkbox :checked="hform.chkHBarflag" style="transform:scale(0.8)" disabled color="#4f81fc" />鏉＄爜鏍稿
</label>
</view>
<view v-if="tabs == 2">
@@ -86,6 +86,9 @@
<view class="detail">
<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
+ <view class="detail">
+ <text>鍗曟嵁鏁伴噺锛�</text>{{item.鍗曟嵁鏁伴噺}}
+ </view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
@@ -94,6 +97,15 @@
</view>
<view class="detail" v-if="item.杈呭姪灞炴��">
<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+ </view>
+ <view class="detail" v-if="item.浠撳簱">
+ <text>浠撳簱锛�</text>{{item.浠撳簱}}
+ </view>
+ <view class="detail" v-if="item.浠撲綅">
+ <text>浠撲綅锛�</text>{{item.浠撲綅}}
+ </view>
+ <view class="detail" >
+ <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
</view>
</view>
</uni-card>
@@ -181,7 +193,7 @@
HModName: 'Kf_OtherInBill_CheckList_PDA',
ModRightName: 'CE_OtherInCheck',
OperationType: 1,
-
+
showHBillNo: true,
tabs: 1,
linterid: '',
@@ -265,7 +277,7 @@
// }else{
// this.hform.HBarCode = res.result
// }
-
+
this.hform.HBillNo = res.result
this.GetMeesageByBillNo(this.hform.HBillNo)
}
@@ -855,8 +867,8 @@
padding: 8rpx 20rpx;
font-size: 30rpx;
}
-
-
+
+
textarea {
width: 98%;
@@ -943,7 +955,8 @@
text-align: center;
}
}
- .checkbox{
+
+ .checkbox {
color: #888;
font-size: 28rpx;
margin-top: 30rpx;
diff --git a/pages/qitarukujiaoyan/table.vue b/pages/qitarukujiaoyan/table.vue
index 03ebec4..ee407b7 100644
--- a/pages/qitarukujiaoyan/table.vue
+++ b/pages/qitarukujiaoyan/table.vue
@@ -128,12 +128,12 @@
page:1,
}
},
- onLoad() {
- //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
- this.CheckModRight()
- this.changeTab(0)
- console.log(this.userInfo,uni.getStorageSync('HUserName'))
- },
+ // onLoad() {
+ // //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ // this.CheckModRight()
+ // this.changeTab(0)
+ // console.log(this.userInfo,uni.getStorageSync('HUserName'))
+ // },
onShow() {
this.CheckModRight()
this.changeTab(0)
diff --git a/pages/shengchanbuliaojiaoyan/CacheList.vue b/pages/shengchanbuliaojiaoyan/CacheList.vue
index 63fbb73..0196a97 100644
--- a/pages/shengchanbuliaojiaoyan/CacheList.vue
+++ b/pages/shengchanbuliaojiaoyan/CacheList.vue
@@ -128,7 +128,13 @@
page:1,
}
},
- onLoad() {
+ // onLoad() {
+ // //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ // this.CheckModRight()
+ // this.changeTab(0)
+ // console.log(this.userInfo,uni.getStorageSync('HUserName'))
+ // },
+ onShow() {
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
this.changeTab(0)
diff --git a/pages/shengchanbuliaojiaoyan/form.vue b/pages/shengchanbuliaojiaoyan/form.vue
index 7b7fd4f..3bc8469 100644
--- a/pages/shengchanbuliaojiaoyan/form.vue
+++ b/pages/shengchanbuliaojiaoyan/form.vue
@@ -22,7 +22,7 @@
</view>
<view class="form-item">
<view class="title">浠撲綅:</view>
- <view class="right" >
+ <view class="right">
<uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
</view>
<!-- <view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName" placeholder="涓嶅彲鎿嶄綔"/></view> -->
@@ -240,6 +240,18 @@
this.getHBaseList()
+ },onLoad(e) {
+ console.log(e, this.userInfo)
+ this.OperationType = e.OperationType
+ if (e.HBillNo) {
+ this.hform.HBillNo = e.HBillNo
+ this.GetMeesageByBillNo(e.HBillNo)
+ } else {
+ // this.getNewData()
+ }
+
+
+ this.getHBaseList()
},
methods: {
//鏉＄爜鍙锋壂鐮�
diff --git a/pages/weiwaibuliaojiaoyan/form.vue b/pages/weiwaibuliaojiaoyan/form.vue
index 3e5e1b2..d36f155 100644
--- a/pages/weiwaibuliaojiaoyan/form.vue
+++ b/pages/weiwaibuliaojiaoyan/form.vue
@@ -86,6 +86,9 @@
<view class="detail">
<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
+ <view class="detail">
+ <text>鍗曟嵁鏁伴噺锛�</text>{{item.鍗曟嵁鏁伴噺}}
+ </view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
@@ -95,6 +98,9 @@
<view class="detail" v-if="item.杈呭姪灞炴��">
<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
</view>
+ <view class="detail">
+ <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+ </view>
</view>
</uni-card>
</view>
diff --git a/pages/weiwailingliaojiaoyan/form.vue b/pages/weiwailingliaojiaoyan/form.vue
index d19bb7a..73a9248 100644
--- a/pages/weiwailingliaojiaoyan/form.vue
+++ b/pages/weiwailingliaojiaoyan/form.vue
@@ -87,6 +87,9 @@
<view class="detail">
<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
+ <view class="detail">
+ <text>鍗曟嵁鏁伴噺锛�</text>{{item.鍗曟嵁鏁伴噺}}
+ </view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
@@ -96,6 +99,15 @@
<view class="detail" v-if="item.杈呭姪灞炴��">
<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
</view>
+ <view class="detail" v-if="item.浠撳簱">
+ <text>浠撳簱锛�</text>{{item.浠撳簱}}
+ </view>
+ <view class="detail" v-if="item.浠撲綅">
+ <text>浠撲綅锛�</text>{{item.浠撲綅}}
+ </view>
+ <view class="detail" >
+ <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
+ </view>
</view>
</uni-card>
</view>
diff --git a/pages/weiwailingliaojiaoyan/table.vue b/pages/weiwailingliaojiaoyan/table.vue
index 7218354..f7a7649 100644
--- a/pages/weiwailingliaojiaoyan/table.vue
+++ b/pages/weiwailingliaojiaoyan/table.vue
@@ -133,6 +133,12 @@
}
},
onLoad() {
+ // //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ // this.CheckModRight()
+ // this.changeTab(0)
+ // console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ },
+ onShow() {
//鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
this.CheckModRight()
this.changeTab(0)
diff --git a/pages/xiaoshouchukujiaoyan/form.vue b/pages/xiaoshouchukujiaoyan/form.vue
index 147675e..f7d6e42 100644
--- a/pages/xiaoshouchukujiaoyan/form.vue
+++ b/pages/xiaoshouchukujiaoyan/form.vue
@@ -86,6 +86,9 @@
<view class="detail">
<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
+ <view class="detail">
+ <text>鍗曟嵁鏁伴噺锛�</text>{{item.鍗曟嵁鏁伴噺}}
+ </view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
@@ -94,6 +97,15 @@
</view>
<view class="detail" v-if="item.杈呭姪灞炴��">
<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
+ </view>
+ <view class="detail" v-if="item.浠撳簱">
+ <text>浠撳簱锛�</text>{{item.浠撳簱}}
+ </view>
+ <view class="detail" v-if="item.浠撲綅">
+ <text>浠撲綅锛�</text>{{item.浠撲綅}}
+ </view>
+ <view class="detail" >
+ <text>鏉＄爜涓暟锛�</text>{{item.鏉＄爜涓暟}}
</view>
</view>
</uni-card>
@@ -768,8 +780,8 @@
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/qitachukujiaoyan/qitachukujiaoyan'
+ uni.navigateBack({
+ url: '/pages/xiaoshouchukujiaoyan/table'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
--
Gitblit v1.9.1