Переглянути джерело

feat(equipment): 表头添加施工队伍,然后修复树形选择的bug

Zimo 5 днів тому
батько
коміт
6ad5dd4262
1 змінених файлів з 6 додано та 2 видалено
  1. 6 2
      src/views/pms/iotrydailyreport/equipment.vue

+ 6 - 2
src/views/pms/iotrydailyreport/equipment.vue

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