Merge remote-tracking branch 'origin/master'

src/views/pms/iotrydailyreport/IotRyDailyReportForm.vue

@@ -7,104 +7,64 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="施工队伍id" prop="deptId">
-        <el-input v-model="formData.deptId" placeholder="请输入施工队伍id" />
+      <el-form-item label="施工队伍" prop="deptName">
+        <el-input v-model="displayData.deptName" placeholder="" disabled/>
       </el-form-item>
-      <el-form-item label="项目id" prop="projectId">
-        <el-input v-model="formData.projectId" placeholder="请输入项目id" />
+      <el-form-item label="项目" prop="contractName">
+        <el-input v-model="displayData.contractName" placeholder="" disabled/>
       </el-form-item>
-      <el-form-item label="任务id" prop="taskId">
-        <el-input v-model="formData.taskId" placeholder="请输入任务id" />
+      <el-form-item label="任务" prop="taskName">
+        <el-input v-model="displayData.taskName" placeholder="" disabled/>
       </el-form-item>
-      <el-form-item label="项目类别(钻井 修井 注氮 酸化压裂... )" prop="projectClassification">
-        <el-input v-model="formData.projectClassification" placeholder="请输入项目类别(钻井 修井 注氮 酸化压裂... )" />
-      </el-form-item>
-      <el-form-item label="搬迁安装天数(D)" prop="relocationDays">
-        <el-input v-model="formData.relocationDays" placeholder="请输入搬迁安装天数(D)" />
+      <el-form-item label="施工状态" prop="rigStatus">
+        <el-radio-group v-model="formData.rigStatus">
+          <el-radio value="1">请选择字典生成</el-radio>
+        </el-radio-group>
       </el-form-item>
-      <el-form-item label="上井次完井时间" prop="lastestWellDoneTime">
+      <el-form-item label="上井次完井时间" prop="latestWellDoneTime">
         <el-date-picker
           v-model="formData.lastestWellDoneTime"
           type="date"
           value-format="x"
-          placeholder="选择上井次完井时间"
+          placeholder=""
+          disabled
         />
       </el-form-item>
+      <el-form-item label="设计井深(m)" prop="designWellDepth">
+        <el-input v-model="formData.designWellDepth" placeholder="" disabled/>
+      </el-form-item>
       <el-form-item label="当前井深(m)" prop="currentDepth">
         <el-input v-model="formData.currentDepth" placeholder="请输入当前井深(m)" />
       </el-form-item>
       <el-form-item label="日进尺(m)" prop="dailyFootage">
-        <el-input v-model="formData.dailyFootage" placeholder="请输入日进尺(m)" />
+        <el-input v-model="formData.dailyFootage" placeholder="" disabled/>
       </el-form-item>
       <el-form-item label="月进尺(m)" prop="monthlyFootage">
-        <el-input v-model="formData.monthlyFootage" placeholder="请输入月进尺(m)" />
+        <el-input v-model="formData.monthlyFootage" placeholder="" disabled/>
       </el-form-item>
       <el-form-item label="年累计进尺(m)" prop="annualFootage">
-        <el-input v-model="formData.annualFootage" placeholder="请输入年累计进尺(m)" />
+        <el-input v-model="formData.annualFootage" placeholder="" disabled/>
       </el-form-item>
       <el-form-item label="当日用电量(kWh)" prop="dailyPowerUsage">
         <el-input v-model="formData.dailyPowerUsage" placeholder="请输入当日用电量(kWh)" />
       </el-form-item>
-      <el-form-item label="当月用电量(kWh)" prop="monthlyPowerUsage">
-        <el-input v-model="formData.monthlyPowerUsage" placeholder="请输入当月用电量(kWh)" />
-      </el-form-item>
       <el-form-item label="当日油耗(吨)" prop="dailyFuel">
         <el-input v-model="formData.dailyFuel" placeholder="请输入当日油耗(吨)" />
       </el-form-item>
-      <el-form-item label="当月油耗(吨)" prop="monthlyFuel">
-        <el-input v-model="formData.monthlyFuel" placeholder="请输入当月油耗(吨)" />
-      </el-form-item>
-      <el-form-item label="非生产时间(H)" prop="nonProductionTime">
-        <el-date-picker
-          v-model="formData.nonProductionTime"
-          type="date"
-          value-format="x"
-          placeholder="选择非生产时间(H)"
-        />
-      </el-form-item>
-      <el-form-item label="非生产时间原因" prop="nptReason">
-        <el-input v-model="formData.nptReason" placeholder="请输入非生产时间原因" />
-      </el-form-item>
-      <el-form-item label="施工开始日期" prop="constructionStartDate">
-        <el-date-picker
-          v-model="formData.constructionStartDate"
-          type="date"
-          value-format="x"
-          placeholder="选择施工开始日期"
-        />
-      </el-form-item>
-      <el-form-item label="施工结束日期" prop="constructionEndDate">
-        <el-date-picker
-          v-model="formData.constructionEndDate"
-          type="date"
-          value-format="x"
-          placeholder="选择施工结束日期"
-        />
-      </el-form-item>
-      <el-form-item label="当日生产情况生产动态" prop="productionStatus">
-        <el-radio-group v-model="formData.productionStatus">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
+      <el-form-item label="总施工井数" prop="monthlyFuel">
+        <el-input v-model="formData.totalConstructionWells" placeholder="" disabled/>
       </el-form-item>
