Merge remote-tracking branch 'origin/master'

src/views/pms/iotprojectinfo/index.vue

@@ -168,6 +168,7 @@
       </template>
       <el-table :data="taskList" v-loading="taskLoading">
         <el-table-column label="井号" align="center" prop="wellName" />
+        <!--
         <el-table-column :label="t('project.wellType')" align="center" prop="wellType" min-width="70">
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.PMS_PROJECT_WELL_TYPE" :value="scope.row.wellType" />
@@ -177,7 +178,7 @@
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.PMS_PROJECT_WELL_CATEGORY" :value="scope.row.wellCategory" />
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column :label="t('project.status')" align="center" prop="status" min-width="70">
           <template #default="scope">
             <el-link type="primary" @click="openTimelineDialog(scope.row)">

src/views/pms/iotprojecttask/IotProjectTaskForm.vue

@@ -1272,9 +1272,9 @@ const validateAllRows = (): boolean => {
       allValid = false;
     }
 
-    if (!row.wellType || row.wellType.trim() === '') {
+    /* if (!row.wellType || row.wellType.trim() === '') {
       allValid = false;
-    }
+    } */
 
     if (!row.location || row.location.trim() === '') {
       allValid = false;

src/views/pms/iotrhdailyreport/index.vue

@@ -66,6 +66,13 @@
     <div class="table-container">
       <el-table ref="tableRef" v-loading="loading" :data="list" :stripe="true"
                 :show-overflow-tooltip="true" style="width: 100%" :cell-style="cellStyle">
+        <el-table-column
+          label="日期"
+          align="center"
+          prop="createTime"
+          :formatter="dateFormatter"
+          :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"/>
@@ -107,13 +114,6 @@
                          :width="columnWidths.totalGasInjection" :formatter="gasInjectionFormatter"/>
         <el-table-column label="累计注水量(方)" align="center" prop="totalWaterInjection" :width="columnWidths.totalWaterInjection"/>
         <el-table-column label="累计完工井次" align="center" prop="cumulativeCompletion" :width="columnWidths.cumulativeCompletion"/>
-        <el-table-column
-          label="创建时间"
-          align="center"
-          prop="createTime"
-          :formatter="dateFormatter"
-          :width="columnWidths.createTime"
-        />
         <el-table-column label="操作" align="center" :width="columnWidths.operation">
           <template #default="scope">
             <el-button