From 9c873fee1a2d339319c3c4de68efdd7c3832cb68 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 18 Apr 2025 19:09:35 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/tickets/orderLog.vue | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 28d407a..f46fd3d 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -67,30 +67,27 @@
:table-loading="loading" @current-change="currentChange" @refresh-change="refreshChange"
@on-load="onLoad" @search-change="searchChange" @size-change="sizeChange">
<template #menu-left>
- <el-button v-if="hasAddBtnPermission()&&activeTab!='WAIT_AUDIT'" type="primary" icon="el-icon-plus"@click="handleAdd" >新建工单</el-button>
+ <el-button v-if="hasAddBtnPermission()&&activeTab!='WAIT_AUDIT'" type="primary" icon="el-icon-plus" @click="handleAdd" >新建工单</el-button>
<el-button type="success" plain icon="el-icon-download" @click="exportData">导出</el-button>
</template>
<template #menu="{ row }">
- <div v-if="row.status == 1 && userInfo.user_id != row.create_user">
+ <div v-if="row.status == 1">
<el-button v-if="hasPaddingBtnPermission()" type="text" icon="el-icon-view" @click="handleViewDetail(row)">审核</el-button>
- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
+
</div>
- <div v-if="userInfo.user_id == row.create_user">
+ <div v-if="userInfo.user_id == row.create_user || hasRecallPaddingBtnPermission()">
<!--待审核状态-->
<div v-if="row.status == 1">
<el-button type="text" icon="el-icon-warning-outline"
@click="orderLogRecall(row.id)">撤回</el-button>
- <el-button type="text" icon="el-icon-view"
- @click="handleViewDetail(row)">详情</el-button>
</div>
</div>
<!--已驳回-->
<div v-if="row.status == 2">
<el-button type="text" icon="el-icon-warning-outline"
@click="rejectDetail(row.id)">驳回原因</el-button>
- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
</div>
<!--草稿-->
<div v-if="row.status == 0 && userInfo.user_id == row.create_user">
@@ -101,7 +98,10 @@
<el-button type="text" icon="el-icon-delete"
@click="deleteOrderLog(row.id)">删除</el-button>
</div>
-
+ <div v-if="row.status == 3 || row.status == 1 || row.status == 2">
+
+ <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
+ </div>
</template>
<template #status="{ row }">
@@ -197,8 +197,8 @@
</el-dialog>
<!-- 工单详情对话框 -->
- <el-dialog v-model="detailVisible" title="工单详情" width="70%" :close-on-click-modal="false" @close="resetForm">
- <el-form :model="form" ref="form" label-width="100px">
+ <el-dialog v-model="detailVisible" title="工单详情" width="70%" :close-on-click-modal="false" @close="resetForm" >
+ <el-form :model="form" ref="testform" label-width="100px">
<div class="custom-steps-container">
<!-- 标题行 -->
<div class="steps-titles">
@@ -335,7 +335,7 @@
deleteOrderLog
} from '@/api/tickets/orderLog'
import { getTicketInfo } from '@/api/tickets/ticket'
-import { getDictionary } from '@/api/system/dictbiz'
+import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getWaylineFileListByArea } from '@/api/resource/wayline'
import { export_json_to_excel } from '@/utils/exportExcel'
import { getFlyingNestBy } from '@/api/device/device'
@@ -452,10 +452,10 @@
}
},
async created() {
- var response = await getDictionary({ code: 'SF' })
- var word_order_typeResponse = await getDictionary({ code: 'WORK_ORDER_TYPE' })
- this.ai_types = response.data.data
- this.types = word_order_typeResponse.data.data
+ var response = await getDictionaryByCode('SF')
+ var word_order_typeResponse = await getDictionaryByCode('WORK_ORDER_TYPE' )
+ this.ai_types = response.data.data['SF']
+ this.types = word_order_typeResponse.data.data['WORK_ORDER_TYPE'];
//获取航线
this.asyncgetWaylineFileListByArea()
const response2 = await getTicketInfo()
@@ -600,7 +600,7 @@
this.page.pageSize = pageSize
},
async submitForm(status) {
- console.log(this.$refs.testform, '111111')
+
this.$refs.testform.validate(async valid => {
if (valid) {
@@ -786,6 +786,11 @@
console.log('权限检查:', this.permission);
return this.permission && this.permission.order_log_review === true;
},
+ hasRecallPaddingBtnPermission() {
+ // undefined 或 false 都返回 false，只有 true 返回 true
+ console.log('权限检查:', this.permission);
+ return this.permission && this.permission.order_log_recall === true;
+ },
//自己点发布
userPublishPush(id) {
this.$confirm('确定发布吗?', '提示', {
--
Gitblit v1.9.3