Merge remote-tracking branch 'origin/master'

chenyao

2026-06-03 b4f08a561973b998036f6ffa9e843cfd5ee877be

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

@@ -22,10 +22,10 @@
               @change="handleSearch"
            >
               <el-option
                  v-for="item in dictObj.workOrderType"
                  :key="item.dictKey"
                  :label="item.dictValue"
                  :value="item.dictKey"
                  v-for="item in workOrderTypeXT"
                  :key="item.dictValue"
                  :label="item.dictLabel"
                  :value="item.dictValue"
               />
            </el-select>
         </el-form-item>
@@ -76,7 +76,7 @@
               <el-table-column prop="taskNo" show-overflow-tooltip label="巡查任务编号" />
               <el-table-column prop="patrolTaskType" show-overflow-tooltip label="巡查任务类型">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.patrolTaskType, dictObj.workOrderType) }}
                     {{ getDictLabelXT(row.patrolTaskType, workOrderTypeXT) }}
                  </template>
               </el-table-column>
               <el-table-column prop="taskStatus" show-overflow-tooltip label="巡查任务状态">
@@ -92,7 +92,7 @@
               <el-table-column prop="taskDesc" show-overflow-tooltip label="巡查任务描述" />
               <el-table-column label="操作" class-name="operation-btns">
                  <template v-slot="{ row }">
                     <el-link  type="primary"  @click="viewDiaLogView(row)">查看线索</el-link>
                     <el-link type="primary" @click="viewDiaLogView(row)">查看线索</el-link>
                  </template>
               </el-table-column>
            </el-table>
@@ -115,12 +115,14 @@
</template>
<script setup>
import { Search, RefreshRight } from '@element-plus/icons-vue'
import { onMounted, ref } from 'vue'
import { computed, onMounted, ref } from 'vue'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { dateRangeFormat, getDictLabel } from '@ztzf/utils'
import { dateRangeFormat, getDictLabel, getDictLabelXT } from '@ztzf/utils'
import { getDictListApi } from '@/api/zkxt'
import { gdPatrolTaskPageApi } from '../inspectionRequest/inspectionRequestApi'
import { getDeptTree } from '@/api/system/dept'
import ViewDiaLog from './ViewDiaLog.vue'
import { useStore } from 'vuex'

// 初始化查询参数
const initSearchParams = () => ({
@@ -149,8 +151,10 @@
   workOrderType: [], // 巡查任务类型
   taskStatus: [], // 巡查任务状态
})
const workOrderTypeXT = ref([])

provide('dictObj', dictObj)
provide('workOrderTypeXT', workOrderTypeXT)
provide('deptTree', deptTree)
provide('treeProps', treeProps)

@@ -163,7 +167,7 @@
         ...searchParams.value,
         startTime: range[0],
         endTime: range[1],
         taskStatus: 8
         taskStatus: 8,
      })
      list.value = res?.data?.data?.records ?? []
      total.value = res?.data?.data?.total ?? 0
@@ -199,11 +203,17 @@
   getDictionaryByCode('workOrderType,taskStatus').then(res => {
      dictObj.value = res.data.data
   })
   getDictListApi('task_inspection_type').then(res => {
      workOrderTypeXT.value = res.data.data || []
   })
}

const store = useStore()
const userInfo = computed(() => store.state.user.userInfo)

// 获取部门树
function getDeptTreeFun() {
   getDeptTree().then(res => {
   getDeptTree(userInfo.value.dept_id).then(res => {
      deptTree.value = res.data.data
   })
}