刘洋 před 7 měsíci
rodič
revize
fe69503a92

+ 12 - 11
src/views/work-hours/work-hours-manage/work-statistics/index.vue

@@ -28,6 +28,7 @@
         row-key="id"
         :columns="columns"
         :data="tableData"
+        v-loading="loading"
         bordered
         :pagination="{
           defaultCurrent: 1,
@@ -140,6 +141,7 @@ const fields = ref([
 ]);
 const mixinSearch = () => {
   if (params.serviceId) {
+    tableData.value = [];
     search();
   }
 };
@@ -173,7 +175,9 @@ const columns = computed(() => {
       { colKey: 'weekends', title: '周末(天)', width: 110 },
       { colKey: 'legalHolidays', title: '法定节假日(天)', width: 150 },
       { colKey: 'addDays', title: '追加人天(天)', width: 140 },
-      { colKey: 'addHours', title: '追加小时(天)', width: 140 },
+      { colKey: 'addDaysDetail', title: '追加详情(天)', width: 140 },
+      { colKey: 'addHours', title: '追加小时(时)', width: 140 },
+      { colKey: 'addHoursDetail', title: '追加详情(时)', width: 140 },
       { colKey: 'workDays', title: '累计人天(天)', width: 140 },
       { colKey: 'workHours', title: '累计工时(小时)', width: 160 },
       { colKey: 'violationDays', title: '违规工时(天)', width: 160 },
@@ -187,7 +191,7 @@ const columns = computed(() => {
       { colKey: 'weekends', title: '周末(天)', width: 110 },
       { colKey: 'legalHolidays', title: '法定节假日(天)', width: 150 },
       { colKey: 'addDays', title: '追加人天(天)', width: 140 },
-      { colKey: 'addHours', title: '追加小时()', width: 140 },
+      { colKey: 'addHours', title: '追加小时()', width: 140 },
       { colKey: 'workDays', title: '累计人天(天)', width: 140 },
       { colKey: 'scanPeriod', title: '扫描周期(天)', width: 160 },
       { colKey: 'markPaperPeriod', title: '阅卷周期(天)', width: 160 },
@@ -203,7 +207,7 @@ const columns = computed(() => {
       { colKey: 'weekends', title: '周末(天)', width: 110 },
       { colKey: 'legalHolidays', title: '法定节假日(天)', width: 150 },
       { colKey: 'addDays', title: '追加人天(天)', width: 140 },
-      { colKey: 'addHours', title: '追加小时()', width: 140 },
+      { colKey: 'addHours', title: '追加小时()', width: 140 },
       { colKey: 'workDays', title: '累计人天(天)', width: 140 },
       { colKey: 'scanPeriod', title: '扫描周期(天)', width: 160 },
       { colKey: 'markPaperPeriod', title: '阅卷周期(天)', width: 160 },
@@ -218,7 +222,7 @@ const columns = computed(() => {
       { colKey: 'weekends', title: '周末(天)', width: 110 },
       { colKey: 'legalHolidays', title: '法定节假日(天)', width: 150 },
       { colKey: 'addDays', title: '追加人天(天)', width: 140 },
-      { colKey: 'addHours', title: '追加小时()', width: 140 },
+      { colKey: 'addHours', title: '追加小时()', width: 140 },
       { colKey: 'workDays', title: '累计人天(天)', width: 140 },
       { colKey: 'scanPeriod', title: '扫描周期(天)', width: 160 },
       { colKey: 'markPaperPeriod', title: '阅卷周期(天)', width: 160 },
@@ -233,7 +237,7 @@ const columns = computed(() => {
       { colKey: 'weekends', title: '周末(天)', width: 110 },
       { colKey: 'legalHolidays', title: '法定节假日(天)', width: 150 },
       { colKey: 'addDays', title: '追加人天(天)', width: 140 },
-      { colKey: 'addHours', title: '追加小时()', width: 140 },
+      { colKey: 'addHours', title: '追加小时()', width: 140 },
       { colKey: 'workDays', title: '累计人天(天)', width: 140 },
       { colKey: 'workHours', title: '累计工时(小时)', width: 160 },
       { colKey: 'violationDays', title: '违规工时(天)', width: 160 },
@@ -241,7 +245,7 @@ const columns = computed(() => {
   };
   return [
     ...map[type],
-    params.type === 'BY_PERSON'
+    params.type === 'BY_PERSON' && !loading.value
       ? {
           title: '操作',
           colKey: 'operate',
@@ -285,11 +289,8 @@ const columns = computed(() => {
 //     width: 100,
 //   },
 // ];
-const { pagination, tableData, fetchData, search, onChange } = useFetchTable(
-  workStatisticsListApi,
-  { params },
-  false
-);
+const { pagination, tableData, fetchData, search, onChange, loading } =
+  useFetchTable(workStatisticsListApi, { params }, false);
 
 const handleExport = () => {
   const confirmDia = DialogPlugin({