档案上架及下架

yiming
1 parent 1ef3bf92
Showing 7 changed files with 68 additions and 41 deletions
ruoyi-archives/src/main/resources/mapper/archives/ArchivesBoxMapper.xml
ruoyi-service/src/main/java/com/ruoyi/service/domain/DepotNode.java
ruoyi-service/src/main/java/com/ruoyi/service/util/TreeSelect.java
ruoyi-ui/src/api/service/depot.js
ruoyi-ui/src/views/archives/box/filingindex.vue
ruoyi-ui/src/views/archives/box/shelveindex.vue
ruoyi-ui/src/views/service/depotNode/index.vue
@@ -39,6 +39,7 @@
         where apprvoal='4'
         <if test="archivesBox.deportNodeId =='isNull'">  and deport_node_id is null</if>
         <if test="archivesBox.deportNodeId =='isNotNull'">  and deport_node_id is not null</if>
+        <if test="archivesBox.deportNodeId !='' and archivesBox.deportNodeId !='isNull' and archivesBox.deportNodeId !='isNotNull'">  and deport_node_id = #{archivesBox.deportNodeId}</if>
         <if test="ids !=null and ids.length>0">
             and id in
             <foreach item="id" collection="ids" open="(" separator="," close=")">
@@ -40,7 +40,7 @@ public class DepotNode extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
-    /** 是否是架子（0不是 1是） */
+    /** 是否是架子（ 1是 2不是） */
     private String nodeFlag;
     /** 库位码 */
@@ -24,6 +24,12 @@ public class TreeSelect implements Serializable
     /** 节点名称 */
     private String label;
