Merge branch 'qhse_file' of shuzhihua/pms-iot-vue into master

src/views/pms/iotrhdailyreport/rh-form.vue

@@ -42,7 +42,7 @@ interface FormOriginal {
   deptName: string
   contractName: string
   taskName: string
-  relatedTasks: Record<string, string>
+  relatedTasks: Record<string, string> | null
   dailyGasInjection: number
   dailyWaterInjection: number
   dailyInjectGasTime: number
@@ -133,7 +133,8 @@ const initFormData = (): Form => {
     relocationDays: 0,
     capacity: 0,
     otherNptReason: '',
-    opinion: ''
+    opinion: '',
+    relatedTasks: null
   }
   // 初始化所有非生产时间字段为 0
   NON_PROD_FIELDS.forEach((field) => {
@@ -148,17 +149,15 @@ const isApproval = computed(() => props.type === 'approval')
 const isEdit = computed(() => props.type === 'edit')
 const isMainFieldDisabled = computed(() => formType.value === 'readonly' || isApproval.value)
 
+// 判断是否使用 taskName 显示（当 relatedTasks 为 null 时）
+const useTaskName = computed(() => {
+  return !form.value.relatedTasks || Object.keys(form.value.relatedTasks).length === 0
+})
+
 function getRelatedTaskOptions() {
   const relatedTasks = form.value.relatedTasks
   if (!relatedTasks || Object.keys(relatedTasks).length === 0) {
-    const taskId = form.value.taskId
-    if (taskId === null || taskId === undefined || taskId === '') return []
-    return [
-      {
-        label: String(taskId),
-        value: taskId
-      }
-    ]
+    return []
   }
 
   return Object.entries(relatedTasks).map(([key, value]) => ({
@@ -411,11 +410,6 @@ const handleAudit = async (auditStatus: 20 | 30) => {
                 >100% 红色预警
               </span>
             </div>
-            <!-- 可以显示一个总计提示，辅助用户 -->
-            <!-- <div class="text-gray-600 dark:text-gray-400">
-              <span class="font-bold text-gray-800 dark:text-gray-200">时间校验：</span>
-              (注气 > 0 ? 注气 : 注水) + 所有非生产时间 = 24H
-            </div> -->
           </div>
         </div>
         <div
@@ -443,15 +437,20 @@ const handleAudit = async (auditStatus: 20 | 30) => {
         <el-form-item label="项目" prop="contractName"
           ><el-input v-model="form.contractName" disabled
         /></el-form-item>
+
+        <!-- 修改任务字段 -->
         <el-form-item label="任务" prop="taskId">
           <el-select
+            v-if="!useTaskName"
             v-model="form.taskId"
             :options="getRelatedTaskOptions()"
             class="w-full"
             filterable
             placeholder="请选择"
-            :disabled="isMainFieldDisabled" />
+            :disabled="formType === 'readonly' || type === 'approval'" />
+          <el-input v-else v-model="form.taskName" disabled placeholder="无任务选项" />
         </el-form-item>
+
         <el-form-item label="搬迁安装天数(D)" prop="relocationDays"
           ><el-input v-model="form.relocationDays" disabled
         /></el-form-item>