Browse Source

修改请假审批+加班剩余时间隐藏

YangJian0701 1 month ago
parent
commit
4d2d0bd530
4 changed files with 4 additions and 9 deletions
  1. BIN
      ERP.zip
  2. 0 6
      components.d.ts
  3. 2 1
      src/components/TableBase/interface/index.ts
  4. 2 2
      src/views/workAttendance/MyLeave.vue

BIN
ERP.zip


+ 0 - 6
components.d.ts

@@ -14,7 +14,6 @@ declare module '@vue/runtime-core' {
     Drawer: typeof import('./src/components/Drawer/index.vue')['default']
     EchartBar: typeof import('./src/components/echart/echart-bar.vue')['default']
     EchartLine: typeof import('./src/components/echart/echart-line.vue')['default']
-    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElBadge: typeof import('element-plus/es')['ElBadge']
@@ -40,23 +39,19 @@ declare module '@vue/runtime-core' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElStatistic: typeof import('element-plus/es')['ElStatistic']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
-    ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
@@ -64,7 +59,6 @@ declare module '@vue/runtime-core' {
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     Image: typeof import('./src/components/Image/index.vue')['default']
     Loading: typeof import('./src/components/Loading/index.vue')['default']
     Pagination: typeof import('./src/components/TableBase/components/Pagination.vue')['default']

+ 2 - 1
src/components/TableBase/interface/index.ts

@@ -1,4 +1,5 @@
 import { TableColumnCtx } from 'element-plus/es/components/table/src/table-column/defaults'
+import { DefaultRow } from 'element-plus/es/components/table/src/table/defaults'
 
 export interface EnumProps {
   label: string // 选项框显示的文字
@@ -32,7 +33,7 @@ export type SearchProps = {
   defaultValue?: string | number | boolean | any[] // 搜索项默认值
 }
 
-export interface ColumnProps<T = any>
+export interface ColumnProps<T extends DefaultRow = any>
   extends Partial<Omit<TableColumnCtx<T>, 'children' | 'renderHeader' | 'renderCell'>> {
   tag?: boolean // 是否是标签展示
   isShow?: boolean // 是否显示在表格当中

+ 2 - 2
src/views/workAttendance/MyLeave.vue

@@ -235,9 +235,9 @@ onMounted(() => {
         <h4 :id="params.titleId" :class="params.titleClass">{{ isNew ? '请假' : '编辑' }} - 申请</h4>
       </template>
       <el-form ref="ruleFormRef" :model="form" :rules="rules">
-        <span class="daysOff"
+        <!-- <span class="daysOff"
           >剩余可调休时长:<el-tag type="danger" effect="dark"> {{ getFormatDuration(RemainingTime) }} </el-tag></span
-        >
+        > -->
         <el-form-item label="请假类型:" :label-width="formLabelWidth" prop="T_type">
           <el-select v-model="form.T_type" placeholder="请选择类型">
             <el-option v-for="item in LeaveType" :key="item.Id" :label="item.T_name" :value="item.Id" />