feat: 类型多选改造

罗广辉

2026-06-06 df3b6543df709dd02f357798ea2234e24f6f7d9e

feat: 类型多选改造

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

@@ -18,7 +18,7 @@
                    popper-class="gd-select-popper"
                    v-model="searchParams.patrolTaskType"
                    :options="workOrderTypeXT"
                    :props="taskTypeFilterCascaderProps"
                    :props="taskTypeCascaderProps"
                    placeholder="请选择"
                    clearable
                    @change="handleSearch"
@@ -118,7 +118,11 @@
import { getDeptTree } from '@/api/system/dept'
import ViewDiaLog from './ViewDiaLog.vue'
import { useStore } from 'vuex'
import { getTaskTypeLabel, normalizeTaskTypeOptions, taskTypeFilterCascaderProps } from '../taskTypeOptions'
import {
    getTaskTypeLabel,
    normalizeTaskTypeOptions,
    taskTypeCascaderProps,
} from '../taskTypeOptions'

// 初始化查询参数
const initSearchParams = () => ({
@@ -164,6 +168,7 @@
            startTime: range[0],
            endTime: range[1],
            taskStatus: 8,
            patrolTaskType: searchParams?.value?.patrolTaskType?.join?.(','),
        })
        list.value = res?.data?.data?.records ?? []
        total.value = res?.data?.data?.total ?? 0

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

@@ -103,7 +103,7 @@
                                    popper-class="gd-select-popper"
                                    v-model="row.patrolTaskType"
                                    :options="workOrderTypeXT"
                                    :props="taskTypeCascaderProps"
                                    :props="{...taskTypeCascaderProps,multiple:true}"
                                    placeholder="请选择"
                                    collapse-tags
                                    @change="handlePatrolTaskTypeChange($index, $event)"
@@ -273,7 +273,6 @@
import { airlineListApi, algorithmGroupedApi } from '@/api/zkxt'
import {
    getTaskTypeLabel,
    getTaskTypeLeafValues,
    taskTypeCascaderProps,
    toTaskTypeCascaderValue,
    toTaskTypeRequestValue,
@@ -441,8 +440,7 @@

// 获取飞手列表
async function getFlyerList(index, skilledTaskType) {
    const leafValues = getTaskTypeLeafValues(skilledTaskType)
    if (!leafValues.length) {
    if (!skilledTaskType.length) {
        flyerListMap.value[index] = []
        return
    }
@@ -450,7 +448,7 @@
    const res = await gdFlyerPageApi({
        size: 999,
        current: 1,
        skilledTaskType: leafValues.join(','),
        skilledTaskType: skilledTaskType.map(item => item[1])?.join?.(','),
        // longitude: obj.longitude || '',
        // latitude: obj.latitude || '',
    })

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

@@ -116,8 +116,9 @@
                                    popper-class="gd-select-popper"
                                    v-model="formData.patrolTaskType"
                                    :options="workOrderTypeXT"
                                    :props="taskTypeCascaderProps"
                                    :props="{...taskTypeCascaderProps,multiple:true}"
                                    placeholder="请选择"
                                    collapse-tags
                                    clearable
                                />
                            </el-form-item>
@@ -489,11 +490,7 @@
    if (!isValid) return
    submitting.value = true
    try {
        const payload = {
            ...formData.value,
            patrolTaskType: toTaskTypeRequestValue(formData.value.patrolTaskType),
        }
        await gdPatrolTaskRepublish(payload)
        await gdPatrolTaskRepublish(formData.value)
        ElMessage.success('更新成功')
        visible.value = false
        emit('success')

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

@@ -6,28 +6,58 @@
        </el-tabs>
        <el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
            <el-form-item label="任务名称" prop="patrolTaskName">
                <el-input class="gd-input gray" v-model="searchParams.patrolTaskName" placeholder="请输入" clearable
                    @clear="handleSearch" />
                <el-input
                    class="gd-input gray"
                    v-model="searchParams.patrolTaskName"
                    placeholder="请输入"
                    clearable
                    @clear="handleSearch"
                />
            </el-form-item>

            <el-form-item label="任务类型" prop="patrolTaskType">
                <el-cascader class="gd-cascader gray" popper-class="gd-cascader-popper" v-model="searchParams.patrolTaskType"
                    :options="workOrderTypeXT" :props="taskTypeFilterCascaderProps" placeholder="请选择" clearable
                    @change="handleSearch" />
                <el-cascader
                    class="gd-cascader gray"
                    popper-class="gd-cascader-popper"
                    v-model="searchParams.patrolTaskType"
                    :options="workOrderTypeXT"
                    :props="taskTypeCascaderProps"
                    placeholder="请选择"
                    clearable
                    @change="handleSearch"
                />
            </el-form-item>

            <el-form-item label="任务状态" prop="taskStatus">
                <el-select class="gd-select gray" popper-class="gd-select-popper" v-model="searchParams.taskStatus"
                    placeholder="请选择" clearable @change="handleSearch">
                    <el-option v-for="item in dictObj.taskStatus" :key="item.dictKey" :label="item.dictValue"
                        :value="item.dictKey" />
                <el-select
                    class="gd-select gray"
                    popper-class="gd-select-popper"
                    v-model="searchParams.taskStatus"
                    placeholder="请选择"
                    clearable
                    @change="handleSearch"
                >
                    <el-option
                        v-for="item in dictObj.taskStatus"
                        :key="item.dictKey"
                        :label="item.dictValue"
                        :value="item.dictKey"
                    />
                </el-select>
            </el-form-item>

            <el-form-item label="执行时间" prop="executeTime">
                <el-date-picker class="gd-date-picker gray" popper-class="gd-date-picker-popper" v-model="dateRange"
                    type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
                    value-format="YYYY-MM-DD HH:mm:ss" @change="handleSearch" />
                <el-date-picker
                    class="gd-date-picker gray"
                    popper-class="gd-date-picker-popper"
                    v-model="dateRange"
                    type="daterange"
                    range-separator="-"
                    start-placeholder="开始日期"
                    end-placeholder="结束日期"
                    value-format="YYYY-MM-DD HH:mm:ss"
                    @change="handleSearch"
                />
            </el-form-item>

            <el-form-item class="gd-search-actions">
@@ -38,8 +68,7 @@

        <div class="gd-table-container" v-loading="loading">
            <div class="gd-table-toolbar">
                <el-button v-if="permission.flyOrder_add" :icon="Plus" color="#4C34FF" type="primary"
                    @click="openForm('add')">
                <el-button v-if="permission.flyOrder_add" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">
                    拆分工单
                </el-button>
            </div>
@@ -75,15 +104,25 @@
            </div>

            <div class="gd-pagination-parent">
                <el-pagination popper-class="gd-select-popper" v-model:current-page="searchParams.current"
                    v-model:page-size="searchParams.size" layout="total, prev, pager, next, sizes" :total="total"
                    @change="getList" />
                <el-pagination
                    popper-class="gd-select-popper"
                    v-model:current-page="searchParams.current"
                    v-model:page-size="searchParams.size"
                    layout="total, prev, pager, next, sizes"
                    :total="total"
                    @change="getList"
                />
            </div>
        </div>

        <FormDiaLog ref="dialogRef" @success="getList" v-if="dialogVisible" v-model="dialogVisible" />
        <ViewDiaLog ref="viewDiaLogRef" @success="getList" @refusalAccept="refusalAccept" v-if="viewDiaLogVisible"
            v-model="viewDiaLogVisible" />
        <ViewDiaLog
            ref="viewDiaLogRef"
            @success="getList"
            @refusalAccept="refusalAccept"
            v-if="viewDiaLogVisible"
            v-model="viewDiaLogVisible"
        />
    </basic-container>
</template>
<script setup>
@@ -97,7 +136,11 @@
import { gdPatrolTaskPageApi, gdPatrolTaskRemoveApi } from './inspectionRequestApi'
import ViewDiaLog from '@/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue'
import { useStore } from 'vuex'
import { getTaskTypeLabel, normalizeTaskTypeOptions, taskTypeFilterCascaderProps } from '../taskTypeOptions'
import {
    getTaskTypeLabel,
    normalizeTaskTypeOptions,
    taskTypeCascaderProps,
} from '../taskTypeOptions'

const store = useStore()
const permission = computed(() => store.state.user.permission)
@@ -136,28 +179,27 @@
provide('workOrderTypeXT', workOrderTypeXT)

const colors = {
    0: '#F6A000',//0待签收
    1: '#FF0202',//1拒绝签收
    2: '#FF0202',//2已撤回
    3: '#212BF4',//3待审核
    4: '#FF0000',//4审核驳回
    5: '#0068F0',//5审核通过
    6: '#FD6716',//6待验收
    7: '#FF0000',//7拒绝验收
    8: '#019612',//8验收通过
    0: '#F6A000', //0待签收
    1: '#FF0202', //1拒绝签收
    2: '#FF0202', //2已撤回
    3: '#212BF4', //3待审核
    4: '#FF0000', //4审核驳回
    5: '#0068F0', //5审核通过
    6: '#FD6716', //6待验收
    7: '#FF0000', //7拒绝验收
    8: '#019612', //8验收通过
}


// 获取列表
async function getList () {
async function getList() {
    const range = dateRangeFormat(dateRange.value)
    loading.value = true
    try {
        const res = await gdPatrolTaskPageApi({
            ...searchParams.value,
            startTime: range[0],
            endTime: range[1],
            createUser: activeName.value === 'my' ? store.state.user.userInfo.user_id : '',
            patrolTaskType: searchParams?.value?.patrolTaskType?.join?.(','),
        })
        list.value = res?.data?.data?.records ?? []
        total.value = res?.data?.data?.total ?? 0
@@ -166,20 +208,20 @@
    }
}

function tabsClick (tab, event) {
function tabsClick(tab, event) {
    activeName.value = tab.props.name
    resetForm()
    handleSearch()
}

// 查询
function handleSearch () {
function handleSearch() {
    searchParams.value.current = 1
    getList()
}

// 重置查询
function resetForm () {
function resetForm() {
    queryParamsRef.value?.resetFields()
    dateRange.value = []
    searchParams.value.current = 1
@@ -187,7 +229,7 @@
}

// 新增/编辑/查看 弹框
function openForm (mode, row) {
function openForm(mode, row) {
    dialogVisible.value = true
    nextTick(() => {
        dialogRef.value?.open({ mode, row })
@@ -196,7 +238,7 @@

// 状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回
// 5审核通过、6待验收、7拒绝验收、8验收通过
function viewDiaLogView (row) {
function viewDiaLogView(row) {
    viewDiaLogVisible.value = true
    nextTick(() => {
        let mode = ['1', '4'].includes(row.taskStatus) && permission.value.flyOrder_add ? 'edit' : 'view'
@@ -205,13 +247,12 @@
}

// 勾选值设置
function handleSelectionChange (rows) {
function handleSelectionChange(rows) {
    selectedIds.value = rows.map(item => item.id)
}


// 获取字典
function getDictList () {
function getDictList() {
    getDictionaryByCode('workOrderType,deviceLoadDemand,taskStatus').then(res => {
        dictObj.value = res.data.data
    })
@@ -220,7 +261,7 @@
    })
}

function refusalAccept (row) {
function refusalAccept(row) {
    dialogVisible.value = true
    nextTick(() => {
        dialogRef.value?.open({ mode: 'edit', row })
@@ -228,7 +269,7 @@
}

// 获取两个tab的总条数
async function getTabTotals () {
async function getTabTotals() {
    const allRes = await gdPatrolTaskPageApi({
        current: 1,
        size: 1,

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

@@ -8,12 +8,17 @@
        destroy-on-close
        :close-on-click-modal="false"
    >
    <el-tabs class="gd-tabs"  v-model="activeName" @tab-click="tabsClick" v-if="dialogReadonly && formData.workOrderStatus >= '30'">
        <el-tabs
            class="gd-tabs"
            v-model="activeName"
            @tab-click="tabsClick"
            v-if="dialogReadonly && formData.workOrderStatus >= '30'"
        >
            <el-tab-pane label="基础信息" name="basic"></el-tab-pane>
            <el-tab-pane label="成果数据" name="result">
                <OutcomeData :workOrderId="formData.id" />
            </el-tab-pane>
            </el-tabs>
        </el-tabs>
        <div class="content" style="display: flex" v-if="activeName === 'basic'">
            <div class="processBox" v-if="dialogMode !== 'add'">
                <div class="detail-title">工单记录</div>
@@ -94,17 +99,16 @@
                        </el-col>
                        <el-col :span="12">
                            <el-form-item label="工单类型" prop="workOrderType">
                                <!-- <el-cascader
                                <el-cascader
                                    class="gd-cascader"
                                    popper-class="gd-cascader-popper"
                                    v-model="formData.workOrderType"
                                    :options="workOrderTypeXT"
                                    :props="taskTypeCascaderProps"
                                    collapse-tags
                                    :props="{...taskTypeCascaderProps,multiple:true }"
                                    placeholder="请选择"
                                    clearable
                                /> -->
                                <el-cascader class="gd-cascader" popper-class="gd-cascader-popper" v-model="formData.workOrderType"
                    :options="workOrderTypeXT" :props="taskTypeCascaderProps" placeholder="请选择" clearable collapse-tags />
                                    collapse-tags
                                />
                            </el-form-item>
                        </el-col>
                        <el-col :span="12">
@@ -130,12 +134,7 @@
                                    clearable
                                    @change="loadDemandChange"
                                >
                                    <el-option
                                        v-for="item in payloadList"
                                        :key="item.name"
                                        :label="item.name"
                                        :value="item.name"
                                    />
                                    <el-option v-for="item in payloadList" :key="item.name" :label="item.name" :value="item.name" />
                                </el-select>
                            </el-form-item>
                        </el-col>
@@ -176,9 +175,7 @@
                </div>
                <el-table
                    class="separateTable"
                    :empty-text="
                        pointList.length ? '暂无数据' : '请先在地图上绘制工单范围'
                    "
                    :empty-text="pointList.length ? '暂无数据' : '请先在地图上绘制工单范围'"
                    ref="deviceTableRef"
                    :data="pointList.length ? deviceList : []"
                    row-key="id"
@@ -284,7 +281,12 @@
import OrderStepBar from '@/views/orderView/orderManage/orderManage/OrderStepBar.vue'
import OutcomeData from './outcomeData.vue'
import { getDictListApi } from '@/api/zkxt'
import { getTaskTypeLabel, taskTypeCascaderProps, toTaskTypeCascaderValue, toTaskTypeRequestValue } from '../taskTypeOptions'
import {
    getTaskTypeLabel,
    taskTypeCascaderProps,
    toTaskTypeCascaderValue,
    toTaskTypeRequestValue,
} from '../taskTypeOptions'
const store = useStore()
const permission = computed(() => store.state.user.permission)
const activeName = ref('basic')
@@ -412,7 +414,7 @@
async function getDeviceList() {
    try {
        const str = [...pointList.value, pointList.value[0]].map(item => `${item.longitude} ${item.latitude}`).join(',')
            let geom = `POLYGON((${str}))`
        let geom = `POLYGON((${str}))`
        const res = await gdManageDeviceListApi({
            deviceIds: dialogMode.value === 'add' ? '' : formData.value.recommendDeviceIds,
            devicePayload: formData.value?.deviceLoadDemand,
@@ -455,11 +457,7 @@
        if (!formData.value.id) {
            formData.value.workOrderStatus = '10'
        }
        const payload = {
            ...formData.value,
            workOrderType: toTaskTypeRequestValue(formData.value.workOrderType),
        }
        await gdWorkOrderSaveApi(payload)
        await gdWorkOrderSaveApi(formData.value)
        ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
        visible.value = false
        emit('success')
@@ -700,15 +698,15 @@
</script>

<style lang="scss">
.orderManageFormDlg{
        .el-dialog__body{
            display: flex;
            flex-direction: column;
            .content{
                height: 0;
                flex: 1;
            }
.orderManageFormDlg {
    .el-dialog__body {
        display: flex;
        flex-direction: column;
        .content {
            height: 0;
            flex: 1;
        }
    }
}
</style>

@@ -725,7 +723,6 @@
        }
    }
}


.content {
    display: flex;

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

@@ -6,28 +6,58 @@
        </el-tabs>
        <el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
            <el-form-item label="工单名称" prop="workOrderName">
                <el-input class="gd-input gray" v-model="searchParams.workOrderName" placeholder="请输入" clearable
                    @clear="handleSearch" />
                <el-input
                    class="gd-input gray"
                    v-model="searchParams.workOrderName"
                    placeholder="请输入"
                    clearable
                    @clear="handleSearch"
                />
            </el-form-item>

            <el-form-item label="工单类型" prop="workOrderType">
                <el-cascader class="gd-cascader gray" popper-class="gd-cascader-popper" v-model="searchParams.workOrderType"
                    :options="workOrderTypeXT" :props="taskTypeFilterCascaderProps" placeholder="请选择" clearable
                    @change="handleSearch" />
                <el-cascader
                    class="gd-cascader gray"
                    popper-class="gd-cascader-popper"
                    v-model="searchParams.workOrderType"
                    :options="workOrderTypeXT"
                    :props="taskTypeCascaderProps"
                    placeholder="请选择"
                    clearable
                    @change="handleSearch"
                />
            </el-form-item>

            <el-form-item label="工单状态" prop="workOrderStatus">
                <el-select class="gd-select gray" popper-class="gd-select-popper" v-model="searchParams.workOrderStatus"
                    placeholder="请选择" clearable @change="handleSearch">
                    <el-option v-for="item in dictObj.workOrderStatus" :key="item.dictKey"
                        :label="item.dictValue.split('_')[1]" :value="item.dictKey" />
                <el-select
                    class="gd-select gray"
                    popper-class="gd-select-popper"
                    v-model="searchParams.workOrderStatus"
                    placeholder="请选择"
                    clearable
                    @change="handleSearch"
                >
                    <el-option
                        v-for="item in dictObj.workOrderStatus"
                        :key="item.dictKey"
                        :label="item.dictValue.split('_')[1]"
                        :value="item.dictKey"
                    />
                </el-select>
            </el-form-item>

            <el-form-item label="执行时间" prop="executeTime">
                <el-date-picker class="gd-date-picker gray" popper-class="gd-date-picker-popper" v-model="dateRange"
                    type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
                    value-format="YYYY-MM-DD HH:mm:ss" @change="handleSearch" />
                <el-date-picker
                    class="gd-date-picker gray"
                    popper-class="gd-date-picker-popper"
                    v-model="dateRange"
                    type="daterange"
                    range-separator="-"
                    start-placeholder="开始日期"
                    end-placeholder="结束日期"
                    value-format="YYYY-MM-DD HH:mm:ss"
                    @change="handleSearch"
                />
            </el-form-item>

            <el-form-item class="gd-search-actions">
@@ -38,8 +68,7 @@

        <div class="gd-table-container" v-loading="loading">
            <div class="gd-table-toolbar">
                <el-button v-if="permission.order_release" :icon="Plus" color="#4C34FF" type="primary"
                    @click="openForm('add')">
                <el-button v-if="permission.order_release" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">
                    新增工单
                </el-button>
            </div>
@@ -85,9 +114,14 @@
            </div>

            <div class="gd-pagination-parent">
                <el-pagination popper-class="gd-select-popper" v-model:current-page="searchParams.current"
                    v-model:page-size="searchParams.size" layout="total, prev, pager, next, sizes" :total="total"
                    @change="getList" />
                <el-pagination
                    popper-class="gd-select-popper"
                    v-model:current-page="searchParams.current"
                    v-model:page-size="searchParams.size"
                    layout="total, prev, pager, next, sizes"
                    :total="total"
                    @change="getList"
                />
            </div>
        </div>

@@ -109,7 +143,11 @@
import testDock from '@/assets/docx/testDocx.docx'
import testPdf from '@/assets/pdf/testPdf.pdf'
import { useStore } from 'vuex'
import { getTaskTypeLabel, normalizeTaskTypeOptions, taskTypeFilterCascaderProps } from '../taskTypeOptions'
import {
    getTaskTypeLabel,
    normalizeTaskTypeOptions,
    taskTypeCascaderProps,
} from '../taskTypeOptions'

const store = useStore()
const activeName = ref('all')
@@ -148,7 +186,7 @@
provide('workOrderTypeXT', workOrderTypeXT)

// 获取列表
async function getList () {
async function getList() {
    const range = dateRangeFormat(dateRange.value)
    loading.value = true
    try {
@@ -157,6 +195,7 @@
            startTime: range[0],
            endTime: range[1],
            createUser: activeName.value === 'my' ? store.state.user.userInfo.user_id : '',
            workOrderType: searchParams?.value?.workOrderType?.join?.(','),
        })
        list.value = res?.data?.data?.records ?? []
        total.value = res?.data?.data?.total ?? 0
@@ -166,27 +205,27 @@
}

// 查询
function handleSearch () {
function handleSearch() {
    searchParams.value.current = 1
    getList()
}

// 重置查询
function resetForm () {
function resetForm() {
    queryParamsRef.value?.resetFields()
    dateRange.value = []
    searchParams.value.current = 1
    getList()
}

function tabsClick (tab, event) {
function tabsClick(tab, event) {
    activeName.value = tab.props.name
    resetForm()
    handleSearch()
}

// 新增/编辑/查看 弹框
function openForm (mode, row) {
function openForm(mode, row) {
    dialogVisible.value = true
    nextTick(() => {
        dialogRef.value?.open({ mode, row })
@@ -196,7 +235,7 @@
// 21响应中_申请取消、22响应中_申请修改、23响应中_已取消、
// 30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、
// 50验收通过_待结算、60结算完成_已结算
function openFormChange (row) {
function openFormChange(row) {
    dialogVisible.value = true
    nextTick(() => {
        const mode = ['11'].includes(row.workOrderStatus) && permission.value.order_release ? 'edit' : 'view'
@@ -223,7 +262,7 @@
}

// 删除
async function handleDelete (row) {
async function handleDelete(row) {
    const tips = row ? '该条' : '选中的项'
    await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', {
        type: 'warning',
@@ -239,12 +278,12 @@
}

// 勾选值设置
function handleSelectionChange (rows) {
function handleSelectionChange(rows) {
    selectedIds.value = rows.map(item => item.id)
}

// 获取字典
function getDictList () {
function getDictList() {
    getDictionaryByCode('deviceLoadDemand,workOrderType,workOrderStatus,taskStatus').then(res => {
        dictObj.value = res.data.data
    })
@@ -254,7 +293,7 @@
}

// 获取两个tab的总条数
async function getTabTotals () {
async function getTabTotals() {
    // 获取全部tab的总数
    const allRes = await gdWorkOrderPageApi({
        current: 1,

 applications/task-work-order/src/views/orderView/orderManage/taskTypeOptions.js

@@ -61,11 +61,9 @@
    return toTaskTypeCascaderValue(value).map(item => [item[0], item[1]])
}

export function getTaskTypeLeafValues(value) {
    return toTaskTypeRequestValue(value).map(item => item[1])
}

export function getTaskTypeLabel(value, options = []) {
    if (!value?.length) return ''
    const paths = toTaskTypeCascaderValue(value)
    if (paths.length) {
        return paths
@@ -91,15 +89,5 @@
    label: 'dictLabel',
    value: 'dictValue',
    children: 'children',
    multiple: true,
    emitPath: true,
    checkStrictly: false,
}

export const taskTypeFilterCascaderProps = {
    label: 'dictLabel',
    value: 'dictValue',
    children: 'children',
    emitPath: false,
    checkStrictly: false,
}