部门联动

ljq
1 parent de53b254
Showing 12 changed files with 252 additions and 137 deletions
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesBorrow.java
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesBox.java
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesCollectBox.java
ruoyi-archives/src/main/resources/mapper/archives/ArchivesBoxMapper.xml
ruoyi-archives/src/main/resources/mapper/archives/ArchivesCollectBoxMapper.xml
ruoyi-ui/src/views/archives/box/filingindex.vue
ruoyi-ui/src/views/archives/box/index.vue
ruoyi-ui/src/views/archives/collerctbox/filingindex.vue
ruoyi-ui/src/views/archives/collerctbox/index.vue
ruoyi-ui/src/views/archives/filing.vue
ruoyi-ui/src/views/archives/index.vue
ruoyi-ui/src/views/borrow/index.vue
@@ -3,6 +3,9 @@ package com.ruoyi.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.util.Date;
 /**
@@ -53,25 +56,7 @@ public class ArchivesBorrow extends ArchivesCollectBox
     /** 借阅文件id */
     @Excel(name = "借阅文件id")
-    private String collectBoxId;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String createBy;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createTime;
-
-    /** 修改人 */
-    @Excel(name = "修改人")
-    private String updateBy;
-
-    /** 修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updateTime;
+    private Long collectBoxId;
     /** 待归还日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -87,8 +72,8 @@ public class ArchivesBorrow extends ArchivesCollectBox
     @Excel(name = "借阅单号")
     private String borrowMark;
-    /** 借阅状态 0-借出 1-归还 2-逾期*/
-    @Excel(name = "申请状态")
+    /** 借阅状态 0-借出 1-归还 2-逾期 3-续借 */
+    @Excel(name = "借阅状态 0-借出 1-归还 2-逾期 3-续借")
     private String status;
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -171,54 +156,15 @@ public class ArchivesBorrow extends ArchivesCollectBox
         this.borrowType = borrowType;
     }
-    public String getCollectBoxId() {
+    public Long getCollectBoxId()
+    {
         return collectBoxId;
     }
-
-    public void setCollectBoxId(String collectBoxId) {
+    public void setCollectBoxId(Long collectBoxId)
+    {
         this.collectBoxId = collectBoxId;
     }
-    @Override
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    @Override
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    @Override
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    @Override
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    @Override
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    @Override
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    @Override
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    @Override
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
     public Date getReturnDate() {
         return returnDate;
     }
@@ -268,4 +214,27 @@ public class ArchivesBorrow extends ArchivesCollectBox
     public void setBorrowDateE(Date borrowDateE) {
         this.borrowDateE = borrowDateE;
     }
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("name", getName())
+                .append("dept", getDept())
+                .append("borrowDate", getBorrowDate())
+                .append("phone", getPhone())
+                .append("mode", getMode())
+                .append("boxType", getBoxType())
+                .append("borrowName", getBorrowName())
+                .append("borrowType", getBorrowType())
+                .append("collectBoxId", getCollectBoxId())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("returnDate", getReturnDate())
+                .append("returnedDate", getReturnedDate())
+                .append("borrowMark", getBorrowMark())
+                .append("status", getStatus())
+                .toString();
+    }
 }
@@ -18,6 +18,10 @@ public class ArchivesBox extends BaseEntity
     /** 主键 */
     private Long id;
+    /** 部门ID */
+    @Excel(name = "部门")
+    private Long deptId;
+
     /** 年度 */
     @Excel(name = "年度")
     private String year;
@@ -105,10 +109,19 @@ public class ArchivesBox extends BaseEntity
         this.apprvoal = apprvoal;
     }
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
+                .append("deptId", getDeptId())
                 .append("year", getYear())
                 .append("boxRule", getBoxRule())
                 .append("boxMark", getBoxMark())
@@ -24,6 +24,10 @@ public class ArchivesCollectBox extends BaseEntity
     /** 盒ID */
     @Excel(name = "盒ID")
     private Long boxId;
