feat: 状态调整

罗广辉

2026-01-23 bd96790eae4e0ef1fb55b927f99d16b84db12931

feat: 状态调整

 applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue

@@ -58,7 +58,7 @@
            </div>

            <!-- 子任务表格表单 -->
            <div class="task-table-section">
            <div class="task-table-section" v-if="selectedWorkOrderId">
                <div class="detail-title" :style="{marginTop: pxToRem(10)}">添加子任务</div>
                <div class="task-table-container">
                    <el-table :data="taskList">
@@ -256,7 +256,7 @@

// 获取工单列表
async function getWorkOrderList() {
    const res = await gdWorkOrderPageApi({ size: 999, })
    const res = await gdWorkOrderPageApi({ size: 999,workOrderStatus: '20' })
    workOrderList.value = res?.data?.data?.records ?? []
}

@@ -273,11 +273,14 @@
// 获取设备列表
async function getDeviceList() {
    const res = await gdManageDeviceListApi({
        // TODO 需要传入ids设备
        // ids:
        deviceIds: selectedWorkOrder.value.recommendDeviceIds
    })
    deviceList.value = res?.data?.data ?? []
}

watch(()=>selectedWorkOrderId.value,()=>{
    getDeviceList()
})

// 提交新增
async function handleSubmit() {
@@ -354,7 +357,6 @@
onMounted(() => {
    getWorkOrderList()
    getFlyerList()
    getDeviceList()
})

defineExpose({ open })

 applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue

New file
@@ -0,0 +1,118 @@
<template>
    <el-dialog
        class="gd-dialog"
        v-model="visible"
        title="编辑"
        @closed="visible = false"
        destroy-on-close
        :close-on-click-modal="false"
    >
        <div v-if="dialogReadonly">
            <el-row class="detail-row-view">
                <el-col :span="24">
                    <div class="label">{{formLabelStr}}：</div>
                    <div class="val">{{ formData.rejectReason || '' }}</div>
                </el-col>
            </el-row>
        </div>
        <el-form
            v-else
            class="gd-dialog-form"
            ref="formRef"
            :model="formData"
            :rules="rules"
            :disabled="dialogReadonly"
            label-width="80px"
        >
            <el-row>
                <el-col :span="24">
                    <el-form-item :label="formLabelStr" prop="rejectReason">
                        <el-input
                            class="gd-input"
                            v-model="formData.rejectReason"
                            type="textarea"
                            :rows="4"
                            placeholder="请输入"
                            clearable
                        />
                    </el-form-item>
                </el-col>
            </el-row>
        </el-form>
        <template #footer>
            <el-button color="#F2F3F5" @click="visible = false">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
            <el-button
                class="save-btn"
                color="#4C34FF"
                v-if="!dialogReadonly"
                :loading="submitting"
                :disabled="submitting"
                @click="handleSubmit"
            >
                确认
            </el-button>
        </template>
    </el-dialog>
</template>

<script setup>
import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { fieldRules, getDictLabel } from '@ztzf/utils'
import { gdWorkOrderHandleStatusApi } from '@/views/orderView/orderManage/orderManage/orderManageApi'
import { gdPatrolTaskAuditApi } from '@/views/orderView/orderManage/inspectionRequest/inspectionRequestApi'

// 初始化表单数据
const initForm = () => ({
    auditStatus: null,
    rejectReason: '',
    id: null,
})

const emit = defineEmits(['success'])
const formRef = ref(null) // 表单实例
const formData = ref(initForm()) // 表单数据
const visible = defineModel() // 弹框显隐
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
const dialogReadonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })

const rules = {
    rejectReason: fieldRules(true, 200),
}

// 提交新增/编辑
async function handleSubmit() {
    const isValid = await formRef.value?.validate().catch(() => false)
    if (!isValid) return
    submitting.value = true
    gdPatrolTaskAuditApi(formData.value)
        .then(res => {
            ElMessage.success('提交成功')
            visible.value = false
            emit('success')
        })
        .finally(() => {
            submitting.value = false
        })
}

let formLabelStr = ref('原因')


// 操作类型：1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝
async function open({ mode = 'add', row, formLabel, type } = {}) {
    dialogMode.value = mode
    formLabelStr.value = formLabel
    formData.value = {
        id: row.id,
        auditStatus: type,
    }
    if (dialogMode.value !== 'add'){
        formData.value.rejectReason = row.rejectReason
    }
}

defineExpose({ open })
</script>

 applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue

@@ -46,9 +46,9 @@
                            <div class="val">{{ formData.taskDesc }}</div>
                        </el-col>
                    </el-row>
                    <template v-if="['6','7','8'].includes(taskStatus)">
                        <div>任务成功({{list.length || 0}}条)</div>
                        <div  style="display: flex">
                    <template v-if="['6', '7', '8'].includes(taskStatus)">
                        <div>任务成功({{ list.length || 0 }}条)</div>
                        <div style="display: flex">
                            <div v-for="item in list">
                                <el-image
                                    v-if="item.resultUrl"
