浏览代码

feat(ledger): add qualification level import function and optimize old list api

1. 新增职业资格等级导入功能,在导入页面添加对应导入项
2. 调整资质证书列表接口请求路径和参数格式
3. 移除旧的导出接口调用并注释多余的导出按钮代码
4. 统一列表接口的时间参数命名规范
huoyi 6 天之前
父节点
当前提交
c44df9653d
共有 3 个文件被更改,包括 31 次插入28 次删除
  1. 4 3
      src/api/ledger/index.js
  2. 11 2
      src/views/ledger/import/index.vue
  3. 16 23
      src/views/ledger/qualificationCertificateStatus/index.vue

+ 4 - 3
src/api/ledger/index.js

@@ -288,8 +288,9 @@ export function exportTrainingIssue(query) {
288
 
288
 
289
 // ===== 资格证书状态 =====
289
 // ===== 资格证书状态 =====
290
 export function listQualificationCertificateStatus(query) {
290
 export function listQualificationCertificateStatus(query) {
291
-  return request({ url: '/ledger/qualificationCertificateStatus/list', method: 'get', params: query })
291
+  return request({ url: '/ledger/qualificationLevel/list', method: 'get', params: query })
292
 }
292
 }
293
-export function exportQualificationCertificateStatus(query) {
294
-  return request({ url: '/ledger/qualificationCertificateStatus/export', method: 'post', params: query, responseType: 'blob' })
293
+//导入职业资格等级
294
+export function importQualificationLevel(data) {
295
+  return request({ url: '/ledger/import/qualificationLevel', method: 'post', data })
295
 }
296
 }

+ 11 - 2
src/views/ledger/import/index.vue

@@ -147,7 +147,8 @@ import {
147
   importLeaderDuty,
147
   importLeaderDuty,
148
   importHealthSoldier,
148
   importHealthSoldier,
149
   importDormFireSafety,
149
   importDormFireSafety,
150
-  importTrainingIssue
150
+  importTrainingIssue,
151
+  importQualificationLevel
151
 } from '@/api/ledger/index'
152
 } from '@/api/ledger/index'
152
 
153
 
153
 defineOptions({ name: 'LedgerImport' })
154
 defineOptions({ name: 'LedgerImport' })
@@ -360,7 +361,15 @@ const importItems = reactive([
360
     loading: false,
361
     loading: false,
361
     lastResult: null
362
     lastResult: null
362
   },
363
   },
363
-
364
+  {
365
+    key: 'qualificationLevel',
366
+    title: '职业资格等级',
367
+    desc: '职业资格等级流程记录',
368
+    icon: 'Medal',
369
+    api: importQualificationLevel,
370
+    loading: false,
371
+    lastResult: null
372
+  },
364
   // {
373
   // {
365
   //   key: 'dailyTraining',
374
   //   key: 'dailyTraining',
366
   //   title: '日常培训记录',
375
   //   title: '日常培训记录',

+ 16 - 23
src/views/ledger/qualificationCertificateStatus/index.vue

@@ -34,13 +34,13 @@
34
       </el-form-item>
34
       </el-form-item>
35
     </el-form>
35
     </el-form>
36
 
36
 
37
-    <el-row :gutter="10" class="mb8">
37
+    <!-- <el-row :gutter="10" class="mb8">
38
       <el-col :span="1.5">
38
       <el-col :span="1.5">
39
         <el-button type="warning" plain icon="Download" @click="handleExport"
39
         <el-button type="warning" plain icon="Download" @click="handleExport"
40
           v-hasPermi="['ledger:qualification:export']">导出</el-button>
40
           v-hasPermi="['ledger:qualification:export']">导出</el-button>
41
       </el-col>
41
       </el-col>
42
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
42
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
43
-    </el-row>
43
+    </el-row> -->
44
 
44
 
45
     <el-table v-loading="loading" :data="list" style="width: 100%;" fit="true"
45
     <el-table v-loading="loading" :data="list" style="width: 100%;" fit="true"
46
       :scrollbar-always-on="true">
46
       :scrollbar-always-on="true">
@@ -48,20 +48,20 @@
48
       <el-table-column label="队室/班组" align="center" prop="teamName" min-width="120" resizable />
48
       <el-table-column label="队室/班组" align="center" prop="teamName" min-width="120" resizable />
49
       <el-table-column label="小组" align="center" prop="groupName" min-width="120" resizable />
49
       <el-table-column label="小组" align="center" prop="groupName" min-width="120" resizable />
50
       <el-table-column label="姓名" align="center" prop="personName" width="80" resizable />
50
       <el-table-column label="姓名" align="center" prop="personName" width="80" resizable />
