From 98cba1b9cb955aec0e526a922fa9528a78a85db4 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 30 Jan 2026 14:12:17 +0800
Subject: [PATCH] feat: 按钮控制调整
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 43 +++++++---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue | 8 +-
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue | 2
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 75 +++++++++---------
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 105 +++++++++++++++-----------
applications/drone-command/src/views/areaManage/sceneManage/index.vue | 4
applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue | 2
7 files changed, 134 insertions(+), 105 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/sceneManage/index.vue b/applications/drone-command/src/views/areaManage/sceneManage/index.vue
index 503d3d7..f9f4689 100644
--- a/applications/drone-command/src/views/areaManage/sceneManage/index.vue
+++ b/applications/drone-command/src/views/areaManage/sceneManage/index.vue
@@ -36,12 +36,12 @@
</el-table-column>
<el-table-column prop="defenseLeader" show-overflow-tooltip label="防控负责人" />
<el-table-column prop="leaderPhone" show-overflow-tooltip label="防控负责人电话" />
- <el-table-column show-overflow-tooltip label="有效时间">
+ <el-table-column show-overflow-tooltip label="有效时间" width="300">
<template v-slot="{ row }">
{{ formatEffectiveDate(row) }}
</template>
</el-table-column>
- <el-table-column prop="defenseSceneId" show-overflow-tooltip label="关联场景配置ID" />
+ <el-table-column prop="defenseSceneName" show-overflow-tooltip label="关联场景配置" />
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
<el-link @click="openForm('view', row)">查看</el-link>
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue
index 50b19e9..08b4a6f 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue
@@ -2,7 +2,7 @@
<el-dialog
class="gd-dialog"
v-model="visible"
- title="编辑"
+ :title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
:close-on-click-modal="false"
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
index 73953d4..b2fa57a 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -205,34 +205,35 @@
</div>
<template #footer>
- <template v-if="requester">
- <el-button v-if="['1', '4'].includes(taskStatus)" @click="viewDescription" color="#F2F3F5">
- {{ gdStatusObj[taskStatus].reason }}
- </el-button>
- <el-button @click="statusChange(3)" v-if="taskStatus === '3'" color="#4C34FF">撤回任务</el-button>
+ <el-button v-if="['1', '4', '7'].includes(taskStatus)" @click="viewDescription" color="#F2F3F5">
+ {{ gdStatusObj[taskStatus].reason }}
+ </el-button>
+ <el-button @click="statusChange(3)" v-if="taskStatus === '3' && permission.flyOrder_revoke" color="#4C34FF">
+ 撤回任务
+ </el-button>
+
+ <template v-if="permission.flyOrder_controlAcceptance">
<el-button @click="refusalToAccept" v-if="taskStatus === '6'" color="#F2F3F5">拒绝验收</el-button>
<el-button @click="statusChange(6)" v-if="taskStatus === '6'" color="#4C34FF">验收通过</el-button>
- <el-button
- v-if="!dialogReadonly || ['1', '4'].includes(taskStatus)"
- :loading="submitting"
- :disabled="submitting"
- color="#4C34FF"
- @click="handleSubmit"
- >
- 提交
- </el-button>
</template>
- <template v-else>
- <el-button v-if="['7'].includes(taskStatus)" @click="viewDescription" color="#F2F3F5">
- {{ gdStatusObj[taskStatus].reason }}
- </el-button>
+ <el-button
+ v-if="!dialogReadonly || (['1', '4'].includes(taskStatus) && permission.flyOrder_add)"
+ :loading="submitting"
+ :disabled="submitting"
+ color="#4C34FF"
+ @click="handleSubmit"
+ >
+ 提交
+ </el-button>
+ <template v-if="permission.flyOrder_controlSignFor">
<el-button v-if="taskStatus === '0'" @click="addDescription" color="#F2F3F5">拒绝签收</el-button>
<el-button v-if="taskStatus === '0'" @click="statusChange(1)" color="#4C34FF">签收</el-button>
+ </template>
+ <template v-if="permission.flyOrder_controlReview">
<el-button v-if="taskStatus === '3'" @click="addDescription" color="#F2F3F5">驳回</el-button>
<el-button v-if="taskStatus === '3'" @click="statusChange(4)" color="#4C34FF">同意</el-button>
</template>
</template>
-
<RefuseOrderDialog1
ref="refuseOrderDialogRef"
v-if="rejectVisible"
@@ -252,11 +253,11 @@
import { pxToRem } from '@/utils/rem'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import { gdTaskResultListApi } from '@/views/orderView/orderManage/clueEvents/achievementApi'
-import RefuseOrderDialog from '@/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue'
import RefuseOrderDialog1 from '@/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue'
import { Check } from '@element-plus/icons-vue'
import { queryAirById } from '@/api/zkxt'
import * as Cesium from 'cesium'
+import { useStore } from 'vuex'
// 初始化表单数据
const initForm = () => ({
@@ -270,11 +271,12 @@
taskDesc: '',
workOrderId: null,
})
+const store = useStore()
+const permission = computed(() => store.state.user.permission)
const rejectVisible = ref(false)
const mapRef = ref(null)
const dictObj = inject('dictObj')
-const requester = inject('requester')
const emit = defineEmits(['success', 'refusalAccept'])
const formRef = ref(null)
const formData = ref(initForm())
@@ -372,7 +374,7 @@
// 获取飞手列表
async function getFlyerList() {
- const res = await gdFlyerPageApi({ size: 999,current: 1 })
+ const res = await gdFlyerPageApi({ size: 999, current: 1 })
flyerList.value = res?.data?.data?.records ?? []
}
@@ -521,23 +523,22 @@
</script>
<style lang="scss" scoped>
-
/* 时间线样式 */
:deep(.gd-timeline) {
- padding-left: 90px;
+ padding-left: 90px;
}
:deep(.el-timeline-item) {
- padding-bottom: 20px;
- .item-content {
- position: relative;
- .flowName {
- width: 80px;
- position: absolute;
- left: -120px;
- top: 0px;
- }
- }
+ padding-bottom: 20px;
+ .item-content {
+ position: relative;
+ .flowName {
+ width: 80px;
+ position: absolute;
+ left: -120px;
+ top: 0px;
+ }
+ }
}
.imgBox {
display: flex;
@@ -554,8 +555,8 @@
}
}
:deep(.el-timeline-item__timestamp) {
- font-size: 12px;
- color: #999;
- margin-top: 2px;
+ font-size: 12px;
+ color: #999;
+ margin-top: 2px;
}
</style>
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
index 08fcba2..5d5e76d 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
@@ -72,7 +72,7 @@
</el-form>
<div class="gd-table-toolbar">
- <el-button v-if="requester" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增</el-button>
+ <el-button v-if="permission.flyOrder_add" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增</el-button>
</div>
<div class="gd-table-container" v-loading="loading">
@@ -139,7 +139,8 @@
import { airlineListApi } from '@/api/zkxt'
const store = useStore()
-const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
+const permission = computed(() => store.state.user.permission)
+
// 初始化查询参数
const initSearchParams = () => ({
patrolTaskName: '', // 任务名称
@@ -169,7 +170,6 @@
})
const activeName = ref('all')
provide('dictObj', dictObj)
-provide('requester', requester)
// 获取列表
async function getList() {
@@ -222,7 +222,7 @@
function viewDiaLogView(row) {
viewDiaLogVisible.value = true
nextTick(() => {
- let mode = ['1', '4'].includes(row.taskStatus) && requester.value ? 'edit' : 'view'
+ let mode = ['1', '4'].includes(row.taskStatus) && permission.value.flyOrder_add ? 'edit' : 'view'
viewDiaLogRef.value?.open({ mode, row })
})
}
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index 1da7cd5..41e1040 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -194,46 +194,64 @@
</div>
<template #footer>
- <template v-if="requester">
- <template v-if="!suddenlyEdit">
- <el-button
- v-if="['11', '21', '23', '24', '25', '31', '60'].includes(gdStatus)"
- @click="viewDescription"
- color="#F2F3F5"
- >
- {{ gdStatusObj[gdStatus].reason }}
- </el-button>
- <el-button @click="addDescription" v-if="['20', '24', '25'].includes(gdStatus)" color="#F2F3F5">
- 申请取消
- </el-button>
- <el-button color="#4C34FF" @click="requestModification" v-if="['20', '25'].includes(gdStatus)">
- 申请修改
- </el-button>
- </template>
+ <el-button
+ v-if="['11', '21', '23','31', '60'].includes(gdStatus)"
+ @click="viewDescription"
+ color="#F2F3F5"
+ >
+ {{ gdStatusObj[gdStatus].reason }}
+ </el-button>
+
+ <template v-if="!suddenlyEdit">
<el-button
- v-if="['11'].includes(gdStatus) || suddenlyEdit || (!dialogReadonly && !formData.id)"
- :loading="submitting"
- :disabled="submitting"
- color="#4C34FF"
- @click="handleSubmit"
+ @click="addDescription"
+ v-if="['20'].includes(gdStatus) && permission.order_applyCancel"
+ color="#F2F3F5"
>
- {{ gdStatus === '11' || !gdStatus ? '发布' : '提交修改' }}
+ 申请取消
+ </el-button>
+ <el-button
+ color="#4C34FF"
+ @click="requestModification"
+ v-if="['20'].includes(gdStatus) && permission.order_applyNegotiation"
+ >
+ 申请修改
</el-button>
</template>
- <template v-else>
- <el-button v-if="['21', '23'].includes(gdStatus)" @click="viewDescription" color="#F2F3F5">
- {{ gdStatusObj[gdStatus].reason }}
- </el-button>
- <el-button v-if="gdStatus === '50'" @click="addDescription" color="#F2F3F5">结算</el-button>
+ <el-button
+ v-if="(['11'].includes(gdStatus) || suddenlyEdit || !formData.id) && permission.order_release"
+ :loading="submitting"
+ :disabled="submitting"
+ color="#4C34FF"
+ @click="handleSubmit"
+ >
+ {{ gdStatus === '11' || !gdStatus ? '发布' : '提交修改' }}
+ </el-button>
+ <el-button v-if="gdStatus === '50' && permission.order_settlement" @click="addDescription" color="#F2F3F5">
+ 结算
+ </el-button>
+ <template v-if="permission.order_controlOrder">
<el-button v-if="gdStatus === '10'" @click="addDescription" color="#F2F3F5">拒绝接单</el-button>
<el-button v-if="gdStatus === '10'" @click="statusChange(1)" color="#4C34FF">接单</el-button>
- <el-button v-if="gdStatus === '22'" @click="addDescription" color="#F2F3F5">不同意修改</el-button>
- <el-button v-if="gdStatus === '22'" @click="statusChange(7)" color="#4C34FF">同意修改</el-button>
- <el-button v-if="gdStatus === '21'" @click="addDescription" color="#F2F3F5">不同意取消</el-button>
- <el-button v-if="gdStatus === '21'" @click="statusChange(5)" color="#4C34FF">同意取消</el-button>
- <el-button v-if="gdStatus === '30'" @click="addDescription" color="#4C34FF">协商修改</el-button>
- <el-button v-if="gdStatus === '31'" @click="statusChange(10)" color="#4C34FF">同意</el-button>
</template>
+ <template v-if="permission.order_controlEdit">
+ <el-button v-if="gdStatus === '22'" @click="statusChange(8)" color="#F2F3F5">驳回</el-button>
+ <el-button v-if="gdStatus === '22'" @click="statusChange(7)" color="#4C34FF">同意</el-button>
+ </template>
+ <template v-if="permission.order_controlCancel">
+ <el-button v-if="gdStatus === '21'" @click="statusChange(6)" color="#F2F3F5">驳回</el-button>
+ <el-button v-if="gdStatus === '21'" @click="statusChange(5)" color="#4C34FF">同意</el-button>
+ </template>
+ <el-button v-if="gdStatus === '30' && permission.order_applyNegotiation" @click="addDescription" color="#4C34FF">
+ 协商修改
+ </el-button>
+ <el-button
+ v-if="gdStatus === '31' && permission.order_controlNegotiation"
+ @click="statusChange(10)"
+ color="#4C34FF"
+ >
+ 同意
+ </el-button>
</template>
<RefuseOrderDialog
@@ -267,6 +285,9 @@
import { Check } from '@element-plus/icons-vue'
import droneIcon from '@/assets/images/orderView/orderManage/drone.png'
import droneActiveIcon from '@/assets/images/orderView/orderManage/droneActive.png'
+import { useStore } from 'vuex'
+const store = useStore()
+const permission = computed(() => store.state.user.permission)
// 初始化表单数据
const initForm = () => ({
@@ -307,23 +328,19 @@
const hasPatrolTaskList = computed(() => ['30', '40', '50', '60'].includes(String(formData.value.workOrderStatus)))
const gdStatusObj = {
- '10': { reason: '拒绝原因', operationType: '2' },
- '11': { reason: '拒绝原因' },
+ '10': { reason: '驳回原因', operationType: '2' },
+ '11': { reason: '驳回原因' },
'20': { reason: '取消原因', operationType: '3' },
- '21': { reason: '原因', operationType: '6' },
- '22': { reason: '驳回原因', operationType: '8' },
'23': { reason: '取消原因' },
- '24': { reason: '驳回原因', operationType: '3' },
- '25': { reason: '驳回原因', operationType: '3' },
- '30': { reason: '修改原因', operationType: '9' },
- '31': { reason: '修改原因' },
+ '30': { reason: '协商修改原因', operationType: '9' },
+ '31': { reason: '协商修改原因' },
'40': { reason: '' },
'50': { reason: '情况说明', operationType: '11' },
'60': { reason: '情况说明' },
}
// 工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、21响应中_申请取消、22响应中_申请修改、23响应中_已取消、
-// 24响应中_拒绝取消、25响应中_拒绝修改 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、50验收通过_待结算、60结算完成_已结算
+// 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、50验收通过_待结算、60结算完成_已结算
const gdStatus = computed(() => formData.value?.workOrderStatus)
const rules = {
@@ -596,9 +613,7 @@
const image = entity.billboard?.image?._value
if ((image === droneIcon || image === droneActiveIcon) && entity.label) {
const device = deviceList.value.find(d => d.nickname === entity.label.text._value)
- entity.billboard.image = device && selectedIds.includes(String(device.id))
- ? droneActiveIcon
- : droneIcon
+ entity.billboard.image = device && selectedIds.includes(String(device.id)) ? droneActiveIcon : droneIcon
}
})
}
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
index adfa2b9..4a28286 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
@@ -2,7 +2,7 @@
<el-dialog
class="gd-dialog"
v-model="visible"
- title="编辑"
+ :title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
:close-on-click-modal="false"
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
index 7864d2f..da197d7 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
@@ -72,17 +72,31 @@
</el-form>
<div class="gd-table-toolbar">
-<!-- <el-button color="#F2F3F5" @click="requester = !requester">我是{{ requester ? '需求方' : '服务方' }}</el-button>-->
-<!-- <el-button color="#F2F3F5" @click="previewVisible = true">预览</el-button>-->
- <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')" v-if="requester">新增</el-button>
- <el-button :icon="Delete" color="#4C34FF" :disabled="!selectedIds.length" @click="handleDelete()" v-if="requester">删除</el-button>
+ <el-button
+ v-if="permission.order_release"
+ :icon="Plus"
+ color="#4C34FF"
+ type="primary"
+ @click="openForm('add')"
+ >
+ 新增
+ </el-button>
+<!-- <el-button
+ :icon="Delete"
+ color="#4C34FF"
+ :disabled="!selectedIds.length"
+ @click="handleDelete()"
+ v-if="permission.order_delete"
+ >
+ 删除
+ </el-button>-->
</div>
<div class="gd-table-container" v-loading="loading">
<div class="gd-table-content gd-table-content-bg">
<el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="46" v-if="requester"/>
+ <el-table-column type="selection" width="46" v-if="permission.order_delete" />
<el-table-column type="index" width="64" label="序号" />
<el-table-column prop="workOrderName" show-overflow-tooltip label="工单名称" />
<el-table-column prop="workOrderCode" show-overflow-tooltip label="工单编号" />
@@ -112,9 +126,9 @@
<el-table-column prop="createTime" show-overflow-tooltip label="工单创建时间" />
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
- <el-link type="primary" @click="openFormChange(row)">查看</el-link>
+ <el-link type="primary" @click="openFormChange(row)">查看</el-link>
<!--<el-link type="primary" @click="openForm('edit', row)">编辑</el-link>-->
- <el-link type="primary" @click="handleDelete(row)" v-if="requester">删除</el-link>
+<!-- <el-link type="primary" @click="handleDelete(row)" v-if="permission.order_delete">删除</el-link>-->
</template>
</el-table-column>
</el-table>
@@ -132,7 +146,7 @@
</div>
</div>
- <PreviewFiles v-model="previewVisible" :src="testDock" type="docx"/>
+ <PreviewFiles v-model="previewVisible" :src="testDock" type="docx" />
<FormDiaLog ref="dialogRef" @success="getList" v-if="dialogVisible" v-model="dialogVisible" />
</basic-container>
</template>
@@ -151,8 +165,10 @@
import { useStore } from 'vuex'
const store = useStore()
-const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
const activeName = ref('all')
+
+const permission = computed(() => store.state.user.permission)
+console.log(permission.value, 'permission')
// 初始化查询参数
const initSearchParams = () => ({
@@ -164,7 +180,6 @@
current: 1, // 当前页
size: 10, // 每页大小
})
-// const requester = ref(true)
const searchParams = ref(initSearchParams()) // 查询参数
const dateRange = ref([]) // 执行时间范围
const total = ref(0) // 总条数
@@ -181,8 +196,6 @@
workOrderStatus: [], // 工单状态
})
provide('dictObj', dictObj)
-provide('requester', requester)
-
// 获取列表
async function getList() {
@@ -230,13 +243,13 @@
})
}
// 工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、
-// 21响应中_申请取消、22响应中_申请修改、23响应中_已取消、24响应中_拒绝取消、
-// 25响应中_拒绝修改 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、
+// 21响应中_申请取消、22响应中_申请修改、23响应中_已取消、
+// 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、
// 50验收通过_待结算、60结算完成_已结算
function openFormChange(row) {
dialogVisible.value = true
nextTick(() => {
- const mode = ['11'].includes(row.workOrderStatus) && requester.value ? 'edit' : 'view'
+ const mode = ['11'].includes(row.workOrderStatus) && permission.value.order_release ? 'edit' : 'view'
dialogRef.value?.open({ mode, row })
})
}
--
Gitblit v1.9.3