职业资格名称列表补充

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -105,8 +105,8 @@ public class SysUser extends BaseEntity
     @Excel(name = "职称专业")
     private String titleProfession;
 
-    /** 执业证书 */
-    @Excel(name = "执业证书", readConverterExp = "0=注册测绘师,1=注册城乡规划师,2=注册岩土工程师,3=注册安全工程师,4=注册会计师")
+    /** 职业资格 */
+    @Excel(name = "职业资格", readConverterExp = "0=注册测绘师,1=注册城乡规划师,2=注册岩土工程师,3=注册安全工程师,4=注册会计师")
     private String certificates;
 
     /** 更新原因 */

oa-back/sql/sq.sql

@@ -1,7 +1,3 @@
-alter table sys_user modify column degree char(1) default null comment '最高学历';
-alter table sys_user modify column major varchar(20) default null comment '最高学历专业';
-alter table sys_user modify column graduate_school varchar(20) default null comment '最高学历院校';
-alter table sys_user add column initial_degree char(1) default null comment '初始学历';
-alter table sys_user add column initial_major varchar(20) default null comment '初始学历专业';
-alter table sys_user add column initial_school varchar(20) default null comment '初始学历院校';
-alter table sys_user add column title_profession varchar(20) default null comment '职称专业';
+INSERT INTO `cmc_oa`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (100, 5, '监理工程师', '5', 'sys_user_certificates', NULL, 'default', 'N', '0', 'admin', '2025-02-27 09:13:35', '', NULL, NULL);
+INSERT INTO `cmc_oa`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (101, 6, '建造师', '6', 'sys_user_certificates', NULL, 'default', 'N', '0', 'admin', '2025-02-27 09:14:01', '', NULL, NULL);
+INSERT INTO `cmc_oa`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (102, 7, '计算机技术与软件专业技术资格', '7', 'sys_user_certificates', NULL, 'default', 'N', '0', 'admin', '2025-02-27 09:14:24', '', NULL, NULL);

oa-ui/src/views/oa/staff/index.vue

@@ -27,8 +27,8 @@
                 :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="执业证书" prop="certificates">
-            <el-select v-model="queryParams.certificates" clearable placeholder="请输入执业证书" style="width:100%;">
+          <el-form-item label="职业资格" prop="certificates">
+            <el-select v-model="queryParams.certificates" clearable placeholder="请输入职业资格" style="width:100%;">
               <el-option v-for="dict in dict.type.sys_user_certificates" :key="dict.value" :label="dict.label"
                 :value="dict.value" />
             </el-select>
@@ -126,7 +126,7 @@
               {{ selectDictLabel(dict.type.sys_user_titles, scope.row.titles) }}
             </template>
           </el-table-column>
-          <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[18].visible"
+          <el-table-column label="职业资格" align="center" key="certificates" prop="certificates" v-if="columns[18].visible"
             :formatter="formatterCertificates" />
           <el-table-column label="毕业院校" align="center" key="graduateSchool" prop="graduateSchool"
             v-if="columns[10].visible" sortable="custom" />
@@ -215,6 +215,10 @@
             <el-form-item label="身份证" prop="idCard">
               <el-input v-model="form.idCard" placeholder="请输入身份证号码" maxlength="18" />
             </el-form-item>
+            <el-form-item label="出生年月" prop="birthday">
+              <el-date-picker v-model="form.birthday" type="month" placeholder="请输入出生年月" style="width:100%;"
+                value-format="yyyy-MM" />
+            </el-form-item>
             <el-form-item label="籍贯" prop="nativePlace">
               <el-input v-model="form.nativePlace" placeholder="请输入籍贯" />
             </el-form-item>
@@ -267,10 +271,6 @@
               <el-date-picker v-model="form.contractExpire" type="date" placeholder="请输入合同期满" style="width:100%;"
                 value-format="yyyy-MM-dd" />
             </el-form-item>
-            <el-form-item label="出生年月" prop="birthday">
-              <el-date-picker v-model="form.birthday" type="month" placeholder="请输入出生年月" style="width:100%;"
-                value-format="yyyy-MM" />
-            </el-form-item>
             <el-form-item label="政治面貌" prop="politicalAffiliation">
               <el-select v-model="form.politicalAffiliation" multiple clearable placeholder="请选择政治面貌"
                 style="width:100%;">
@@ -284,11 +284,11 @@
                   :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="职称证书专业" prop="titleProfession">
-              <el-input type="textarea" v-model="form.titleProfession" placeholder="职称证书专业" />
+            <el-form-item label="职称专业" prop="titleProfession">
+              <el-input type="textarea" v-model="form.titleProfession" placeholder="职称专业" />
             </el-form-item>
-            <el-form-item label="执业证书">
-              <el-select v-model="form.certificates" multiple placeholder="请输入执业证书" style="width:100%;">
+            <el-form-item label="职业资格">
+              <el-select v-model="form.certificates" multiple placeholder="请输入职业资格" style="width:100%;">
                 <el-option v-for="dict in dict.type.sys_user_certificates" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
@@ -470,7 +470,7 @@ export default {
         { key: 15, label: `民族`, visible: false },
         { key: 16, label: `入职时间`, visible: true },
         { key: 17, label: `职务`, visible: false },
-        { key: 18, label: `执业证书`, visible: false },
+        { key: 18, label: `职业资格`, visible: false },
       ],
       // 表单校验
       rules: {

oa-ui/src/views/oa/staff/info.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-26 17:09:25
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-02-27 10:22:52
 -->
 <template>
   <div class="bg" v-loading="loading">
@@ -146,7 +146,12 @@ export default {
               value: this.form.titles != null ? this.selectDictLabels(this.dict.type.sys_user_titles, this.form.titles, ',') : ''
             },
             {
-              label: '执业证书：',
+              label: '职称专业：',
+              icon: 'titles',
+              value: this.form.titleProfession
+            },
+            {
+              label: '职业资格：',
               icon: 'certificate',
               value: this.form.certificates != null ? this.selectDictLabels(this.dict.type.sys_user_certificates, this.form.certificates, ',') : ''
             },

oa-ui/src/views/system/user/index.vue

@@ -192,8 +192,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="执业证书">
-              <el-select v-model="form.certificates" multiple placeholder="请输入执业证书">
+            <el-form-item label="职业资格">
+              <el-select v-model="form.certificates" multiple placeholder="请输入职业资格">
                 <el-option v-for="dict in dict.type.sys_user_certificates" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>