档案合并

ljq
1 parent 06cb983b
Showing 6 changed files with 122 additions and 21 deletions
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesCollectBox.java
ruoyi-archives/src/main/resources/mapper/archives/ArchivesCollectBoxMapper.xml
ruoyi-ui/src/api/archives/collerctbox.js
ruoyi-ui/src/views/archives/box/index.vue
ruoyi-ui/src/views/archives/collerctbox/index.vue
ruoyi-ui/src/views/archives/file/index.vue
@@ -20,6 +20,10 @@ public class ArchivesCollectBox extends BaseEntity
     /** 主键 */
     private Long id;
  
+
+    /** 盒ID */
+    @Excel(name = "盒ID")
+    private Long boxId;
     /** 全宗号 */
     @Excel(name = "全宗号")
     private String general;
@@ -413,10 +417,19 @@ public class ArchivesCollectBox extends BaseEntity
         return boxMark;
     }
  
+    public Long getBoxId() {
+        return boxId;
+    }
+
+    public void setBoxId(Long boxId) {
+        this.boxId = boxId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
+            .append("boxId", getBoxId())
             .append("general", getGeneral())
             .append("year", getYear())
             .append("title", getTitle())
@@ -6,6 +6,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  
     <resultMap type="ArchivesCollectBox" id="ArchivesCollectBoxResult">
         <result property="id"    column="id"    />
+        <result property="boxId"    column="box_id"    />
         <result property="general"    column="general"    />
         <result property="year"    column="year"    />
         <result property="title"    column="title"    />
@@ -42,12 +43,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </resultMap>
  
     <sql id="selectArchivesCollectBoxVo">
-        select 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 from archives_collect_box
+        select id,box_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 from archives_collect_box
     </sql>
  
     <select id="selectArchivesCollectBoxList" parameterType="ArchivesCollectBox" resultMap="ArchivesCollectBoxResult">
         <include refid="selectArchivesCollectBoxVo"/>
-        <where>  
+        <where>
+            <if test="boxId != null "> and box_id = #{boxId}</if>
             <if test="general != null  and general != ''"> and general = #{general}</if>
             <if test="year != null  and year != ''"> and year = #{year}</if>
             <if test="title != null  and title != ''"> and title = #{title}</if>
@@ -88,6 +90,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <insert id="insertArchivesCollectBox" parameterType="ArchivesCollectBox" useGeneratedKeys="true" keyProperty="id">
         insert into archives_collect_box
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="boxId != null">box_id,</if>
             <if test="general != null">general,</if>
             <if test="year != null">year,</if>
             <if test="title != null">title,</if>
@@ -123,6 +126,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="boxMark != null">box_mark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="boxId != null">#{boxId},</if>
             <if test="general != null">#{general},</if>
             <if test="year != null">#{year},</if>
             <if test="title != null">#{title},</if>
@@ -162,6 +166,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <update id="updateArchivesCollectBox" parameterType="ArchivesCollectBox">
         update archives_collect_box
         <trim prefix="SET" suffixOverrides=",">
+            <if test="boxId != null">box_id = #{boxId},</if>
             <if test="general != null">general = #{general},</if>
             <if test="year != null">year = #{year},</if>
             <if test="title != null">title = #{title},</if>
 import request from '@/utils/request'
  
 // 查询【请填写功能名称】列表
-export function listBox(query) {
+export function listCollerBox(query) {
   return request({
     url: '/archives/collerctbox/list',
     method: 'get',
@@ -160,9 +160,8 @@
  
  
  
-    <el-dialog :title="title" :visible.sync="boxOpen"   width="80%" append-to-body>
-
-      <indexbox :statusPd="2" />
+    <el-dialog :title="title" :visible.sync="boxtOpen"   width="80%" append-to-body>
+      <indexbox  :boxsId= boxsId :statusPd= "2" v-if="boxtOpen"/>
     </el-dialog>
   </div>
 </template>
@@ -210,7 +209,8 @@ export default {
       // 表单校验
       rules: {
       },
-      boxOpen : false
+      boxtOpen : false,
+      boxsId : null,
     };
   },
   created() {
@@ -317,8 +317,10 @@ export default {
     },
  
     handleCheck(row){
-      this.boxOpen = true;
-    }
+      this.boxsId = row.id;
+      this.boxtOpen = true;
+    },
+
   }
 };
 </script>
@@ -46,7 +46,7 @@
  
  
       <el-col :span="1.5">
-        <el-select v-model="approval_type">
+        <el-select v-model="approval">
           <el-option
             v-for="dict in dict.type.approval_type"
             :key="dict.value"
@@ -115,6 +115,7 @@
           plain
           icon="el-icon-download"
           size="mini"
+          :disabled="single"
           @click="handleinserBox"
           v-hasPermi="['archives:collerctbox:inserBox']"
         >加入盒</el-button>
@@ -167,7 +168,7 @@
       <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">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="titleshow">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -314,11 +315,51 @@
     <el-dialog :title="title" :visible.sync="fileOpen"   width="80%" append-to-body>
             <file  :collboxId=collboxId />
     </el-dialog>
+
+
+    <el-dialog :title="title" :visible.sync="boxOpen"   width="80%" append-to-body>
+      <el-table v-loading="loading" :data="boxtwoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="年度" align="center" prop="year" />
+        <el-table-column label="卷盒规则" align="center" prop="boxRule" />
+        <el-table-column label="盒号" align="center" prop="boxMark" />
+        <el-table-column label="库位码" align="center" prop="deportNodeId" />
+        <el-table-column label="描述" align="center" prop="describes" />
+      </el-table>
+
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['archives:box:edit']"
+        >修改</el-button>
+      </el-col>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary"    @click="insetBox">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+
+<!--
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />-->
+
+    </el-dialog>
   </div>
 </template>
  
 <script>
-import { listBox, getBox, delBox, addBox, updateBox } from "@/api/archives/collerctbox";
+import { listCollerBox, getBox, delBox, addBox, updateBox } from "@/api/archives/collerctbox";
+
+
 import file from "@/views/archives/file/index.vue";
 export default {
   name: "collerctbox",
@@ -327,6 +368,9 @@ export default {
   props: {
     statusPd: {
       type: Number, // 这里你接收的值是什么类型就写什么类型
+    },
+    boxsId: {
+      type: Number,
     }
   },
  
@@ -346,6 +390,7 @@ export default {
       total: 0,
       // 【请填写功能名称】表格数据
       boxList: [],
+      boxtwoList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -389,16 +434,20 @@ export default {
       // 表单校验
       rules: {
       },
-      approval_type : null,
+      approval : "0", //是否审批 //默认待整理
      // statusPd : null, //页面传递参数  1.未整理 2.已整理 3.盒
-      titleshow : true,//3.盒 不显示查询条件
+      titleshow : true,//2.盒 不显示查询条件
       fileOpen : false,
       collboxId: null,//本次Id
-      lecommit: false
+      lecommit: false,
+      inserBox: false,//加入盒按钮
+      boxOpen:false,
+      collerboxid : null,
     };
   },
   //statusPd  0未整理文件 1 已整理文件 2 盒
   created() {
+    debugger
     this.getList();
     this.titleshow =this.statusPd == 2 ? false : true; //提交
     this.lecommit = this.statusPd != "0" ? false :true;
@@ -407,9 +456,11 @@ export default {
   methods: {
     /** 查询【请填写功能名称】列表 */
     getList() {
+      debugger
       this.loading = true;
+      this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
       this.queryParams.status = this.statusPd;
-      listBox(this.queryParams).then(response => {
+      listCollerBox(this.queryParams).then(response => {
         this.boxList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -424,6 +475,7 @@ export default {
     reset() {
       this.form = {
         id: null,
+        boxId: null,
         general: null,
         year: null,
         title: null,
@@ -457,7 +509,6 @@ export default {
         apprvoal: null,
         belongRole: null,
         boxMark: null,
-        inserBox: false,
       };
       this.resetForm("form");
     },
@@ -529,6 +580,13 @@ export default {
         ...this.queryParams
       }, `box_${new Date().getTime()}.xlsx`)
     },
+
+
+    handleCheck(row){
+      this.fileOpen = true;
+      this.collboxId = row.id;
+    },
+
     /** 提交按钮操作 */
     handleCommit(row){
       const id = row.id || this.ids
@@ -542,13 +600,35 @@ export default {
         });
       });
     },
+    //打开加入盒页面 并保存id
     handleinserBox(row){
+      const collerboxid = row.id || this.ids;
+      this.boxOpen = true;
+      this.collerboxid = collerboxid;
+      listBox(this.queryParams).then(response => {
+        this.boxtwoList = response.rows;
+      });
+    },
  
+    //加入盒
+    insetBox(row){
+      let id = row.id || this.ids;
+      if (id.length > 1){
+        alert("请选择1个盒")
+        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;
+        });
+      });
     },
-    handleCheck(row){
-      this.fileOpen = true;
-      this.collboxId = row.id;
-    }
+
   }
 };
 </script>
@@ -342,6 +342,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.colletctId = this.collboxId;
             addFile(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;