Merge remote-tracking branch 'origin/master'

罗广辉

2026-02-27 3cf3cd88a7b7a49e3300e8e8c1e9034eb69a3429

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

@@ -6,63 +6,30 @@
      </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-select
               class="gd-select gray"
               popper-class="gd-select-popper"
               v-model="searchParams.patrolTaskType"
               placeholder="请选择"
               clearable
               @change="handleSearch"
            >
               <el-option
                  v-for="item in dictObj.workOrderType"
                  :key="item.dictKey"
                  :label="item.dictValue"
                  :value="item.dictKey"
               />
            <el-select class="gd-select gray" popper-class="gd-select-popper" v-model="searchParams.patrolTaskType"
               placeholder="请选择" clearable @change="handleSearch">
               <el-option v-for="item in dictObj.workOrderType" :key="item.dictKey" :label="item.dictValue"
                  :value="item.dictKey" />
            </el-select>
         </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">
@@ -71,13 +38,14 @@
         </el-form-item>
      </el-form>

      <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>

      <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" />-->
@@ -109,25 +77,15 @@
         </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>