@@ -170,32 +170,40 @@
        </div>

        <template #footer>
            <!--            <el-button color="#F2F3F5" @click="visible = false">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>-->
            <el-button
                class="save-btn"
                color="#4C34FF"
                v-if="!dialogReadonly"
                :loading="submitting"
                :disabled="submitting"
                @click="handleSubmit"
            >
                确认
            </el-button>

            <template v-if="requester">
<!--                statusChange(6)-->
                <el-button color="#F2F3F5" v-if="taskStatus === '1'">拒绝原因</el-button>
                <el-button color="#F2F3F5" @click="statusChange(3)" v-if="taskStatus === '3'">撤回任务</el-button>
                <el-button color="#F2F3F5" @click="refusalToAccept" v-if="taskStatus === '6'">拒绝验收</el-button>
                <el-button color="#F2F3F5" @click="statusChange(6)" v-if="taskStatus === '6'">验收通过</el-button>
                <el-button
                    v-if="!dialogReadonly || ['1','4'].includes(taskStatus)"
                    :loading="submitting"
                    :disabled="submitting"
                    @click="handleSubmit"
                >
                    提交
                </el-button>
                <el-button v-if="['1','4'].includes(taskStatus)" @click="viewDescription">
                    {{ gdStatusObj[taskStatus].reason }}
                </el-button>
                <el-button @click="statusChange(3)" v-if="taskStatus === '3'">撤回任务</el-button>
                <el-button @click="refusalToAccept" v-if="taskStatus === '6'">拒绝验收</el-button>
                <el-button @click="statusChange(6)" v-if="taskStatus === '6'">验收通过</el-button>
            </template>
            <template v-else>
                <el-button color="#F2F3F5" @click="statusChange(2)" v-if="taskStatus === '0'">拒绝签收</el-button>
                <el-button color="#F2F3F5" @click="statusChange(1)" v-if="taskStatus === '0'">签收</el-button>
                <el-button color="#F2F3F5" @click="statusChange(5)" v-if="taskStatus === '3'">驳回</el-button>
                <el-button color="#F2F3F5" @click="statusChange(4)" v-if="taskStatus === '3'">通过</el-button>
                <el-button v-if="['7'].includes(taskStatus)" @click="viewDescription">
                    {{ gdStatusObj[taskStatus].reason }}
                </el-button>
                <el-button v-if="taskStatus === '0'" @click="addDescription">拒绝签收</el-button>
                <el-button v-if="taskStatus === '0'" @click="statusChange(1)" >签收</el-button>
                <el-button v-if="taskStatus === '3'" @click="addDescription" >驳回</el-button>
                <el-button v-if="taskStatus === '3'" @click="statusChange(4)" >同意</el-button>
            </template>
        </template>

        <RefuseOrderDialog1
            ref="refuseOrderDialogRef"
            v-if="rejectVisible"
            v-model="rejectVisible"
            @success="rejectSuccess"
        />
    </el-dialog>
</template>

@@ -209,6 +217,8 @@
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'

// 初始化表单数据
const initForm = () => ({
@@ -223,10 +233,11 @@
    workOrderId: null,
})

const rejectVisible = ref(false)
const mapRef = ref(null)
const dictObj = inject('dictObj')
const requester = inject('requester')
const emit = defineEmits(['success','refusalAccept'])
const emit = defineEmits(['success', 'refusalAccept'])
const formRef = ref(null)
const formData = ref(initForm())
const visible = defineModel()
@@ -235,6 +246,8 @@
const dialogReadonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看' })
const taskStatus = computed(() => formData.value.taskStatus)
const refuseOrderDialogRef = ref(null)

// 下拉选项
const flyerList = ref([])
const deviceList = ref([])
@@ -244,6 +257,20 @@
    { name: '航线2', id: '2' },
    { name: '航线3', id: '3' },
])


const gdStatusObj = {
    '0': { reason: '拒绝原因',operationType: '2' },
    '1': { reason: '拒绝原因' },
    '2': { reason: '' },
    '3': { reason: '驳回原因',operationType: '5' },
    '4': { reason: '驳回原因' },
    '5': { reason: '' },
    '6': { reason: '拒绝原因' },
    '7': { reason: '拒绝原因' },
    '8': { reason: '' },
}


let viewer

@@ -255,6 +282,36 @@
    patrolRouteUrl: fieldRules(true),
    recommendFlyerName: fieldRules(true),
    deviceId: fieldRules(true),
}

function rejectSuccess() {
    visible.value = false
    emit('success')
}


// 填写说明
function addDescription() {
    rejectVisible.value = true
    nextTick(() => {
        refuseOrderDialogRef.value.open({
            mode: 'add',
            row: formData.value,
            type: gdStatusObj[taskStatus.value].operationType,
            formLabel: gdStatusObj[taskStatus.value].reason,
        })
    })
}
// 查看说明
function viewDescription() {
    rejectVisible.value = true
    nextTick(() => {
        refuseOrderDialogRef.value.open({
            mode: 'view',
            row: formData.value,
            formLabel: gdStatusObj[taskStatus.value].reason,
        })
    })
}

// 获取航线名称
@@ -296,7 +353,7 @@
}

function refusalToAccept() {
    emit('refusalAccept',formData.value)
    emit('refusalAccept', formData.value)
    visible.value = false
}

