Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

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

@@ -177,6 +177,14 @@ public class SysUser extends BaseEntity
     @Excel(name = "家庭住址")
     private String homePlace;
 
+    /** 紧急联系人 */
+    @Excel(name = "紧急联系人")
+    private String contact;
+
+    /** 紧急联系电话 */
+    @Excel(name = "紧急联系电话")
+    private String telephone;
+
     /** 部门对象 */
     @Excels({
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@@ -666,6 +674,24 @@ public class SysUser extends BaseEntity
     {
         return titleProfession;
     }
+    public void setContact(String contact)
+    {
+        this.contact = contact;
+    }
+
+    public String getContact()
+    {
+        return contact;
+    }
+    public void setTelephone(String telephone)
+    {
+        this.telephone = telephone;
+    }
+
+    public String getTelephone()
+    {
+        return telephone;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcResourceMapper.xml

@@ -6,7 +6,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="CmcResource" id="CmcResourceResult">
         <result property="resourceId"    column="resource_id"    />
-        <result property="trainId"    column="train_id"    />
         <result property="uploader"    column="uploader"    />
         <result property="uploadDept"    column="upload_dept"    />
         <result property="title"    column="title"    />
@@ -98,7 +97,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fieldId != null">field_id,</if>
             <if test="uploadTime != null">upload_time,</if>
             <if test="hours != null">hours,</if>
-            <if test="trainId != null">train_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="uploader != null">#{uploader},</if>
@@ -109,7 +107,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fieldId != null">#{fieldId},</if>
             <if test="uploadTime != null">#{uploadTime},</if>
             <if test="hours != null">#{hours},</if>
-            <if test="trainId != null">#{trainId},</if>
          </trim>
     </insert>
 
@@ -124,7 +121,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fieldId != null">field_id = #{fieldId},</if>
             <if test="uploadTime != null">upload_time = #{uploadTime},</if>
             <if test="hours != null">hours = #{hours},</if>
-            <if test="trainId != null">train_id = #{trainId},</if>
         </trim>
         where resource_id = #{resourceId}
     </update>

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -49,6 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="initialMajor"    column="initial_major"    />
 		<result property="initialSchool"    column="initial_school"    />
 		<result property="titleProfession"    column="title_profession"    />
+		<result property="contact"    column="contact"    />
+		<result property="telephone"    column="telephone"    />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <association property="salary"    javaType="CmcPostSalary"         resultMap="CmcPostSalaryResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
@@ -85,7 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
                u.pm_level, u.titles, u.certificates, u.update_reason, u.engineer_level, u.post_level, u.salary_level,
                u.operator_level, u.entry_date, u.birthday, u.age, u.id_card, u.native_place, u.political_affiliation,
-               u.ethnic, u.graduate_school, u.major, u.degree, u.contract_sign, u.contract_expire, u.home_place, u.initial_degree, u.initial_major, u.initial_school, u.title_profession,
+               u.ethnic, u.graduate_school, u.major, u.degree, u.contract_sign, u.contract_expire, u.home_place, u.initial_degree,
+               u.initial_major, u.initial_school, u.title_profession, u.contact, u.telephone,
                d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
                r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, ps.salary
         from sys_user u
@@ -100,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		       u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.certificates, u.update_reason,
 		       u.engineer_level, u.post_level, u.salary_level, u.operator_level, u.entry_date, u.birthday, u.age, u.id_card,
 		       u.native_place, u.political_affiliation, u.ethnic, u.graduate_school, u.major, u.degree, u.contract_sign, u.contract_expire,
-		       u.home_place, d.dept_name, d.leader, ps.salary, u.initial_degree, u.initial_major, u.initial_school, u.title_profession from sys_user u
+		       u.home_place, d.dept_name, d.leader, ps.salary, u.initial_degree, u.initial_major, u.initial_school, u.title_profession, u.contact, u.telephone from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join cmc_post_salary ps on u.post_level = ps.post_level and u.salary_level = ps.salary_level
 		where u.del_flag = '0' and u.user_id != 1
@@ -150,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		       u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.certificates, u.update_reason,
 		       u.engineer_level, u.post_level, u.salary_level, u.operator_level, u.entry_date, u.birthday, u.age, u.id_card,
 		       u.native_place, u.political_affiliation, u.ethnic, u.graduate_school, u.major, u.degree, u.contract_sign, u.contract_expire,
-		       u.home_place, d.dept_name, d.leader, ps.salary, u.initial_degree, u.initial_major, u.initial_school, u.title_profession from sys_user u
+		       u.home_place, d.dept_name, d.leader, ps.salary, u.initial_degree, u.initial_major, u.initial_school, u.title_profession, u.contact, u.telephone from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join cmc_post_salary ps on u.post_level = ps.post_level and u.salary_level = ps.salary_level
 		where u.del_flag = '0' and u.user_id != 1 AND (u.status = '0' or u.status = '3' or u.status = '4')
@@ -289,6 +292,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="initialMajor != null">initial_major,</if>
 			<if test="initialSchool != null">initial_school,</if>
 			<if test="titleProfession != null">title_profession,</if>
+			<if test="contact != null">contact,</if>
+			<if test="telephone != null">telephone,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -329,6 +334,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="initialMajor != null">#{initialMajor},</if>
 			<if test="initialSchool != null">#{initialSchool},</if>
 			<if test="titleProfession != null">#{titleProfession},</if>
+			<if test="contact != null">#{contact},</if>
+			<if test="telephone != null">#{telephone},</if>
  			sysdate()
  		)
 	</insert>
@@ -375,6 +382,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="initialMajor != null">initial_major = #{initialMajor},</if>
 			<if test="initialSchool != null">initial_school = #{initialSchool},</if>
 			<if test="titleProfession != null">title_profession = #{titleProfession},</if>
+			<if test="contact != null">contact = #{contact},</if>
+			<if test="telephone != null">telephone = #{telephone},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}

oa-back/sql/sq.sql

@@ -23,4 +23,10 @@ alter table cmc_budget add column out_adjust decimal(10,2) default null comment
 alter table cmc_budget add column tax_adjust decimal(10,2) default null comment '核算税费';
 alter table cmc_budget add column letter_adjust decimal(10,2) default null comment '保函核算费用';
 alter table cmc_budget add column win_adjust decimal(10,2) default null comment '中标服务核算费用';
-alter table cmc_budget add column travel_adjust decimal(10,2) default null comment '管理出差核算费用';
+alter table cmc_budget add column travel_adjust decimal(10,2) default null comment '管理出差核算费用';
+insert into sys_user_role values(73,15);
+insert into sys_user_role values(115,15);
+insert into sys_user_role values(149,15);
+insert into sys_user_role values(150,15);
+alter table sys_user add column contact varchar(30) default null comment '紧急联系人';
+alter table sys_user add column telephone varchar(11) default null comment '紧急联系电话';

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

@@ -157,7 +157,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="form.isRent == '1'" label="单日成本" prop="dayCost">
-          <el-input style="width:400px;margin-right:10px;" v-model="form.dayCost" placeholder="若不填写，将以残值5%，采用年数总和法计提单日成本"/>
+          <el-input style="width:400px;margin-right:10px;" v-model="form.dayCost" placeholder="请输入单日成本"/>
           <span>元</span>
         </el-form-item>
         <el-form-item label="车辆状态" prop="status">

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

@@ -166,7 +166,7 @@
           <el-col :span="12">
             <el-form-item label="单日成本" prop="dayCost">
               <el-input type="textarea" :rows="2" style="width:230px;margin-right:10px;" v-model="form.dayCost"
-                placeholder="若不填写，将以残值5%，采用年数总和法计提单日成本" />
+                placeholder="请输入单日成本" />
               <span>元</span>
             </el-form-item>
           </el-col>

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

@@ -133,6 +133,8 @@
           <el-table-column label="最高学历专业" align="center" key="major" prop="major" v-if="columns[11].visible" />
           <el-table-column label="最高学历" sortable align="center" key="degree" prop="degree" :formatter="formatterDegree"
             v-if="columns[12].visible" />
+          <el-table-column label="初始学历毕业院校" align="center" key="initialSchool" prop="initialSchool"
+            v-if="columns[21].visible" sortable="custom" />
           <el-table-column label="初始学历专业" align="center" key="initialMajor" prop="initialMajor" v-if="columns[20].visible" />
           <el-table-column label="初始学历" sortable align="center" key="initialDegree" prop="initialDegree" :formatter="formatterInitialDegree"
             v-if="columns[19].visible" />
@@ -229,24 +231,27 @@
               <el-input v-model="form.ethnic" placeholder="请输入民族" />
             </el-form-item>
             <el-form-item label="初始学历专业" prop="initialDegree">
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-select v-model="form.initialDegree" placeholder="请选择" style="width:100%;" clearable>
                   <el-option v-for="dict in dict.type.sys_user_degree" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
                 </el-select>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="16">
                 <el-input v-model="form.initialMajor" placeholder="请输入专业" />
               </el-col>
             </el-form-item>
+            <el-form-item label="初始学历毕业学校" prop="initialSchool">
+              <el-input v-model="form.initialSchool" placeholder="请输入初始学历毕业学校" />
+            </el-form-item>
             <el-form-item label="最高学历专业" prop="degree">
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-select v-model="form.degree" placeholder="请选择" style="width:100%;" clearable>
                   <el-option v-for="dict in dict.type.sys_user_degree" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
                 </el-select>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="16">
                 <el-input v-model="form.major" placeholder="请输入专业" />
               </el-col>
             </el-form-item>
@@ -333,6 +338,12 @@
                     :value="dict.value" />
                 </el-select>
               </el-col>
+            </el-form-item>            
+            <el-form-item label="紧急联系人" prop="contact">
+              <el-input v-model="form.contact" placeholder="请输入紧急联系人" />
+            </el-form-item>
+            <el-form-item label="紧急联系电话" prop="telephone">
+              <el-input v-model="form.telephone" placeholder="请输入紧急联系电话" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -476,6 +487,7 @@ export default {
         { key: 18, label: `职业资格`, visible: false },
         { key: 19, label: `初始学历`, visible: false },
         { key: 20, label: `初始学历专业`, visible: false },
+        { key: 21, label: `初始学历毕业院校`, visible: false },
       ],
       // 表单校验
       rules: {
@@ -592,6 +604,9 @@ export default {
         graduateSchool: undefined,
         major: undefined,
         degree: undefined,
+        initialSchool: undefined,
+        initialMajor: undefined,
+        initialDegree: undefined,
         homePlace: undefined,
         entryDate: undefined,
         contractSign: undefined,
@@ -606,7 +621,9 @@ export default {
         postIds: [],
         postLevel: undefined,
         salaryLevel: undefined,
-        salaryLevel: undefined,
+        titleProfession: undefined,
+        contact: null,
+        telephone: null
       };
       // this.resetForm("form");
     },

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-27 11:40:45
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-05-19 16:50:50
 -->
 <template>
   <div class="bg" v-loading="loading">
@@ -81,6 +81,13 @@
             <div class="item-label" style="min-width:70px;">家庭住址：</div>
           </div>
           <div>{{ form.homePlace }}</div>
+        </div>        
+        <div class="info-item">
+          <div class="item-label">
+            <svg-icon icon-class="user" class="info-icon"></svg-icon>
+            <div class="item-label" style="min-width:70px;">紧急联系方式：</div>
+          </div>
+          <div>{{ form.contact + form.telephone }}</div>
         </div>
       </el-col>
       <el-col :span="15" class="stateInfo">
@@ -205,6 +212,11 @@ export default {
               icon: 'degree',
               value: this.selectDictLabel(this.dict.type.sys_user_degree, this.form.degree)
             },
+            {
+              label: '初始学历毕业院校：',
+              icon: 'school',
+              value: this.form.initialSchool
+            },
             {
               label: '初始学历专业：',
               icon: 'major',
@@ -309,7 +321,7 @@ export default {
 
 .userInfo {
   background-color: #fff;
-  height: 900px;
+  height: 1000px;
   margin-right: 40px;
   padding: 5px;
 
@@ -369,7 +381,7 @@ export default {
 
 .stateInfo {
   background-color: #fff;
-  height: 900px;
+  height: 1000px;
   overflow-y: scroll;
   padding: 10px 30px 0;
 }