刘洋 1 vuosi sitten
vanhempi
commit
947c308bb6

+ 1 - 1
src/views/sop/sop-manage/office-sop/index.vue

@@ -285,7 +285,7 @@ const originColumns = [
     width: 180,
     code: 'DATE',
   },
-  { fieldId: 'flowCreateName', fieldTitle: '提交人', width: 140 },
+  { fieldId: 'flowCreateName', fieldTitle: '提交人', width: 140, code: 'TEXT' },
   {
     fieldId: 'flowCreateTime',
     fieldTitle: '提交时间',

+ 1 - 1
src/views/sop/sop-manage/student-sop/index.vue

@@ -280,7 +280,7 @@ const originColumns = [
     width: 180,
     code: 'DATE',
   },
-  { fieldId: 'flowCreateName', fieldTitle: '提交人', width: 140 },
+  { fieldId: 'flowCreateName', fieldTitle: '提交人', width: 140, code: 'TEXT' },
   {
     fieldId: 'flowCreateTime',
     fieldTitle: '提交时间',

+ 4 - 2
src/views/work-hours/work-hours-manage/work-statistics/index.vue

@@ -101,7 +101,7 @@ import {
   timestampFilter,
   attendanceStatisticsSubmitStatusFilter,
 } from '@/utils/filter';
-import { FLOW_STATUS } from '@/config/constants';
+import { ATTENDANCE_STATISTICS_SUBMIT_STATUS } from '@/config/constants';
 import { dictToOptionList } from '@/utils/tool';
 import usePermission from '@/hooks/usePermission';
 const { perm } = usePermission();
@@ -121,7 +121,9 @@ const fields = ref([
     type: 'select',
     labelWidth: 80,
     colSpan: 6,
-    options: dictToOptionList(FLOW_STATUS),
+    options: dictToOptionList(ATTENDANCE_STATISTICS_SUBMIT_STATUS).filter(
+      (item) => item.value !== 'WILL_SUBMIT'
+    ),
     attrs: {
       clearable: true,
     },