5#国日报修改

src/views/pms/constructionDailyReport/components/ConstructionDailyReportFormSection.vue

@@ -40,6 +40,22 @@ function getDictOptions(field: ConstructionDailyReportField) {
   return field.dictType ? getStrDictOptions(field.dictType) : []
 }
 
+function getRelatedTaskOptions() {
+  const relatedTasks = props.model.relatedTasks
+  if (!relatedTasks) return []
+  return Object.entries(relatedTasks).map(([key, value]) => ({
+    label: value,
+    value: Number.isNaN(Number(key)) ? key : Number(key)
+  }))
+}
+
+function getSelectOptions(field: ConstructionDailyReportField) {
+  if (field.prop === 'taskId') {
+    return getRelatedTaskOptions()
+  }
+  return getDictOptions(field)
+}
+
 function getNumberSuffix(field: ConstructionDailyReportField) {
   return field.suffix || ''
 }
@@ -84,10 +100,11 @@ function getFieldClass(field: ConstructionDailyReportField) {
           v-else-if="field.type === 'select'"
           size="default"
           :model-value="props.model[field.prop]"
-          :options="getDictOptions(field)"
+          :options="getSelectOptions(field)"
           class="w-full"
           clearable
-          placeholder="请选择"
+          filterable
+          placeholder="璇烽€夋嫨"
           :disabled="isFieldDisabled(field)"
           @update:model-value="updateField(field.prop, $event)"
         />

src/views/pms/constructionDailyReport/components/report-config.ts

@@ -4,7 +4,7 @@ export interface ConstructionDailyReportRow {
   id?: number
   deptId?: number
   projectId?: number
-  taskId?: number
+  taskId?: number | string
   status?: number
   auditStatus?: number
   createTime?: number | string
@@ -49,6 +49,7 @@ export interface ConstructionDailyReportRow {
   monthWorkingLayers?: number | null
   monthWorkingWells?: number | null
   fiveStatus?: string
+  relatedTasks?: Record<string, string>
 }
 
 export interface ConstructionDailyReportQuery {
@@ -148,7 +149,7 @@ export const formSections: ConstructionDailyReportSection[] = [
       { prop: 'projectName', label: '项目' },
       { prop: 'location', label: '施工区域' },
       { prop: 'deptName', label: '队伍' },
-      { prop: 'wellName', label: '生产任务' },
+      { prop: 'taskId', label: '生产任务', type: 'select', editableInEdit: true },
       { prop: 'customer', label: '合同甲方' },
       { prop: 'deviceNames', label: '设备名称', span: 2 }
     ]