Jelajahi Sumber

✨ feat(瑞恒瑞鹰日报): 查询列表添加组织id

Zimo 1 Minggu lalu
induk
melakukan
f9f252bfb2
3 mengubah file dengan 13 tambahan dan 6 penghapusan
  1. 4 2
      pages/ruihen/index.vue
  2. 5 2
      pages/ruiying/index.vue
  3. 4 2
      pages/ruiyingx/index.vue

+ 4 - 2
pages/ruihen/index.vue

@@ -4,6 +4,7 @@
   import dayjs from 'dayjs';
   import { getRuiHenReportPage } from '@/api/ruihen';
   import { useDataDictStore } from '@/store/modules/dataDict';
+  import { getDeptId } from '@/utils/auth';
 
   const dictStore = useDataDictStore();
 
@@ -31,8 +32,9 @@
     getRuiHenReportPage({
       pageNo,
       pageSize,
-      taskName: orderName.value,
-      contractName: orderName.value,
+      ...(orderName.value ? { taskName: orderName.value } : {}),
+      ...(orderName.value ? { contractName: orderName.value } : {}),
+      deptId: getDeptId(),
     })
       .then(res => {
         paging.value.complete(res.data.list);

+ 5 - 2
pages/ruiying/index.vue

@@ -5,6 +5,8 @@
   import { getRuiYingReportPage } from '@/api/ruiying';
   import { useDataDictStore } from '@/store/modules/dataDict';
 
+  import { getDeptId } from '@/utils/auth';
+
   const dictStore = useDataDictStore();
 
   const fillStatusDict = reactive({});
@@ -32,8 +34,9 @@
       pageNo,
       pageSize,
       projectClassification: '1',
-      taskName: orderName.value,
-      contractName: orderName.value,
+      ...(orderName.value ? { taskName: orderName.value } : {}),
+      ...(orderName.value ? { contractName: orderName.value } : {}),
+      deptId: getDeptId(),
     })
       .then(res => {
         paging.value.complete(res.data.list);

+ 4 - 2
pages/ruiyingx/index.vue

@@ -4,6 +4,7 @@
   import dayjs from 'dayjs';
   import { getRuiYingReportPage } from '@/api/ruiying';
   import { useDataDictStore } from '@/store/modules/dataDict';
+  import { getDeptId } from '@/utils/auth';
 
   const dictStore = useDataDictStore();
 
@@ -31,8 +32,9 @@
     getRuiYingReportPage({
       pageNo,
       pageSize,
-      taskName: orderName.value,
-      contractName: orderName.value,
+      ...(orderName.value ? { taskName: orderName.value } : {}),
+      ...(orderName.value ? { contractName: orderName.value } : {}),
+      deptId: getDeptId(),
       projectClassification: '2',
     })
       .then(res => {