From 4ecdc50ae3deea4714b4638936ff8244f9839aff Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 三月 2025 17:43:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/visitorApprove.vue | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/h5/pages/staff/task/visitorApprove.vue b/h5/pages/staff/task/visitorApprove.vue
index 970f44b..af5b291 100644
--- a/h5/pages/staff/task/visitorApprove.vue
+++ b/h5/pages/staff/task/visitorApprove.vue
@@ -106,7 +106,10 @@
info.approveDateVO.canBeApproved != null &&
info.approveDateVO.canBeApproved == 1
" class="main_footer">
+ <view class="btn" @click="cancelShow = true" v-if="checkAuth('business:visits:cancel') && [0,1,2,5].includes(info.status)">鍙栨秷棰勭害</view>
+ <view style="width: 30rpx; height: 100%;"></view>
<view class="btn" @click="handleSub(3)">鎷掔粷</view>
+ <view style="width: 30rpx; height: 100%;"></view>
<view class="btn agree" @click="handleSub(2)">鍚屾剰</view>
</view>
@@ -118,10 +121,19 @@
" placeholder-class="placeholder9" />
<view class="main_footer">
<view class="btn" @click="showApprModal = false">鍙栨秷</view>
+ <view style="width: 30rpx; height: 100%;"></view>
<view class="btn agree" @click="onSubmit">鎻愪氦</view>
</view>
</view>
</u-popup>
+ <!-- 鍙栨秷棰勭害寮圭獥 -->
+ <u-modal
+ :show="cancelShow"
+ :showCancelButton="true"
+ title="绯荤粺鎻愮ず"
+ content='纭畾鍙栨秷褰撳墠棰勭害鍚楋紵'
+ @cancel="cancelShow = false"
+ @confirm="cancel" />
</view>
</template>
@@ -133,6 +145,9 @@
export default {
data() {
return {
+ userInfo: uni.getStorageSync('userInfo') || {
+ permissions: []
+ },
showApprModal: false,
param: {},
info: {},
@@ -167,7 +182,8 @@
2: '宸查�氳繃',
3: '宸叉嫆缁�',
4: '宸插彇娑�',
- }
+ },
+ cancelShow: false
}
},
onLoad(op) {
@@ -176,6 +192,16 @@
this.getDetail()
},
methods: {
+ // 鍙栨秷棰勭害
+ cancel() {
+ visitsCancel(this.id).then(res => {
+ this.getDetail()
+ })
+ },
+ checkAuth(str) {
+ const permissions = this.userInfo.permissions || []
+ return permissions.indexOf(str) > -1
+ },
getDetail() {
const {
id
@@ -503,7 +529,8 @@
background: #ffffff;
.btn {
- width: 336rpx;
+ // width: 336rpx;
+ flex: 1;
height: 88rpx;
line-height: 88rpx;
background: #ffffff;
--
Gitblit v1.9.3