Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-26 beb95fb5fc166804056abafd70fc01ac27de7621

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

@@ -1,9 +1,13 @@
<template>
   <basic-container>
      <el-tabs class="gd-tabs" v-model="activeName" @tab-click="tabsClick">
         <el-tab-pane label="全部 " name="all"></el-tab-pane>
         <el-tab-pane label="我的巡查任务" name="my"></el-tab-pane>
      </el-tabs>
      <el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
         <el-form-item label="任务名称" prop="patrolTaskName">
            <el-input
               class="gd-input"
               class="gd-input gray"
               v-model="searchParams.patrolTaskName"
               placeholder="请输入"
               clearable
@@ -13,7 +17,7 @@

         <el-form-item label="任务类型" prop="patrolTaskType">
            <el-select
               class="gd-select"
               class="gd-select gray"
               popper-class="gd-select-popper"
               v-model="searchParams.patrolTaskType"
               placeholder="请选择"
@@ -31,7 +35,7 @@

         <el-form-item label="任务状态" prop="taskStatus">
            <el-select
               class="gd-select"
               class="gd-select gray"
               popper-class="gd-select-popper"
               v-model="searchParams.taskStatus"
               placeholder="请选择"
@@ -49,7 +53,7 @@

         <el-form-item label="执行时间" prop="executeTime">
            <el-date-picker
               class="gd-date-picker"
               class="gd-date-picker gray"
               popper-class="gd-date-picker-popper"
               v-model="dateRange"
               type="daterange"
@@ -68,10 +72,7 @@
      </el-form>

      <div class="gd-table-toolbar">
         <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 v-if="requester" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增</el-button>
      </div>

      <div class="gd-table-container" v-loading="loading">
@@ -117,7 +118,13 @@
      </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>
@@ -129,7 +136,10 @@
import FormDiaLog from './FormDiaLog.vue'
import { gdPatrolTaskPageApi, gdPatrolTaskRemoveApi } from './inspectionRequestApi'
import ViewDiaLog from '@/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue'
import { useStore } from 'vuex'

const store = useStore()
const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
// 初始化查询参数
const initSearchParams = () => ({
   patrolTaskName: '', // 任务名称
@@ -151,14 +161,13 @@
const viewDiaLogRef = ref(null)
const dialogVisible = ref(false)
const viewDiaLogVisible = ref(false)
const requester = ref(true)
const dictObj = ref({
   patrolTaskType: [], // 巡查任务类型
   workOrderType: [], // 工单类型
   deviceLoadDemand: [], // 设备负载需求
   taskStatus: [], // 巡查任务状态
})

const activeName = ref('all')
provide('dictObj', dictObj)
provide('requester', requester)

@@ -167,12 +176,23 @@
   const range = dateRangeFormat(dateRange.value)
   loading.value = true
   try {
      const res = await gdPatrolTaskPageApi({ ...searchParams.value, startTime: range[0], endTime: range[1] })
      const res = await gdPatrolTaskPageApi({
         ...searchParams.value,
         startTime: range[0],
         endTime: range[1],
         createUser: activeName.value === 'my' ? store.state.user.userInfo.user_id : '',
      })
      list.value = res?.data?.data?.records ?? []
      total.value = res?.data?.data?.total ?? 0
   } finally {
      loading.value = false
   }
}

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

// 查询
@@ -222,7 +242,7 @@
function refusalAccept(row) {
   dialogVisible.value = true
   nextTick(() => {
      dialogRef.value?.open({ mode:'edit', row })
      dialogRef.value?.open({ mode: 'edit', row })
   })
}