Merge remote-tracking branch 'origin/master'

张含笑

2026-01-30 b248152cc5d600d41e3b0be287a3c43415e46ed1

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

@@ -22,7 +22,7 @@
               @change="handleSearch"
            >
               <el-option
                  v-for="item in dictObj.patrolTaskType"
                  v-for="item in dictObj.workOrderType"
                  :key="item.dictKey"
                  :label="item.dictValue"
                  :value="item.dictKey"
@@ -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.patrolTaskType) }}
                     {{ getDictLabel(row.patrolTaskType, dictObj.workOrderType) }}
                  </template>
               </el-table-column>
               <el-table-column prop="taskStatus" show-overflow-tooltip label="巡查任务状态">
@@ -146,7 +146,7 @@
   children: 'children',
}
const dictObj = ref({
   patrolTaskType: [], // 巡查任务类型
   workOrderType: [], // 巡查任务类型
   taskStatus: [], // 巡查任务状态
})

@@ -196,7 +196,7 @@

// 获取字典
function getDictList() {
   getDictionaryByCode('patrolTaskType,taskStatus').then(res => {
   getDictionaryByCode('workOrderType,taskStatus').then(res => {
      dictObj.value = res.data.data
   })
}