From 682f51fa9da27bd9df6105b2e27de89c460e5c47 Mon Sep 17 00:00:00 2001
From: rjg <746338628@qq.com>
Date: Tue, 22 Apr 2025 11:37:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature_0.1_04' into test
---
src/views/tickets/orderLog.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 8590d70..29a0098 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -287,12 +287,12 @@
<el-button type="danger"
v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
@click="submitForm(1)">发布</el-button>
- <!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
- @click="submitForm(0)">保存</el-button> -->
+ <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
+ @click="submitForm(0)">保存</el-button>
- <el-button type="primary" v-if="form.status == 1 && userInfo.user_id != form.create_user"
+ <el-button type="primary" v-if="form.status == 1 && this.permission.orderLogpass"
@click="orderLogPass(form.id)">通过</el-button>
- <el-button type="danger" v-if="form.status == 1 && userInfo.user_id != form.create_user"
+ <el-button type="danger" v-if="form.status == 1 && hasRejectionBtnPermission()"
@click="orderLogReject(form.id)">驳回</el-button>
</el-col>
<el-col :span="3">
@@ -791,6 +791,12 @@
console.log('权限检查:', this.permission);
return this.permission && this.permission.order_log_recall === true;
},
+ //驳回按钮权限
+ hasRejectionBtnPermission() {
+ // undefined 或 false 都返回 false，只有 true 返回 true
+ console.log('权限检查:', this.permission);
+ return this.permission && this.permission.rejection_btn === true;
+ },
//自己点发布
userPublishPush(id) {
this.$confirm('确定发布吗?', '提示', {
--
Gitblit v1.9.3