档案合并

ljq
1 parent c42e8030
Showing 6 changed files with 148 additions and 46 deletions
ruoyi-archives/src/main/java/com/ruoyi/controller/ArchivesController.java
ruoyi-ui/src/views/archives/box/index.vue
ruoyi-ui/src/views/archives/collerctbox/index.vue
ruoyi-ui/src/views/archives/file/index.vue
ruoyi-ui/src/views/archives/index.vue
ruoyi-ui/src/views/archives/preview/preview.vue
@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class ArchivesController {
  
     /**
-     * 查询【请填写功能名称】列表
+     * 登记著录
      */
     @PreAuthorize("@ss.hasPermi('archives:list')")
     @RequestMapping("/index")
@@ -82,6 +82,30 @@
           v-hasPermi="['archives:box:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5" v-if="updateyfiling">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :disabled="single"
+          @click="handleupdateyfiling"
+          v-hasPermi="['archives:collerctbox:inserBox']"
+        >预归档</el-button>
+      </el-col>
+
+      <el-col :span="1.5" v-if="updatefiling">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :disabled="single"
+          @click="handleupdatefiling"
+          v-hasPermi="['archives:collerctbox:inserBox']"
+        >归档</el-button>
+      </el-col>
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
  
@@ -132,7 +156,7 @@
       @pagination="getList"
     />
  
-    <!-- 添加或修改【请填写功能名称】对话框 -->
+    <!-- 添加或修改【著录盒】对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="年度" prop="year">
@@ -188,7 +212,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 【请填写功能名称】表格数据
+      // 【著录盒】表格数据
       boxList: [],
       // 弹出层标题
       title: "",
@@ -210,14 +234,16 @@ export default {
       rules: {
       },
       boxtOpen : false,
-      boxsId : null,
+      boxsId : null, //盒id
+      updateyfiling :true, //预归档
+      updatefiling: true,//归档
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    /** 查询【请填写功能名称】列表 */
+    /** 查询【著录盒】列表 */
     getList() {
       this.loading = true;
       listBox(this.queryParams).then(response => {
@@ -267,7 +293,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加【请填写功能名称】";
+      this.title = "添加【著录盒】";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -276,7 +302,7 @@ export default {
       getBox(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改【请填写功能名称】";
+        this.title = "修改【著录盒】";
       });
     },
     /** 提交按钮 */
@@ -302,7 +328,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除【著录盒】编号为"' + ids + '"的数据项？').then(function() {
         return delBox(ids);
       }).then(() => {
         this.getList();
@@ -315,11 +341,20 @@ export default {
         ...this.queryParams
       }, `box_${new Date().getTime()}.xlsx`)
     },
-
+    /* 查看  */
     handleCheck(row){
       this.boxsId = row.id;
       this.boxtOpen = true;
     },
+    /** 预归档 **/
+    handleupdateyfiling(row){
+
+    },
+
+    /** 归档 **/
+    handleupdatefiling(row){
+
+    }
  
   }
 };
@@ -43,10 +43,8 @@
  
  
     <el-row :gutter="10" class="mb8" v-if="titleshow">
-
-
-      <el-col :span="1.5">
-        <el-select v-model="approval">
+      <el-col :span="1.5" v-if="approvalStatus">
+        <el-select v-model="approval" @change="approvalpuRefresh">
           <el-option
             v-for="dict in dict.type.approval_type"
             :key="dict.value"
@@ -106,7 +104,7 @@
           size="mini"
           @click="handleCommit"
           v-hasPermi="['archives:collerctbox:commmit']"
-        >提交</el-button>
+        >编号</el-button>
       </el-col>
  
       <el-col :span="1.5" v-if="inserBox">
@@ -120,6 +118,31 @@
           v-hasPermi="['archives:collerctbox:inserBox']"
         >加入盒</el-button>
       </el-col>
+
+      <el-col :span="1.5" v-if="updateyfiling">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :disabled="single"
+          @click="handleupdateyfiling"
+          v-hasPermi="['archives:collerctbox:inserBox']"
+        >预归档</el-button>
+      </el-col>
+
+      <el-col :span="1.5" v-if="updatefiling">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :disabled="single"
+          @click="handleupdatefiling"
+          v-hasPermi="['archives:collerctbox:inserBox']"
+        >归档</el-button>
+      </el-col>
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
  
@@ -196,7 +219,7 @@
       @pagination="getList"
     />
  
-    <!-- 添加或修改【请填写功能名称】对话框 -->
+    <!-- 添加或修改【登记著录】对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
@@ -388,7 +411,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 【请填写功能名称】表格数据
+      // 【登记著录】表格数据
       boxList: [],
       boxtwoList: [],
       // 弹出层标题
@@ -439,10 +462,13 @@ export default {
       titleshow : true,//2.盒 不显示查询条件
       fileOpen : false,
       collboxId: null,//本次Id
-      lecommit: false,
+      lecommit: false, //提交按钮
       inserBox: false,//加入盒按钮
-      boxOpen:false,
-      collerboxid : null,
+      boxOpen:false,  //盒遮罩层
+      collerboxid : null, //盒id
+      updateyfiling :false, //预归档
+      updatefiling: false,//归档
+      approvalStatus: false, //待整理 待审核
     };
   },
   //statusPd  0未整理文件 1 已整理文件 2 盒
