Merge remote-tracking branch 'origin/master'

chenyao

2026-06-30 4b3c357f2fa24a27eac3fe59cbf64e34255ab212

 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')
@@ -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