From ee8589ea223a7ff864df467c4dbcafe9aa45909e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 20 Sep 2025 11:05:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v6.0/6.0.3' into feature/v6.0/6.0.3
---
src/views/tickets/orderLog.vue | 143 ++++++++++++++++++++++++++---------------------
1 files changed, 78 insertions(+), 65 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 759bd5c..9b7ac72 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -262,6 +262,7 @@
<!-- 新建工单对话框 -->
<el-dialog
+ class="ztzf-dialog-mange"
v-model="dialogVisible"
title="新建工单"
width="70%"
@@ -384,18 +385,26 @@
</el-col>
</el-row>
- <el-row>
- <div class="add-box-btns">
- <el-button type="danger" @click="submitForm(1)">发起</el-button>
- <el-button type="primary" @click="submitForm(0)">存草稿</el-button>
- <el-button @click="dialogVisible = false">取消</el-button>
- </div>
- </el-row>
+<!-- <el-row>-->
+<!-- <div class="add-box-btns">-->
+<!-- <el-button type="danger" @click="submitForm(1)">发起</el-button>-->
+<!-- <el-button type="primary" @click="submitForm(0)">存草稿</el-button>-->
+<!-- <el-button @click="dialogVisible = false">取消</el-button>-->
+<!-- </div>-->
+<!-- </el-row>-->
</el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="danger" @click="submitForm(1)">发起</el-button>
+ <el-button type="primary" @click="submitForm(0)">存草稿</el-button>
+ <el-button @click="dialogVisible = false" :icon="CircleClose">取消</el-button>
+ </div>
+ </template>
</el-dialog>
<!-- 工单详情对话框 -->
<el-dialog
+ class="ztzf-dialog-mange"
align-center
v-model="detailVisible"
:title="detailTitle"
@@ -573,43 +582,43 @@
<map-container v-if="detailVisible" ref="MapContainer"></map-container>
</el-col>
</el-row>
-
- <el-row>
- <div class="add-box-btns">
- <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 || (form.status == 2 && 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 && hasPaddingBtnPermission()"
- @click="orderLogPass(form.id)"
- >通过</el-button
- >
- <el-button
- type="danger"
- v-if="form.status == 1 && hasRejectionBtnPermission()"
- @click="orderLogReject(form.id)"
- >驳回</el-button
- >
- </div>
- </el-row>
</el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <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 || (form.status == 2 && 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 && hasPaddingBtnPermission()"
+ @click="orderLogPass(form.id)"
+ >通过</el-button
+ >
+ <el-button
+ type="danger"
+ v-if="form.status == 1 && hasRejectionBtnPermission()"
+ @click="orderLogReject(form.id)"
+ >驳回</el-button
+ >
+ </div>
+ </template>
</el-dialog>
<!-- 工单详情 -->
<el-dialog
+ class="ztzf-dialog-mange"
align-center
v-model="detailVisibleCopy"
title="工单详情"
@@ -778,33 +787,33 @@
</el-col>
</el-row>
- <el-row>
- <div class="add-box-btns">
- <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 == 1 && hasPaddingBtnPermission()"
- @click="orderLogPass(form.id)"
- >通过</el-button
- >
- <el-button
- type="danger"
- v-if="form.status == 1 && hasRejectionBtnPermission()"
- @click="orderLogReject(form.id)"
- >驳回</el-button
- >
- <el-button @click="detailVisibleCopy = false">取消</el-button>
- </div>
- </el-row>
</el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <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 == 1 && hasPaddingBtnPermission()"
+ @click="orderLogPass(form.id)"
+ >通过</el-button
+ >
+ <el-button
+ type="danger"
+ v-if="form.status == 1 && hasRejectionBtnPermission()"
+ @click="orderLogReject(form.id)"
+ >驳回</el-button
+ >
+ <el-button @click="detailVisibleCopy = false">取消</el-button>
+ </div>
+ </template>
</el-dialog>
</basic-container>
</template>
@@ -837,6 +846,7 @@
import 'dayjs/locale/zh-cn'; // 导入中文语言包
import weekday from 'dayjs/plugin/weekday';
import elTooltipCopy from '@/components/ElTooltipCopy.vue';
+import { CircleClose } from '@element-plus/icons-vue';
dayjs.extend(weekday);
dayjs.locale('zh-cn');
@@ -1067,6 +1077,9 @@
}
},
computed: {
+ CircleClose() {
+ return CircleClose
+ },
...mapGetters(['userInfo', 'permission']),
filteredTabs() {
// rejection_and_draft 权限控制“已驳回”和“草稿”tab
--
Gitblit v1.9.3