@@ -450,14 +476,24 @@ export default {
     debugger
     this.getList();
     this.titleshow =this.statusPd == 2 ? false : true; //提交
-    this.lecommit = this.statusPd != "0" ? false :true;
-    this.inserBox = this.statusPd == 1 ? true : false; //加入盒
+    if (this.statusPd == 0){ //未整理
+      this.lecommit = true;
+      this.approvalStatus = true;
+    }
+
+    if (this.statusPd == 1){ //已整理
+      this.inserBox = true; //加入盒
+      this.updateyfiling = true; //预归档
+      this.updatefiling = true; //归档
+    }
   },
   methods: {
-    /** 查询【请填写功能名称】列表 */
+    /** 查询【登记著录】列表 */
     getList() {
-      debugger
       this.loading = true;
+      if (this.statusPd == "0"){  //待整理 待审核
+        this.queryParams.apprvoal = this.approval;
+      }
       this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
       this.queryParams.status = this.statusPd;
       listCollerBox(this.queryParams).then(response => {
@@ -555,6 +591,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.approval = "0" //初始创建所有都是0.待整理
             addBox(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -567,7 +604,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除【登记著录】编号为"' + ids + '"的数据项？').then(function() {
         return delBox(ids);
       }).then(() => {
         this.getList();
@@ -581,23 +618,22 @@ export default {
       }, `box_${new Date().getTime()}.xlsx`)
     },
  
-
+    /** 查看按钮 **/
     handleCheck(row){
       this.fileOpen = true;
       this.collboxId = row.id;
     },
  
-    /** 提交按钮操作 */
+    /** 编号按钮操作 */
     handleCommit(row){
       const id = row.id || this.ids
-      getBox(id).then(response => {
-        let from  = response.data;
-        from.status = "1";
-        updateBox(from).then(response => {
-          this.$modal.msgSuccess("提交成功");
-          this.open = false;
-          this.getList();
-        });
+      let from  = this.handleSelectId(id)
+      from.status = "1";  //1.已整理文件
+      from.apprvoal = "3"; //3.专职档案提交通过
+      updateBox(from).then(response => {
+        this.$modal.msgSuccess("提交成功");
+        this.open = false;
+        this.getList();
       });
     },
     //打开加入盒页面 并保存id
@@ -618,17 +654,48 @@ export default {
         return;
       }
       let collerboxid = this.collerboxid;
-      getBox(collerboxid).then(response => {
-        let from  = response.data;
-        from.boxId =  id + ""; //盒id
-        from.status = "2";
-        updateBox(from).then(response => {
-          this.$modal.msgSuccess("提交成功");
-          this.boxOpen = false;
-        });
+      let from  = this.handleSelectId(id)
+      from.boxId =  id + ""; //盒id
+      from.status = "2";
+      updateBox(from).then(response => {
+        this.$modal.msgSuccess("提交成功");
+        this.boxOpen = false;
+      });
+    },
+    /** 预归档 **/
+    handleupdateyfiling(row){
+      const id = row.id || this.ids
+      let from  = this.handleSelectId(id)
+      from.apprvoal = "3";
+      updateBox(from).then(response => {
+        this.$modal.msgSuccess("提交成功");
+        this.open = false;
+        this.getList();
+      });
+    },
+
+    /** 归档 **/
+    handleupdatefiling(row){
+      const id = row.id || this.ids
+      let from  = this.handleSelectId(id)
+      from.apprvoal = "4";
+      updateBox(from).then(response => {
+        this.$modal.msgSuccess("提交成功");
+        this.open = false;
+        this.getList();
       });
     },
  
+
+    handleSelectId(id){
+      getBox(id).then(response => {
+        return response.data;
+      });
+    },
+
+    approvalpuRefresh(){
+      this.getList();
+    }
   }
 };
 </script>
@@ -373,7 +373,7 @@ export default {
       this.title = "...";
       this.reload()
     },
-
+    //加载完成 fileOpen = true
     reload(){
       this.fileOpen = false;
       this.$nextTick(function (){
@@ -35,8 +35,8 @@
  
  
           <el-tabs v-model="activeName" type="card" @tab-click="handleClick" v-if="stattwo">
-            <el-tab-pane label="未整理文件" name="first" > <indexbox :statusPd=0 v-if="isFirst"/></el-tab-pane>
-            <el-tab-pane label="已整理文件" name="second" ><indexbox :statusPd="1"  v-if="isSecond" /></el-tab-pane>
+            <el-tab-pane label="未整理文件" name="first" > <indexbox :statusPd= 0  v-if="isFirst"/></el-tab-pane>
+            <el-tab-pane label="已整理文件" name="second" ><indexbox :statusPd= 1  v-if="isSecond" /></el-tab-pane>
             <el-tab-pane label="盒" name="third" ><box  v-if="isThird" /></el-tab-pane>
           </el-tabs>
  
@@ -32,7 +32,7 @@ export default {
     if(this.fileurl != null && this.fileurl != undefined){
  
       let url = "http://localhost"+ process.env.VUE_APP_BASE_API +this.fileurl; //要预览文件的访问地址
-      this.reportUrl = 'http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(bsbase64Encode.encode(url));
+      this.reportUrl = 'http://192.168.168.140:8012/onlinePreview?url='+encodeURIComponent(bsbase64Encode.encode(url));
     }
   },
   methods: {