+    /** 库位码 */
+    private String depotCode;
+
+    private boolean disabled;
+
+
     /** 子节点 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeSelect> children;
@@ -38,6 +44,8 @@ public class TreeSelect implements Serializable
         this.id = depotNode.getId();
         this.label = depotNode.getNodeName();
         this.children = depotNode.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
+        this.depotCode = depotNode.getDepotCode();
+        this.disabled ="2".equalsIgnoreCase(depotNode.getNodeFlag());
     }
@@ -78,4 +86,20 @@ public class TreeSelect implements Serializable
     {
         this.children = children;
     }
+
+    public String getDepotCode() {
+        return depotCode;
+    }
+
+    public void setDepotCode(String depotCode) {
+        this.depotCode = depotCode;
+    }
+
+    public boolean isDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(boolean disabled) {
+        this.disabled = disabled;
+    }
 }
@@ -5,7 +5,7 @@ import {parseStrEmpty} from &quot;@/utils/ruoyi&quot;;
 // 查询库房树结构
 export function treeselect() {
   return request({
-    url: '/service/depot/treeselect',
+    url: '/service/depotNode/treeselect',
     method: 'get'
   })
 }
@@ -334,6 +334,7 @@ export default {
       this.shelveType=1;
       this.shelveOpen = true;
       this.$nextTick(()=>{
+        this.$refs.shelve.clearCheck();
         this.$refs.shelve.getList();
       })
     },
@@ -342,6 +343,7 @@ export default {
       this.shelveType=2;
       this.shelveOpen = true;
       this.$nextTick(()=>{
+        this.$refs.shelve.clearCheck();
         this.$refs.shelve.getList();
       })
     },handleCheckShelve(){
@@ -11,8 +11,9 @@
             :default-expand-all=true
             node-key="id"
             ref="tree"
+            show-checkbox
             highlight-current
-            @node-click="handleNodeClick"
+            @check="handleNodeClick"
           />
         </div>
       </el-col>
@@ -56,7 +57,6 @@ export default {
       single:true,
       loading: true,
       list: [],
-      level:undefined,
       queryParams:{
         depotNodeId:undefined
       },
@@ -84,16 +84,25 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
-      this.level=data.level;
-      this.params.depotNodeId=data.dbId;
-      this.params.depotCode=data.label;
+      this.clearCheck();
+      this.$refs.tree.setChecked(data.id,true,false);
+      this.params.depotNodeId=data.id;
+      this.params.depotCode=data.depotCode;
+      this.queryParams.deportNodeId=data.depotCode;
+      this.getList();
+    },
+    clearCheck(){
+      let arr=this.$refs.tree.getCheckedKeys(true);
+      arr.forEach(k=>{
+        this.$refs.tree.setChecked(k,false,false);
+      })
     },
     getList() {
       this.loading = true;
       if(this.shelveType==1){
         this.queryParams.deportNodeId='isNull'
       }
-      else if(this.shelveType==2){
+      else if(this.shelveType==2 && this.queryParams.deportNodeId==undefined){
         this.queryParams.deportNodeId='isNotNull'
       }
       listByIds(this.queryParams,this.ids).then(response => {
@@ -108,8 +117,8 @@ export default {
       this.multiple = !selection.length
     },
     shelve(){
-      if(this.level!=6){
-        this.$message.error('只能上架节点')
+      if(this.params.ids==undefined){
+        this.$modal.msgWarning("至少选择一条")
         return;
       }
       shelve(this.params).then(response => {
@@ -118,6 +127,10 @@ export default {
       });
     },
     shelveDown(){
+      if(this.params.ids==undefined){
+        this.$modal.msgWarning("至少选择一条")
+        return;
+      }
       shelveDown(this.params).then(response => {
         this.$modal.msgSuccess("修改成功");
         this.getList();
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="部门名称" prop="nodeName">
+      <el-form-item label="库房名称" prop="nodeName">
         <el-input
           v-model="queryParams.nodeName"
-          placeholder="请输入部门名称"
+          placeholder="请输入库房名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
+        <el-select v-model="queryParams.status" placeholder="库房状态" clearable>
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
@@ -33,7 +33,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:dept:add']"
+          v-hasPermi="['service:depotNode:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -97,20 +97,20 @@
       </el-table-column>
     </el-table>
-    <!-- 添加或修改部门对话框 -->
+    <!-- 添加或修改库房对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0" >
             <el-form-item label="上级" prop="parentId" >
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" :disabled="type==2"/>
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级" :disabled="type==2"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="名称" prop="nodeName">
-              <el-input v-model="form.nodeName" placeholder="请输入部门名称" />
+              <el-input v-model="form.nodeName" placeholder="请输入库房名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -132,7 +132,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="部门状态">
+            <el-form-item label="库房状态">
               <el-radio-group v-model="form.status">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
@@ -158,7 +158,7 @@ import Treeselect from &quot;@riophae/vue-treeselect&quot;;
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
-  name: "Dept",
+  name: "DepotNode",
   dicts: ['sys_normal_disable','yes_no'],
   components: { Treeselect },
   data() {
@@ -169,7 +169,7 @@ export default {
       showSearch: true,
       // 表格树数据
       deptList: [],
-      // 部门树选项
+      // 库房树选项
       deptOptions: [],
       // 弹出层标题
       title: "",
@@ -189,27 +189,16 @@ export default {
       // 表单校验
       rules: {
         parentId: [
-          { required: true, message: "上级部门不能为空", trigger: "blur" }
+          { required: true, message: "上级库房不能为空", trigger: "blur" }
         ],
         nodeName: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" }
+          { required: true, message: "库房名称不能为空", trigger: "blur" }
         ],
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }
         ],
-        email: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phone: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
+        nodeFlag: [
+          { required: true, message: "档案架不能为空", trigger: "blur" }
         ]
       },
       type:undefined
@@ -219,7 +208,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询部门列表 */
+    /** 查询库房列表 */
     getList() {
       this.loading = true;
       listDept(this.queryParams).then(response => {
@@ -227,7 +216,7 @@ export default {
         this.loading = false;
       });
     },
-    /** 转换部门数据结构 */
+    /** 转换库房数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
         delete node.children;
@@ -250,9 +239,7 @@ export default {
         parentId: undefined,
         nodeName: undefined,
         orderNum: undefined,
-        leader: undefined,
-        phone: undefined,
-        email: undefined,
+        nodeFlag: undefined,
         status: "0"
       };
       this.resetForm("form");
@@ -274,7 +261,7 @@ export default {
         this.form.parentId = row.id;
       }
       this.open = true;
-      this.title = "添加部门";
+      this.title = "添加库房";
       listDept().then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });