From ead1419555db06f8f8a258c5b5242e1acb17f034 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 20 Jan 2026 18:56:20 +0800
Subject: [PATCH] feat: 提交
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 10 +++-
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue | 11 +----
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 62 +++++++++++++++++--------------
3 files changed, 44 insertions(+), 39 deletions(-)
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 3f9b056..bb34317 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
@@ -66,13 +66,13 @@
<el-button color="#F2F3F5" @click="requester = !requester">我是{{ requester ? '需求方' : '服务方' }}</el-button>
<el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增</el-button>
- <el-button :icon="Delete" color="#4C34FF" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
+<!-- <el-button :icon="Delete" color="#4C34FF" :disabled="!selectedIds.length" @click="handleDelete()">删除</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" />
+<!-- <el-table-column type="selection" width="46" />-->
<el-table-column type="index" width="64" label="序号" />
<el-table-column prop="patrolTaskName" show-overflow-tooltip label="巡查任务名称" />
<el-table-column prop="taskNo" show-overflow-tooltip label="巡查任务编号" />
@@ -216,12 +216,7 @@
function viewDiaLogView(row) {
viewDiaLogVisible.value = true
nextTick(() => {
- let mode
- if (requester.value) {
- mode = ['0', '2', '3', '5', '6', '7', '8'].includes(row.taskStatus) ? 'view' : 'edit'
- } else {
- mode = 'view'
- }
+ let mode = ['1','4',].includes(row.taskStatus) && requester.value ? '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 0d8e352..1391c15 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
@@ -9,7 +9,7 @@
>
<div class="content" style="display: flex">
<div class="processBox">
- <div v-for="(item, index) in processList">{{index}}-{{ item.flowName }}{{ item.flowDesc }}</div>
+ <div v-for="(item, index) in processList">{{ index }}-{{ item.flowName }}{{ item.flowDesc }}</div>
</div>
<div class="leftBox">
<div class="detail-container" v-if="dialogReadonly">
@@ -140,52 +140,49 @@
</div>
<template #footer>
- <el-button color="#F2F3F5" @click="requester = !requester">我是{{ requester ? '需求方' : '服务方' }}</el-button>
- <el-button color="#F2F3F5" @click="visible = false">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
+<!-- <el-button color="#F2F3F5" @click="visible = false">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>-->
<el-button
class="save-btn"
color="#4C34FF"
- v-if="!dialogReadonly && !formData.id"
+ v-if="(!dialogReadonly && !formData.id) || suddenlyEdit"
:loading="submitting"
:disabled="submitting"
@click="handleSubmit"
>
发布
</el-button>
- <template v-if="requester">
- <template v-if="editStatus.includes(gdStatus)">
+ <template v-else>
+ <template v-if="requester">
<el-button
- color="#4C34FF"
class="save-btn"
+ color="#4C34FF"
+ v-if="editStatus.includes(gdStatus)"
:loading="submitting"
:disabled="submitting"
@click="handleSubmit"
>
- 重新发布
+ 发布
+ </el-button>
+ <el-button color="#F2F3F5" v-if="gdStatus === '11'">拒单原因</el-button>
+ <el-button color="#F2F3F5" @click="statusChange(3)" v-if="gdStatus === '20'">申请取消</el-button>
+ <el-button color="#4C34FF" @click="requestModification" v-if="gdStatus === '20'" class="save-btn">
+ 申请修改
</el-button>
</template>
- <template v-if="gdStatus === '11'">
- <el-button color="#F2F3F5">拒单原因</el-button>
- </template>
- <template v-else-if="gdStatus === '20'">
- <el-button color="#F2F3F5" @click="statusChange(3)">申请取消</el-button>
- <el-button color="#4C34FF" @click="statusChange(4)" class="save-btn">申请修改</el-button>
+ <template v-else>
+ <el-button color="#F2F3F5" v-if="gdStatus === '10'" @click="rejectOrders">拒绝接单</el-button>
+ <el-button color="#4C34FF" v-if="gdStatus === '10'" @click="statusChange(1)" class="save-btn">接单</el-button>
+ <el-button color="#F2F3F5" v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
+ <el-button color="#4C34FF" v-if="gdStatus === '22'" @click="statusChange(8)" class="save-btn">
+ 不同意修改
+ </el-button>
+ <el-button color="#F2F3F5" v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
+ <el-button color="#4C34FF" v-if="gdStatus === '21'" @click="statusChange(6)" class="save-btn">
+ 不同意取消
+ </el-button>
</template>
</template>
- <template v-else>
- <template v-if="gdStatus === '10'">
- <el-button color="#F2F3F5" @click="rejectOrders">拒绝接单</el-button>
- <el-button color="#4C34FF" @click="statusChange(1)" class="save-btn">接单</el-button>
- </template>
- <template v-else-if="gdStatus === '22'">
- <el-button color="#F2F3F5" @click="statusChange(7)">同意修改</el-button>
- <el-button color="#4C34FF" @click="statusChange(8)" class="save-btn">不同意修改</el-button>
- </template>
- <template v-else-if="gdStatus === '21'">
- <el-button color="#F2F3F5" @click="statusChange(5)">同意取消</el-button>
- <el-button color="#4C34FF" @click="statusChange(6)" class="save-btn">不同意取消</el-button>
- </template>
- </template>
+
</template>
<RefuseOrderDialog
@@ -268,6 +265,15 @@
})
}
+const suddenlyEdit = ref(false)
+function requestModification() {
+ suddenlyEdit.value = true
+ dialogMode.value = 'edit'
+ nextTick(() => {
+ syncSelection()
+ })
+}
+
function rejectSuccess() {
visible.value = false
emit('success')
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 90c6b0b..e0bec14 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
@@ -165,10 +165,9 @@
workOrderType: [], // 工单类型
workOrderStatus: [], // 工单状态
})
-const editStatus = ['11', '24', '25']
provide('dictObj', dictObj)
provide('requester', requester)
-provide('editStatus', editStatus)
+
// 获取列表
async function getList() {
@@ -204,7 +203,12 @@
dialogRef.value?.open({ mode, row })
})
}
-
+const editStatus = ['0','11','24','25']
+provide('editStatus', editStatus)
+// 工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、
+// 21响应中_申请取消、22响应中_申请修改、23响应中_已取消、24响应中_拒绝取消、
+// 25响应中_拒绝修改 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、
+// 50验收通过_待结算、60结算完成_已结算
function openFormChange(row) {
dialogVisible.value = true
nextTick(() => {
--
Gitblit v1.9.3