5号国日报

src/views/pms/constructionDailyReport/components/ConstructionDailyReportTable.vue

@@ -30,7 +30,7 @@ const { ZmTable, ZmTableColumn } = useTableComponents<ConstructionDailyReportRow
 
 function formatCellValue(row: ConstructionDailyReportRow, prop: keyof ConstructionDailyReportRow) {
   const value = row[prop]
-  if (prop === 'createTime') {
+  if (prop === 'createTime' || prop === 'constructionStartDate' || prop === 'constructionEndDate') {
     if (!value) return '-'
     return dayjs(value).isValid() ? dayjs(value).format('YYYY-MM-DD') : value
   }
@@ -49,8 +49,7 @@ function formatCellValue(row: ConstructionDailyReportRow, prop: keyof Constructi
             :width="width"
             :height="height"
             :max-height="height"
-            show-border
-          >
+            show-border>
             <ZmTableColumn type="index" label="序号" :width="60" fixed="left" />
             <ZmTableColumn
               v-for="column in tableColumns"
@@ -62,8 +61,9 @@ function formatCellValue(row: ConstructionDailyReportRow, prop: keyof Constructi
               :fixed="column.fixed"
               show-overflow-tooltip
               cover-formatter
-              :real-value="(row: ConstructionDailyReportRow) => formatCellValue(row, column.prop)"
-            />
+              :real-value="
+                (row: ConstructionDailyReportRow) => formatCellValue(row, column.prop)
+              " />
             <ZmTableColumn label="操作" :width="120" fixed="right" action>
               <template #default="{ row }">
                 <slot name="action" :row="row"></slot>
@@ -83,8 +83,7 @@ function formatCellValue(row: ConstructionDailyReportRow, prop: keyof Constructi
         :total="props.total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="emits('size-change', $event)"
-        @current-change="emits('current-change', $event)"
-      />
+        @current-change="emits('current-change', $event)" />
     </div>
   </div>
 </template>

src/views/pms/constructionDailyReport/components/report-config.ts

@@ -11,7 +11,7 @@ export interface ConstructionDailyReportRow {
   location?: string
   mainDeviceNum?: number | null
   wellName?: string
-  wokDeviceMum?: number | null
+  wokDeviceNum?: number | null
   fiveStatusLabel?: string
   dailyWorkingLayers?: number | null
   dailySandVolume?: number | null
@@ -28,6 +28,11 @@ export interface ConstructionDailyReportRow {
   temperature?: string
   deviceNames?: string
   customer?: string
+  reportName?: string
+  constructionEndDate?: string | number
+  constructionStartDate?: string | number
+  monthWorkingLayers?: number | null
+  monthWorkingWells?: number | null
 }
 
 export interface ConstructionDailyReportQuery {
@@ -59,21 +64,23 @@ export const tableColumns: Array<{
   minWidth?: number
   fixed?: 'left' | 'right'
 }> = [
-  { prop: 'createTime', label: '日报日期', width: 120, fixed: 'left' },
-  { prop: 'deptName', label: '公司', minWidth: 150, fixed: 'left' },
+  { prop: 'reportName', label: '日报名称', minWidth: 180, fixed: 'left' },
+  { prop: 'createTime', label: '创建(施工)日期', width: 120 },
+  // { prop: 'constructionStartDate', label: '施工开始日期', width: 120 },
+  { prop: 'constructionEndDate', label: '施工结束日期', width: 120 },
   { prop: 'projectName', label: '项目', minWidth: 160, fixed: 'left' },
   { prop: 'location', label: '施工区域', minWidth: 140 },
   { prop: 'deptName', label: '队伍', minWidth: 140 },
-  { prop: 'mainDeviceNum', label: '主设备数量', width: 110 },
+  { prop: 'mainDeviceNum', label: '主设备(泵车)数量', width: 110 },
   { prop: 'wellName', label: '生产任务', minWidth: 140 },
-  { prop: 'wokDeviceMum', label: '作业泵车数量', width: 120 },
+  { prop: 'wokDeviceNum', label: '作业泵车数量', width: 120 },
   { prop: 'fiveStatusLabel', label: '队伍状态', minWidth: 120 },
   { prop: 'dailyWorkingLayers', label: '当日主压层数', width: 120 },
-  { prop: 'dailySandVolume', label: '当日加砂量', width: 120 },
-  { prop: 'dailyLiquidVolume', label: '当日注液量', width: 120 },
-  { prop: 'jingshu', label: '当月作业井数', width: 120 },
-  { prop: 'cengshu', label: '当月作业层数', width: 120 },
-  { prop: 'dailyFuel', label: '当日油耗', width: 110 },
+  { prop: 'dailySandVolume', label: '当日加砂量(吨)', width: 120 },
+  { prop: 'dailyLiquidVolume', label: '当日注液量(‌m³)', width: 120 },
+  { prop: 'monthWorkingWells', label: '当月作业井数', width: 120 },
+  { prop: 'monthWorkingLayers', label: '当月作业层数', width: 120 },
+  { prop: 'dailyFuel', label: '当日油耗(L)', width: 110 },
   { prop: 'nonProductionTime', label: '当日非生产时间', width: 130 },
   { prop: 'nptReason', label: '造成非生产时间原因', minWidth: 180 },
   { prop: 'singleWellWorkload', label: '单井工作量', width: 120 },
@@ -103,7 +110,7 @@ export const formSections: ConstructionDailyReportSection[] = [
     title: '生产数据',
     fields: [
       { prop: 'mainDeviceNum', label: '主设备数量', type: 'number' },
-      { prop: 'wokDeviceMum', label: '作业泵车数量', type: 'number' },
+      { prop: 'wokDeviceNum', label: '作业泵车数量', type: 'number' },
       { prop: 'fiveStatusLabel', label: '队伍状态' },
       { prop: 'dailyWorkingLayers', label: '当日主压层数', type: 'number', precision: 2 },
       { prop: 'dailySandVolume', label: '当日加砂量', type: 'number', precision: 2 },
@@ -130,7 +137,7 @@ export const formSections: ConstructionDailyReportSection[] = [
 export function createEmptyConstructionDailyReport(): ConstructionDailyReportRow {
   return {
     mainDeviceNum: null,
-    wokDeviceMum: null,
+    wokDeviceNum: null,
     dailyWorkingLayers: null,
     dailySandVolume: null,
     dailyLiquidVolume: null,