zhangjie 1 年之前
父節點
當前提交
e959552bfa
共有 31 個文件被更改,包括 61 次插入32 次删除
  1. 0 1
      src/api/system.js
  2. 0 2
      src/api/work-hours.js
  3. 2 0
      src/views/project-quality/project-quality-manage/issues-feedback/index.vue
  4. 2 0
      src/views/project-quality/project-quality-manage/issues-query/index.vue
  5. 2 0
      src/views/resource-guard/device-guard/registration-query/index.vue
  6. 2 0
      src/views/resource-guard/person-guard/person-allocate/index.vue
  7. 2 0
      src/views/resource-guard/person-guard/person-files/index.vue
  8. 2 0
      src/views/service-unit/dispatch/dispatch-manage/index.vue
  9. 2 0
      src/views/service-unit/service-unit-manage/add-range/index.vue
  10. 2 0
      src/views/service-unit/service-unit-manage/range-manage/index.vue
  11. 2 0
      src/views/service-unit/service-unit-manage/regional-planning/index.vue
  12. 2 0
      src/views/service-unit/service-unit-manage/unit-manage/index.vue
  13. 2 0
      src/views/sop/sop-manage/device-out-in/index.vue
  14. 2 0
      src/views/sop/sop-manage/office-sop/index.vue
  15. 2 0
      src/views/sop/sop-manage/project-change-report/index.vue
  16. 2 0
      src/views/sop/sop-manage/student-sop/index.vue
  17. 2 0
      src/views/sop/sop-monitor/delay-warning/index.vue
  18. 2 0
      src/views/sop/sop-monitor/violation-registration/index.vue
  19. 2 0
      src/views/system/config-manage/checkin-manage/index.vue
  20. 2 0
      src/views/system/config-manage/customer-manage/index.vue
  21. 2 0
      src/views/system/config-manage/device-manage/index.vue
  22. 2 0
      src/views/system/config-manage/service-level-manage/index.vue
  23. 2 0
      src/views/system/config-manage/supplier-manage/index.vue
  24. 2 0
      src/views/system/notice-log/notice-manage/index.vue
  25. 3 1
      src/views/system/notice-log/notice-manage/notice-message-dialog.vue
  26. 2 0
      src/views/system/task/task-manage/index.vue
  27. 2 0
      src/views/user/auth-manage/role-manage/index.vue
  28. 2 0
      src/views/user/auth-manage/user-manage/index.vue
  29. 2 26
      src/views/work-hours/work-hours-manage/work-attendance-detail/index.vue
  30. 3 1
      src/views/work-hours/work-hours-manage/work-attendance/index.vue
  31. 3 1
      src/views/work-hours/work-hours-manage/work-statistics/index.vue

+ 0 - 1
src/api/system.js

@@ -228,7 +228,6 @@ export const noticeMessageExportApi = (data) =>
   request({
   request({
     url: '/api/sys/message/export',
     url: '/api/sys/message/export',
     params: data,
     params: data,
-    download: true,
   });
   });
 
 
 // task-manage
 // task-manage

+ 0 - 2
src/api/work-hours.js

@@ -42,7 +42,6 @@ export const workAttendanceExportApi = (ids) =>
   request({
   request({
     url: '/api/system/work-attendance/export',
     url: '/api/system/work-attendance/export',
     params: { ids },
     params: { ids },
-    download: true,
     paramsSerializer,
     paramsSerializer,
   });
   });
 export const workAttendanceWithdrawApi = (id) =>
 export const workAttendanceWithdrawApi = (id) =>
