ljq / archives · Commits

Commit 90511f6d296af234573d52efeffc21b08e8a1610

Authored by ljq
1 parent de53b254
build: skipped

部门联动

Inline Side-by-side
Showing 12 changed files with 252 additions and 137 deletions
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesBorrow.java
  View file @90511f6
... ... @@ -3,6 +3,9 @@ package com.ruoyi.domain;
3 3 import com.fasterxml.jackson.annotation.JsonFormat;
4 4 import com.ruoyi.common.annotation.Excel;
5 5 import com.ruoyi.common.core.domain.BaseEntity;
  6 +import org.apache.commons.lang3.builder.ToStringBuilder;
  7 +import org.apache.commons.lang3.builder.ToStringStyle;
  8 +
6 9 import java.util.Date;
7 10  
8 11 /**
... ... @@ -53,25 +56,7 @@ public class ArchivesBorrow extends ArchivesCollectBox
53 56  
54 57 /** 借阅文件id */
55 58 @Excel(name = "借阅文件id")
56   - private String collectBoxId;
57   -
58   - /** 创建人 */
59   - @Excel(name = "创建人")
60   - private String createBy;
61   -
62   - /** 创建时间 */
63   - @JsonFormat(pattern = "yyyy-MM-dd")
64   - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
65   - private Date createTime;
66   -
67   - /** 修改人 */
68   - @Excel(name = "修改人")
69   - private String updateBy;
70   -
71   - /** 修改时间 */
72   - @JsonFormat(pattern = "yyyy-MM-dd")
73   - @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
74   - private Date updateTime;
  59 + private Long collectBoxId;
75 60  
76 61 /** 待归还日期 */
77 62 @JsonFormat(pattern = "yyyy-MM-dd")
... ... @@ -87,8 +72,8 @@ public class ArchivesBorrow extends ArchivesCollectBox
87 72 @Excel(name = "借阅单号")
88 73 private String borrowMark;
89 74  
90   - /** 借阅状态 0-借出 1-归还 2-逾期*/
91   - @Excel(name = "申请状态")
  75 + /** 借阅状态 0-借出 1-归还 2-逾期 3-续借 */
  76 + @Excel(name = "借阅状态 0-借出 1-归还 2-逾期 3-续借")
92 77 private String status;
93 78  
94 79 @JsonFormat(pattern = "yyyy-MM-dd")
... ... @@ -171,54 +156,15 @@ public class ArchivesBorrow extends ArchivesCollectBox
171 156 this.borrowType = borrowType;
172 157 }
173 158  
174   - public String getCollectBoxId() {
  159 + public Long getCollectBoxId()
  160 + {
175 161 return collectBoxId;
176 162 }
177   -
178   - public void setCollectBoxId(String collectBoxId) {
  163 + public void setCollectBoxId(Long collectBoxId)
  164 + {
179 165 this.collectBoxId = collectBoxId;
180 166 }
181 167  
182   - @Override
183   - public String getCreateBy() {
184   - return createBy;
185   - }
186   -
187   - @Override
188   - public void setCreateBy(String createBy) {
189   - this.createBy = createBy;
190   - }
191   -
192   - @Override
193   - public Date getCreateTime() {
194   - return createTime;
195   - }
196   -
197   - @Override
198   - public void setCreateTime(Date createTime) {
199   - this.createTime = createTime;
200   - }
201   -
202   - @Override
203   - public String getUpdateBy() {
204   - return updateBy;
205   - }
206   -
207   - @Override
208   - public void setUpdateBy(String updateBy) {
209   - this.updateBy = updateBy;
210   - }
211   -
212   - @Override
213   - public Date getUpdateTime() {
214   - return updateTime;
215   - }
216   -
217   - @Override
218   - public void setUpdateTime(Date updateTime) {
219   - this.updateTime = updateTime;
220   - }
221   -
222 168 public Date getReturnDate() {
223 169 return returnDate;
224 170 }
... ... @@ -268,4 +214,27 @@ public class ArchivesBorrow extends ArchivesCollectBox
268 214 public void setBorrowDateE(Date borrowDateE) {
269 215 this.borrowDateE = borrowDateE;
270 216 }
  217 + @Override
  218 + public String toString() {
  219 + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
  220 + .append("id", getId())
  221 + .append("name", getName())
  222 + .append("dept", getDept())
  223 + .append("borrowDate", getBorrowDate())
  224 + .append("phone", getPhone())
  225 + .append("mode", getMode())
  226 + .append("boxType", getBoxType())
  227 + .append("borrowName", getBorrowName())
  228 + .append("borrowType", getBorrowType())
  229 + .append("collectBoxId", getCollectBoxId())
  230 + .append("createBy", getCreateBy())
  231 + .append("createTime", getCreateTime())
  232 + .append("updateBy", getUpdateBy())
  233 + .append("updateTime", getUpdateTime())
  234 + .append("returnDate", getReturnDate())
  235 + .append("returnedDate", getReturnedDate())
  236 + .append("borrowMark", getBorrowMark())
  237 + .append("status", getStatus())
  238 + .toString();
  239 + }
271 240 }
... ...
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesBox.java
  View file @90511f6
... ... @@ -18,6 +18,10 @@ public class ArchivesBox extends BaseEntity
18 18 /** 主键 */
19 19 private Long id;
20 20  
  21 + /** 部门ID */
  22 + @Excel(name = "部门")
  23 + private Long deptId;
  24 +
21 25 /** 年度 */
22 26 @Excel(name = "年度")
23 27 private String year;
... ... @@ -105,10 +109,19 @@ public class ArchivesBox extends BaseEntity
105 109 this.apprvoal = apprvoal;
106 110 }
107 111  
  112 + public Long getDeptId() {
  113 + return deptId;
  114 + }
  115 +
  116 + public void setDeptId(Long deptId) {
  117 + this.deptId = deptId;
  118 + }
  119 +