51
-      <el-table-column label="一级发证时间" align="center" prop="level1CertTime" width="120" resizable>
52
-        <template #default="{ row }">{{ row.level1CertTime || '-' }}</template>
51
+      <el-table-column label="一级发证时间" align="center" prop="levelOneTime" width="120" resizable>
52
+        <template #default="{ row }">{{ row.levelOneTime || '-' }}</template>
53
       </el-table-column>
53
       </el-table-column>
54
-      <el-table-column label="二级发证时间" align="center" prop="level2CertTime" width="120" resizable>
55
-        <template #default="{ row }">{{ row.level2CertTime || '-' }}</template>
54
+      <el-table-column label="二级发证时间" align="center" prop="levelTwoTime" width="120" resizable>
55
+        <template #default="{ row }">{{ row.levelTwoTime || '-' }}</template>
56
       </el-table-column>
56
       </el-table-column>
57
-      <el-table-column label="三级发证时间" align="center" prop="level3CertTime" width="120" resizable>
58
-        <template #default="{ row }">{{ row.level3CertTime || '-' }}</template>
57
+      <el-table-column label="三级发证时间" align="center" prop="levelThreeTime" width="120" resizable>
58
+        <template #default="{ row }">{{ row.levelThreeTime || '-' }}</template>
59
       </el-table-column>
59
       </el-table-column>
60
-      <el-table-column label="四级发证时间" align="center" prop="level4CertTime" width="120" resizable>
61
-        <template #default="{ row }">{{ row.level4CertTime || '-' }}</template>
60
+      <el-table-column label="四级发证时间" align="center" prop="levelFourTime" width="120" resizable>
61
+        <template #default="{ row }">{{ row.levelFourTime || '-' }}</template>
62
       </el-table-column>
62
       </el-table-column>
63
-      <el-table-column label="五级发证时间" align="center" prop="level5CertTime" width="120" resizable>
64
-        <template #default="{ row }">{{ row.level5CertTime || '-' }}</template>
63
+      <el-table-column label="五级发证时间" align="center" prop="levelFiveTime" width="120" resizable>
64
+        <template #default="{ row }">{{ row.levelFiveTime || '-' }}</template>
65
       </el-table-column>
65
       </el-table-column>
66
       <el-table-column label="录入时间" align="center" prop="createTime" width="170" resizable>
66
       <el-table-column label="录入时间" align="center" prop="createTime" width="170" resizable>
67
         <template #default="{ row }">{{ row.createTime }}</template>
67
         <template #default="{ row }">{{ row.createTime }}</template>
@@ -77,7 +77,7 @@ import { ref, reactive, onMounted } from 'vue'
77
 import { listDept } from '@/api/system/dept'
77
 import { listDept } from '@/api/system/dept'
78
 import { deptTreeSelect } from '@/api/system/user'
78
 import { deptTreeSelect } from '@/api/system/user'
79
 import { listUser } from '@/api/system/user'
79
 import { listUser } from '@/api/system/user'
80
-import { listQualificationCertificateStatus, exportQualificationCertificateStatus } from '@/api/ledger/index'
80
+import { listQualificationCertificateStatus } from '@/api/ledger/index'
81
 
81
 
82
 defineOptions({ name: 'LedgerQualificationCertificateStatus' })
82
 defineOptions({ name: 'LedgerQualificationCertificateStatus' })
83
 
83
 
@@ -134,8 +134,8 @@ function getList() {
134
   loading.value = true
134
   loading.value = true
135
   const p = { ...queryParams }
135
   const p = { ...queryParams }
136
   if (dateRange.value?.length === 2) {
136
   if (dateRange.value?.length === 2) {
137
-    p['params[beginTime]'] = dateRange.value[0]
138
-    p['params[endTime]'] = dateRange.value[1]
137
+    p.beginTime = dateRange.value[0]
138
+    p.endTime = dateRange.value[1]
139
   }
139
   }
140
   listQualificationCertificateStatus(p).then(r => {
140
   listQualificationCertificateStatus(p).then(r => {
141
     list.value = r.rows
141
     list.value = r.rows
@@ -160,14 +160,7 @@ function resetQuery() {
160
   handleQuery()
160
   handleQuery()
161
 }
161
 }
162
 
162
 
163
-function handleExport() {
164
-  const p = { ...queryParams }
165
-  if (dateRange.value?.length === 2) {
166
-    p['params[beginTime]'] = dateRange.value[0]
167
-    p['params[endTime]'] = dateRange.value[1]
168
-  }
169
-  exportQualificationCertificateStatus(p)
170
-}
163
+
171
 
164
 
172
 onMounted(() => {
165
 onMounted(() => {
173
   loadQueryDepts()
166
   loadQueryDepts()