Merge remote-tracking branch 'origin/master'

张含笑

2026-01-30 b248152cc5d600d41e3b0be287a3c43415e46ed1

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

@@ -39,7 +39,7 @@
                  </el-col>
                  <el-col :span="12">
                     <div class="label">巡查任务类型</div>
                     <div class="val">{{ getDictLabel(formData.patrolTaskType, dictObj.patrolTaskType) }}</div>
                     <div class="val">{{ getDictLabel(formData.patrolTaskType, dictObj.workOrderType) }}</div>
                  </el-col>
                  <el-col :span="12">
                     <div class="label">任务执行时间</div>
@@ -106,7 +106,7 @@
                           clearable
                        >
                           <el-option
                              v-for="item in dictObj.patrolTaskType"
                              v-for="item in dictObj.workOrderType"
                              :key="item.dictKey"
                              :label="item.dictValue"
                              :value="item.dictKey"