-      <el-form-item label="下步工作计划" prop="nextPlan">
-        <el-input v-model="formData.nextPlan" placeholder="请输入下步工作计划" />
+      <el-form-item label="完工井数" prop="completedWells">
+        <el-input v-model="formData.completedWells" placeholder="" disabled/>
       </el-form-item>
-      <el-form-item label="施工状态(动迁 准备 施工 完工)" prop="rigStatus">
-        <el-radio-group v-model="formData.rigStatus">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="人员情况" prop="personnel">
-        <el-input v-model="formData.personnel" placeholder="请输入人员情况" />
-      </el-form-item>
-      <el-form-item label="泥浆性能-密度(g/cm³)" prop="mudDensity">
+      <el-form-item label="泥浆密度(g/cm³)" prop="mudDensity">
         <el-input v-model="formData.mudDensity" placeholder="请输入泥浆性能-密度(g/cm³)" />
       </el-form-item>
-      <el-form-item label="泥浆性能-粘度(S)" prop="mudViscosity">
+      <el-form-item label="泥浆粘度(S)" prop="mudViscosity">
         <el-input v-model="formData.mudViscosity" placeholder="请输入泥浆性能-粘度(S)" />
       </el-form-item>
-      <el-form-item label="水平段长度(m) 适用于水平井" prop="lateralLength">
-        <el-input v-model="formData.lateralLength" placeholder="请输入水平段长度(m) 适用于水平井" />
+      <el-form-item label="水平段长度(m)" prop="lateralLength">
+        <el-input v-model="formData.lateralLength" placeholder="请输入水平段长度(m)" />
       </el-form-item>
       <el-form-item label="井斜(°)" prop="wellInclination">
         <el-input v-model="formData.wellInclination" placeholder="请输入井斜(°)" />
@@ -112,27 +72,17 @@
       <el-form-item label="方位(°)" prop="azimuth">
         <el-input v-model="formData.azimuth" placeholder="请输入方位(°)" />
       </el-form-item>
-      <el-form-item label="不同专业公司的扩展属性值" prop="extProperty">
-        <el-input v-model="formData.extProperty" placeholder="请输入不同专业公司的扩展属性值" />
-      </el-form-item>
-      <el-form-item label="排序值" prop="sort">
-        <el-input v-model="formData.sort" placeholder="请输入排序值" />
+      <el-form-item label="设计井身结构" prop="designWellStruct">
+        <el-input v-model="displayData.designWellStruct" placeholder="" type="textarea" disabled/>
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
-      </el-form-item>
-      <el-form-item label="状态(0启用 1禁用)" prop="status">
-        <el-radio-group v-model="formData.status">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
+      <el-form-item label="生产动态" prop="productionStatus">
+        <el-input v-model="formData.productionStatus" placeholder="请输入生产动态" type="textarea"/>
       </el-form-item>
-      <el-form-item label="流程实例id" prop="processInstanceId">
-        <el-input v-model="formData.processInstanceId" placeholder="请输入流程实例id" />
+      <el-form-item label="人员情况" prop="personnel">
+        <el-input v-model="formData.personnel" placeholder="请输入人员情况" type="textarea"/>
       </el-form-item>
-      <el-form-item label="审批状态 未提交、审批中、审批通过、审批不通过、已取消" prop="auditStatus">
-        <el-radio-group v-model="formData.auditStatus">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea"/>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -143,6 +93,8 @@
 </template>
 <script setup lang="ts">
 import { IotRyDailyReportApi, IotRyDailyReportVO } from '@/api/pms/iotrydailyreport'
+import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
+import { computed, ref, watch, nextTick, reactive } from 'vue'
 
 /** 瑞鹰日报 表单 */
 defineOptions({ name: 'IotRyDailyReportForm' })
