-填写申请单的时候增加联想功能

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

@@ -18,6 +18,7 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.apply.domain.TApplyLock;
 import com.ruoyi.project.apply.domain.TApplyOfflinevalve;
+import com.ruoyi.project.apply.domain.TApplySafetychange;
 import com.ruoyi.project.apply.service.ITApplyLockService;
 import com.ruoyi.project.apply.service.ITApplyOfflinevalveService;
 import com.ruoyi.project.approve.damain.DevTask;
@@ -83,6 +84,12 @@ public class TApplyOfflinevalveController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/listSAFA")
+    public AjaxResult listSAFA(TApplyOfflinevalve tApplyOfflinevalve) {
+        List<TApplyOfflinevalve> list = tApplyOfflinevalveService.selectSAFA(tApplyOfflinevalve);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出安全阀离线切出申请列表
      */

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

@@ -29,6 +29,8 @@ public interface TApplyOfflinevalveMapper
      */
     @DataScope(deptAlias = "d")
     public List<TApplyOfflinevalve> selectTApplyOfflinevalveList(TApplyOfflinevalve tApplyOfflinevalve);
+    @DataScope(deptAlias = "d")
+    public List<TApplyOfflinevalve> selectSAFA(TApplyOfflinevalve tApplyOfflinevalve);
 
     /**
      * 新增安全阀离线切出申请

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

@@ -27,6 +27,7 @@ public interface ITApplyOfflinevalveService
      * @return 安全阀离线切出申请集合
      */
     public List<TApplyOfflinevalve> selectTApplyOfflinevalveList(TApplyOfflinevalve tApplyOfflinevalve);
+    public List<TApplyOfflinevalve> selectSAFA(TApplyOfflinevalve tApplyOfflinevalve);
 
     /**
      * 新增安全阀离线切出申请

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

@@ -44,6 +44,12 @@ public class TApplyOfflinevalveServiceImpl implements ITApplyOfflinevalveService
         return tApplyOfflinevalveMapper.selectTApplyOfflinevalveList(tApplyOfflinevalve);
     }
 
+    @Override
+    public List<TApplyOfflinevalve> selectSAFA(TApplyOfflinevalve tApplyOfflinevalve)
+    {
+        return tApplyOfflinevalveMapper.selectSAFA(tApplyOfflinevalve);
+    }
+
     /**
      * 新增安全阀离线切出申请
      *

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

@@ -256,4 +256,16 @@
         where lock_no like concat(concat('%',#{lockNo}),'%') and d.status=0 and d.approve_status=2
     </select>
 
+
+    <select id="selectSAFA" parameterType="TApplyOfflinevalve" resultMap="TApplyOfflinevalveResult">
+        select distinct(safa) from  T_APPLY_OFFLINEVALVE 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>
+
 </mapper>

ui/src/api/apply/offlinevalve.js

@@ -43,6 +43,14 @@ export function handle(data) {
   })
 }
 
+export function listSAFA(query) {
+  return request({
+    url: '/apply/offlinevalve/listSAFA',
+    method: 'get',
+    params:query
+  })
+}
+
 
 
 // 删除安全阀离线切出申请

ui/src/views/apply/safetychange/index.vue

@@ -217,7 +217,15 @@
             :fetch-suggestions="getchangeDescribe"></el-autocomplete>
         </el-form-item>
         <el-form-item label="状态变更的原因" prop="changeReason">
-          <el-input type="textarea" v-model="form.changeReason" placeholder="请输入状态变更的原因"/>
+<!--          <el-input type="textarea" v-model="form.changeReason" placeholder="请输入状态变更的原因"/>-->
+          <el-autocomplete
+            type="textarea"
+            class="inline-input"
+            style="width: 100%"
+            v-model="form.changeReason"
+            placeholder="请输入状态变更的原因"
+            :trigger-on-focus="false"
+            :fetch-suggestions="getReason"></el-autocomplete>
         </el-form-item>
         <el-form-item label="破锁编号" prop="lockNo">
           <el-select v-model="form.lockNo" placeholder="请选择锁编号" multiple clearable size="small" filterable
@@ -421,7 +429,7 @@ import {
   updateSafetychange,
   exportSafetychange,
   importTemplate,
-  wordView, listChangeDescribe
+  wordView, listChangeDescribe, listSAFA, listChangeReason
 } from "@/api/apply/safetychange";
 import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
@@ -446,6 +454,7 @@ export default {
       executorList: [],
       safaerList: [],
       changeDescribeList: [],
+      reasonList: [],
       statusFlag: '',
       approveStatusFlag: '',
       status: {0: "未完成", 1: "已完成"},
@@ -611,6 +620,14 @@ export default {
       }
       return cb(list);
     },
+    getReason(val, cb) {
+      let list = [];
+      for (const item of this.reasonList) {
+        if (item.changeReason.indexOf(val) > -1)
+          list.push({"value": item.changeReason})
+      }
+      return cb(list);
+    },
     openDetail(row) {
       this.statusFlag = '';
       this.approveStatusFlag = '';
@@ -682,9 +699,13 @@ export default {
         this.loading = false;
       });
       this.changeDescribeList = [];
+      this.reasonList = [];
       listChangeDescribe({}).then(res => {
         this.changeDescribeList = res.data
       })
+      listChangeReason({}).then(res => {
+        this.reasonList = res.data
+      })
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {

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

@@ -87,7 +87,15 @@
       <div v-if="flag">
         <div v-if="taskName=='临时措施制定人'">
           <el-form-item label="安全评估以及临时措施执行" prop="safa">
-            <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>
           <el-form-item label="安全阀锁开是否拆解" prop="disassembly">
             <el-radio-group v-model="form.disassembly">
@@ -225,7 +233,7 @@
 </template>
 
 <script>
-import {getOfflinevalve, handle} from "@/api/apply/offlinevalve";
+import {getOfflinevalve, handle, listSAFA} from "@/api/apply/offlinevalve";
 import {getHistorylist} from "@/api/ehs/approvedanger";
 import {listUserPost} from "@/api/system/user";
 import {allSafetyvavle} from "@/api/reliability/safetyvavle";
@@ -243,6 +251,7 @@ export default {
       infoConfirmerList: [],
       // 安全阀清单
       safetyvavleList: [],
+      safaList: [],
       unitOptions: [],
       lockList: [],
       //流转列表
@@ -392,6 +401,17 @@ export default {
       this.getDicts("UNIT").then(response => {
         this.unitOptions = response.data;
       });
+      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);
     },
     getLocks(devNo) {
       listAllLock({position: devNo, status: 0}).then(res => {