pms 瑞鹰修井日报 编辑页面

src/locales/en.ts

@@ -268,6 +268,9 @@ export default {
     status: 'status',
     taskAttrDetail: 'Attr Detail',
     nptReason: 'NPT Reason',
+    currentOperation: 'Current Operation',
+    nextPlan: 'Next Plan',
+    transitTime: 'Transit Time',
   },
   form: {
     input: 'Input',

src/locales/ru.ts

@@ -233,6 +233,9 @@ export default {
     status: '施工状态',
     taskAttrDetail: '任务属性详情',
     nptReason: '非生产时间原因',
+    currentOperation: '目前工序',
+    nextPlan: '下步工序',
+    transitTime: '运行时效',
   },
   form: {
     input: '输入框',

src/locales/zh-CN.ts

@@ -271,6 +271,9 @@ export default {
     status: '施工状态',
     taskAttrDetail: '任务属性详情',
     nptReason: '非生产时间原因',
+    currentOperation: '目前工序',
+    nextPlan: '下步工序',
+    transitTime: '运行时效',
   },
   form: {
     input: '输入框',

src/views/pms/iotrydailyreport/IotRyXjDailyReportForm.vue

@@ -4,7 +4,7 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="120px"
+      label-width="130px"
       v-loading="formLoading"
     >
       <el-form-item label="施工队伍" prop="deptName">
@@ -26,18 +26,29 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="上井次完井时间" prop="latestWellDoneTime">
-        <el-date-picker
-          v-model="formData.latestWellDoneTime"
-          type="date"
-          value-format="x"
-          placeholder=""
-          disabled
-        />
+      <el-form-item :label="t('project.technology')" prop="technique">
+        <el-select v-model="displayData.technique" placeholder="请选择" disabled>
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PMS_PROJECT_RY_TECHNOLOGY)"
+            :key="dict.id"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="井别" prop="wellCategory">
+        <el-input v-model="displayData.wellCategory" placeholder="" disabled/>
       </el-form-item>
       <el-form-item label="设计井深(m)" prop="designWellDepth">
         <el-input v-model="displayData.designWellDepth" placeholder="" disabled/>
       </el-form-item>
+      <el-form-item label="井控级别" prop="wellControlLevel">
+        <el-input v-model="displayData.wellControlLevel" placeholder="" disabled/>
+      </el-form-item>
+      <el-form-item label="套生段产管尺寸(mm)" prop="casingPipeSize">
+        <el-input v-model="displayData.casingPipeSize" placeholder="" disabled/>
+      </el-form-item>
+      <!--
       <el-form-item label="当前井深(m)" prop="currentDepth">
         <el-input v-model="formData.currentDepth" placeholder="请输入当前井深(m)" />
       </el-form-item>
@@ -55,13 +66,14 @@
       </el-form-item>
       <el-form-item label="当日油耗(吨)" prop="dailyFuel">
         <el-input v-model="formData.dailyFuel" placeholder="请输入当日油耗(吨)" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="总施工井数" prop="monthlyFuel">
         <el-input v-model="displayData.totalConstructionWells" placeholder="" disabled/>
       </el-form-item>
       <el-form-item label="完工井数" prop="completedWells">
         <el-input v-model="displayData.completedWells" placeholder="" disabled/>
       </el-form-item>
+      <!--
       <el-form-item label="泥浆密度(g/cm³)" prop="mudDensity">
         <el-input v-model="formData.mudDensity" placeholder="请输入泥浆性能-密度(g/cm³)" />
       </el-form-item>
@@ -79,6 +91,27 @@
       </el-form-item>
       <el-form-item label="设计井身结构" prop="designWellStruct">
         <el-input v-model="displayData.designWellStruct" placeholder="" type="textarea" disabled/>
+      </el-form-item> -->
+      <el-form-item :label="t('project.currentOperation')" prop="currentOperation">
+        <el-input v-model="formData.currentOperation" placeholder="请输入目前工序" type="textarea"/>
+      </el-form-item>
+      <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="t('project.transitTime')" prop="transitTime">
+        <el-input v-model="displayTransitTime" placeholder="" disabled
+                  :class="{'red-text': isTransitTimeOver}"
+                  id="transitTimeInput" />
+      </el-form-item>
+      <el-form-item :label="t('project.nptReason')" prop="ryNptReason">
+        <el-select v-model="formData.ryNptReason" placeholder="请选择" disabled>
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PMS_PROJECT_RY_NPT_REASON)"
+            :key="dict.id"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="生产动态" prop="productionStatus">
         <el-input v-model="formData.productionStatus" placeholder="请输入生产动态" type="textarea"/>
@@ -122,9 +155,10 @@ watch(() => props.rowData, (newVal) => {
     displayData.value.contractName = newVal.contractName || ''
     displayData.value.taskName = newVal.taskName || ''
     displayData.value.designWellDepth = newVal.designWellDepth || ''
-    displayData.value.designWellStruct = newVal.designWellStruct || ''
-    displayData.value.totalConstructionWells = newVal.totalConstructionWells || ''
-    displayData.value.completedWells = newVal.completedWells || ''
+    displayData.value.technique = newVal.technique || ''
+    displayData.value.wellCategory = newVal.wellCategory || ''
+    displayData.value.wellControlLevel = newVal.wellControlLevel || ''
+    displayData.value.casingPipeSize = newVal.casingPipeSize || ''
   }
 }, { immediate: true })
 