@@ -335,8 +392,8 @@
// 打开弹框
async function open({ mode = 'view', row } = {}) {
    dialogMode.value = mode
    formData.value = { ...initForm(), ...row };
    ['6','7','8'].includes(row.taskStatus) && getList()
    formData.value = { ...initForm(), ...row }
    ;['6', '7', '8'].includes(row.taskStatus) && getList()
    initMap()
}


 applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue

@@ -181,13 +181,12 @@
        <template #footer>
            <template v-if="requester">
                <el-button
                    v-if="['11', '31'].includes(gdStatus) || suddenlyEdit || (!dialogReadonly && !formData.id)"
                    v-if="['11'].includes(gdStatus) || suddenlyEdit || (!dialogReadonly && !formData.id)"
                    :loading="submitting"
                    :disabled="submitting"
                    @click="handleSubmit"
                >
                    {{ gdStatus === '11' ? '发布' : '提交修改' }}
                    发布
                    {{ gdStatus === '11' || !gdStatus ? '发布' : '提交修改' }}
                </el-button>
                <el-button v-if="['11', '21', '23', '24', '25', '31', '60'].includes(gdStatus)" @click="viewDescription">
                    {{ gdStatusObj[gdStatus].reason }}
@@ -206,8 +205,9 @@
                <el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
                <el-button v-if="gdStatus === '22'" @click="statusChange(8)">不同意修改</el-button>
                <el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
                <el-button v-if="gdStatus === '21'" @click="statusChange(6)">不同意取消</el-button>
                <el-button v-if="gdStatus === '21'" @click="addDescription">不同意取消</el-button>
                <el-button v-if="gdStatus === '30'" @click="addDescription">协商修改</el-button>
                <el-button v-if="gdStatus === '31'" @click="statusChange(10)">同意</el-button>
            </template>
        </template>

@@ -279,11 +279,10 @@
const hasPatrolTaskList = computed(() => ['30', '40', '50', '60'].includes(String(formData.value.workOrderStatus)))

const gdStatusObj = {
    '0': { reason: '' },
    '10': { reason: '拒绝原因', operationType: '2' },
    '11': { reason: '拒绝原因' },
    '20': { reason: '取消原因', operationType: '3' },
    '21': { reason: '取消原因' },
    '21': { reason: '原因', operationType: '6' },
    '22': { reason: '驳回原因' },
    '23': { reason: '取消原因' },
    '24': { reason: '驳回原因', operationType: '3' },
@@ -291,7 +290,7 @@
    '30': { reason: '修改原因', operationType: '9' },
    '31': { reason: '修改原因' },
    '40': { reason: '' },
    '50': { reason: '情况说明', operationType: '10' },
    '50': { reason: '情况说明', operationType: '11' },
    '60': { reason: '情况说明' },
}

@@ -306,7 +305,8 @@
    deviceLoadDemand: fieldRules(true),
}

// 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改
// 操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消
// 6不同意取消 7.同意修改 8.不同意修改 9.协商修改,10:同意协商修改，11.结算
function statusChange(operationType) {
    gdWorkOrderHandleStatusApi({
        operationType: operationType,
@@ -345,12 +345,15 @@
    })
}

// 查看说明
function viewDescription() {
    rejectVisible.value = true
    refuseOrderDialogRef.value.open({
        mode: 'view',
        row: formData.value,
        formLabel: gdStatusObj[gdStatus.value].reason,
    nextTick(() => {
        refuseOrderDialogRef.value.open({
            mode: 'view',
            row: formData.value,
            formLabel: gdStatusObj[gdStatus.value].reason,
        })
    })
}

@@ -360,7 +363,7 @@
        const str = [...pointList.value, pointList.value[0]].map(item => `${item.longitude} ${item.latitude}`).join(',')
        let geom = `POLYGON((${str}))`
        const res = await gdManageDeviceListApi({
            ids: formData.value.recommendDeviceIds,
            deviceIds: formData.value.recommendDeviceIds,
            devicePayload: dialogMode.value === 'add' ? formData.value.deviceLoadDemand : '',
            geom: dialogMode.value === 'add' ? geom : '',
        })
@@ -370,6 +373,7 @@
    }
}

// 设备需求变化
function loadDemandChange() {
    formData.value.recommendDeviceIds = ''
    selectedDevices.value = []
@@ -418,6 +422,7 @@
    }
)

// 加载时间线list
function loadList() {
    gdWorkOrderFlowListApi({ workOrderId: formData.value.id }).then(res => {
        processList.value = res.data.data
@@ -581,6 +586,7 @@
    }

    .rightBox {
        width: 350px;
        .title {
            font-weight: 500;
            font-size: 14px;

 applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue

@@ -60,8 +60,6 @@
import { ElMessage } from 'element-plus'
import { fieldRules, getDictLabel } from '@ztzf/utils'
import { gdWorkOrderHandleStatusApi } from '@/views/orderView/orderManage/orderManage/orderManageApi'
import { pxToRem } from '@/utils/rem'
import dayjs from 'dayjs'

// 初始化表单数据
const initForm = () => ({