档案借阅

ljq
1 parent 90511f6d
Showing 6 changed files with 390 additions and 93 deletions
ruoyi-archives/src/main/resources/mapper/archives/ArchivesCollectBoxMapper.xml
ruoyi-ui/src/views/archives/box/filingindex.vue
ruoyi-ui/src/views/archives/collerctbox/filingindex.vue
ruoyi-ui/src/views/archives/collerctbox/index.vue
ruoyi-ui/src/views/archives/remove/index.vue
ruoyi-ui/src/views/borrow/index.vue
@@ -47,7 +47,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </resultMap>
     <sql id="selectArchivesCollectBoxVo">
-        select id,box_id,dept_id general, year, title, sort, safekeeping_date, secret_level, pages, filing_number, zk_number, location_code, filing_dept, archival_code, responsibility_name, serial_mark, piece_mark, register_mark, counsellors, filing_name, summary_name, record_type, carrier_type, draft_name, page, document_mark, text, create_by, create_time, update_by, update_time, status, apprvoal, belong_role, box_mark,expire_date, remove, borrow_status from archives_collect_box
+        select id,box_id,dept_id, general, year, title, sort, safekeeping_date, secret_level, pages, filing_number, zk_number, location_code, filing_dept, archival_code, responsibility_name, serial_mark, piece_mark, register_mark, counsellors, filing_name, summary_name, record_type, carrier_type, draft_name, page, document_mark, text, create_by, create_time, update_by, update_time, status, apprvoal, belong_role, box_mark,expire_date, remove, borrow_status from archives_collect_box
     </sql>
     <select id="selectArchivesCollectBoxList" parameterType="ArchivesCollectBox" resultMap="ArchivesCollectBoxResult">
