🦄 refactor: 调整瑞鹰日报填报

src/layout/components/Menu/src/components/useRenderMenuItem.tsx

@@ -42,7 +42,6 @@ export const useRenderMenuItem = () =>
           // return !v.meta?.hidden
         })
         .map((v) => {
-          console.log('v :>> ', v)
           const meta = v.meta ?? {}
           const { oneShowingChild, onlyOneChild } = hasOneShowingChild(v.children, v)
           const fullPath = isUrl(v.path) ? v.path : pathResolve(parentPath, v.path) // getAllParentPath<AppRouteRecordRaw>(allRouters, v.path).join('/')

src/views/pms/iotrydailyreport/index.vue

@@ -445,7 +445,7 @@
                 <el-button
                   link
                   type="primary"
-                  @click="openForm('update', scope.row.id, scope.row)"
+                  @click="handleOpenForm(scope.row.id, 'edit')"
                   v-hasPermi="['pms:iot-ry-daily-report:update']"
                 >
                   编辑
@@ -472,15 +472,15 @@
       </ContentWrap>
 
       <!-- 表单弹窗：添加/修改 -->
-      <IotRyDailyReportForm ref="formRef" @success="getList" :row-data="selectedRowData" />
+      <ry-form v-model:visible="visible" type="edit" ref="formRef" :load-list="getList" />
     </el-col>
   </el-row>
 </template>
 
 <script setup lang="ts">
+import ryForm from './ry-form.vue'
 import { dateFormatter, dateFormatter2, rangeShortcuts } from '@/utils/formatTime'
 import { IotRyDailyReportApi, IotRyDailyReportVO } from '@/api/pms/iotrydailyreport'
-import IotRyDailyReportForm from './IotRyDailyReportForm.vue'
 import { DICT_TYPE } from '@/utils/dict'
 import { ref, reactive, onMounted, nextTick, watch, onUnmounted } from 'vue'
 
@@ -930,27 +930,37 @@ const resetQuery = () => {
   handleQuery()
 }
 
-/** 添加/修改操作 */
+const visible = ref(false)
+
 const formRef = ref()
-const openForm = (type: string, id?: number, row?: any) => {
-  // 保存当前行数据
-  if (row) {
-    selectedRowData.value = {
-      deptName: row.deptName,
-      contractName: row.contractName,
-      taskName: row.taskName,
-      designWellDepth: row.designWellDepth,
-      designWellStruct: row.designWellStruct,
-      totalConstructionWells: row.totalConstructionWells,
-      completedWells: row.completedWells
-    }
-  } else {
-    selectedRowData.value = null
-  }
 
-  formRef.value.open(type, id)
+function handleOpenForm(id: number, type: 'edit' | 'readonly') {
+  if (formRef.value) {
+    formRef.value.handleOpenForm(id, type)
+  }
 }
 
+/** 添加/修改操作 */
+// const formRef = ref()
+// const openForm = (type: string, id?: number, row?: any) => {
+//   // 保存当前行数据
+//   if (row) {
+//     selectedRowData.value = {
+//       deptName: row.deptName,
+//       contractName: row.contractName,
+//       taskName: row.taskName,
+//       designWellDepth: row.designWellDepth,
+//       designWellStruct: row.designWellStruct,
+//       totalConstructionWells: row.totalConstructionWells,
+//       completedWells: row.completedWells
+//     }
+//   } else {
+//     selectedRowData.value = null
+//   }
+
+//   formRef.value.open(type, id)
+// }
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {

src/views/pms/iotrydailyreport/ry-form.vue

@@ -456,6 +456,7 @@ const orange = computed(() => {
             :disabled="isMainFieldDisabled"
             :controls="false"
             align="left"
+            class="w-full!"
           />
         </el-form-item>
         <el-form-item label="当日用电量(kWh)" prop="dailyPowerUsage">
@@ -467,6 +468,7 @@ const orange = computed(() => {
             :disabled="isMainFieldDisabled"
             :controls="false"
             align="left"
+            class="w-full!"
           />
         </el-form-item>
         <el-form-item label="当日油耗(升)" prop="dailyFuel">
@@ -479,6 +481,7 @@ const orange = computed(() => {
             :disabled="isMainFieldDisabled"
             :controls="false"
             align="left"
+            class="w-full!"
           />
         </el-form-item>
         <el-form-item label="泥浆密度(g/cm³)" prop="mudDensity">
@@ -490,6 +493,7 @@ const orange = computed(() => {
             :disabled="isMainFieldDisabled"
             :controls="false"
             align="left"
+            class="w-full!"
           />
         </el-form-item>
         <el-form-item label="泥浆粘度(S)" prop="mudViscosity">
@@ -501,6 +505,7 @@ const orange = computed(() => {
             :disabled="isMainFieldDisabled"
             :controls="false"
             align="left"
+            class="w-full!"
           />
         </el-form-item>
         <el-form-item label="水平段长度(m)" prop="lateralLength">
@@ -512,6 +517,7 @@ const orange = computed(() => {
             :disabled="isMainFieldDisabled"
             :controls="false"
             align="left"
+            class="w-full!"
           />
         </el-form-item>
         <el-form-item label="井斜(°)" prop="wellInclination">
@@ -523,6 +529,7 @@ const orange = computed(() => {
             :disabled="isMainFieldDisabled"
             :controls="false"
             align="left"
+            class="w-full!"
           />
         </el-form-item>
         <el-form-item label="方位(°)" prop="azimuth">
@@ -534,6 +541,7 @@ const orange = computed(() => {
             :disabled="isMainFieldDisabled"
             :controls="false"
             align="left"
+            class="w-full!"
           />
         </el-form-item>
         <el-form-item label="设计井身结构" prop="designWellStruct">

src/views/pms/iotrydailyreport/ry-xj-form.vue

@@ -521,10 +521,17 @@ const orange = computed(() => {
             :min="0"
             v-model="form.totalStaffNum"
             placeholder="请输入全员数量"
+            class="w-full!"
           />
         </el-form-item>
         <el-form-item label="在岗人数" prop="onDutyStaffNum">
-          <el-input-number :min="0" v-model="onDutyStaffNum" placeholder="" disabled />
+          <el-input-number
+            :min="0"
+            v-model="onDutyStaffNum"
+            placeholder=""
+            disabled
+            class="w-full!"
+          />
         </el-form-item>
         <el-form-item label="休假人员数量" prop="leaveStaffNum">
           <el-input-number
@@ -534,6 +541,7 @@ const orange = computed(() => {
             :min="0"
             v-model="form.leaveStaffNum"
             placeholder="请输入休假人员数量"
+            class="w-full!"
           />
         </el-form-item>
         <el-form-item class="col-span-2" label="生产动态" prop="productionStatus">

src/views/pms/iotrydailyreport/xjindex.vue

@@ -455,7 +455,7 @@
                 <el-button
                   link
                   type="primary"
-                  @click="openForm('update', scope.row.id, scope.row)"
+                  @click="handleOpenForm(scope.row.id, 'edit')"
                   v-hasPermi="['pms:iot-ry-daily-report:update']"
                 >
                   编辑
@@ -482,16 +482,16 @@
       </ContentWrap>
 
       <!-- 表单弹窗：添加/修改 -->
-      <IotRyXjDailyReportForm ref="formRef" @success="getList" :row-data="selectedRowData" />
+      <ry-xj-form v-model:visible="visible" type="edit" ref="formRef" :load-list="getList" />
     </el-col>
   </el-row>
 </template>
 
 <script setup lang="ts">
+import ryXjForm from './ry-xj-form.vue'
 import { dateFormatter, dateFormatter2, rangeShortcuts } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { IotRyDailyReportApi, IotRyDailyReportVO } from '@/api/pms/iotrydailyreport'
-import IotRyXjDailyReportForm from './IotRyXjDailyReportForm.vue'
 import { DICT_TYPE } from '@/utils/dict'
 import { ref, reactive, onMounted, nextTick, watch, onUnmounted } from 'vue'
 import { useDebounceFn } from '@vueuse/core'
@@ -1058,26 +1058,14 @@ const resetQuery = () => {
   handleQuery()
 }
 
-/** 添加/修改操作 */
+const visible = ref(false)
+
 const formRef = ref()
-const openForm = (type: string, id?: number, row?: any) => {
-  // 保存当前行数据
-  if (row) {
-    selectedRowData.value = {
-      deptName: row.deptName,
-      contractName: row.contractName,
-      taskName: row.taskName,
-      designWellDepth: row.designWellDepth,
-      technique: row.technique,
-      wellCategory: row.wellCategory,
-      wellControlLevel: row.wellControlLevel,
-      casingPipeSize: row.casingPipeSize
-    }
-  } else {
-    selectedRowData.value = null
-  }
 
-  formRef.value.open(type, id)
+function handleOpenForm(id: number, type: 'edit' | 'readonly') {
+  if (formRef.value) {
+    formRef.value.handleOpenForm(id, type)
+  }
 }
 
 /** 删除按钮操作 */