Browse Source

pms 瑞都日报 加载中航北斗油耗记录 逻辑优化

zhangcl 1 week ago
parent
commit
087d06aa03

+ 17 - 1
src/views/pms/iotrddailyreport/FillDailyReportForm.vue

@@ -880,6 +880,7 @@ const initPlatformData = (reportData: any) => {
 
         return existingData || {
           taskId: platform.id,
+          dailyFuel: platform.dailyFuel || '',
           reportId: platform.reportId, // 使用接口返回的 reportId
           wellName: platform.wellName,
           rdStatus: platform.rdStatus || '', // 初始为空
@@ -1774,7 +1775,7 @@ const loadPlatformData = (platformId: number) => {
   if (platformData) {
     // 更新表单字段
     formData.value.rdStatus = platformData.rdStatus || ''
-    // formData.value.techniqueIds = platformData.techniqueIds ? [...platformData.techniqueIds] : []
+    // formData.value.dailyFuel = platformData.dailyFuel ? [...platformData.dailyFuel] : []
     // 将施工工艺数值转换为对应的标签
     if (platformData.techniqueIds && Array.isArray(platformData.techniqueIds)) {
       // 如果是数字数组,转换为字符串数组(与数据字典格式匹配)
@@ -1783,6 +1784,15 @@ const loadPlatformData = (platformId: number) => {
       formData.value.techniqueIds = platformData.techniqueIds ? [...platformData.techniqueIds] : []
     }
 
+    // 在详情或审批模式下,更新 dailyFuel 为当前平台井的值
+    if (isDetailMode.value || isApprovalMode.value) {
+      // 使用平台井的 dailyFuel 值
+      const platformDailyFuel = platformData.dailyFuel || ''
+      formData.value.dailyFuel = platformDailyFuel ? formatNumber(platformDailyFuel, 2) : ''
+      // 同步更新输入框
+      dailyFuelInput.value = formData.value.dailyFuel
+    }
+
     // 更新动态属性
     if (platformData.extProperty && platformData.extProperty.length > 0) {
       const dynamicFields: Record<string, any> = {}
@@ -1800,6 +1810,12 @@ const loadPlatformData = (platformId: number) => {
     formData.value.rdStatus = ''
     formData.value.techniqueIds = []
     formData.value.dynamicFields = {}
+
+    // 在详情或审批模式下,清空 dailyFuel
+    if (isDetailMode.value || isApprovalMode.value) {
+      formData.value.dailyFuel = ''
+      dailyFuelInput.value = ''
+    }
   }
 }
 

+ 4 - 1
src/views/pms/iotrydailyreport/IotRyXjDailyReportForm.vue

@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="t('project.technology')" prop="technique">
-        <el-select v-model="displayData.technique" placeholder="请选择" disabled>
+        <el-select v-model="displayData.technique" placeholder="请选择" >
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.PMS_PROJECT_RY_TECHNOLOGY)"
             :key="dict.id"
@@ -98,6 +98,9 @@
       <el-form-item :label="t('project.nextPlan')" prop="nextPlan">
         <el-input v-model="formData.nextPlan" placeholder="请输入下步工序" type="textarea"/>
       </el-form-item>
+      <el-form-item label="生产时间(H)" prop="productionTime">
+        <el-input v-model="formData.productionTime" placeholder="请输入生产时间(H)" />
+      </el-form-item>
       <el-form-item :label="t('project.transitTime')" prop="transitTime">
         <el-input v-model="displayTransitTime" placeholder="" disabled
                   :class="{'red-text': isTransitTimeOver}"