108 120 @Override
109 121 public String toString() {
110 122 return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
111 123 .append("id", getId())
  124 + .append("deptId", getDeptId())
112 125 .append("year", getYear())
113 126 .append("boxRule", getBoxRule())
114 127 .append("boxMark", getBoxMark())
... ...
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesCollectBox.java
  View file @90511f6
... ... @@ -24,6 +24,10 @@ public class ArchivesCollectBox extends BaseEntity
24 24 /** 盒ID */
25 25 @Excel(name = "盒ID")
26 26 private Long boxId;
  27 + /** 部门ID */
  28 + @Excel(name = "部门")
  29 + private Long deptId;
  30 +
27 31 /** 全宗号 */
28 32 @Excel(name = "全宗号")
29 33 private String general;
... ... @@ -148,7 +152,17 @@ public class ArchivesCollectBox extends BaseEntity
148 152 /** 库位码 */
149 153 private String deportNodeId;
150 154  
151   - /** 0-借出 1-归还 */
  155 + /** 到期时间 */
  156 + @JsonFormat(pattern = "yyyy-MM-dd")
  157 + @Excel(name = "到期时间", width = 30, dateFormat = "yyyy-MM-dd")
  158 + private Date expireDate;
  159 +
  160 + /** 是否删除0?1 */
  161 + @Excel(name = "是否删除0?1")
  162 + private String remove;
  163 +
  164 + /** 是否借出 0-借出 1-归还 */
  165 + @Excel(name = "是否借出 0-借出 1-归还 ")
152 166 private String borrowStatus;
153 167  
154 168 public void setId(Long id)
... ... @@ -439,50 +453,85 @@ public class ArchivesCollectBox extends BaseEntity
439 453 this.deportNodeId = deportNodeId;
440 454 }
441 455  
442   - public String getBorrowStatus() {
443   - return borrowStatus;
  456 + public void setExpireDate(Date expireDate)
  457 + {
  458 + this.expireDate = expireDate;
444 459 }
445 460  
446   - public void setBorrowStatus(String borrowStatus) {
  461 + public Date getExpireDate()
  462 + {
  463 + return expireDate;
  464 + }
  465 + public void setRemove(String remove)
  466 + {
  467 + this.remove = remove;
  468 + }
  469 +
  470 + public String getRemove()
  471 + {
  472 + return remove;
  473 + }
  474 + public void setBorrowStatus(String borrowStatus)
  475 + {
447 476 this.borrowStatus = borrowStatus;
448 477 }
449 478  
  479 + public String getBorrowStatus()
  480 + {
  481 + return borrowStatus;
  482 + }
  483 +
  484 + public Long getDeptId() {
  485 + return deptId;
  486 + }
  487 +
  488 + public void setDeptId(Long deptId) {
  489 + this.deptId = deptId;
  490 + }
  491 +
450 492 @Override
451 493 public String toString() {
452   - return "ArchivesCollectBox{" +
453   - "id=" + id +
454   - ", boxId=" + boxId +
455   - ", general='" + general + '\'' +
456   - ", year='" + year + '\'' +
457   - ", title='" + title + '\'' +
458   - ", sort='" + sort + '\'' +
459   - ", safekeepingDate=" + safekeepingDate +
460   - ", secretLevel='" + secretLevel + '\'' +
461   - ", pages='" + pages + '\'' +
462   - ", filingNumber='" + filingNumber + '\'' +
463   - ", zkNumber='" + zkNumber + '\'' +
464   - ", locationCode='" + locationCode + '\'' +
465   - ", filingDept='" + filingDept + '\'' +
466   - ", archivalCode='" + archivalCode + '\'' +
467   - ", responsibilityName='" + responsibilityName + '\'' +
468   - ", serialMark='" + serialMark + '\'' +
469   - ", pieceMark='" + pieceMark + '\'' +
470   - ", registerMark='" + registerMark + '\'' +
471   - ", counsellors='" + counsellors + '\'' +
472   - ", filingName='" + filingName + '\'' +
473   - ", summaryName='" + summaryName + '\'' +
474   - ", recordType='" + recordType + '\'' +
475   - ", carrierType='" + carrierType + '\'' +
476   - ", draftName='" + draftName + '\'' +
477   - ", page='" + page + '\'' +
478   - ", documentMark='" + documentMark + '\'' +
479   - ", text='" + text + '\'' +
480   - ", status='" + status + '\'' +
481   - ", apprvoal='" + apprvoal + '\'' +
482   - ", belongRole='" + belongRole + '\'' +
483   - ", boxMark='" + boxMark + '\'' +
484   - ", deportNodeId='" + deportNodeId + '\'' +
485   - ", borrowStatus='" + borrowStatus + '\'' +
486   - '}';
  494 + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
  495 + .append("id", getId())
  496 + .append("boxId", getBoxId())
  497 + .append("deptId", getDeptId())
  498 + .append("general", getGeneral())
  499 + .append("year", getYear())
  500 + .append("title", getTitle())
  501 + .append("sort", getSort())
  502 + .append("safekeepingDate", getSafekeepingDate())
  503 + .append("secretLevel", getSecretLevel())
  504 + .append("pages", getPages())
  505 + .append("filingNumber", getFilingNumber())
  506 + .append("zkNumber", getZkNumber())
  507 + .append("locationCode", getLocationCode())
  508 + .append("filingDept", getFilingDept())
  509 + .append("archivalCode", getArchivalCode())
  510 + .append("responsibilityName", getResponsibilityName())
  511 + .append("serialMark", getSerialMark())
  512 + .append("pieceMark", getPieceMark())
  513 + .append("registerMark", getRegisterMark())
  514 + .append("counsellors", getCounsellors())
  515 + .append("filingName", getFilingName())
  516 + .append("summaryName", getSummaryName())
  517 + .append("recordType", getRecordType())
  518 + .append("carrierType", getCarrierType())
  519 + .append("draftName", getDraftName())
  520 + .append("page", getPage())
  521 + .append("documentMark", getDocumentMark())
  522 + .append("text", getText())
  523 + .append("createBy", getCreateBy())
  524 + .append("createTime", getCreateTime())
  525 + .append("updateBy", getUpdateBy())
  526 + .append("updateTime", getUpdateTime())
  527 + .append("status", getStatus())
  528 + .append("apprvoal", getApprvoal())
  529 + .append("belongRole", getBelongRole())
  530 + .append("boxMark", getBoxMark())
  531 + .append("deportNodeId", getDeportNodeId())
  532 + .append("expireDate", getExpireDate())
  533 + .append("remove", getRemove())
  534 + .append("borrowStatus", getBorrowStatus())
  535 + .toString();
487 536 }
488 537 }
... ...
ruoyi-archives/src/main/resources/mapper/archives/ArchivesBoxMapper.xml
  View file @90511f6
... ... @@ -6,6 +6,7 @@
6 6  
7 7 <resultMap type="ArchivesBox" id="ArchivesBoxResult">
8 8 <result property="id" column="id" />
  9 + <result property="deptId" column="dept_id" />
9 10 <result property="year" column="year" />
10 11 <result property="boxRule" column="box_rule" />
11 12 <result property="boxMark" column="box_mark" />
... ... @@ -19,12 +20,13 @@
19 20 </resultMap>
20 21  
21 22 <sql id="selectArchivesBoxVo">
22   - select id, year, box_rule, box_mark, deport_node_id, describes, create_by, create_time, update_by, update_time, apprvoal from archives_box
  23 + 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
23 24 </sql>
24 25  
25 26 <select id="selectArchivesBoxList" parameterType="ArchivesBox" resultMap="ArchivesBoxResult">
26 27 <include refid="selectArchivesBoxVo"/>
27 28 <where>
  29 + <if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
28 30 <if test="year != null and year != ''"> and year = #{year}</if>
29 31 <if test="boxRule != null and boxRule != ''"> and box_rule = #{boxRule}</if>
30 32 <if test="boxMark != null and boxMark != ''"> and box_mark = #{boxMark}</if>
... ... @@ -56,6 +58,7 @@
56 58 <insert id="insertArchivesBox" parameterType="ArchivesBox" useGeneratedKeys="true" keyProperty="id">
57 59 insert into archives_box
58 60 <trim prefix="(" suffix=")" suffixOverrides=",">
  61 + <if test="deptId != null">dept_id,</if>
59 62 <if test="year != null">year,</if>
60 63 <if test="boxRule != null">box_rule,</if>
61 64 <if test="boxMark != null">box_mark,</if>
... ... @@ -68,6 +71,7 @@
68 71 <if test="apprvoal != null">apprvoal,</if>
69 72 </trim>
70 73 <trim prefix="values (" suffix=")" suffixOverrides=",">
  74 + <if test="deptId != null">#{deptId},</if>
71 75 <if test="year != null">#{year},</if>
72 76 <if test="boxRule != null">#{boxRule},</if>
73 77 <if test="boxMark != null">#{boxMark},</if>
... ... @@ -84,6 +88,7 @@
84 88 <update id="updateArchivesBox" parameterType="ArchivesBox">
85 89 update archives_box
86 90 <trim prefix="SET" suffixOverrides=",">
  91 + <if test="deptId != null">dept_id = #{deptId},</if>
87 92 <if test="year != null">year = #{year},</if>
88 93 <if test="boxRule != null">box_rule = #{boxRule},</if>
89 94 <if test="boxMark != null">box_mark = #{boxMark},</if>
... ...
ruoyi-archives/src/main/resources/mapper/archives/ArchivesCollectBoxMapper.xml
  View file @90511f6
... ... @@ -7,6 +7,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
7 7 <resultMap type="ArchivesCollectBox" id="ArchivesCollectBoxResult">
8 8 <result property="id" column="id" />
9 9 <result property="boxId" column="box_id" />
  10 + <result property="deptId" column="dept_id" />
10 11 <result property="general" column="general" />
11 12 <result property="year" column="year" />
12 13 <result property="title" column="title" />
... ... @@ -40,16 +41,20 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
40 41 <result property="apprvoal" column="apprvoal" />
41 42 <result property="belongRole" column="belong_role" />
42 43 <result property="boxMark" column="box_mark" />
  44 + <result property="expireDate" column="expire_date" />
  45 + <result property="remove" column="remove" />
  46 + <result property="borrowStatus" column="borrow_status" />
43 47 </resultMap>
44 48  
45 49 <sql id="selectArchivesCollectBoxVo">
46   - 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
  50 + 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
47 51 </sql>
48 52  
49 53 <select id="selectArchivesCollectBoxList" parameterType="ArchivesCollectBox" resultMap="ArchivesCollectBoxResult">
50 54 <include refid="selectArchivesCollectBoxVo"/>
51 55 <where>
52 56 <if test="boxId != null "> and box_id = #{boxId}</if>
  57 + <if test="deptId != null "> and dept_id = #{deptId}</if>
53 58 <if test="general != null and general != ''"> and general = #{general}</if>
54 59 <if test="year != null and year != ''"> and year = #{year}</if>
55 60 <if test="title != null and title != ''"> and title = #{title}</if>
... ... @@ -79,6 +84,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
79 84 <if test="apprvoal != null and apprvoal != ''"> and apprvoal = #{apprvoal}</if>
80 85 <if test="belongRole != null and belongRole != ''"> and belong_role = #{belongRole}</if>
81 86 <if test="boxMark != null and boxMark != ''"> and box_mark = #{boxMark}</if>
  87 + <if test="expireDate != null "> and expire_date = #{expireDate}</if>
  88 + <if test="remove != null and remove != ''"> and remove = #{remove}</if>
  89 + <if test="borrowStatus != null and borrowStatus != ''"> and borrow_status = #{borrowStatus}</if>
82 90 </where>
83 91 </select>
84 92  
... ... @@ -91,6 +99,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
91 99 insert into archives_collect_box
92 100 <trim prefix="(" suffix=")" suffixOverrides=",">
93 101 <if test="boxId != null">box_id,</if>
  102 + <if test="deptId != null">dept_id,</if>
94 103 <if test="general != null">general,</if>
95 104 <if test="year != null">year,</if>
96 105 <if test="title != null">title,</if>
... ... @@ -124,9 +133,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
124 133 <if test="apprvoal != null">apprvoal,</if>
125 134 <if test="belongRole != null">belong_role,</if>
126 135 <if test="boxMark != null">box_mark,</if>
  136 + <if test="expireDate != null">expire_date,</if>
  137 + <if test="remove != null">remove,</if>
  138 + <if test="borrowStatus != null">borrow_status,</if>
127 139 </trim>
128 140 <trim prefix="values (" suffix=")" suffixOverrides=",">
129 141 <if test="boxId != null">#{boxId},</if>
  142 + <if test="deptId != null">#{deptId},</if>
130 143 <if test="general != null">#{general},</if>
131 144 <if test="year != null">#{year},</if>
132 145 <if test="title != null">#{title},</if>
... ... @@ -160,6 +173,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
160 173 <if test="apprvoal != null">#{apprvoal},</if>
161 174 <if test="belongRole != null">#{belongRole},</if>
162 175 <if test="boxMark != null">#{boxMark},</if>
  176 + <if test="expireDate != null">#{expireDate},</if>
  177 + <if test="remove != null">#{remove},</if>
  178 + <if test="borrowStatus != null">#{borrowStatus},</if>
163 179 </trim>
164 180 </insert>
165 181  
... ... @@ -167,6 +183,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
167 183 update archives_collect_box
168 184 <trim prefix="SET" suffixOverrides=",">
169 185 <if test="boxId != null">box_id = #{boxId},</if>
  186 + <if test="deptId != null">dept_id = #{deptId},</if>
170 187 <if test="general != null">general = #{general},</if>
171 188 <if test="year != null">year = #{year},</if>
172 189 <if test="title != null">title = #{title},</if>
... ... @@ -200,6 +217,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
200 217 <if test="apprvoal != null">apprvoal = #{apprvoal},</if>
201 218 <if test="belongRole != null">belong_role = #{belongRole},</if>
202 219 <if test="boxMark != null">box_mark = #{boxMark},</if>
  220 + <if test="expireDate != null">expire_date = #{expireDate},</if>
  221 + <if test="remove != null">remove = #{remove},</if>
  222 + <if test="borrowStatus != null">borrow_status = #{borrowStatus},</if>
203 223 </trim>
204 224 where id = #{id}
205 225 </update>
... ...
ruoyi-ui/src/views/archives/box/filingindex.vue
  View file @90511f6
... ... @@ -98,7 +98,7 @@
98 98  
99 99 <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
100 100 <el-table-column type="selection" width="55" align="center" />
101   - <el-table-column label="主键" align="center" prop="id" />
  101 +<!-- <el-table-column label="主键" align="center" prop="id" />-->
102 102 <el-table-column label="年度" align="center" prop="year" />
103 103 <el-table-column label="操作" align="center" prop="year" >
104 104 <template slot-scope="scope">
... ... @@ -148,9 +148,9 @@
148 148 <el-form-item label="盒号" prop="boxMark">
149 149 <el-input v-model="form.boxMark" placeholder="请输入盒号" />
150 150 </el-form-item>
151   - <el-form-item label="库位码" prop="deportNodeId">
  151 +<!-- <el-form-item label="库位码" prop="deportNodeId">
152 152 <el-input v-model="form.deportNodeId" placeholder="请输入库位码" />
153   - </el-form-item>
  153 + </el-form-item>-->
154 154 <el-form-item label="描述" prop="describes">
155 155 <el-input v-model="form.describes" placeholder="请输入描述" />
156 156 </el-form-item>
... ... @@ -187,6 +187,12 @@ import shelve from &quot;@/views/archives/box/shelveindex.vue&quot;;
187 187 export default {
188 188 name: "Box",
189 189 components: { indexbox,shelve },
  190 + props: {
  191 + deptId: {
  192 + type: Number,
  193 + }
  194 + },
  195 +
190 196 data() {
191 197 return {
192 198 // 遮罩层
... ... @@ -238,6 +244,7 @@ export default {
238 244 /** 查询【著录盒】列表 */
239 245 getList() {
240 246 this.loading = true;
  247 + this.queryParams.deptId = this.deptId;
241 248 this.queryParams.apprvoal = this.apprvoal;
242 249 listBox(this.queryParams).then(response => {
243 250 this.boxList = response.rows;
... ...
ruoyi-ui/src/views/archives/box/index.vue
  View file @90511f6
... ... @@ -182,9 +182,9 @@
182 182 <el-form-item label="盒号" prop="boxMark">
183 183 <el-input v-model="form.boxMark" placeholder="请输入盒号" />
184 184 </el-form-item>
185   - <el-form-item label="库位码" prop="deportNodeId">
  185 +<!-- <el-form-item label="库位码" prop="deportNodeId">
186 186 <el-input v-model="form.deportNodeId" placeholder="请输入库位码" />
187   - </el-form-item>
  187 + </el-form-item>-->
188 188 <el-form-item label="描述" prop="describes">
189 189 <el-input v-model="form.describes" placeholder="请输入描述" />
190 190 </el-form-item>
... ... @@ -212,6 +212,13 @@ import indexbox from &quot;@/views/archives/collerctbox/index.vue&quot;;
212 212 export default {
213 213 name: "Box",
214 214 components: { indexbox },
  215 +
  216 + props: {
  217 + deptId: {
  218 + type: Number,
  219 + }
  220 + },
  221 +
215 222 data() {
216 223 return {
217 224 // 遮罩层
... ... @@ -261,6 +268,7 @@ export default {
261 268 /** 查询【著录盒】列表 */
262 269 getList() {
263 270 this.loading = true;
  271 + this.queryParams.deptId = this.deptId;
264 272 this.queryParams.apprvoal = this.apprvoal;
265 273 listBox(this.queryParams).then(response => {
266 274 this.boxList = response.rows;
... ...
ruoyi-ui/src/views/archives/collerctbox/filingindex.vue
  View file @90511f6
... ... @@ -348,6 +348,9 @@ export default {
348 348 },
349 349 boxsId: {
350 350 type: Number,
  351 + },
  352 + deptId: {
  353 + type: Number,
351 354 }
352 355 },
353 356  
... ... @@ -441,7 +444,8 @@ export default {
441 444 /** 查询【登记著录】列表 */
442 445 getList() {
443 446 this.loading = true;
444   - this.queryParams.apprvoal = this.approval; //预归档
  447 + this.queryParams.deptId = this.deptId; //部门
  448 + this.queryParams.apprvoal = this.approval; //归档
445 449 this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
446 450 this.queryParams.status = this.statusPd;
447 451 listCollerBox(this.queryParams).then(response => {
... ... @@ -585,6 +589,7 @@ export default {
585 589 updateBox(from).then(response => {
586 590 this.$modal.msgSuccess("提交成功");
587 591 this.boxOpen = false;
  592 + this.getList();
588 593 });
589 594 });
590 595 },
... ...
ruoyi-ui/src/views/archives/collerctbox/index.vue
  View file @90511f6
... ... @@ -372,7 +372,11 @@ export default {
372 372 },
373 373 boxsId: {
374 374 type: Number,
  375 + },
  376 + deptId: {
  377 + type: Number,
375 378 }
  379 +
376 380 },
377 381  
378 382 data() {
... ... @@ -474,8 +478,7 @@ export default {
474 478 if (this.statusPd == "1"){ //已整理文件 固定是2
475 479 this.queryParams.apprvoal = "2";
476 480 }
477   -
478   -
  481 + this.queryParams.deptId = this.deptId; //部门
479 482 this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
480 483 this.queryParams.status = this.statusPd;
481 484 listCollerBox(this.queryParams).then(response => {
... ... @@ -550,7 +553,7 @@ export default {
550 553 handleAdd() {
551 554 this.reset();
552 555 this.open = true;
553   - this.title = "添加【11】";
  556 + this.title = "添加【档案】";
554 557 },
555 558 /** 修改按钮操作 */
556 559 handleUpdate(row) {
... ... @@ -573,7 +576,7 @@ export default {
573 576 this.getList();
574 577 });
575 578 } else {
576   - this.form.approval = "0" //初始创建所有都是0.待整理
  579 + this.form.deptId = this.deptId;
577 580 addBox(this.form).then(response => {
578 581 this.$modal.msgSuccess("新增成功");
579 582 this.open = false;
... ...
ruoyi-ui/src/views/archives/filing.vue
  View file @90511f6
... ... @@ -35,8 +35,8 @@
35 35  
36 36  
37 37 <el-tabs v-model="activeName" type="card" @tab-click="handleClick" v-if="stattwo">
38   - <el-tab-pane label="已整理文件" name="second" ><indexbox :statusPd= 1 v-if="isSecond" /></el-tab-pane>
39   - <el-tab-pane label="盒" name="third" ><box v-if="isThird" /></el-tab-pane>
  38 + <el-tab-pane label="已整理文件" name="second" ><indexbox ref="indexbox" :statusPd= 1 :deptId = deptId v-if="isSecond" /></el-tab-pane>
  39 + <el-tab-pane label="盒" name="third" ><box ref="box" v-if="isThird" :deptId = deptId /></el-tab-pane>
40 40 </el-tabs>
41 41  
42 42 <el-tabs v-model="tactiveName" type="card" @tab-click="thandleClick" v-if="stat">
... ... @@ -76,7 +76,7 @@ export default {
76 76 itThird: false,
77 77 shellOpen: false,
78 78 stat:false,
79   - stattwo : true,
  79 + stattwo : false,
80 80 reportUrl : null
81 81 };
82 82 },
... ... @@ -101,9 +101,15 @@ export default {
101 101 // 节点单击事件
102 102 handleNodeClick(data) {
103 103 this.deptId = data.id;
104   -
105   - this.stattwo = this.stattwo == false ? true : false;
106   - this.stat = this.stat == false ? true : false;
  104 + this.stattwo = true;
  105 + debugger
  106 + if(this.isSecond == true){
  107 + this.$refs.indexbox.deptId = data.id;
  108 + this.$refs.indexbox.getList();
  109 + }else if (this.isThird == true){
  110 + this.$refs.box.deptId = data.id;
  111 + this.$refs.box.getList();
  112 + }
107 113 },
108 114  
109 115 handleClick(tab) {
... ...
ruoyi-ui/src/views/archives/index.vue
  View file @90511f6
... ... @@ -35,9 +35,9 @@
35 35  
36 36  
37 37 <el-tabs v-model="activeName" type="card" @tab-click="handleClick" v-if="stattwo">
38   - <el-tab-pane label="未整理文件" name="first" > <indexbox :statusPd= 0 v-if="isFirst"/></el-tab-pane>
39   - <el-tab-pane label="已整理文件" name="second" ><indexbox :statusPd= 1 v-if="isSecond" /></el-tab-pane>
40   - <el-tab-pane label="盒" name="third" ><box v-if="isThird" /></el-tab-pane>
  38 + <el-tab-pane label="未整理文件" name="first" > <indexbox ref="indexbox" :statusPd= 0 :deptId = deptId v-if="isFirst"/></el-tab-pane>
  39 + <el-tab-pane label="已整理文件" name="second" ><indexbox ref="indexbox" :statusPd= 1 :deptId = deptId v-if="isSecond" /></el-tab-pane>
  40 + <el-tab-pane label="盒" name="third" ><box ref="box" v-if="isThird" :deptId = deptId /></el-tab-pane>
41 41 </el-tabs>
42 42  
43 43 <el-tabs v-model="tactiveName" type="card" @tab-click="thandleClick" v-if="stat">
... ... @@ -78,8 +78,8 @@ export default {
78 78 itThird: false,
79 79 shellOpen: false,
80 80 stat:false,
81   - stattwo : true,
82   - reportUrl : null
  81 + stattwo : false,
  82 + reportUrl : null,
83 83 };
84 84 },
85 85  
... ... @@ -103,9 +103,15 @@ export default {
103 103 // 节点单击事件
104 104 handleNodeClick(data) {
105 105 this.deptId = data.id;
  106 + this.stattwo = true;
  107 + if(this.isFirst == true || this.isSecond == true){
  108 + this.$refs.indexbox.deptId = data.id;
  109 + this.$refs.indexbox.getList();
  110 + }else if (this.isThird == true){
  111 + this.$refs.box.deptId = data.id;
  112 + this.$refs.box.getList();
  113 + }
106 114  
107   - this.stattwo = this.stattwo == false ? true : false;
108   - this.stat = this.stat == false ? true : false;
109 115 },
110 116  
111 117 handleClick(tab) {
... ...
ruoyi-ui/src/views/borrow/index.vue
  View file @90511f6
... ... @@ -198,8 +198,8 @@
198 198 <td>题名</td>
199 199 </tr>
200 200 <tr style="border:1px solid #FFDCDF;">
201   - <td>11111111111</td>
202   - <td>222222222</td>
  201 + <td> <span>{{ CollertBox1 }}</span>
  202 + <td> <span>{{ CollertBox2 }}</span> </td>
203 203 </tr>
204 204 <tr>
205 205  
... ... @@ -293,8 +293,10 @@
293 293 // 表单校验
294 294 rules: {
295 295 },
296   - borrowStatus : 1,//可借阅
297   - collectBoxId : null,
  296 + borrowStatus: 1,//可借阅
  297 + collectBoxId: null,
  298 + CollertBox1: 111,
  299 + CollertBox2: null,
298 300 };
299 301 },
300 302 //statusPd 0未整理文件 1 已整理文件 2 盒
... ... @@ -304,6 +306,7 @@
304 306 methods: {
305 307 /** 查询【登记著录】列表 */
306 308 getList() {
  309 + this.queryParams.borrowStatus = this.borrowStatus;
307 310 this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
308 311 listCollerBox(this.queryParams).then(response => {
309 312 this.boxList = response.rows;
... ... @@ -360,7 +363,14 @@
360 363  
361 364 handleupdateborrow(row){
362 365 this.open = true;
363   - this.collectBoxId = row.id;
  366 + const id = row.id || this.ids
  367 + this.collectBoxId = Number(id);
  368 + getBox(id).then(response => {
  369 + this.CollertBox1 = response.data.archivalCode;
  370 + this.CollertBox2 = response.data.title;
  371 + });
  372 + this.form.name = this.$store.state.user.name;
  373 + this.form.dept = this.$store.state.user.deptName();
364 374 },
365 375  
366 376  
... ... @@ -369,14 +379,28 @@
369 379 if (valid) {
370 380 this.form.collectBoxId = this.collectBoxId;
371 381 addBorrow(this.form).then(response => {
372   - this.$modal.msgSuccess("新增成功");
373 382 this.open = false;
374   - this.getList();
  383 + this.handleSelectId(this.collectBoxId,"2");//可借阅 转为可归还
375 384 });
376   -
377 385 }
378 386 });
379   - }
  387 + },
  388 +
  389 +
  390 +
  391 + handleSelectId(id,borrowStatus){
  392 + debugger
  393 + getBox(id).then(response => {
  394 + let from = response.data;
  395 + from.borrowStatus = borrowStatus;
  396 + updateBox(from).then(response => {
  397 + this.$modal.msgSuccess("提交成功");
  398 + this.open = false;
  399 + this.getList();
  400 + });
  401 + });
  402 + },
  403 +
380 404  
381 405  
382 406 }
... ...