@@ -89,7 +88,6 @@ export const workStatisticsExportApi = (data) =>
   request({
   request({
     url: ' /api/admin/tb/ding/export',
     url: ' /api/admin/tb/ding/export',
     params: data,
     params: data,
-    download: true,
   });
   });
 export const workStatisticsPassApi = (id) =>
 export const workStatisticsPassApi = (id) =>
   request({
   request({

+ 2 - 0
src/views/project-quality/project-quality-manage/issues-feedback/index.vue

@@ -24,6 +24,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/project-quality/project-quality-manage/issues-query/index.vue

@@ -16,6 +16,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/resource-guard/device-guard/registration-query/index.vue

@@ -22,6 +22,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/resource-guard/person-guard/person-allocate/index.vue

@@ -55,6 +55,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/resource-guard/person-guard/person-files/index.vue

@@ -55,6 +55,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/service-unit/dispatch/dispatch-manage/index.vue

@@ -43,6 +43,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/service-unit/service-unit-manage/add-range/index.vue

@@ -28,6 +28,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"
         v-loading="tableLoading"
         v-loading="tableLoading"

+ 2 - 0
src/views/service-unit/service-unit-manage/range-manage/index.vue

@@ -29,6 +29,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/service-unit/service-unit-manage/regional-planning/index.vue

@@ -28,6 +28,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/service-unit/service-unit-manage/unit-manage/index.vue

@@ -22,6 +22,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/sop/sop-manage/device-out-in/index.vue

@@ -21,6 +21,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
         }"
         }"
         :selected-row-keys="selectedRowKeys"
         :selected-row-keys="selectedRowKeys"

+ 2 - 0
src/views/sop/sop-manage/office-sop/index.vue

@@ -18,6 +18,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
         }"
         }"
         :selected-row-keys="selectedRowKeys"
         :selected-row-keys="selectedRowKeys"

+ 2 - 0
src/views/sop/sop-manage/project-change-report/index.vue

@@ -18,6 +18,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
         }"
         }"
         :selected-row-keys="selectedRowKeys"
         :selected-row-keys="selectedRowKeys"

+ 2 - 0
src/views/sop/sop-manage/student-sop/index.vue

@@ -18,6 +18,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
         }"
         }"
         :selected-row-keys="selectedRowKeys"
         :selected-row-keys="selectedRowKeys"

+ 2 - 0
src/views/sop/sop-monitor/delay-warning/index.vue

@@ -19,6 +19,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
         }"
         }"
       >
       >

+ 2 - 0
src/views/sop/sop-monitor/violation-registration/index.vue

@@ -31,6 +31,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
         }"
         }"
       >
       >

+ 2 - 0
src/views/system/config-manage/checkin-manage/index.vue

@@ -19,6 +19,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/system/config-manage/customer-manage/index.vue

@@ -30,6 +30,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/system/config-manage/device-manage/index.vue

@@ -62,6 +62,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/system/config-manage/service-level-manage/index.vue

@@ -14,6 +14,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
         }"
         }"
         v-loading="tableLoading"
         v-loading="tableLoading"

+ 2 - 0
src/views/system/config-manage/supplier-manage/index.vue

@@ -14,6 +14,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
         }"
         }"
         v-loading="tableLoading"
         v-loading="tableLoading"

+ 2 - 0
src/views/system/notice-log/notice-manage/index.vue

@@ -21,6 +21,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 3 - 1
src/views/system/notice-log/notice-manage/notice-message-dialog.vue

@@ -40,6 +40,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"
@@ -185,7 +187,7 @@ async function onExport() {
       confirmDia.hide();
       confirmDia.hide();
       const res = await noticeMessageExportApi(params).catch(() => {});
       const res = await noticeMessageExportApi(params).catch(() => {});
       if (!res) return;
       if (!res) return;
-      MessagePlugin.success('开始下载');
+      MessagePlugin.success('导出任务提交成功,请前往任务管理中下载');
     },
     },
   });
   });
 }
 }

+ 2 - 0
src/views/system/task/task-manage/index.vue

@@ -12,6 +12,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"

+ 2 - 0
src/views/user/auth-manage/role-manage/index.vue

@@ -14,6 +14,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
         }"
         }"
         v-loading="tableLoading"
         v-loading="tableLoading"

+ 2 - 0
src/views/user/auth-manage/user-manage/index.vue

