Merge remote-tracking branch 'origin/master'

master/src/main/resources/application.yml

@@ -93,24 +93,24 @@ spring:
         max-wait: -1ms
   # 邮箱配置
   mail:
-#    host: smtpout.basf-it-services.com
-#    protocol: smtp
-#    default-encoding: UTF-8
-#    password:
-#    username:
-#    port: 25
-#    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
-#    properties.mail.debug: true
-#    from: CPMS.byc@BASF-YPC.com.cn
-    host: smtp.exmail.qq.com
+    host: smtpout.basf-it-services.com
     protocol: smtp
     default-encoding: UTF-8
-    password: vvTAT8hciG7FLk4C
-    username: email@seashoreept.com
-    port: 587
+    password:
+    username:
+    port: 25
     properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
     properties.mail.debug: true
-    from: email@seashoreept.com
+    from: CPMS.byc@BASF-YPC.com.cn
+#    host: smtp.exmail.qq.com
+#    protocol: smtp
+#    default-encoding: UTF-8
+#    password: vvTAT8hciG7FLk4C
+#    username: email@seashoreept.com
+#    port: 587
+#    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
+#    properties.mail.debug: true
+#    from: email@seashoreept.com
 # token配置
 token:
     # 令牌自定义标识

master/src/main/resources/mybatis/plant/TStaffmgrMapper.xml

@@ -31,10 +31,11 @@
         <result property="photo"    column="photo"    />
         <result property="pId"    column="p_id"    />
         <result property="specialDuty"    column="special_duty"    />
+        <result property="leftDate"    column="left_date"    />
     </resultMap>
 
     <sql id="selectTStaffmgrVo">
-         select d.id, d.plant_code, d.staffid, d.name, d.photo, d.sex, d.birthday, d.unit, d.team, d.actualpost, d.contact, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.education, d.en_ability, d.accident_num, d.mail, d.skill_score, d.p_id , d.special_duty, s.dept_name from t_staffmgr d
+         select d.id, d.plant_code,d.left_date, d.staffid, d.name, d.photo, d.sex, d.birthday, d.unit, d.team, d.actualpost, d.contact, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.education, d.en_ability, d.accident_num, d.mail, d.skill_score, d.p_id , d.special_duty, s.dept_name from t_staffmgr d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -288,7 +289,7 @@
     </update>
 
     <update id="deleteLeftTStaffmgrByIds" parameterType="Long">
-        update t_staffmgr set del_flag = 9 where id = #{id}
+        update t_staffmgr set del_flag = 9 , LEFT_DATE = SYSDATE  where id = #{id}
     </update>
 
     <update id="reLeftTStaffmgrByIds" parameterType="Long">

ui/src/views/plant/staffmgr/index.vue

@@ -522,6 +522,11 @@
         <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :formatter="plantCodeFormat" />
         <el-table-column :label="$t('员工编号')" align="center" prop="staffid" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('员工姓名')" align="center" prop="name" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('离职日期')" align="center" prop="leftDate" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.leftDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button