|
@@ -3,6 +3,7 @@ import { IotRyImproveDailyReportApi } from '@/api/pms/iotryimprovedailyreport'
|
|
|
import { useTableComponents } from '@/components/ZmTable/useTableComponents'
|
|
import { useTableComponents } from '@/components/ZmTable/useTableComponents'
|
|
|
import dayjs from 'dayjs'
|
|
import dayjs from 'dayjs'
|
|
|
import EquipmentForm from './components/equipment-form.vue'
|
|
import EquipmentForm from './components/equipment-form.vue'
|
|
|
|
|
+import { useUserStore } from '../../../store/modules/user.js'
|
|
|
|
|
|
|
|
defineOptions({ name: 'IotRyEquipmentDailyReport' })
|
|
defineOptions({ name: 'IotRyEquipmentDailyReport' })
|
|
|
|
|
|
|
@@ -20,12 +21,13 @@ interface ReportRow {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
interface Query {
|
|
interface Query {
|
|
|
|
|
+ deptId?: number
|
|
|
pageNo: number
|
|
pageNo: number
|
|
|
pageSize: number
|
|
pageSize: number
|
|
|
createTime?: string[]
|
|
createTime?: string[]
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-const deptId = ref(158)
|
|
|
|
|
|
|
+const deptId = useUserStore().getUser.deptId
|
|
|
const loading = ref(false)
|
|
const loading = ref(false)
|
|
|
const { ZmTable, ZmTableColumn } = useTableComponents<ReportRow>()
|
|
const { ZmTable, ZmTableColumn } = useTableComponents<ReportRow>()
|
|
|
const formRef = ref()
|
|
const formRef = ref()
|
|
@@ -33,6 +35,7 @@ const formVisible = ref(false)
|
|
|
const total = ref(0)
|
|
const total = ref(0)
|
|
|
|
|
|
|
|
const query = ref<Query>({
|
|
const query = ref<Query>({
|
|
|
|
|
+ deptId: deptId,
|
|
|
pageNo: 1,
|
|
pageNo: 1,
|
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
|
createTime: undefined
|
|
createTime: undefined
|
|
@@ -107,7 +110,7 @@ onMounted(() => {
|
|
|
<DeptTreeSelect
|
|
<DeptTreeSelect
|
|
|
:top-id="158"
|
|
:top-id="158"
|
|
|
:deptId="deptId"
|
|
:deptId="deptId"
|
|
|
- v-model="deptId"
|
|
|
|
|
|
|
+ v-model="query.deptId"
|
|
|
:show-title="false"
|
|
:show-title="false"
|
|
|
class="row-span-2" />
|
|
class="row-span-2" />
|
|
|
|
|
|
|
@@ -154,6 +157,7 @@ onMounted(() => {
|
|
|
show-border>
|
|
show-border>
|
|
|
<zm-table-column type="index" label="序号" width="70" fixed="left" />
|
|
<zm-table-column type="index" label="序号" width="70" fixed="left" />
|
|
|
<zm-table-column label="标题" prop="title" fixed="left" />
|
|
<zm-table-column label="标题" prop="title" fixed="left" />
|
|
|
|
|
+ <zm-table-column label="施工队伍" prop="deptName" />
|
|
|
<zm-table-column label="汇报时间" prop="createTime">
|
|
<zm-table-column label="汇报时间" prop="createTime">
|
|
|
<template #default="{ row }">
|
|
<template #default="{ row }">
|
|
|
{{ dayjs(row.createTime).format('YYYY.MM.DD') }}
|
|
{{ dayjs(row.createTime).format('YYYY.MM.DD') }}
|