@@ -341,6 +341,10 @@ export default {
     handleSelectId(id,apprvoal){
       getBox(id).then(response => {
         let from  = response.data;
+        if (from.deportNodeId != null){
+          this.$modal.msgError("盒已上架,无法打回");
+          return
+        }
         from.apprvoal = apprvoal;
         updateBox(from).then(response => {
           this.$modal.msgSuccess("提交成功");
@@ -148,8 +148,6 @@
       <el-table-column label="页次" align="center" prop="page" />
       <el-table-column label="文号" align="center" prop="documentMark" />
       <el-table-column label="原文" align="center" prop="text" />
-      <el-table-column label="1.待整理 2.待审批" align="center" prop="apprvoal" />
-      <el-table-column label="该文本属于哪个角色" align="center" prop="belongRole" />
       <el-table-column label="盒号" align="center" prop="boxMark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="titleshow">
         <template slot-scope="scope">
@@ -448,6 +446,7 @@ export default {
       this.queryParams.apprvoal = this.approval; //归档
       this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
       this.queryParams.status = this.statusPd;
+      this.queryParams.remove = 0; //未删除数据
       listCollerBox(this.queryParams).then(response => {
         this.boxList = response.rows;
         this.total = response.total;
@@ -39,9 +39,6 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
-
-
     <el-row :gutter="10" class="mb8" v-if="titleshow">
       <el-col :span="1.5" v-if="approvalStatus">
         <el-select v-model="approval" @change="approvalpuRefresh">
@@ -188,8 +185,6 @@
       <el-table-column label="页次" align="center" prop="page" />
       <el-table-column label="文号" align="center" prop="documentMark" />
       <el-table-column label="原文" align="center" prop="text" />
-      <el-table-column label="1.待整理 2.待审批" align="center" prop="apprvoal" />
-      <el-table-column label="该文本属于哪个角色" align="center" prop="belongRole" />
       <el-table-column label="盒号" align="center" prop="boxMark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="titleshow">
         <template slot-scope="scope">
@@ -481,6 +476,7 @@ export default {
       this.queryParams.deptId = this.deptId; //部门
       this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
       this.queryParams.status = this.statusPd;
+      this.queryParams.remove = 0; //未删除数据
       listCollerBox(this.queryParams).then(response => {
         this.boxList = response.rows;
         this.total = response.total;
 <template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" v-if="titleshow">
+      <el-form-item label="全宗号1" prop="general">
+        <el-input
+          v-model="queryParams.general"
+          placeholder="请输入全宗号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="年度" prop="year">
+        <el-input
+          v-model="queryParams.year"
+          placeholder="请输入年度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="题名" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入题名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分类号" prop="sort">
+        <el-input
+          v-model="queryParams.sort"
+          placeholder="请输入分类号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5" v-if="">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleDelete"
+          v-hasPermi="['archives:collerctbox:commmit']"
+        >还原</el-button>
+      </el-col>
+
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="操作" align="center" prop="year" >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleCheck(scope.row)"
+            v-hasPermi="['archives:box:check']"
+          >查看</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="全宗号" align="center" prop="general" />
+      <el-table-column label="年度" align="center" prop="year" />
+      <el-table-column label="题名" align="center" prop="title" />
+      <el-table-column label="分类号" align="center" prop="sort" />
+      <el-table-column label="保管期限" align="center" prop="safekeepingDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.safekeepingDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="密级" align="center" prop="secretLevel" />
+      <el-table-column label="页数" align="center" prop="pages" />
+      <el-table-column label="归档份数" align="center" prop="filingNumber" />
+      <el-table-column label="在库份数" align="center" prop="zkNumber" />
+      <el-table-column label="库位码" align="center" prop="locationCode" />
+      <el-table-column label="归档部门" align="center" prop="filingDept" />
+      <el-table-column label="档号" align="center" prop="archivalCode" />
+      <el-table-column label="责任者" align="center" prop="responsibilityName" />
+      <el-table-column label="序号" align="center" prop="serialMark" />
+      <el-table-column label="件号" align="center" prop="pieceMark" />
+      <el-table-column label="登记号" align="center" prop="registerMark" />
+      <el-table-column label="参议人员" align="center" prop="counsellors" />
+      <el-table-column label="归档人" align="center" prop="filingName" />
+      <el-table-column label="纪要人" align="center" prop="summaryName" />
+      <el-table-column label="文种" align="center" prop="recordType" />
+      <el-table-column label="载体类型" align="center" prop="carrierType" />
+      <el-table-column label="拟稿人" align="center" prop="draftName" />
+      <el-table-column label="页次" align="center" prop="page" />
+      <el-table-column label="文号" align="center" prop="documentMark" />
+      <el-table-column label="原文" align="center" prop="text" />
+      <el-table-column label="盒号" align="center" prop="boxMark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="titleshow">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['archives:collerctbox:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['archives:collerctbox:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+
+
+  </div>
 </template>
 <script>
+import { listCollerBox, getBox, delBox, addBox, updateBox,updatedelBox } from "@/api/archives/collerctbox";
+import { listBox } from "@/api/archives/box";
+
+import file from "@/views/archives/file/index.vue";
 export default {
-  name: "index"
-}
-</script>
+  name: "collerctbox",
+  dicts: ['approval_type'],
+  components: { file },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 【登记著录】表格数据
+      boxList: [],
+      boxtwoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        general: null,
+        year: null,
+        title: null,
+        sort: null,
+        safekeepingDate: null,
+        secretLevel: null,
+        pages: null,
+        filingNumber: null,
+        zkNumber: null,
+        locationCode: null,
+        filingDept: null,
+        archivalCode: null,
+        responsibilityName: null,
+        serialMark: null,
+        pieceMark: null,
+        registerMark: null,
+        counsellors: null,
+        filingName: null,
+        summaryName: null,
+        recordType: null,
+        carrierType: null,
+        draftName: null,
+        page: null,
+        documentMark: null,
+        text: null,
+        status: null,
+        apprvoal: null,
+        belongRole: null,
+        boxMark: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      remove : "1", //是否审批 //默认待整理
+
+    };
+  },
+  //statusPd  0未整理文件 1 已整理文件 2 盒
+  created() {
+    this.getList();
+
+  },
+  methods: {
+    /** 查询【登记著录】列表 */
+    getList() {
+      this.queryParams.remove = this.remove;
+      listCollerBox(this.queryParams).then(response => {
+        this.boxList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.boxOpen = false;
+      this.open = false;
+      this.reset();
+    },
-<style scoped>
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
-</style>
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      let remove = 0;
+      this.$modal.confirm('是否确认还原【登记著录】编号为"' + ids + '"的数据项？').then(function() {
+        return updatedelBox(ids,remove);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("还原成功");
+      }).catch(() => {});
+    },
+
+
+  }
+};
+</script>
 <template>
   <div class="app-container">
-
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" >
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+
+
+
+        <div class="head-container">
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="deptOptions"
+            :expand-on-click-node="false"
+            ref="tree"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" >
       <el-form-item label="全宗号1" prop="general">
         <el-input
           v-model="queryParams.general"
@@ -42,73 +69,76 @@
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5" >
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :disabled="single"
-          @click="handleupdateborrow"
-          v-hasPermi="['archives:collerctbox:inserBox']"
-        >借阅</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5" >
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              :disabled="single"
+              @click="handleupdateborrow"
+              v-hasPermi="['archives:collerctbox:inserBox']"
+            >借阅</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
-    <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="操作" align="center" prop="year" >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleCheck(scope.row)"
-            v-hasPermi="['archives:box:check']"
-          >查看</el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="全宗号" align="center" prop="general" />
-      <el-table-column label="年度" align="center" prop="year" />
-      <el-table-column label="题名" align="center" prop="title" />
-      <el-table-column label="分类号" align="center" prop="sort" />
-      <el-table-column label="保管期限" align="center" prop="safekeepingDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.safekeepingDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="密级" align="center" prop="secretLevel" />
-      <el-table-column label="页数" align="center" prop="pages" />
-      <el-table-column label="归档份数" align="center" prop="filingNumber" />
-      <el-table-column label="在库份数" align="center" prop="zkNumber" />
-      <el-table-column label="库位码" align="center" prop="locationCode" />
-      <el-table-column label="归档部门" align="center" prop="filingDept" />
-      <el-table-column label="档号" align="center" prop="archivalCode" />
-      <el-table-column label="责任者" align="center" prop="responsibilityName" />
-      <el-table-column label="序号" align="center" prop="serialMark" />
-      <el-table-column label="件号" align="center" prop="pieceMark" />
-      <el-table-column label="登记号" align="center" prop="registerMark" />
-      <el-table-column label="参议人员" align="center" prop="counsellors" />
-      <el-table-column label="归档人" align="center" prop="filingName" />
-      <el-table-column label="纪要人" align="center" prop="summaryName" />
-      <el-table-column label="文种" align="center" prop="recordType" />
-      <el-table-column label="载体类型" align="center" prop="carrierType" />
-      <el-table-column label="拟稿人" align="center" prop="draftName" />
-      <el-table-column label="页次" align="center" prop="page" />
-      <el-table-column label="文号" align="center" prop="documentMark" />
-      <el-table-column label="原文" align="center" prop="text" />
-      <el-table-column label="盒号" align="center" prop="boxMark" />
-    </el-table>
+        <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="操作" align="center" prop="year" >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleCheck(scope.row)"
+                v-hasPermi="['archives:box:check']"
+              >查看</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="全宗号" align="center" prop="general" />
+          <el-table-column label="年度" align="center" prop="year" />
+          <el-table-column label="题名" align="center" prop="title" />
+          <el-table-column label="分类号" align="center" prop="sort" />
+          <el-table-column label="保管期限" align="center" prop="safekeepingDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.safekeepingDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="密级" align="center" prop="secretLevel" />
+          <el-table-column label="页数" align="center" prop="pages" />
+          <el-table-column label="归档份数" align="center" prop="filingNumber" />
+          <el-table-column label="在库份数" align="center" prop="zkNumber" />
+          <el-table-column label="库位码" align="center" prop="locationCode" />
+          <el-table-column label="归档部门" align="center" prop="filingDept" />
+          <el-table-column label="档号" align="center" prop="archivalCode" />
+          <el-table-column label="责任者" align="center" prop="responsibilityName" />
+          <el-table-column label="序号" align="center" prop="serialMark" />
+          <el-table-column label="件号" align="center" prop="pieceMark" />
+          <el-table-column label="登记号" align="center" prop="registerMark" />
+          <el-table-column label="参议人员" align="center" prop="counsellors" />
+          <el-table-column label="归档人" align="center" prop="filingName" />
+          <el-table-column label="纪要人" align="center" prop="summaryName" />
+          <el-table-column label="文种" align="center" prop="recordType" />
+          <el-table-column label="载体类型" align="center" prop="carrierType" />
+          <el-table-column label="拟稿人" align="center" prop="draftName" />
+          <el-table-column label="页次" align="center" prop="page" />
+          <el-table-column label="文号" align="center" prop="documentMark" />
+          <el-table-column label="原文" align="center" prop="text" />
+          <el-table-column label="盒号" align="center" prop="boxMark" />
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+      </el-col>
+    </el-row>
     <el-dialog :title="title" :visible.sync="open"  width="40%" append-to-body>
@@ -160,8 +190,8 @@
         <el-row>
           <el-col :span="12">
-            <el-form-item label="档案门类" prop="borrowName1">
-              <el-input v-model="form.borrowName1" placeholder="请输入借阅登记人" />
+            <el-form-item label="档案门类" prop="boxType">
+              <el-input v-model="form.boxType" placeholder="请输入借阅登记人" />
             </el-form-item>
           </el-col>
@@ -174,7 +204,7 @@
         <el-row>
-          <el-form-item label="借阅目的" prop="borrowName">
+          <el-form-item label="借阅目的" prop="borrowType">
             <el-select v-model="form.borrowType" placeholder="请选择借阅目的">
               <el-option
                 v-for="dict in dict.type.borrow_type"
@@ -202,7 +232,6 @@
                 <td> <span>{{ CollertBox2 }}</span> </td>
               </tr>
               <tr>
-
               </tr>
             </table>
           </el-form-item>
@@ -219,8 +248,8 @@
 <script>
   import { listCollerBox, getBox, delBox, addBox, updateBox,updatedelBox } from "@/api/archives/collerctbox";
   import { addBorrow } from "@/api/archives/borrow.js";
-
   import file from "@/views/archives/file";
+  import {treeselect} from "@/api/archives/dept";
   export default {
     dicts: ['borrow_type'],
     components: { file },
@@ -232,9 +261,17 @@
         type: Number,
       }
     },
+    watch: {
+      // 根据名称筛选部门树
+      deptName(val) {
+        this.$refs.tree.filter(val);
+      },
+    },
     data() {
       return {
+        // 部门树选项
+        deptOptions: undefined,
         // 遮罩层
         loading: true,
         // 选中数组
@@ -295,17 +332,26 @@
         },
         borrowStatus: 1,//可借阅
         collectBoxId: null,
-        CollertBox1: 111,
+        CollertBox1: null,
         CollertBox2: null,
       };
     },
     //statusPd  0未整理文件 1 已整理文件 2 盒
     created() {
       this.getList();
+      this.getTreeselect();
     },
     methods: {
+      /** 查询部门下拉树结构 */
+      getTreeselect() {
+        treeselect().then(response => {
+          this.deptOptions = response.data;
+        });
+      },
       /** 查询【登记著录】列表 */
       getList() {
+
+        this.queryParams.deptId = this.deptId != null ? this.deptId : "000"//是否盒内文件
         this.queryParams.borrowStatus = this.borrowStatus;
         this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
         listCollerBox(this.queryParams).then(response => {
@@ -339,6 +385,8 @@
           returnDate: null,
           returnedDate: null,
           borrowMark: null,
+          deptId : null,
+          deptName: null,
         };
         this.resetForm("form");
       },
@@ -359,8 +407,14 @@
         this.multiple = !selection.length
       },
+      // 节点单击事件
+      handleNodeClick(data) {
+        this.deptId = data.id;
+        this.deptName = data.label;
+        this.getList();
+      },
-
+      //借阅按钮
       handleupdateborrow(row){
         this.open = true;
         const id = row.id || this.ids
@@ -370,10 +424,9 @@
           this.CollertBox2 = response.data.title;
         });
         this.form.name = this.$store.state.user.name;
-        this.form.dept = this.$store.state.user.deptName();
+        this.form.boxType = this.deptName;
       },
-
-
+      //借阅
       submitForm(){
         this.$refs["form"].validate(valid => {
           if (valid) {
@@ -385,9 +438,7 @@
           }
         });
       },
-
-
-
+      ////可借阅 转为可归还
       handleSelectId(id,borrowStatus){
         debugger
         getBox(id).then(response => {