-修改组织保护措施审批页面

master/src/main/java/com/ruoyi/project/apply/controller/TApplySafetychangeController.java

@@ -90,6 +90,18 @@ public class TApplySafetychangeController extends BaseController {
         return AjaxResult.success(list);
     }
 
+    @GetMapping("/listChangeReason")
+    public AjaxResult listChangeReason(TApplySafetychange tApplySafetychange) {
+        List<TApplySafetychange> list = tApplySafetychangeService.selectChangeReason(tApplySafetychange);
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/listSAFA")
+    public AjaxResult listSAFA(TApplySafetychange tApplySafetychange) {
+        List<TApplySafetychange> list = tApplySafetychangeService.selectSAFA(tApplySafetychange);
+        return AjaxResult.success(list);
+    }
+
 
     /**
      * 导出组织保护措施状态变更申请列表
@@ -272,6 +284,9 @@ public class TApplySafetychangeController extends BaseController {
                 for (String lockNo : tApplySafetychange.getLockNo().split(",")) {
                     TApplyLock tApplyLock = tApplyLockService.selectTApplyLockByLockCode(lockNo);
                     if (tApplyLock != null) {
+                        if (tApplyLock.getStatus() == 1 || tApplyLock.getStatus() == 2) {
+                            return AjaxResult.error("该锁已被使用。");
+                        }
                         tApplyLock.setStatus(1L);//将锁状态改为已拆锁
                         tApplyLockService.updateTApplyLock(tApplyLock);
                     }

master/src/main/java/com/ruoyi/project/apply/mapper/TApplySafetychangeMapper.java

@@ -33,6 +33,12 @@ public interface TApplySafetychangeMapper
     @DataScope(deptAlias = "d")
     public List<TApplySafetychange> selectChangeDescribe(TApplySafetychange tApplySafetychange);
 
+    @DataScope(deptAlias = "d")
+    public List<TApplySafetychange> selectChangeReason(TApplySafetychange tApplySafetychange);
+
+    @DataScope(deptAlias = "d")
+    public List<TApplySafetychange> selectSAFA(TApplySafetychange tApplySafetychange);
+
     /**
      * 新增组织保护措施状态变更申请
      *

master/src/main/java/com/ruoyi/project/apply/service/ITApplySafetychangeService.java

@@ -29,6 +29,8 @@ public interface ITApplySafetychangeService
      */
     public List<TApplySafetychange> selectTApplySafetychangeList(TApplySafetychange tApplySafetychange);
     public List<TApplySafetychange> selectChangeDescribe(TApplySafetychange tApplySafetychange);
+    public List<TApplySafetychange> selectSAFA(TApplySafetychange tApplySafetychange);
+    public List<TApplySafetychange> selectChangeReason(TApplySafetychange tApplySafetychange);
 
     /**
      * 新增组织保护措施状态变更申请

master/src/main/java/com/ruoyi/project/apply/service/impl/TApplySafetychangeServiceImpl.java

@@ -55,6 +55,18 @@ public class TApplySafetychangeServiceImpl implements ITApplySafetychangeService
         return tApplySafetychangeMapper.selectChangeDescribe(tApplySafetychange);
     }
 
+    @Override
+    public List<TApplySafetychange> selectChangeReason(TApplySafetychange tApplySafetychange)
+    {
+        return tApplySafetychangeMapper.selectChangeReason(tApplySafetychange);
+    }
+
+    @Override
+    public List<TApplySafetychange> selectSAFA(TApplySafetychange tApplySafetychange)
+    {
+        return tApplySafetychangeMapper.selectSAFA(tApplySafetychange);
+    }
+
     /**
      * 新增组织保护措施状态变更申请
      *

master/src/main/java/com/ruoyi/project/listener/apply/change/ChangeNextTaskListener.java

@@ -45,6 +45,9 @@ public class ChangeNextTaskListener implements Serializable, TaskListener {
         } else {
             userIds.add(assignee);
         }
+        if(delegateTask.getEventName().equals("措施执行人")){
+            logger.info("====================================措施执行人：{}",userIds);
+        }
         StringBuilder to = new StringBuilder();
         for (String userId : userIds) {
             //发送邮件

master/src/main/resources/mybatis/apply/TApplySafetychangeMapper.xml

@@ -115,6 +115,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ${params.dataScope}
     </select>
 
+    <select id="selectChangeReason" parameterType="TApplySafetychange" resultMap="TApplySafetychangeResult">
+        select distinct(CHANGE_REASON) from  t_apply_safetychange d
+        left join sys_dept s on s.dept_id = d.dept_id
+        <where>
+            and d.del_flag = 0
+            and d.CHANGE_REASON is not null
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectSAFA" parameterType="TApplySafetychange" resultMap="TApplySafetychangeResult">
+        select distinct(safa) from  t_apply_safetychange d
+        left join sys_dept s on s.dept_id = d.dept_id
+        <where>
+            and d.del_flag = 0
+            and d.safa is not null
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
     <select id="selectTApplySafetychangeById" parameterType="Long" resultMap="TApplySafetychangeResult">
         <include refid="selectTApplySafetychangeVo"/>
         where id = #{id}

ui/src/api/apply/safetychange.js

@@ -15,6 +15,20 @@ export function listChangeDescribe(query) {
     params: query
   })
 }
+export function listChangeReason(query) {
+  return request({
+    url: '/apply/safetychange/listChangeReason',
+    method: 'get',
+    params: query
+  })
+}
+export function listSAFA(query) {
+  return request({
+    url: '/apply/safetychange/listSAFA',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询组织保护措施状态变更申请详细
 export function getSafetychange(id) {

ui/src/views/approve/approveDetail/safetychange-detail.vue

@@ -110,7 +110,15 @@
         </div>
         <div v-if="taskName=='安全评估人1'">
           <el-form-item label="安全评估及临时的安全措施" prop="safa" label-width="190px">
-            <el-input type="textarea" v-model="form.safa" placeholder="请输入安全评估及临时的安全措施"/>
+<!--            <el-input type="textarea" v-model="form.safa" placeholder="请输入安全评估及临时的安全措施"/>-->
+            <el-autocomplete
+              type="textarea"
+              class="inline-input"
+              style="width: 100%"
+              v-model="form.safa"
+              placeholder="请输入安全评估及临时的安全措施"
+              :trigger-on-focus="false"
+              :fetch-suggestions="getSAFA"></el-autocomplete>
           </el-form-item>
         </div>
         <div v-if="taskName=='变更执行人'">
@@ -132,17 +140,17 @@
               <el-radio label="NA">NA</el-radio>
             </el-radio-group>
           </el-form-item>
-<!--          <el-form-item label="确认人" prop="resetConfirmer1">
-            <el-select v-model="form.resetConfirmer1" placeholder="请选择确认人" clearable size="small" filterable
-                       style="width: 100%">
-              <el-option
-                v-for="item in resetConfirmerList"
-                :key="item.userId"
-                :label="item.nickName"
-                :value="item.userId"
-              ></el-option>
-            </el-select>
-          </el-form-item>-->
+          <!--          <el-form-item label="确认人" prop="resetConfirmer1">
+                      <el-select v-model="form.resetConfirmer1" placeholder="请选择确认人" clearable size="small" filterable
+                                 style="width: 100%">
+                        <el-option
+                          v-for="item in resetConfirmerList"
+                          :key="item.userId"
+                          :label="item.nickName"
+                          :value="item.userId"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>-->
         </div>
         <el-form-item label="备注" prop="remarks" v-if="taskName!='申请人提交申请'">
           <el-input type="textarea" v-model="form.remarks" placeholder="选填"/>
@@ -181,7 +189,7 @@
 
 <script>
 
-import {getSafetychange, handle} from "@/api/apply/safetychange";
+import {getSafetychange, handle, listChangeReason, listSAFA} from "@/api/apply/safetychange";
 import {getHistorylist} from "@/api/ehs/approvedanger";
 import {listUserPost} from "@/api/system/user";
 
@@ -199,6 +207,7 @@ export default {
       resetConfirmerList: [],
       statusList: [],
       approveStatusList: [],
+      safaList: [],
       //流转列表
       historyList: [],
       historyLoading: true,
@@ -271,15 +280,15 @@ export default {
         businessKey: '',
         offlinevalve: {}
       },
-      desFlag:false,
+      desFlag: false,
     }
   },
   methods: {
-    init(id, taskId, processId, taskName, flag,desFlag) {
+    init(id, taskId, processId, taskName, flag, desFlag) {
       this.reset();
       this.devList = [];
-      this.desFlag=desFlag;
-      this.dataForm={}  ;
+      this.desFlag = desFlag;
+      this.dataForm = {};
       this.historyList = [];
       this.dataForm.id = id || 0;
       this.form.id = id || 0;
@@ -290,15 +299,15 @@ export default {
       this.taskForm.taskId = taskId;
       this.taskForm.businessKey = id;
       this.dataForm.processId = processId;
-      this.statusFlag='';
-      this.approveStatusFlag='';
+      this.statusFlag = '';
+      this.approveStatusFlag = '';
       getSafetychange(id).then(res => {
         this.dataForm = res.data;
         this.devList.push(this.dataForm);
-          if (taskName == '申请人提交申请') {
-            this.form.changeReason=this.dataForm.changeReason;
-            this.form.changeDescribe=this.dataForm.changeDescribe;
-          }
+        if (taskName == '申请人提交申请') {
+          this.form.changeReason = this.dataForm.changeReason;
+          this.form.changeDescribe = this.dataForm.changeDescribe;
+        }
 
         if (this.dataForm.status === 1) {
           this.statusFlag = 'success';
@@ -326,6 +335,17 @@ export default {
       }).then(response => {
         this.resetConfirmerList = response;
       });
+      listSAFA({}).then(res => {
+        this.safaList = res.data;
+      })
+    },
+    getSAFA(val, cb) {
+      let list = [];
+      for (const item of this.safaList) {
+        if (item.safa.indexOf(val) > -1)
+          list.push({"value": item.safa})
+      }
+      return cb(list);
     },
     statusFormat(row, column) {
       let s = this.selectDictLabel(this.statusList, row.status);
@@ -378,8 +398,8 @@ export default {
         updatedate: null,
         deptId: null,
         approveStatus: null,
-        apNo:null,
-        processId:null,
+        apNo: null,
+        processId: null,
       };
       this.resetForm("form");
     },
@@ -402,7 +422,7 @@ export default {
           this.submitDisabled = true;
           this.taskForm.condition = val;
           this.taskForm.safetychange = this.form;
-          handle(this.taskForm).then(res=>{
+          handle(this.taskForm).then(res => {
             this.msgSuccess("审核成功");
             this.visible = false;
             this.$emit('refreshDataList')