5号国日报

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

@@ -25,7 +25,7 @@ const form = ref<ConstructionDailyReportRow>(createEmptyConstructionDailyReport(
 const message = useMessage()
 
 const drawerTitle = computed(() =>
-  drawerMode.value === 'readonly' ? '查看施工日报' : '编辑施工日报'
+  drawerMode.value === 'readonly' ? '查看施工日报' : '填报施工日报'
 )
 const disabled = computed(() => drawerMode.value === 'readonly')
 
@@ -68,11 +68,7 @@ async function handleSubmit() {
   submitLoading.value = true
   try {
     const payload = { ...form.value } as Record<string, any>
-    if (payload.id) {
-      await FiveIotProjectDailyReportApi.updateIotProjectDailyReport(payload)
-    } else {
-      await FiveIotProjectDailyReportApi.updateIotProjectDailyReport(payload)
-    }
+    await FiveIotProjectDailyReportApi.updateIotProjectDailyReport(payload)
     message.success('保存成功')
     emits('update:visible', false)
     await props.loadList()
@@ -94,7 +90,8 @@ defineExpose({ handleOpenForm })
     size="80%"
     destroy-on-close
     header-class="mb-0!"
-    @update:model-value="emits('update:visible', $event)">
+    @update:model-value="emits('update:visible', $event)"
+  >
     <template #header>
       <span class="text-xl font-bold text-[var(--el-text-color-primary)]">{{ drawerTitle }}</span>
     </template>
@@ -107,7 +104,8 @@ defineExpose({ handleOpenForm })
           :model="form"
           :section="section"
           :disabled="disabled"
-          @update:model="handleModelChange" />
+          @update:model="handleModelChange"
+        />
       </div>
     </el-form>
 

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

@@ -96,8 +96,9 @@ export const formSections: ConstructionDailyReportSection[] = [
   {
     title: '基础信息',
     fields: [
+      { prop: 'reportName', label: '日报名称' },
       { prop: 'createTime', label: '日报日期' },
-      { prop: 'deptName', label: '公司' },
+
       { prop: 'projectName', label: '项目' },
       { prop: 'location', label: '施工区域' },
       { prop: 'deptName', label: '队伍' },

src/views/pms/constructionDailyReport/index.vue

@@ -3,7 +3,6 @@ import { FiveIotProjectDailyReportApi } from '@/api/pms/fiveconstructiondailyrep
 import { useUserStore } from '@/store/modules/user'
 import { rangeShortcuts } from '@/utils/formatTime'
 import { useDebounceFn } from '@vueuse/core'
-import dayjs from 'dayjs'
 import ConstructionDailyReportDrawer from './components/ConstructionDailyReportDrawer.vue'
 import ConstructionDailyReportTable from './components/ConstructionDailyReportTable.vue'
 import type {
@@ -20,9 +19,6 @@ const initQuery: ConstructionDailyReportQuery = {
   pageNo: 1,
   pageSize: 10,
   deptId
-  // createTime: [
-  //   ...rangeShortcuts[2].value().map((item) => dayjs(item).format('YYYY-MM-DD HH:mm:ss'))
-  // ]
 }
 
 const query = ref<ConstructionDailyReportQuery>({ ...initQuery })
@@ -90,16 +86,19 @@ onMounted(() => {
 
 <template>
   <div
-    class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]">
+    class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
+  >
     <DeptTreeSelect
       v-model="query.deptId"
       :top-id="158"
       :deptId="deptId"
       :show-title="false"
-      class="row-span-2" />
+      class="row-span-2"
+    />
     <el-form
       size="default"
-      class="bg-white dark:bg-[#1d1e1f] rounded-lg shadow px-8 gap-8 flex items-center justify-between">
+      class="bg-white dark:bg-[#1d1e1f] rounded-lg shadow px-8 gap-8 flex items-center justify-between"
+    >
       <div class="flex items-center gap-8">
         <el-form-item label="项目">
           <el-input
@@ -107,7 +106,8 @@ onMounted(() => {
             placeholder="请输入项目名称"
             clearable
             @keyup.enter="handleQuery()"
-            class="!w-240px" />
+            class="!w-240px"
+          />
         </el-form-item>
         <el-form-item label="生产任务">
           <el-input
@@ -115,7 +115,8 @@ onMounted(() => {
             placeholder="请输入生产任务"
             clearable
             @keyup.enter="handleQuery()"
-            class="!w-240px" />
+            class="!w-240px"
+          />
         </el-form-item>
         <el-form-item label="创建时间">
           <el-date-picker
@@ -126,14 +127,17 @@ onMounted(() => {
             end-placeholder="结束日期"
             :shortcuts="rangeShortcuts"
             :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-            class="!w-260px" />
+            class="!w-260px"
+          />
         </el-form-item>
       </div>
       <el-form-item>
         <el-button type="primary" @click="handleQuery()">
           <Icon icon="ep:search" class="mr-5px" /> 搜索
         </el-button>
-        <el-button @click="resetQuery"> <Icon icon="ep:refresh" class="mr-5px" /> 重置 </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -144,28 +148,36 @@ onMounted(() => {
       :page-no="query.pageNo"
       :page-size="query.pageSize"
       @size-change="handleSizeChange"
-      @current-change="handleCurrentChange">
+      @current-change="handleCurrentChange"
+    >
       <template #action="{ row }">
         <el-button
+          v-if="row.status === 0"
           link
-          type="success"
-          @click="handleOpenForm(row.id!, 'readonly')"
-          v-hasPermi="['pms:iot-five-daily-report:query']">
-          查看
+          type="primary"
+          @click="handleOpenForm(row.id!, 'edit')"
+          v-hasPermi="['pms:iot-five-daily-report:update']"
+        >
+          填报
         </el-button>
         <el-button
-          v-show="row.status === 0 || row.status === undefined || row.status === null"
+          v-else-if="row.status === 1"
           link
-          type="primary"
-          @click="handleOpenForm(row.id!, 'edit')"
-          v-hasPermi="['pms:iot-five-daily-report:update']">
-          编辑
+          type="success"
+          @click="handleOpenForm(row.id!, 'readonly')"
+          v-hasPermi="['pms:iot-five-daily-report:query']"
+        >
+          查看
         </el-button>
       </template>
     </ConstructionDailyReportTable>
   </div>
 
-  <ConstructionDailyReportDrawer ref="formRef" v-model:visible="visible" :load-list="loadList" />
+  <ConstructionDailyReportDrawer
+    ref="formRef"
+    v-model:visible="visible"
+    :load-list="loadList"
+  />
 </template>
 
 <style scoped>