修改装置清单区域选项；修改部门下拉；

master/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java

@@ -53,6 +53,8 @@ public class SysDeptController extends BaseController
         return AjaxResult.success(depts);
     }
 
+
+
     /**
      * 查询部门列表（排除节点）
      */
@@ -104,6 +106,13 @@ public class SysDeptController extends BaseController
         return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
     }
 
+    @GetMapping("/listDeptByNames")
+    public AjaxResult listDeptByNames(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptByNames(dept);
+        return AjaxResult.success(depts);
+    }
+
     /**
      * 加载对应角色部门列表树
      */

master/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java

@@ -142,4 +142,6 @@ public interface SysDeptMapper
     public int deleteDeptById(Long deptId);
 
     List<SysDept> selectAllDeptList(SysDept dept);
+
+    List<SysDept> selectDeptByNames(SysDept dept);
 }

master/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java

@@ -20,6 +20,7 @@ public interface ISysDeptService
     public List<SysDept> selectDeptList(SysDept dept);
 
     List<SysDept> selectAllDeptList(SysDept dept);
+    List<SysDept> selectDeptByNames(SysDept dept);
 
     /**
      * 构建前端所需要树结构

master/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java

@@ -56,6 +56,12 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.selectAllDeptList(dept);
     }
 
+    @Override
+    public List<SysDept> selectDeptByNames(SysDept dept)
+    {
+        return deptMapper.selectDeptByNames(dept);
+    }
+
     /**
      * 构建前端所需要树结构
      *

master/src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -70,6 +70,18 @@
         order by d.parent_id, d.order_num
     </select>
 
+    <select id="selectDeptByNames" parameterType="SysDept" resultMap="SysDeptResult">
+        <include refid="selectDeptVo"/>
+        <where>
+            <if test="deptName != null and deptName != ''">and dept_name in
+                <foreach item="deptName" collection="deptName.split(',')" open="(" separator="," close=")">
+                    #{deptName}
+                </foreach>
+            </if>
+        </where>
+        order by dept_name
+    </select>
+
     <select id="selectDeptListByRoleId" resultType="Integer">
         select d.dept_id
         from sys_dept d

ui/src/api/system/dept.js

@@ -41,6 +41,14 @@ export function alltreeselect() {
   })
 }
 
+export function listDeptByNames(query) {
+  return request({
+    url: '/system/dept/listDeptByNames',
+    method: 'get',
+    params: query
+  })
+}
+
 // 根据角色ID查询部门树结构
 export function roleDeptTreeselect(roleId) {
   return request({

ui/src/views/issue/issuelist/bd.vue

@@ -49,7 +49,9 @@
         />
       </el-form-item>
       <el-form-item label="负责部门" prop="responsibleUnit">
-        <treeselect v-model="queryParams.responsibleUnit" :options="allDeptOptions"  :show-count="true" placeholder="请选择负责部门" style="width: 220px"/>
+        <el-select  v-model="queryParams.responsibleUnit"  placeholder="请选择负责部门" @change="handleQuery" clearable >
+          <el-option v-for="item in allDeptOptions" :key="item.deptId" :value="item.deptId" :label="item.deptName" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -228,7 +230,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="负责部门 " prop="responsibleUnit">
-          <treeselect v-model="form.responsibleUnit" :options="allDeptOptions" @select="getResponsiblePersonList" :show-count="true"  placeholder="请选择负责部门" />
+          <el-select  v-model="form.responsibleUnit" @change="getResponsiblePersonList" placeholder="请选择负责部门" clearable style="width: 100%">
+            <el-option v-for="item in allDeptOptions" :key="item.deptId" :value="item.deptId" :label="item.deptName" />
+          </el-select>
         </el-form-item>
         <el-form-item label="负责人员" prop="responsiblePerson">
           <el-select v-model="form.responsiblePerson" clearable filterable style="width: 100%">
@@ -384,7 +388,7 @@ import {
   listIssuelist,
   updateIssuelist
 } from "@/api/issue/issuelist";
-import {treeselect} from "@/api/system/dept";
+import {listDeptByNames, treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -579,8 +583,8 @@ export default {
     this.getAllDeptList();
   },
   methods: {
-    getResponsiblePersonList(node, instanceId){
-      this.getUserList(node.id);
+    getResponsiblePersonList(val){
+      this.getUserList(val);
     },
     getUserList(deptId){
       this.userOptions=[];
@@ -604,7 +608,7 @@ export default {
       });
     },
     getAllDeptList(){
-      alltreeselect().then(response => {
+      listDeptByNames({deptName:'CTA/M,CTM/M,CTA/SP,CTS/LY,CBP,CBP/B'}).then(response => {
         this.allDeptOptions = response.data;
       });
     },

ui/src/views/issue/issuelist/ebsm.vue

@@ -9,8 +9,8 @@
           <el-option value="2400#单元" laabel="2400#单元"></el-option>
           <el-option value="8200#单元" laabel="8200#单元"></el-option>
           <el-option value="8500#单元" laabel="8500#单元"></el-option>
+          <el-option value="8800#单元" laabel="8500#单元"></el-option>
           <el-option value="8900#单元" laabel="8900#单元"></el-option>
-          <el-option value="8800#单元" laabel="8800#单元"></el-option>
           <el-option value="9000#单元" laabel="9000#单元"></el-option>
           <el-option value="其他" laabel="其他"></el-option>
         </el-select>
@@ -52,7 +52,9 @@
         />
       </el-form-item>
       <el-form-item label="负责部门" prop="responsibleUnit">
-        <treeselect v-model="queryParams.responsibleUnit" :options="allDeptOptions"  :show-count="true" placeholder="请选择负责部门" style="width: 220px"/>
+        <el-select  v-model="queryParams.responsibleUnit"  placeholder="请选择负责部门" @change="handleQuery" clearable >
+          <el-option v-for="item in allDeptOptions" :key="item.deptId" :value="item.deptId" :label="item.deptName" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -196,8 +198,8 @@
             <el-option value="2400#单元" laabel="2400#单元"></el-option>
             <el-option value="8200#单元" laabel="8200#单元"></el-option>
             <el-option value="8500#单元" laabel="8500#单元"></el-option>
-            <el-option value="8900#单元" laabel="8900#单元"></el-option>
             <el-option value="8800#单元" laabel="8800#单元"></el-option>
+            <el-option value="8900#单元" laabel="8900#单元"></el-option>
             <el-option value="9000#单元" laabel="9000#单元"></el-option>
             <el-option value="其他" laabel="其他"></el-option>
           </el-select>
@@ -234,7 +236,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="负责部门 " prop="responsibleUnit">
-          <treeselect v-model="form.responsibleUnit" :options="allDeptOptions" @select="getResponsiblePersonList" :show-count="true"  placeholder="请选择负责部门" />
+          <el-select  v-model="form.responsibleUnit" @change="getResponsiblePersonList" placeholder="请选择负责部门" clearable style="width: 100%">
+            <el-option v-for="item in allDeptOptions" :key="item.deptId" :value="item.deptId" :label="item.deptName" />
+          </el-select>
         </el-form-item>
         <el-form-item label="负责人员" prop="responsiblePerson">
           <el-select v-model="form.responsiblePerson" clearable filterable style="width: 100%">
@@ -390,7 +394,7 @@ import {
   listIssuelist,
   updateIssuelist
 } from "@/api/issue/issuelist";
-import {treeselect} from "@/api/system/dept";
+import {listDeptByNames, treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -585,8 +589,8 @@ export default {
     this.getAllDeptList();
   },
   methods: {
-    getResponsiblePersonList(node, instanceId){
-      this.getUserList(node.id);
+    getResponsiblePersonList(val){
+      this.getUserList(val);
     },
     getUserList(deptId){
       this.userOptions=[];
@@ -610,7 +614,7 @@ export default {
       });
     },
     getAllDeptList(){
-      alltreeselect().then(response => {
+      listDeptByNames({deptName:'CTA/M,CTM/M,CTA/SP,CTS/LY,CBP,CBP/B'}).then(response => {
         this.allDeptOptions = response.data;
       });
     },

ui/src/views/issue/issuelist/ib.vue

@@ -49,7 +49,9 @@
         />
       </el-form-item>
       <el-form-item label="负责部门" prop="responsibleUnit">
-        <treeselect v-model="queryParams.responsibleUnit" :options="allDeptOptions"  :show-count="true" placeholder="请选择负责部门" style="width: 220px"/>
+        <el-select  v-model="queryParams.responsibleUnit"  placeholder="请选择负责部门" @change="handleQuery" clearable >
+          <el-option v-for="item in allDeptOptions" :key="item.deptId" :value="item.deptId" :label="item.deptName" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -228,7 +230,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="负责部门 " prop="responsibleUnit">
-          <treeselect v-model="form.responsibleUnit" :options="allDeptOptions" @select="getResponsiblePersonList" :show-count="true"  placeholder="请选择负责部门" />
+          <el-select  v-model="form.responsibleUnit" @change="getResponsiblePersonList" placeholder="请选择负责部门" clearable style="width: 100%">
+            <el-option v-for="item in allDeptOptions" :key="item.deptId" :value="item.deptId" :label="item.deptName" />
+          </el-select>
         </el-form-item>
         <el-form-item label="负责人员" prop="responsiblePerson">
           <el-select v-model="form.responsiblePerson" clearable filterable style="width: 100%">
@@ -384,7 +388,7 @@ import {
   listIssuelist,
   updateIssuelist
 } from "@/api/issue/issuelist";
-import {treeselect} from "@/api/system/dept";
+import {listDeptByNames, treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -579,8 +583,8 @@ export default {
     this.getAllDeptList();
   },
   methods: {
-    getResponsiblePersonList(node, instanceId){
-      this.getUserList(node.id);
+    getResponsiblePersonList(val){
+      this.getUserList(val);
     },
     getUserList(deptId){
       this.userOptions=[];
@@ -604,7 +608,7 @@ export default {
       });
     },
     getAllDeptList(){
-      alltreeselect().then(response => {
+      listDeptByNames({deptName:'CTA/M,CTM/M,CTA/SP,CTS/LY,CBP,CBP/B'}).then(response => {
         this.allDeptOptions = response.data;
       });
     },