@@ -139,9 +173,10 @@ const displayData = ref({
   contractName: '',
   taskName: '',
   designWellDepth: '',
-  designWellStruct: '',
-  totalConstructionWells: '',
-  completedWells: ''
+  technique: '',
+  wellCategory: '',
+  wellControlLevel: '',
+  casingPipeSize: ''
 })
 
 const formData = ref({
@@ -152,6 +187,7 @@ const formData = ref({
   projectClassification: undefined,
   relocationDays: undefined,
   latestWellDoneTime: undefined,
+  technique: undefined,
   designWellDepth: undefined,
   currentDepth: undefined,
   dailyFootage: undefined,
@@ -164,7 +200,7 @@ const formData = ref({
   dailyFuel: undefined,
   monthlyFuel: undefined,
   nonProductionTime: undefined,
-  nptReason: undefined,
+  ryNptReason: undefined,
   constructionStartDate: undefined,
   constructionEndDate: undefined,
   productionStatus: undefined,
@@ -201,9 +237,10 @@ const open = async (type: string, id?: number) => {
     displayData.value.contractName = props.rowData.contractName || ''
     displayData.value.taskName = props.rowData.taskName || ''
     displayData.value.designWellDepth = props.rowData.designWellDepth || ''
-    displayData.value.designWellStruct = props.rowData.designWellStruct || ''
-    displayData.value.totalConstructionWells = props.rowData.totalConstructionWells || ''
-    displayData.value.completedWells = props.rowData.completedWells || ''
+    displayData.value.technique = props.rowData.technique || ''
+    displayData.value.wellCategory = props.rowData.wellCategory || ''
+    displayData.value.wellControlLevel = props.rowData.wellControlLevel || ''
+    displayData.value.casingPipeSize = props.rowData.casingPipeSize || ''
   }
 
   // 修改时，设置数据
@@ -291,9 +328,10 @@ const resetForm = () => {
     contractName: '',
     taskName: '',
     designWellDepth: '',
-    designWellStruct: '',
-    totalConstructionWells: '',
-    completedWells: ''
+    technique: '',
+    wellCategory: '',
+    wellControlLevel: '',
+    casingPipeSize: ''
   }
 
   formRef.value?.resetFields()

src/views/pms/iotrydailyreport/xjindex.vue

@@ -159,9 +159,9 @@
                 </el-tooltip>
               </template>
             </el-table-column> -->
-            <el-table-column label="目前工序" align="center" prop="currentOperation" :width="columnWidths.currentOperation"/>
-            <el-table-column label="下部工序" align="center" prop="nextPlan" :width="columnWidths.nextPlan"/>
-            <el-table-column label="运行时效" align="center" prop="transitTime" :width="columnWidths.transitTime" :formatter="percentageFormatter"/>
+            <el-table-column :label="t('project.currentOperation')" align="center" prop="currentOperation" :width="columnWidths.currentOperation"/>
+            <el-table-column :label="t('project.nextPlan')" align="center" prop="nextPlan" :width="columnWidths.nextPlan"/>
+            <el-table-column :label="t('project.transitTime')" align="center" prop="transitTime" :width="columnWidths.transitTime" :formatter="percentageFormatter"/>
             <el-table-column label="额定生产时间(H)" align="center" prop="ratedProductionTime" :width="columnWidths.ratedProductionTime"/>
             <el-table-column label="生产时间(H)" align="center" prop="productionTime" :width="columnWidths.productionTime"/>
             <el-table-column label="非生产时间(H)" align="center" prop="nonProductionTime" :width="columnWidths.nonProductionTime"/>
@@ -215,7 +215,7 @@
       </ContentWrap>
 
       <!-- 表单弹窗：添加/修改 -->
-      <IotRyDailyReportForm ref="formRef" @success="getList" :row-data="selectedRowData"/>
+      <IotRyXjDailyReportForm ref="formRef" @success="getList" :row-data="selectedRowData"/>
     </el-col>
   </el-row>
 
@@ -225,7 +225,7 @@
 import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
 import download from '@/utils/download'
 import { IotRyDailyReportApi, IotRyDailyReportVO } from '@/api/pms/iotrydailyreport'
-import IotRyDailyReportForm from './IotRyDailyReportForm.vue'
+import IotRyXjDailyReportForm from './IotRyXjDailyReportForm.vue'
 import {DICT_TYPE, getDictLabel} from "@/utils/dict";
 import { ref, reactive, onMounted, nextTick, watch, onUnmounted } from 'vue'
 import DeptTree2 from "@/views/pms/iotrhdailyreport/DeptTree2.vue";
@@ -620,9 +620,10 @@ const openForm = (type: string, id?: number, row?: any) => {
       contractName: row.contractName,
       taskName: row.taskName,
       designWellDepth: row.designWellDepth,
-      designWellStruct: row.designWellStruct,
-      totalConstructionWells: row.totalConstructionWells,
-      completedWells: row.completedWells
+      technique: row.technique,
+      wellCategory: row.wellCategory,
+      wellControlLevel: row.wellControlLevel,
+      casingPipeSize: row.casingPipeSize
     }
   } else {
     selectedRowData.value = null