LY 修改离职日期

master/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /u03/cpmsfile/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: /u03/cpmsfile/uploadPath
   # 邮件中链接跳转路径 示例（本地：http://localhost/#，服务器：http://47.114.101.16:8080/cpms/index.html#）
   requestJumpPath: https://cpms.basf-ypc.net.cn/cpms/index.html#
   # 获取ip地址开关

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

@@ -282,6 +282,7 @@
             <if test="photo != null">photo = #{photo},</if>
             <if test="pId != null">p_id = #{pId},</if>
             <if test="specialDuty != null">special_duty = #{specialDuty},</if>
+            <if test="leftDate != null">left_date = #{leftDate},</if>
         </trim>
         where id = #{id}
     </update>
@@ -295,7 +296,7 @@
     </update>
 
     <update id="reLeftTStaffmgrByIds" parameterType="Long">
-        update t_staffmgr set del_flag = 0 where id = #{id}
+        update t_staffmgr set del_flag = 0 , LEFT_DATE = null where id = #{id}
     </update>
     <update id="deleteTStaffmgrByIds" parameterType="String">
         update t_staffmgr set del_flag = 2 where id in

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

@@ -411,6 +411,16 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="form.delFlag == 9">
+            <el-form-item :label="$t('离职日期')" prop="birthday">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.leftDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              :placeholder="$t('请选择') + $t('离职日期')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -529,6 +539,13 @@
         </el-table-column>
         <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
           <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['plant:staffmgr:edit']"
+            >{{ $t('修改') }}</el-button>
             <el-button
               size="mini"
               type="text"