@@ -22,6 +22,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
         }"
         }"
         v-loading="tableLoading"
         v-loading="tableLoading"

+ 2 - 26
src/views/work-hours/work-hours-manage/work-attendance-detail/index.vue

@@ -17,9 +17,6 @@
           <span>累计人天:{{ statisticsInfo.allDays }}天</span>
           <span>累计人天:{{ statisticsInfo.allDays }}天</span>
           <span>累计工时:{{ statisticsInfo.allHours }}小时</span>
           <span>累计工时:{{ statisticsInfo.allHours }}小时</span>
         </t-space>
         </t-space>
-        <div class="btn-group">
-          <!-- <t-button theme="success" @click="multExport">批量导出</t-button> -->
-        </div>
       </div>
       </div>
 
 
       <t-table
       <t-table
@@ -32,6 +29,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"
@@ -54,12 +53,10 @@
 import { reactive, ref } from 'vue';
 import { reactive, ref } from 'vue';
 import { omit } from 'lodash';
 import { omit } from 'lodash';
 
 
-import { DialogPlugin, MessagePlugin } from 'tdesign-vue-next';
 import useFetchTable from '@/hooks/useFetchTable';
 import useFetchTable from '@/hooks/useFetchTable';
 import {
 import {
   workAttendanceDetailListApi,
   workAttendanceDetailListApi,
   workStatisticsDetailInfoApi,
   workStatisticsDetailInfoApi,
-  workAttendanceDetailExportApi,
 } from '@/api/work-hours';
 } from '@/api/work-hours';
 import {
 import {
   timestampFilter,
   timestampFilter,
@@ -218,25 +215,4 @@ const getStatisticsInfo = async () => {
   const res = await workStatisticsDetailInfoApi(params);
   const res = await workStatisticsDetailInfoApi(params);
   statisticsInfo.value = res || {};
   statisticsInfo.value = res || {};
 };
 };
-
-const multExport = () => {
-  if (!selectedRowKeys.value.length) {
-    MessagePlugin.error('请选择要导出的记录');
-    return;
-  }
-  const confirmDia = DialogPlugin({
-    header: '操作提示',
-    body: `确定要导出选择的所有记录吗?`,
-    confirmBtn: '确定',
-    cancelBtn: '取消',
-    onConfirm: async () => {
-      confirmDia.hide();
-      const res = await workAttendanceDetailExportApi(computedParams).catch(
-        () => {}
-      );
-      if (!res) return;
-      MessagePlugin.success('开始下载');
-    },
-  });
-};
 </script>
 </script>

+ 3 - 1
src/views/work-hours/work-hours-manage/work-attendance/index.vue

@@ -47,6 +47,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"
@@ -353,7 +355,7 @@ const multExport = () => {
         () => {}
         () => {}
       );
       );
       if (!res) return;
       if (!res) return;
-      MessagePlugin.success('开始下载');
+      MessagePlugin.success('导出任务提交成功,请前往任务管理中下载');
     },
     },
   });
   });
 };
 };

+ 3 - 1
src/views/work-hours/work-hours-manage/work-statistics/index.vue

@@ -36,6 +36,8 @@
           defaultCurrent: 1,
           defaultCurrent: 1,
           defaultPageSize: 10,
           defaultPageSize: 10,
           onChange,
           onChange,
+          showJumper: true,
+          showPageSize: false,
           total: pagination.total,
           total: pagination.total,
           current: pagination.pageNumber,
           current: pagination.pageNumber,
         }"
         }"
@@ -253,7 +255,7 @@ const handleExport = () => {
       confirmDia.hide();
       confirmDia.hide();
       const res = await workStatisticsExportApi(params).catch(() => {});
       const res = await workStatisticsExportApi(params).catch(() => {});
       if (!res) return;
       if (!res) return;
-      MessagePlugin.success('开始下载');
+      MessagePlugin.success('导出任务提交成功,请前往任务管理中下载');
     },
     },
   });
   });
 };
 };