@@ -150,10 +102,38 @@ defineOptions({ name: 'IotRyDailyReportForm' })
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
+// 添加 props 接收行数据
+const props = defineProps({
+  rowData: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+// 监听 props.rowData 的变化
+watch(() => props.rowData, (newVal) => {
+  if (newVal) {
+    displayData.value.deptName = newVal.deptName || ''
+    displayData.value.contractName = newVal.contractName || ''
+    displayData.value.taskName = newVal.taskName || ''
+    displayData.value.relocationDays = newVal.relocationDays || ''
+    displayData.value.designWellStruct = newVal.designWellStruct || ''
+  }
+}, { immediate: true })
+
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+
+// 添加显示数据对象
+const displayData = ref({
+  deptName: '',
+  contractName: '',
+  taskName: '',
+  designWellStruct: ''
+})
+
 const formData = ref({
   id: undefined,
   deptId: undefined,
@@ -161,11 +141,14 @@ const formData = ref({
   taskId: undefined,
   projectClassification: undefined,
   relocationDays: undefined,
-  lastestWellDoneTime: undefined,
+  latestWellDoneTime: undefined,
+  designWellDepth: undefined,
   currentDepth: undefined,
   dailyFootage: undefined,
   monthlyFootage: undefined,
   annualFootage: undefined,
+  totalConstructionWells: undefined,
+  completedWells: undefined,
   dailyPowerUsage: undefined,
   monthlyPowerUsage: undefined,
   dailyFuel: undefined,
@@ -183,6 +166,7 @@ const formData = ref({
   lateralLength: undefined,
   wellInclination: undefined,
   azimuth: undefined,
+  designWellStruct: undefined,
   extProperty: undefined,
   sort: undefined,
   remark: undefined,
@@ -200,6 +184,15 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+
+  // 设置显示数据
+  if (props.rowData) {
+    displayData.value.deptName = props.rowData.deptName || ''
+    displayData.value.contractName = props.rowData.contractName || ''
+    displayData.value.taskName = props.rowData.taskName || ''
+    displayData.value.relocationDays = props.rowData.relocationDays || ''
+  }
+
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -210,6 +203,7 @@ const open = async (type: string, id?: number) => {
     }
   }
 }
+
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
@@ -245,11 +239,14 @@ const resetForm = () => {
     taskId: undefined,
     projectClassification: undefined,
     relocationDays: undefined,
-    lastestWellDoneTime: undefined,
+    latestWellDoneTime: undefined,
+    designWellDepth: undefined,
     currentDepth: undefined,
     dailyFootage: undefined,
     monthlyFootage: undefined,
     annualFootage: undefined,
+    totalConstructionWells: undefined,
+    completedWells: undefined,
     dailyPowerUsage: undefined,
     monthlyPowerUsage: undefined,
     dailyFuel: undefined,
@@ -267,6 +264,7 @@ const resetForm = () => {
     lateralLength: undefined,
     wellInclination: undefined,
     azimuth: undefined,
+    designWellStruct: undefined,
     extProperty: undefined,
     sort: undefined,
     remark: undefined,
@@ -274,6 +272,14 @@ const resetForm = () => {
     processInstanceId: undefined,
     auditStatus: undefined,
   }
+
+  displayData.value = {
+    deptName: '',
+    contractName: '',
+    taskName: '',
+    designWellStruct: ''
+  }
+
   formRef.value?.resetFields()
 }
 </script>

src/views/pms/iotrydailyreport/index.vue

@@ -8,315 +8,24 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="施工队伍id" prop="deptId">
+      <el-form-item label="项目" prop="contractName">
         <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入施工队伍id"
+          v-model="queryParams.contractName"
+          placeholder="请输入项目"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="项目id" prop="projectId">
+      <el-form-item label="任务" prop="taskName">
         <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
+          v-model="queryParams.taskName"
+          placeholder="请输入任务"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="任务id" prop="taskId">
-        <el-input
-          v-model="queryParams.taskId"
-          placeholder="请输入任务id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="项目类别(钻井 修井 注氮 酸化压裂... )" prop="projectClassification">
-        <el-input
-          v-model="queryParams.projectClassification"
-          placeholder="请输入项目类别(钻井 修井 注氮 酸化压裂... )"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="搬迁安装天数(D)" prop="relocationDays">
-        <el-input
-          v-model="queryParams.relocationDays"
-          placeholder="请输入搬迁安装天数(D)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="上井次完井时间" prop="lastestWellDoneTime">
-        <el-date-picker
-          v-model="queryParams.lastestWellDoneTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="当前井深(m)" prop="currentDepth">
-        <el-input
-          v-model="queryParams.currentDepth"
-          placeholder="请输入当前井深(m)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="日进尺(m)" prop="dailyFootage">
-        <el-input
-          v-model="queryParams.dailyFootage"
-          placeholder="请输入日进尺(m)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="月进尺(m)" prop="monthlyFootage">
-        <el-input
-          v-model="queryParams.monthlyFootage"
-          placeholder="请输入月进尺(m)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="年累计进尺(m)" prop="annualFootage">
-        <el-input
-          v-model="queryParams.annualFootage"
-          placeholder="请输入年累计进尺(m)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="当日用电量(kWh)" prop="dailyPowerUsage">
-        <el-input
-          v-model="queryParams.dailyPowerUsage"
-          placeholder="请输入当日用电量(kWh)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="当月用电量(kWh)" prop="monthlyPowerUsage">
-        <el-input
-          v-model="queryParams.monthlyPowerUsage"
-          placeholder="请输入当月用电量(kWh)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="当日油耗(吨)" prop="dailyFuel">
-        <el-input
-          v-model="queryParams.dailyFuel"
-          placeholder="请输入当日油耗(吨)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="当月油耗(吨)" prop="monthlyFuel">
-        <el-input
-          v-model="queryParams.monthlyFuel"
-          placeholder="请输入当月油耗(吨)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="非生产时间(H)" prop="nonProductionTime">
-        <el-date-picker
-          v-model="queryParams.nonProductionTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="非生产时间原因" prop="nptReason">
-        <el-input
-          v-model="queryParams.nptReason"
-          placeholder="请输入非生产时间原因"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="施工开始日期" prop="constructionStartDate">
-        <el-date-picker
-          v-model="queryParams.constructionStartDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="施工结束日期" prop="constructionEndDate">
-        <el-date-picker
-          v-model="queryParams.constructionEndDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-220px"
-        />
-      </el-form-item>
-      <el-form-item label="当日生产情况生产动态" prop="productionStatus">
-        <el-select
-          v-model="queryParams.productionStatus"
-          placeholder="请选择当日生产情况生产动态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="下步工作计划" prop="nextPlan">
-        <el-input
-          v-model="queryParams.nextPlan"
-          placeholder="请输入下步工作计划"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="施工状态(动迁 准备 施工 完工)" prop="rigStatus">
-        <el-select
-          v-model="queryParams.rigStatus"
-          placeholder="请选择施工状态(动迁 准备 施工 完工)"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="人员情况" prop="personnel">
-        <el-input
-          v-model="queryParams.personnel"
-          placeholder="请输入人员情况"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="泥浆性能-密度(g/cm³)" prop="mudDensity">
-        <el-input
-          v-model="queryParams.mudDensity"
-          placeholder="请输入泥浆性能-密度(g/cm³)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="泥浆性能-粘度(S)" prop="mudViscosity">
-        <el-input
-          v-model="queryParams.mudViscosity"
-          placeholder="请输入泥浆性能-粘度(S)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="水平段长度(m) 适用于水平井" prop="lateralLength">
-        <el-input
-          v-model="queryParams.lateralLength"
-          placeholder="请输入水平段长度(m) 适用于水平井"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="井斜(°)" prop="wellInclination">
-        <el-input
-          v-model="queryParams.wellInclination"
-          placeholder="请输入井斜(°)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="方位(°)" prop="azimuth">
-        <el-input
-          v-model="queryParams.azimuth"
-          placeholder="请输入方位(°)"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="不同专业公司的扩展属性值" prop="extProperty">
-        <el-input
-          v-model="queryParams.extProperty"
-          placeholder="请输入不同专业公司的扩展属性值"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="排序值" prop="sort">
-        <el-input
-          v-model="queryParams.sort"
-          placeholder="请输入排序值"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="状态(0启用 1禁用)" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态(0启用 1禁用)"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="流程实例id" prop="processInstanceId">
-        <el-input
-          v-model="queryParams.processInstanceId"
-          placeholder="请输入流程实例id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="审批状态 未提交、审批中、审批通过、审批不通过、已取消" prop="auditStatus">
-        <el-select
-          v-model="queryParams.auditStatus"
-          placeholder="请选择审批状态 未提交、审批中、审批通过、审批不通过、已取消"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -353,88 +62,88 @@
   </ContentWrap>
 
   <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="施工队伍id" align="center" prop="deptId" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="任务id" align="center" prop="taskId" />
-      <el-table-column label="项目类别(钻井 修井 注氮 酸化压裂... )" align="center" prop="projectClassification" />
-      <el-table-column label="搬迁安装天数(D)" align="center" prop="relocationDays" />
-      <el-table-column
-        label="上井次完井时间"
-        align="center"
-        prop="lastestWellDoneTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="当前井深(m)" align="center" prop="currentDepth" />
-      <el-table-column label="日进尺(m)" align="center" prop="dailyFootage" />
-      <el-table-column label="月进尺(m)" align="center" prop="monthlyFootage" />
-      <el-table-column label="年累计进尺(m)" align="center" prop="annualFootage" />
-      <el-table-column label="当日用电量(kWh)" align="center" prop="dailyPowerUsage" />
-      <el-table-column label="当月用电量(kWh)" align="center" prop="monthlyPowerUsage" />
-      <el-table-column label="当日油耗(吨)" align="center" prop="dailyFuel" />
-      <el-table-column label="当月油耗(吨)" align="center" prop="monthlyFuel" />
-      <el-table-column label="非生产时间(H)" align="center" prop="nonProductionTime" />
-      <el-table-column label="非生产时间原因" align="center" prop="nptReason" />
-      <el-table-column
-        label="施工开始日期"
-        align="center"
-        prop="constructionStartDate"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column
-        label="施工结束日期"
-        align="center"
-        prop="constructionEndDate"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="当日生产情况生产动态" align="center" prop="productionStatus" />
-      <el-table-column label="下步工作计划" align="center" prop="nextPlan" />
-      <el-table-column label="施工状态(动迁 准备 施工 完工)" align="center" prop="rigStatus" />
-      <el-table-column label="人员情况" align="center" prop="personnel" />
-      <el-table-column label="泥浆性能-密度(g/cm³)" align="center" prop="mudDensity" />
-      <el-table-column label="泥浆性能-粘度(S)" align="center" prop="mudViscosity" />
-      <el-table-column label="水平段长度(m) 适用于水平井" align="center" prop="lateralLength" />
-      <el-table-column label="井斜(°)" align="center" prop="wellInclination" />
-      <el-table-column label="方位(°)" align="center" prop="azimuth" />
-      <el-table-column label="不同专业公司的扩展属性值" align="center" prop="extProperty" />
-      <el-table-column label="排序值" align="center" prop="sort" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="状态(0启用 1禁用)" align="center" prop="status" />
-      <el-table-column label="流程实例id" align="center" prop="processInstanceId" />
-      <el-table-column label="审批状态 未提交、审批中、审批通过、审批不通过、已取消" align="center" prop="auditStatus" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center" min-width="120px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['pms:iot-ry-daily-report:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['pms:iot-ry-daily-report:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+  <ContentWrap ref="tableContainerRef">
+    <div class="table-container">
+      <el-table ref="tableRef" v-loading="loading" :data="list" :stripe="true"
+                style="width: 100%" :cell-style="cellStyle">
+        <el-table-column
+          label="日期"
+          align="center"
+          prop="createTime"
+          :formatter="dateFormatter2"
+          :width="columnWidths.createTime"
+        />
+        <el-table-column label="施工队伍" align="center" prop="deptName" :width="columnWidths.deptName"/>
+        <el-table-column label="项目" align="center" prop="contractName" :width="columnWidths.contractName"/>
+        <el-table-column label="任务" align="center" prop="taskName" :width="columnWidths.taskName"/>
+        <el-table-column label="设备型号" align="center" prop="equipmentType" :width="columnWidths.equipmentType"/>
+        <el-table-column :label="t('project.status')" align="center" prop="rigStatus" :width="columnWidths.rigStatus">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.PMS_PROJECT_TASK_RY_SCHEDULE" :value="scope.row.rigStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column label="上井次完井时间" align="center" prop="latestWellDoneTime" :width="columnWidths.latestWellDoneTime"/>
+        <el-table-column label="设计井深(m)" align="center" prop="designInjection" :width="columnWidths.designWellDepth"/>
+        <el-table-column label="当前井深(m)" align="center" prop="currentDepth" :width="columnWidths.currentDepth" />
+        <el-table-column label="日进尺(m)" align="center" prop="dailyFootage" :width="columnWidths.dailyFootage" />
+        <el-table-column label="月进尺(m)" align="center" prop="monthlyFootage" :width="columnWidths.monthlyFootage"/>
+        <el-table-column label="年累计进尺(m)" align="center" prop="annualFootage" :width="columnWidths.annualFootage"/>
+        <el-table-column label="总施工井数" align="center" prop="totalCompletedWells" :width="columnWidths.totalConstructionWells"/>
+        <el-table-column label="完工井数" align="center" prop="completedWells" :width="columnWidths.completedWells"/>
+        <el-table-column label="泥浆性能-密度(g/cm³)" align="center" prop="mudDensity" :width="columnWidths.mudDensity"/>
+        <el-table-column label="泥浆性能-粘度(S)" align="center" prop="mudViscosity" :width="columnWidths.mudViscosity"/>
+        <el-table-column
+          label="施工开始日期"
+          align="center"
+          prop="constructionStartDate"
+          :formatter="dateFormatter"
+          :width="columnWidths.constructionStartDate"
+        />
+        <el-table-column
+          label="施工结束日期"
+          align="center"
+          prop="constructionEndDate"
+          :formatter="dateFormatter"
+          :width="columnWidths.constructionEndDate"
+        />
+        <el-table-column label="水平段长度(m)" align="center" prop="lateralLength" :width="columnWidths.lateralLength" />
+        <el-table-column label="井斜(°)" align="center" prop="wellInclination" :width="columnWidths.wellInclination"/>
+        <el-table-column label="方位(°)" align="center" prop="azimuth" :width="columnWidths.azimuth"/>
+        <el-table-column label="设计井身结构" align="center" :width="columnWidths.designWellStruct" fixed-width>
+          <template #default="scope">
+            <el-tooltip
+              effect="light"
+              :content="scope.row.designWellStruct"
+              placement="top"
+              popper-class="design-well-struct-tooltip"
+              :disabled="!scope.row.designWellStruct || scope.row.designWellStruct.length <= 30"
+            >
+              <span class="design-well-struct-text">{{ formatDesignWellStruct(scope.row.designWellStruct) }}</span>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" :width="columnWidths.operation" fixed="right">
+          <template #default="scope">
+            <el-button
+              link
+              type="primary"
+              @click="openForm('update', scope.row.id, scope.row)"
+              v-hasPermi="['pms:iot-ry-daily-report:update']"
+            >
+              编辑
+            </el-button>
+            <el-button
+              link
+              type="danger"
+              @click="handleDelete(scope.row.id)"
+              v-hasPermi="['pms:iot-ry-daily-report:delete']"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
     <!-- 分页 -->
     <Pagination
       :total="total"
@@ -445,14 +154,16 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <IotRyDailyReportForm ref="formRef" @success="getList" />
+  <IotRyDailyReportForm ref="formRef" @success="getList" :row-data="selectedRowData"/>
 </template>
 
 <script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
+import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
 import download from '@/utils/download'
 import { IotRyDailyReportApi, IotRyDailyReportVO } from '@/api/pms/iotrydailyreport'
 import IotRyDailyReportForm from './IotRyDailyReportForm.vue'
+import {DICT_TYPE, getDictLabel} from "@/utils/dict";
+import { ref, reactive, onMounted, nextTick, watch, onUnmounted } from 'vue'
 
 /** 瑞鹰日报 列表 */
 defineOptions({ name: 'IotRyDailyReport' })
@@ -460,6 +171,9 @@ defineOptions({ name: 'IotRyDailyReport' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+// 添加 selectedRowData 响应式变量
+const selectedRowData = ref<Record<string, any> | null>(null)
+
 const loading = ref(true) // 列表的加载中
 const list = ref<IotRyDailyReportVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
@@ -467,7 +181,9 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   deptId: undefined,
+  contractName: undefined,
   projectId: undefined,
+  taskName: undefined,
   taskId: undefined,
   projectClassification: undefined,
   relocationDays: undefined,
@@ -504,6 +220,69 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
+// 表格引用
+const tableRef = ref()
+// 表格容器引用
+const tableContainerRef = ref()
+
+// 列宽度配置
+const columnWidths = ref({
+  deptName: '120px',
+  contractName: '150px',
+  taskName: '120px',
+  equipmentType: '120px',
+  rigStatus: '110px',
+  latestWellDoneTime: '120px',
+  designWellDepth: '120px',
+  currentDepth: '100px',
+  dailyFootage: '150px',
+  monthlyFootage: '150px',
+  annualFootage: '150px',
+  totalConstructionWells: '150px',
+  completedWells: '150px',
+  mudDensity: '150px',
+  mudViscosity: '150px',
+  constructionStartDate: '180px',
+  constructionEndDate: '180px',
+  lateralLength: '150px',
+  wellInclination: '150px',
+  azimuth: '150px',
+  designWellStruct: '200px',
+  createTime: '180px',
+  operation: '120px'
+})
+
+// 格式化设计井身结构文本
+const formatDesignWellStruct = (text: string | null | undefined) => {
+  if (!text) return '-';
+  // 如果文本长度超过30个字符，显示前30个字符并添加省略号
+  return text.length > 30 ? text.substring(0, 30) + '...' : text;
+};
+
+// 计算文本宽度
+const getTextWidth = (text: string, fontSize = 14) => {
+  const span = document.createElement('span');
+  span.style.visibility = 'hidden';
+  span.style.position = 'absolute';
+  span.style.whiteSpace = 'nowrap';
+  span.style.fontSize = `${fontSize}px`;
+  span.style.fontFamily = 'inherit';
+  span.innerText = text;
+
+  document.body.appendChild(span);
+  const width = span.offsetWidth;
+  document.body.removeChild(span);
+
+  return width;
+};
+
+// 可伸缩列配置
+const FLEXIBLE_COLUMNS = ['deptName', 'contractName', 'taskName', 'equipmentType', 'rigStatus', 'latestWellDoneTime', 'designWellDepth',
+  'currentDepth', 'dailyFootage', 'monthlyFootage', 'annualFootage', 'totalConstructionWells',
+  'completedWells', 'mudDensity', 'mudViscosity', 'constructionStartDate',
+  'constructionEndDate', 'lateralLength', 'wellInclination',
+  'azimuth', 'createTime'];
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -511,11 +290,125 @@ const getList = async () => {
     const data = await IotRyDailyReportApi.getIotRyDailyReportPage(queryParams)
     list.value = data.list
     total.value = data.total
+    // 获取数据后计算列宽
+    nextTick(() => {
+      calculateColumnWidths();
+    });
   } finally {
     loading.value = false
   }
 }
 
+// 计算列宽度
+const calculateColumnWidths = () => {
+  const MIN_WIDTH = 80; // 最小列宽
+  const PADDING = 25; // 列内边距
+
+  // 确保表格容器存在
+  if (!tableContainerRef.value?.$el) return;
+
+  const container = tableContainerRef.value.$el;
+  const containerWidth = container.clientWidth;
+
+  // 1. 计算所有列的最小宽度
+  const minWidths: Record<string, number> = {};
+  let totalMinWidth = 0;
+
+  // 计算列最小宽度的函数
+  const calculateColumnMinWidth = (key: string, label: string, getValue: Function) => {
+    const headerWidth = getTextWidth(label) * 1.2;
+    let contentMaxWidth = 0;
+
+    // 计算内容最大宽度
+    list.value.forEach((row, index) => {
+      let text = '';
+      if (key === 'rigStatus') {
+        // 特殊处理字典列
+        const dictValue = row[key];
+        // 这里需要根据实际情况获取字典标签，简化处理使用值本身
+        text = String(dictValue || '');
+      } else if (key.includes('Date') || key === 'createTime') {
+        // 日期列使用格式化后的值
+        text = dateFormatter(null, null, row[key]) || '';
+      } else {
+        text = String(getValue ? getValue(row, index) : (row[key] || ''));
+      }
+
+      const textWidth = getTextWidth(text);
+      if (textWidth > contentMaxWidth) contentMaxWidth = textWidth;
+    });
+
+    const minWidth = Math.max(headerWidth, contentMaxWidth, MIN_WIDTH) + PADDING;
+    minWidths[key] = minWidth;
+    totalMinWidth += minWidth;
+    return minWidth;
+  };
+
+  // 计算各列最小宽度
+  calculateColumnMinWidth('deptName', '施工队伍', (row: any) => row.deptName);
+  calculateColumnMinWidth('contractName', '项目', (row: any) => row.contractName);
+  calculateColumnMinWidth('taskName', '任务', (row: any) => row.taskName);
+  calculateColumnMinWidth('equipmentType', '设备型号', (row: any) => row.equipmentType);
+  calculateColumnMinWidth('rigStatus', t('project.status'), (row: any) => {
+    // 这里可以获取字典标签，简化处理使用值本身
+    return String(row.rigStatus || '');
+  });
+  calculateColumnMinWidth('latestWellDoneTime', '上井次完井时间', (row: any) => row.latestWellDoneTime);
+  calculateColumnMinWidth('designWellDepth', '设计井深(m)', (row: any) => row.designWellDepth);
+  calculateColumnMinWidth('currentDepth', '当前井深(m)', (row: any) => row.currentDepth);
+  calculateColumnMinWidth('dailyFootage', '日进尺(m)', (row: any) => row.dailyFootage);
+  calculateColumnMinWidth('monthlyFootage', '月进尺(m)', (row: any) => row.monthlyFootage);
+  calculateColumnMinWidth('annualFootage', '年累计进尺(m)', (row: any) => row.annualFootage);
+  calculateColumnMinWidth('totalConstructionWells', '总施工井数', (row: any) => row.totalConstructionWells);
+  calculateColumnMinWidth('completedWells', '完工井数', (row: any) => row.completedWells);
+  calculateColumnMinWidth('mudDensity', '泥浆性能-密度(g/cm³)', (row: any) => row.mudDensity);
+  calculateColumnMinWidth('mudViscosity', '泥浆性能-粘度(S)', (row: any) => row.mudViscosity);
+  calculateColumnMinWidth('constructionStartDate', '施工开始日期', (row: any) => dateFormatter(null, null, row.constructionStartDate));
+  calculateColumnMinWidth('constructionEndDate', '施工结束日期', (row: any) => dateFormatter(null, null, row.constructionEndDate));
+  calculateColumnMinWidth('lateralLength', '水平段长度(m)', (row: any) => row.lateralLength);
+  calculateColumnMinWidth('wellInclination', '井斜(°)', (row: any) => row.wellInclination);
+  calculateColumnMinWidth('azimuth', '方位(°)', (row: any) => row.azimuth);
+  calculateColumnMinWidth('designWellStruct', '设计井身结构', (row: any) => row.designWellStruct);
+  calculateColumnMinWidth('createTime', '创建时间', (row: any) => dateFormatter(null, null, row.createTime));
+
+  // 设计井身结构列使用固定宽度，不参与自动计算
+  minWidths.designWellStruct = 200; // 固定宽度200px
+  totalMinWidth += 200;
+
+  // 操作列固定宽度
+  minWidths.operation = 120;
+  totalMinWidth += 120;
+
+  // 2. 计算可伸缩列最终宽度
+  const newWidths: Record<string, string> = {};
+  const availableWidth = containerWidth - 17; // 减去滚动条宽度
+
+  // 应用最小宽度到所有列
+  Object.keys(minWidths).forEach(key => {
+    newWidths[key] = `${minWidths[key]}px`;
+  });
+
+  // 计算可伸缩列需要的宽度
+  if (totalMinWidth < availableWidth) {
+    // 有剩余空间：按比例分配给可伸缩列
+    const extraSpace = availableWidth - totalMinWidth;
+    const flexibleColumnCount = FLEXIBLE_COLUMNS.length;
+    const spacePerColumn = Math.floor(extraSpace / flexibleColumnCount);
+
+    FLEXIBLE_COLUMNS.forEach(key => {
+      newWidths[key] = `${minWidths[key] + spacePerColumn}px`;
+    });
+  }
+
+  // 3. 更新列宽配置
+  columnWidths.value = newWidths;
+
+  // 4. 触发表格重新布局
+  nextTick(() => {
+    tableRef.value?.doLayout();
+  });
+};
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
@@ -530,7 +423,19 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
+const openForm = (type: string, id?: number, row?: any) => {
+  // 保存当前行数据
+  if (row) {
+    selectedRowData.value = {
+      deptName: row.deptName,
+      contractName: row.contractName,
+      taskName: row.taskName,
+      designWellStruct: row.designWellStruct
+    }
+  } else {
+    selectedRowData.value = null
+  }
+
   formRef.value.open(type, id)
 }
 
@@ -562,8 +467,103 @@ const handleExport = async () => {
   }
 }
 
+// 声明 ResizeObserver 实例
+let resizeObserver: ResizeObserver | null = null;
+
 /** 初始化 **/
 onMounted(() => {
   getList()
+  // 创建 ResizeObserver 监听表格容器尺寸变化
+  if (tableContainerRef.value?.$el) {
+    resizeObserver = new ResizeObserver(() => {
+      // 使用防抖避免频繁触发
+      clearTimeout((window as any).resizeTimer);
+      (window as any).resizeTimer = setTimeout(() => {
+        calculateColumnWidths();
+      }, 100);
+    });
+    resizeObserver.observe(tableContainerRef.value.$el);
+  }
+})
+
+onUnmounted(() => {
+  // 清除 ResizeObserver
+  if (resizeObserver && tableContainerRef.value?.$el) {
+    resizeObserver.unobserve(tableContainerRef.value.$el);
+    resizeObserver = null;
+  }
+
+  // 清除定时器
+  if ((window as any).resizeTimer) {
+    clearTimeout((window as any).resizeTimer);
+  }
 })
-</script>
+
+// 监听列表数据变化重新计算列宽
+watch(list, () => {
+  nextTick(calculateColumnWidths)
+}, { deep: true })
+
+</script>
+
+<style scoped>
+/* 表格容器样式，确保水平滚动 */
+.table-container {
+  width: 100%;
+  overflow-x: auto;
+}
+
+/* 确保表格单元格内容不换行 */
+:deep(.el-table .cell) {
+  white-space: nowrap;
+}
+
+/* 确保表格列标题不换行 */
+:deep(.el-table th > .cell) {
+  white-space: nowrap;
+}
+
+/* 调整表格最小宽度，确保内容完全显示 */
+:deep(.el-table) {
+  min-width: 100%;
+}
+
+/* 强制显示所有内容，防止省略号 */
+:deep(.el-table td.el-table__cell),
+:deep(.el-table th.el-table__cell) {
+  overflow: visible !important;
+}
+
+:deep(.el-table .cell) {
+  overflow: visible !important;
+  text-overflow: clip !important;
+}
+
+/* 设计井身结构文本样式 - 多行显示并添加省略号 */
+.design-well-struct-text {
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height: 1.5;
+  max-height: 3em; /* 两行文本的高度 */
+}
+
+/* 确保设计井身结构列不参与自动调整 */
+:deep(.el-table__header-wrapper .el-table__cell.fixed-width),
+:deep(.el-table__body-wrapper .el-table__cell.fixed-width) {
+  flex-shrink: 0;
+  flex-grow: 0;
+}
+
+</style>
+
+<style>
+/* 设计井身结构 tooltip 样式 - 保留换行符 */
+.design-well-struct-tooltip {
+  white-space: pre-line;
+  max-width: 500px;
+  line-height: 1.5;
+}
+</style>