+    /** 部门ID */
+    @Excel(name = "部门")
+    private Long deptId;
+    
     /** 全宗号 */
     @Excel(name = "全宗号")
     private String general;
@@ -148,7 +152,17 @@ public class ArchivesCollectBox extends BaseEntity
     /** 库位码 */
     private String deportNodeId;
-    /** 0-借出 1-归还  */
+    /** 到期时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "到期时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expireDate;
+
+    /** 是否删除0?1 */
+    @Excel(name = "是否删除0?1")
+    private String remove;
+
+    /** 是否借出 0-借出 1-归还  */
+    @Excel(name = "是否借出 0-借出 1-归还 ")
     private String borrowStatus;
     public void setId(Long id) 
@@ -439,50 +453,85 @@ public class ArchivesCollectBox extends BaseEntity
         this.deportNodeId = deportNodeId;
     }
-    public String getBorrowStatus() {
-        return borrowStatus;
+    public void setExpireDate(Date expireDate)
+    {
+        this.expireDate = expireDate;
     }
-    public void setBorrowStatus(String borrowStatus) {
+    public Date getExpireDate()
+    {
+        return expireDate;
+    }
+    public void setRemove(String remove)
+    {
+        this.remove = remove;
+    }
+
+    public String getRemove()
+    {
+        return remove;
+    }
+    public void setBorrowStatus(String borrowStatus)
+    {
         this.borrowStatus = borrowStatus;
     }
+    public String getBorrowStatus()
+    {
+        return borrowStatus;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     @Override
     public String toString() {
-        return "ArchivesCollectBox{" +
-                "id=" + id +
-                ", boxId=" + boxId +
-                ", general='" + general + '\'' +
-                ", year='" + year + '\'' +
-                ", title='" + title + '\'' +
-                ", sort='" + sort + '\'' +
-                ", safekeepingDate=" + safekeepingDate +
-                ", secretLevel='" + secretLevel + '\'' +
-                ", pages='" + pages + '\'' +
-                ", filingNumber='" + filingNumber + '\'' +
-                ", zkNumber='" + zkNumber + '\'' +
-                ", locationCode='" + locationCode + '\'' +
-                ", filingDept='" + filingDept + '\'' +
-                ", archivalCode='" + archivalCode + '\'' +
-                ", responsibilityName='" + responsibilityName + '\'' +
-                ", serialMark='" + serialMark + '\'' +
-                ", pieceMark='" + pieceMark + '\'' +
-                ", registerMark='" + registerMark + '\'' +
-                ", counsellors='" + counsellors + '\'' +
-                ", filingName='" + filingName + '\'' +
-                ", summaryName='" + summaryName + '\'' +
-                ", recordType='" + recordType + '\'' +
-                ", carrierType='" + carrierType + '\'' +
-                ", draftName='" + draftName + '\'' +
-                ", page='" + page + '\'' +
-                ", documentMark='" + documentMark + '\'' +
-                ", text='" + text + '\'' +
-                ", status='" + status + '\'' +
-                ", apprvoal='" + apprvoal + '\'' +
-                ", belongRole='" + belongRole + '\'' +
-                ", boxMark='" + boxMark + '\'' +
-                ", deportNodeId='" + deportNodeId + '\'' +
-                ", borrowStatus='" + borrowStatus + '\'' +
-                '}';
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("boxId", getBoxId())
+                .append("deptId", getDeptId())
+                .append("general", getGeneral())
+                .append("year", getYear())
+                .append("title", getTitle())
+                .append("sort", getSort())
+                .append("safekeepingDate", getSafekeepingDate())
+                .append("secretLevel", getSecretLevel())
+                .append("pages", getPages())
+                .append("filingNumber", getFilingNumber())
+                .append("zkNumber", getZkNumber())
+                .append("locationCode", getLocationCode())
+                .append("filingDept", getFilingDept())
+                .append("archivalCode", getArchivalCode())
+                .append("responsibilityName", getResponsibilityName())
+                .append("serialMark", getSerialMark())
+                .append("pieceMark", getPieceMark())
+                .append("registerMark", getRegisterMark())
+                .append("counsellors", getCounsellors())
+                .append("filingName", getFilingName())
+                .append("summaryName", getSummaryName())
+                .append("recordType", getRecordType())
+                .append("carrierType", getCarrierType())
+                .append("draftName", getDraftName())
+                .append("page", getPage())
+                .append("documentMark", getDocumentMark())
+                .append("text", getText())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("status", getStatus())
+                .append("apprvoal", getApprvoal())
+                .append("belongRole", getBelongRole())
+                .append("boxMark", getBoxMark())
+                .append("deportNodeId", getDeportNodeId())
+                .append("expireDate", getExpireDate())
+                .append("remove", getRemove())
+                .append("borrowStatus", getBorrowStatus())
+                .toString();
     }
 }
@@ -6,6 +6,7 @@
     <resultMap type="ArchivesBox" id="ArchivesBoxResult">
         <result property="id"    column="id"    />
+        <result property="deptId"    column="dept_id" />
         <result property="year"    column="year"    />
         <result property="boxRule"    column="box_rule"    />
         <result property="boxMark"    column="box_mark"    />
@@ -19,12 +20,13 @@
     </resultMap>
     <sql id="selectArchivesBoxVo">
-        select id, year, box_rule, box_mark, deport_node_id, describes, create_by, create_time, update_by, update_time, apprvoal from archives_box
+        select id, dept_id,year, box_rule, box_mark, deport_node_id, describes, create_by, create_time, update_by, update_time, apprvoal from archives_box
     </sql>
     <select id="selectArchivesBoxList" parameterType="ArchivesBox" resultMap="ArchivesBoxResult">
         <include refid="selectArchivesBoxVo"/>
         <where>
+            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
             <if test="year != null  and year != ''"> and year = #{year}</if>
             <if test="boxRule != null  and boxRule != ''"> and box_rule = #{boxRule}</if>
             <if test="boxMark != null  and boxMark != ''"> and box_mark = #{boxMark}</if>
@@ -56,6 +58,7 @@
     <insert id="insertArchivesBox" parameterType="ArchivesBox" useGeneratedKeys="true" keyProperty="id">
         insert into archives_box
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">dept_id,</if>
             <if test="year != null">year,</if>
             <if test="boxRule != null">box_rule,</if>
             <if test="boxMark != null">box_mark,</if>
@@ -68,6 +71,7 @@
             <if test="apprvoal != null">apprvoal,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">#{deptId},</if>
             <if test="year != null">#{year},</if>
             <if test="boxRule != null">#{boxRule},</if>
             <if test="boxMark != null">#{boxMark},</if>
@@ -84,6 +88,7 @@
     <update id="updateArchivesBox" parameterType="ArchivesBox">
         update archives_box
         <trim prefix="SET" suffixOverrides=",">
+            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="year != null">year = #{year},</if>
             <if test="boxRule != null">box_rule = #{boxRule},</if>
             <if test="boxMark != null">box_mark = #{boxMark},</if>
@@ -7,6 +7,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="deptId"    column="dept_id"    />
         <result property="general"    column="general"    />
         <result property="year"    column="year"    />
         <result property="title"    column="title"    />
@@ -40,16 +41,20 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="apprvoal"    column="apprvoal"    />
         <result property="belongRole"    column="belong_role"    />
         <result property="boxMark"    column="box_mark"    />
+        <result property="expireDate"    column="expire_date"    />
+        <result property="remove"    column="remove"    />
+        <result property="borrowStatus"    column="borrow_status"    />
     </resultMap>
     <sql id="selectArchivesCollectBoxVo">
-        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
+        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">
         <include refid="selectArchivesCollectBoxVo"/>
         <where>
             <if test="boxId != null "> and box_id = #{boxId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</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>
@@ -79,6 +84,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="apprvoal != null  and apprvoal != ''"> and apprvoal = #{apprvoal}</if>
             <if test="belongRole != null  and belongRole != ''"> and belong_role = #{belongRole}</if>
             <if test="boxMark != null  and boxMark != ''"> and box_mark = #{boxMark}</if>
+            <if test="expireDate != null "> and expire_date = #{expireDate}</if>
+            <if test="remove != null  and remove != ''"> and remove = #{remove}</if>
+            <if test="borrowStatus != null  and borrowStatus != ''"> and borrow_status = #{borrowStatus}</if>
         </where>
     </select>
@@ -91,6 +99,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         insert into archives_collect_box
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="boxId != null">box_id,</if>
+            <if test="deptId != null">dept_id,</if>
             <if test="general != null">general,</if>
             <if test="year != null">year,</if>
             <if test="title != null">title,</if>
@@ -124,9 +133,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="apprvoal != null">apprvoal,</if>
             <if test="belongRole != null">belong_role,</if>
             <if test="boxMark != null">box_mark,</if>
+            <if test="expireDate != null">expire_date,</if>
+            <if test="remove != null">remove,</if>
+            <if test="borrowStatus != null">borrow_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="boxId != null">#{boxId},</if>
+            <if test="deptId != null">#{deptId},</if>
             <if test="general != null">#{general},</if>
             <if test="year != null">#{year},</if>
             <if test="title != null">#{title},</if>
@@ -160,6 +173,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="apprvoal != null">#{apprvoal},</if>
             <if test="belongRole != null">#{belongRole},</if>
             <if test="boxMark != null">#{boxMark},</if>
+            <if test="expireDate != null">#{expireDate},</if>
+            <if test="remove != null">#{remove},</if>
+            <if test="borrowStatus != null">#{borrowStatus},</if>
          </trim>
     </insert>
@@ -167,6 +183,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         update archives_collect_box
         <trim prefix="SET" suffixOverrides=",">
             <if test="boxId != null">box_id = #{boxId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="general != null">general = #{general},</if>
             <if test="year != null">year = #{year},</if>
             <if test="title != null">title = #{title},</if>
@@ -200,6 +217,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="apprvoal != null">apprvoal = #{apprvoal},</if>
             <if test="belongRole != null">belong_role = #{belongRole},</if>
             <if test="boxMark != null">box_mark = #{boxMark},</if>
+            <if test="expireDate != null">expire_date = #{expireDate},</if>
+            <if test="remove != null">remove = #{remove},</if>
+            <if test="borrowStatus != null">borrow_status = #{borrowStatus},</if>    
         </trim>
         where id = #{id}
     </update>
@@ -98,7 +98,7 @@
     <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="id" />
+<!--      <el-table-column label="主键" align="center" prop="id" />-->
       <el-table-column label="年度" align="center" prop="year" />
       <el-table-column label="操作" align="center" prop="year" >
         <template slot-scope="scope">
@@ -148,9 +148,9 @@
         <el-form-item label="盒号" prop="boxMark">
           <el-input v-model="form.boxMark" placeholder="请输入盒号" />
         </el-form-item>
-        <el-form-item label="库位码" prop="deportNodeId">
+<!--        <el-form-item label="库位码" prop="deportNodeId">
           <el-input v-model="form.deportNodeId" placeholder="请输入库位码" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="描述" prop="describes">
           <el-input v-model="form.describes" placeholder="请输入描述" />
         </el-form-item>
@@ -187,6 +187,12 @@ import shelve from &quot;@/views/archives/box/shelveindex.vue&quot;;
 export default {
   name: "Box",
   components: { indexbox,shelve },
+  props: {
+    deptId: {
+      type: Number,
+    }
+  },
+
   data() {
     return {
       // 遮罩层
@@ -238,6 +244,7 @@ export default {
     /** 查询【著录盒】列表 */
     getList() {
       this.loading = true;
+      this.queryParams.deptId = this.deptId;
       this.queryParams.apprvoal = this.apprvoal;
       listBox(this.queryParams).then(response => {
         this.boxList = response.rows;
@@ -182,9 +182,9 @@
         <el-form-item label="盒号" prop="boxMark">
           <el-input v-model="form.boxMark" placeholder="请输入盒号" />
         </el-form-item>
-        <el-form-item label="库位码" prop="deportNodeId">
+<!--        <el-form-item label="库位码" prop="deportNodeId">
           <el-input v-model="form.deportNodeId" placeholder="请输入库位码" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="描述" prop="describes">
           <el-input v-model="form.describes" placeholder="请输入描述" />
         </el-form-item>
@@ -212,6 +212,13 @@ import indexbox from &quot;@/views/archives/collerctbox/index.vue&quot;;
 export default {
   name: "Box",
   components: { indexbox },
+
+  props: {
+    deptId: {
+      type: Number,
+    }
+  },
+
   data() {
     return {
       // 遮罩层
@@ -261,6 +268,7 @@ export default {
     /** 查询【著录盒】列表 */
     getList() {
       this.loading = true;
+      this.queryParams.deptId = this.deptId;
       this.queryParams.apprvoal = this.apprvoal;
       listBox(this.queryParams).then(response => {
         this.boxList = response.rows;
@@ -348,6 +348,9 @@ export default {
     },
     boxsId: {
       type: Number,
+    },
+    deptId: {
+      type: Number,
     }
   },
@@ -441,7 +444,8 @@ export default {
     /** 查询【登记著录】列表 */
     getList() {
       this.loading = true;
-      this.queryParams.apprvoal = this.approval; //预归档
+      this.queryParams.deptId = this.deptId; //部门
+      this.queryParams.apprvoal = this.approval; //归档
       this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
       this.queryParams.status = this.statusPd;
       listCollerBox(this.queryParams).then(response => {
@@ -585,6 +589,7 @@ export default {
         updateBox(from).then(response => {
           this.$modal.msgSuccess("提交成功");
           this.boxOpen = false;
+          this.getList();
         });
       });
     },
@@ -372,7 +372,11 @@ export default {
     },
     boxsId: {
       type: Number,
+    },
+    deptId: {
+      type: Number,
     }
+
   },
   data() {
@@ -474,8 +478,7 @@ export default {
       if (this.statusPd == "1"){  //已整理文件  固定是2
         this.queryParams.apprvoal = "2";
       }
-
-
+      this.queryParams.deptId = this.deptId; //部门
       this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
       this.queryParams.status = this.statusPd;
       listCollerBox(this.queryParams).then(response => {
@@ -550,7 +553,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加【11】";
+      this.title = "添加【档案】";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -573,7 +576,7 @@ export default {
               this.getList();
             });
           } else {
-            this.form.approval = "0" //初始创建所有都是0.待整理
+            this.form.deptId = this.deptId;
             addBox(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -35,8 +35,8 @@
           <el-tabs v-model="activeName" type="card" @tab-click="handleClick" v-if="stattwo">
-            <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-tab-pane label="已整理文件" name="second" ><indexbox ref="indexbox"  :statusPd= 1  :deptId = deptId v-if="isSecond" /></el-tab-pane>
+            <el-tab-pane label="盒" name="third" ><box ref="box" v-if="isThird" :deptId = deptId /></el-tab-pane>
           </el-tabs>
           <el-tabs v-model="tactiveName" type="card" @tab-click="thandleClick" v-if="stat">
@@ -76,7 +76,7 @@ export default {
       itThird: false,
       shellOpen: false,
       stat:false,
-      stattwo : true,
+      stattwo : false,
       reportUrl : null
     };
   },
@@ -101,9 +101,15 @@ export default {
     // 节点单击事件
     handleNodeClick(data) {
       this.deptId = data.id;
-
-      this.stattwo =  this.stattwo == false ? true : false;
-      this.stat = this.stat == false ? true : false;
+      this.stattwo = true;
+      debugger
+      if(this.isSecond == true){
+        this.$refs.indexbox.deptId = data.id;
+        this.$refs.indexbox.getList();
+      }else if (this.isThird == true){
+        this.$refs.box.deptId = data.id;
+        this.$refs.box.getList();
+      }
     },
     handleClick(tab) {
@@ -35,9 +35,9 @@
           <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="third" ><box  v-if="isThird" /></el-tab-pane>
+            <el-tab-pane label="未整理文件" name="first" > <indexbox ref="indexbox" :statusPd= 0 :deptId = deptId v-if="isFirst"/></el-tab-pane>
+            <el-tab-pane label="已整理文件" name="second" ><indexbox ref="indexbox" :statusPd= 1 :deptId = deptId v-if="isSecond" /></el-tab-pane>
+            <el-tab-pane label="盒" name="third" ><box ref="box" v-if="isThird" :deptId = deptId /></el-tab-pane>
           </el-tabs>
           <el-tabs v-model="tactiveName" type="card" @tab-click="thandleClick" v-if="stat">
@@ -78,8 +78,8 @@ export default {
       itThird: false,
       shellOpen: false,
       stat:false,
-      stattwo : true,
-      reportUrl : null
+      stattwo : false,
+      reportUrl : null,
     };
   },
@@ -103,9 +103,15 @@ export default {
     // 节点单击事件
     handleNodeClick(data) {
       this.deptId = data.id;
+      this.stattwo = true;
+      if(this.isFirst == true || this.isSecond == true){
+        this.$refs.indexbox.deptId = data.id;
+        this.$refs.indexbox.getList();
+      }else if (this.isThird == true){
+        this.$refs.box.deptId = data.id;
+        this.$refs.box.getList();
+      }
-       this.stattwo =  this.stattwo == false ? true : false;
-       this.stat = this.stat == false ? true : false;
     },
     handleClick(tab) {
@@ -198,8 +198,8 @@
                 <td>题名</td>
               </tr>
               <tr style="border:1px solid #FFDCDF;">
-                <td>11111111111</td>
-                <td>222222222</td>
+                <td> <span>{{ CollertBox1 }}</span>
+                <td> <span>{{ CollertBox2 }}</span> </td>
               </tr>
               <tr>
@@ -293,8 +293,10 @@
         // 表单校验
         rules: {
         },
-        borrowStatus : 1,//可借阅
-        collectBoxId : null,
+        borrowStatus: 1,//可借阅
+        collectBoxId: null,
+        CollertBox1: 111,
+        CollertBox2: null,
       };
     },
     //statusPd  0未整理文件 1 已整理文件 2 盒
@@ -304,6 +306,7 @@
     methods: {
       /** 查询【登记著录】列表 */
       getList() {
+        this.queryParams.borrowStatus = this.borrowStatus;
         this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
         listCollerBox(this.queryParams).then(response => {
           this.boxList = response.rows;
@@ -360,7 +363,14 @@
       handleupdateborrow(row){
         this.open = true;
-        this.collectBoxId = row.id;
+        const id = row.id || this.ids
+        this.collectBoxId = Number(id);
+        getBox(id).then(response => {
+          this.CollertBox1 = response.data.archivalCode;
+          this.CollertBox2 = response.data.title;
+        });
+        this.form.name = this.$store.state.user.name;
+        this.form.dept = this.$store.state.user.deptName();
       },
@@ -369,14 +379,28 @@
           if (valid) {
             this.form.collectBoxId =  this.collectBoxId;
             addBorrow(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
               this.open = false;
-              this.getList();
+              this.handleSelectId(this.collectBoxId,"2");//可借阅 转为可归还
             });
-
           }
         });
-      }
+      },
+
+
+
+      handleSelectId(id,borrowStatus){
+        debugger
+        getBox(id).then(response => {
+          let from  = response.data;
+          from.borrowStatus = borrowStatus;
+          updateBox(from).then(response => {
+            this.$modal.msgSuccess("提交成功");
+            this.open = false;
+            this.getList();
+          });
+        });
+      },
+
     }