ljq / archives · Commits

Commit 4eb2ddd9beeb8004399baf82af4eacaf50c072e0

Authored by yiming
2 parents 3aa05140 1e08a0b2
build: skipped

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 13 changed files with 907 additions and 373 deletions
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesBorrow.java
  View file @4eb2ddd
... ... @@ -212,4 +212,27 @@ public class ArchivesBorrow extends ArchivesCollectBox
212 212 public void setBorrowDateE(Date borrowDateE) {
213 213 this.borrowDateE = borrowDateE;
214 214 }
  215 + @Override
  216 + public String toString() {
  217 + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
  218 + .append("id", getId())
  219 + .append("name", getName())
  220 + .append("dept", getDept())
  221 + .append("borrowDate", getBorrowDate())
  222 + .append("phone", getPhone())
  223 + .append("mode", getMode())
  224 + .append("boxType", getBoxType())
  225 + .append("borrowName", getBorrowName())
  226 + .append("borrowType", getBorrowType())
  227 + .append("collectBoxId", getCollectBoxId())
  228 + .append("createBy", getCreateBy())
  229 + .append("createTime", getCreateTime())
  230 + .append("updateBy", getUpdateBy())
  231 + .append("updateTime", getUpdateTime())
  232 + .append("returnDate", getReturnDate())
  233 + .append("returnedDate", getReturnedDate())
  234 + .append("borrowMark", getBorrowMark())
  235 + .append("status", getStatus())
  236 + .toString();
  237 + }
215 238 }
... ...
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesBox.java
  View file @4eb2ddd
... ... @@ -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 @4eb2ddd
... ... @@ -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,6 +152,15 @@ public class ArchivesCollectBox extends BaseEntity
148 152 /** 库位码 */
149 153 private String deportNodeId;
150 154  
  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 +
151 164 /** 是否借出 0-借出 1-归还 */
152 165 @Excel(name = "是否借出 0-借出 1-归还 ")
153 166 private String borrowStatus;
... ... @@ -440,50 +453,85 @@ public class ArchivesCollectBox extends BaseEntity
440 453 this.deportNodeId = deportNodeId;
441 454 }
442 455  
443   - public String getBorrowStatus() {
444   - return borrowStatus;
  456 + public void setExpireDate(Date expireDate)
  457 + {
  458 + this.expireDate = expireDate;
445 459 }
446 460  
447   - 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 + {
448 476 this.borrowStatus = borrowStatus;
449 477 }
450 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 +
451 492 @Override
452 493 public String toString() {
453   - return "ArchivesCollectBox{" +
454   - "id=" + id +
455   - ", boxId=" + boxId +
456   - ", general='" + general + '\'' +
457   - ", year='" + year + '\'' +
458   - ", title='" + title + '\'' +
459   - ", sort='" + sort + '\'' +
460   - ", safekeepingDate=" + safekeepingDate +
461   - ", secretLevel='" + secretLevel + '\'' +
462   - ", pages='" + pages + '\'' +
463   - ", filingNumber='" + filingNumber + '\'' +
464   - ", zkNumber='" + zkNumber + '\'' +
465   - ", locationCode='" + locationCode + '\'' +
466   - ", filingDept='" + filingDept + '\'' +
467   - ", archivalCode='" + archivalCode + '\'' +
468   - ", responsibilityName='" + responsibilityName + '\'' +
469   - ", serialMark='" + serialMark + '\'' +
470   - ", pieceMark='" + pieceMark + '\'' +
471   - ", registerMark='" + registerMark + '\'' +
472   - ", counsellors='" + counsellors + '\'' +
473   - ", filingName='" + filingName + '\'' +
474   - ", summaryName='" + summaryName + '\'' +
475   - ", recordType='" + recordType + '\'' +
476   - ", carrierType='" + carrierType + '\'' +
477   - ", draftName='" + draftName + '\'' +
478   - ", page='" + page + '\'' +
479   - ", documentMark='" + documentMark + '\'' +
480   - ", text='" + text + '\'' +
481   - ", status='" + status + '\'' +
482   - ", apprvoal='" + apprvoal + '\'' +
483   - ", belongRole='" + belongRole + '\'' +
484   - ", boxMark='" + boxMark + '\'' +
485   - ", deportNodeId='" + deportNodeId + '\'' +
486   - ", borrowStatus='" + borrowStatus + '\'' +
487   - '}';
  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();
488 536 }
489 537 }
... ...
ruoyi-archives/src/main/resources/mapper/archives/ArchivesBoxMapper.xml
  View file @4eb2ddd
... ... @@ -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 @4eb2ddd
... ... @@ -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,17 +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" />
43 46 <result property="borrowStatus" column="borrow_status" />
44 47 </resultMap>
45 48  
46 49 <sql id="selectArchivesCollectBoxVo">
47   - 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,borrow_status 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
48 51 </sql>
49 52  
50 53 <select id="selectArchivesCollectBoxList" parameterType="ArchivesCollectBox" resultMap="ArchivesCollectBoxResult">
51 54 <include refid="selectArchivesCollectBoxVo"/>
52 55 <where>
53 56 <if test="boxId != null "> and box_id = #{boxId}</if>
  57 + <if test="deptId != null "> and dept_id = #{deptId}</if>
54 58 <if test="general != null and general != ''"> and general = #{general}</if>
55 59 <if test="year != null and year != ''"> and year = #{year}</if>
56 60 <if test="title != null and title != ''"> and title = #{title}</if>
... ... @@ -80,6 +84,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
80 84 <if test="apprvoal != null and apprvoal != ''"> and apprvoal = #{apprvoal}</if>
81 85 <if test="belongRole != null and belongRole != ''"> and belong_role = #{belongRole}</if>
82 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>
83 89 <if test="borrowStatus != null and borrowStatus != ''"> and borrow_status = #{borrowStatus}</if>
84 90 </where>
85 91 </select>
... ... @@ -93,6 +99,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
93 99 insert into archives_collect_box
94 100 <trim prefix="(" suffix=")" suffixOverrides=",">
95 101 <if test="boxId != null">box_id,</if>
  102 + <if test="deptId != null">dept_id,</if>
96 103 <if test="general != null">general,</if>
97 104 <if test="year != null">year,</if>
98 105 <if test="title != null">title,</if>
... ... @@ -126,10 +133,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
126 133 <if test="apprvoal != null">apprvoal,</if>
127 134 <if test="belongRole != null">belong_role,</if>
128 135 <if test="boxMark != null">box_mark,</if>
  136 + <if test="expireDate != null">expire_date,</if>
  137 + <if test="remove != null">remove,</if>
129 138 <if test="borrowStatus != null">borrow_status,</if>
130 139 </trim>
131 140 <trim prefix="values (" suffix=")" suffixOverrides=",">
132 141 <if test="boxId != null">#{boxId},</if>
  142 + <if test="deptId != null">#{deptId},</if>
133 143 <if test="general != null">#{general},</if>
134 144 <if test="year != null">#{year},</if>
135 145 <if test="title != null">#{title},</if>
... ... @@ -163,6 +173,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
163 173 <if test="apprvoal != null">#{apprvoal},</if>
164 174 <if test="belongRole != null">#{belongRole},</if>
165 175 <if test="boxMark != null">#{boxMark},</if>
  176 + <if test="expireDate != null">#{expireDate},</if>
  177 + <if test="remove != null">#{remove},</if>
166 178 <if test="borrowStatus != null">#{borrowStatus},</if>
167 179 </trim>
168 180 </insert>
... ... @@ -171,6 +183,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
171 183 update archives_collect_box
172 184 <trim prefix="SET" suffixOverrides=",">
173 185 <if test="boxId != null">box_id = #{boxId},</if>
  186 + <if test="deptId != null">dept_id = #{deptId},</if>
174 187 <if test="general != null">general = #{general},</if>
175 188 <if test="year != null">year = #{year},</if>
176 189 <if test="title != null">title = #{title},</if>
... ... @@ -204,7 +217,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
204 217 <if test="apprvoal != null">apprvoal = #{apprvoal},</if>
205 218 <if test="belongRole != null">belong_role = #{belongRole},</if>
206 219 <if test="boxMark != null">box_mark = #{boxMark},</if>
207   - <if test="borrowStatus != null">borrow_status = #{borrowStatus},</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>
208 223 </trim>
209 224 where id = #{id}
210 225 </update>
... ...
ruoyi-ui/src/views/archives/box/filingindex.vue
  View file @4eb2ddd
... ... @@ -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/collerctbox/filingindex.vue
  View file @4eb2ddd
... ... @@ -148,8 +148,6 @@
148 148 <el-table-column label="页次" align="center" prop="page" />
149 149 <el-table-column label="文号" align="center" prop="documentMark" />
150 150 <el-table-column label="原文" align="center" prop="text" />
151   - <el-table-column label="1.待整理 2.待审批" align="center" prop="apprvoal" />
152   - <el-table-column label="该文本属于哪个角色" align="center" prop="belongRole" />
153 151 <el-table-column label="盒号" align="center" prop="boxMark" />
154 152 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="titleshow">
155 153 <template slot-scope="scope">
... ... @@ -224,62 +222,91 @@
224 222 <el-input v-model="form.filingNumber" placeholder="请输入归档份数" />
225 223 </el-form-item>
226 224 </el-col>
  225 +
  226 + </el-row>
  227 + <el-row>
  228 + <el-col :span="6">
  229 + <el-form-item label="在库份数" prop="zkNumber">
  230 + <el-input v-model="form.zkNumber" placeholder="请输入在库份数" />
  231 + </el-form-item>
  232 + </el-col>
  233 + <el-col :span="6">
  234 + <el-form-item label="库位码" prop="locationCode">
  235 + <el-input v-model="form.locationCode" placeholder="请输入库位码" />
  236 + </el-form-item>
  237 + </el-col>
  238 + <el-col :span="6">
  239 + <el-form-item label="归档部门" prop="filingDept">
  240 + <el-input v-model="form.filingDept" placeholder="请输入归档部门" />
  241 + </el-form-item>
  242 + </el-col>
  243 + <el-col :span="6">
  244 + <el-form-item label="档号" prop="archivalCode">
  245 + <el-input v-model="form.archivalCode" placeholder="请输入档号" />
  246 + </el-form-item>
  247 + </el-col>
  248 + </el-row>
  249 + <el-row>
  250 + <el-col :span="6">
  251 + <el-form-item label="责任者" prop="responsibilityName">
  252 + <el-input v-model="form.responsibilityName" placeholder="请输入责任者" />
  253 + </el-form-item>
  254 + </el-col>
  255 + <el-col :span="6">
  256 + <el-form-item label="序号" prop="serialMark">
  257 + <el-input v-model="form.serialMark" placeholder="请输入序号" />
  258 + </el-form-item>
  259 + </el-col>
  260 + <el-col :span="6">
  261 + <el-form-item label="件号" prop="pieceMark">
  262 + <el-input v-model="form.pieceMark" placeholder="请输入件号" />
  263 + </el-form-item>
  264 + </el-col>
  265 + <el-col :span="6">
  266 + <el-form-item label="登记号" prop="registerMark">
  267 + <el-input v-model="form.registerMark" placeholder="请输入登记号" />
  268 + </el-form-item>
  269 + </el-col>
  270 + </el-row>
  271 + <el-row>
  272 + <el-col :span="6">
  273 + <el-form-item label="参议人员" prop="counsellors">
  274 + <el-input v-model="form.counsellors" placeholder="请输入参议人员" />
  275 + </el-form-item>
  276 + </el-col>
  277 + <el-col :span="6">
  278 + <el-form-item label="归档人" prop="filingName">
  279 + <el-input v-model="form.filingName" placeholder="请输入归档人" />
  280 + </el-form-item>
  281 + </el-col>
  282 + <el-col :span="6">
  283 + <el-form-item label="纪要人" prop="summaryName">
  284 + <el-input v-model="form.summaryName" placeholder="请输入纪要人" />
  285 + </el-form-item>
  286 + </el-col>
  287 + <el-col :span="6">
  288 + <el-form-item label="拟稿人" prop="draftName">
  289 + <el-input v-model="form.draftName" placeholder="请输入拟稿人" />
  290 + </el-form-item>
  291 + </el-col>
  292 + </el-row>
  293 + <el-row>
  294 + <el-col :span="6">
  295 + <el-form-item label="页次" prop="page">
  296 + <el-input v-model="form.page" placeholder="请输入页次" />
  297 + </el-form-item>
  298 + </el-col>
  299 + <el-col :span="6">
  300 + <el-form-item label="文号" prop="documentMark">
  301 + <el-input v-model="form.documentMark" placeholder="请输入文号" />
  302 + </el-form-item>
  303 + </el-col>
  304 + <el-col :span="6">
  305 + <el-form-item label="原文" prop="text">
  306 + <el-input v-model="form.text" placeholder="请输入原文" />
  307 + </el-form-item>
  308 + </el-col>
227 309 </el-row>
228   - <!-- <el-form-item label="在库份数" prop="zkNumber">
229   - <el-input v-model="form.zkNumber" placeholder="请输入在库份数" />
230   - </el-form-item>
231   - <el-form-item label="库位码" prop="locationCode">
232   - <el-input v-model="form.locationCode" placeholder="请输入库位码" />
233   - </el-form-item>
234   - <el-form-item label="归档部门" prop="filingDept">
235   - <el-input v-model="form.filingDept" placeholder="请输入归档部门" />
236   - </el-form-item>
237   - <el-form-item label="档号" prop="archivalCode">
238   - <el-input v-model="form.archivalCode" placeholder="请输入档号" />
239   - </el-form-item>
240   - <el-form-item label="责任者" prop="responsibilityName">
241   - <el-input v-model="form.responsibilityName" placeholder="请输入责任者" />
242   - </el-form-item>
243   - <el-form-item label="序号" prop="serialMark">
244   - <el-input v-model="form.serialMark" placeholder="请输入序号" />
245   - </el-form-item>
246   - <el-form-item label="件号" prop="pieceMark">
247   - <el-input v-model="form.pieceMark" placeholder="请输入件号" />
248   - </el-form-item>
249   - <el-form-item label="登记号" prop="registerMark">
250   - <el-input v-model="form.registerMark" placeholder="请输入登记号" />
251   - </el-form-item>
252   - <el-form-item label="参议人员" prop="counsellors">
253   - <el-input v-model="form.counsellors" placeholder="请输入参议人员" />
254   - </el-form-item>
255   - <el-form-item label="归档人" prop="filingName">
256   - <el-input v-model="form.filingName" placeholder="请输入归档人" />
257   - </el-form-item>
258   - <el-form-item label="纪要人" prop="summaryName">
259   - <el-input v-model="form.summaryName" placeholder="请输入纪要人" />
260   - </el-form-item>
261   - <el-form-item label="拟稿人" prop="draftName">
262   - <el-input v-model="form.draftName" placeholder="请输入拟稿人" />
263   - </el-form-item>
264   - <el-form-item label="页次" prop="page">
265   - <el-input v-model="form.page" placeholder="请输入页次" />
266   - </el-form-item>
267   - <el-form-item label="文号" prop="documentMark">
268   - <el-input v-model="form.documentMark" placeholder="请输入文号" />
269   - </el-form-item>
270   - <el-form-item label="原文" prop="text">
271   - <el-input v-model="form.text" placeholder="请输入原文" />
272   - </el-form-item>
273   -
274   - <el-form-item label="1.待整理 2.待审批" prop="apprvoal">
275   - <el-input v-model="form.apprvoal" placeholder="请输入1.待整理 2.待审批" />
276   - </el-form-item>
277   - <el-form-item label="该文本属于哪个角色" prop="belongRole">
278   - <el-input v-model="form.belongRole" placeholder="请输入该文本属于哪个角色" />
279   - </el-form-item>
280   - <el-form-item label="盒号" prop="boxMark">
281   - <el-input v-model="form.boxMark" placeholder="请输入盒号" />
282   - </el-form-item>-->
283 310 </el-form>
284 311 <div slot="footer" class="dialog-footer">
285 312 <el-button type="primary" @click="submitForm">确 定</el-button>
... ... @@ -348,6 +375,9 @@ export default {
348 375 },
349 376 boxsId: {
350 377 type: Number,
  378 + },
  379 + deptId: {
  380 + type: Number,
351 381 }
352 382 },
353 383  
... ... @@ -441,9 +471,11 @@ export default {
441 471 /** 查询【登记著录】列表 */
442 472 getList() {
443 473 this.loading = true;
444   - this.queryParams.apprvoal = this.approval; //预归档
  474 + this.queryParams.deptId = this.deptId; //部门
  475 + this.queryParams.apprvoal = this.approval; //归档
445 476 this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
446 477 this.queryParams.status = this.statusPd;
  478 + this.queryParams.remove = 0; //未删除数据
447 479 listCollerBox(this.queryParams).then(response => {
448 480 this.boxList = response.rows;
449 481 this.total = response.total;
... ... @@ -520,7 +552,7 @@ export default {
520 552 getBox(id).then(response => {
521 553 this.form = response.data;
522 554 this.open = true;
523   - this.title = "修改【22】";
  555 + this.title = "修改档案";
524 556 });
525 557 },
526 558 /** 提交按钮 */
... ... @@ -585,6 +617,7 @@ export default {
585 617 updateBox(from).then(response => {
586 618 this.$modal.msgSuccess("提交成功");
587 619 this.boxOpen = false;
  620 + this.getList();
588 621 });
589 622 });
590 623 },
... ...
ruoyi-ui/src/views/archives/collerctbox/index.vue
  View file @4eb2ddd
... ... @@ -39,9 +39,6 @@
39 39 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
40 40 </el-form-item>
41 41 </el-form>
42   -
43   -
44   -
45 42 <el-row :gutter="10" class="mb8" v-if="titleshow">
46 43 <el-col :span="1.5" v-if="approvalStatus">
47 44 <el-select v-model="approval" @change="approvalpuRefresh">
... ... @@ -188,8 +185,6 @@
188 185 <el-table-column label="页次" align="center" prop="page" />
189 186 <el-table-column label="文号" align="center" prop="documentMark" />
190 187 <el-table-column label="原文" align="center" prop="text" />
191   - <el-table-column label="1.待整理 2.待审批" align="center" prop="apprvoal" />
192   - <el-table-column label="该文本属于哪个角色" align="center" prop="belongRole" />
193 188 <el-table-column label="盒号" align="center" prop="boxMark" />
194 189 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="titleshow">
195 190 <template slot-scope="scope">
... ... @@ -229,19 +224,19 @@
229 224 </el-form-item>
230 225 </el-col>
231 226 <el-col :span="6">
232   - <el-form-item label="年度" prop="year">
233   - <el-input v-model="form.year" placeholder="请输入年度" />
234   - </el-form-item>
  227 + <el-form-item label="年度" prop="year">
  228 + <el-input v-model="form.year" placeholder="请输入年度" />
  229 + </el-form-item>
  230 + </el-col>
  231 + <el-col :span="6">
  232 + <el-form-item label="题名" prop="title">
  233 + <el-input v-model="form.title" placeholder="请输入题名" />
  234 + </el-form-item>
235 235 </el-col>
236   - <el-col :span="6">
237   - <el-form-item label="题名" prop="title">
238   - <el-input v-model="form.title" placeholder="请输入题名" />
239   - </el-form-item>
240   - </el-col>
241 236 <el-col :span="6">
242   - <el-form-item label="分类号" prop="sort">
243   - <el-input v-model="form.sort" placeholder="请输入分类号" />
244   - </el-form-item>
  237 + <el-form-item label="分类号" prop="sort">
  238 + <el-input v-model="form.sort" placeholder="请输入分类号" />
  239 + </el-form-item>
245 240 </el-col>
246 241 </el-row>
247 242 <el-row>
... ... @@ -256,76 +251,105 @@
256 251 </el-form-item>
257 252 </el-col>
258 253 <el-col :span="6">
259   - <el-form-item label="密级" prop="secretLevel">
260   - <el-input v-model="form.secretLevel" placeholder="请输入密级" />
261   - </el-form-item>
  254 + <el-form-item label="密级" prop="secretLevel">
  255 + <el-input v-model="form.secretLevel" placeholder="请输入密级" />
  256 + </el-form-item>
262 257 </el-col>
263   - <el-col :span="6">
264   - <el-form-item label="页数" prop="pages">
265   - <el-input v-model="form.pages" placeholder="请输入页数" />
266   - </el-form-item>
267   - </el-col>
268 258 <el-col :span="6">
269   - <el-form-item label="归档份数" prop="filingNumber">
270   - <el-input v-model="form.filingNumber" placeholder="请输入归档份数" />
271   - </el-form-item>
  259 + <el-form-item label="页数" prop="pages">
  260 + <el-input v-model="form.pages" placeholder="请输入页数" />
  261 + </el-form-item>
  262 + </el-col>
  263 + <el-col :span="6">
  264 + <el-form-item label="归档份数" prop="filingNumber">
  265 + <el-input v-model="form.filingNumber" placeholder="请输入归档份数" />
  266 + </el-form-item>
272 267 </el-col>
273   - </el-row>
274   -<!-- <el-form-item label="在库份数" prop="zkNumber">
275   - <el-input v-model="form.zkNumber" placeholder="请输入在库份数" />
276   - </el-form-item>
277   - <el-form-item label="库位码" prop="locationCode">
278   - <el-input v-model="form.locationCode" placeholder="请输入库位码" />
279   - </el-form-item>
280   - <el-form-item label="归档部门" prop="filingDept">
281   - <el-input v-model="form.filingDept" placeholder="请输入归档部门" />
282   - </el-form-item>
283   - <el-form-item label="档号" prop="archivalCode">
284   - <el-input v-model="form.archivalCode" placeholder="请输入档号" />
285   - </el-form-item>
286   - <el-form-item label="责任者" prop="responsibilityName">
287   - <el-input v-model="form.responsibilityName" placeholder="请输入责任者" />
288   - </el-form-item>
289   - <el-form-item label="序号" prop="serialMark">
290   - <el-input v-model="form.serialMark" placeholder="请输入序号" />
291   - </el-form-item>
292   - <el-form-item label="件号" prop="pieceMark">
293   - <el-input v-model="form.pieceMark" placeholder="请输入件号" />
294   - </el-form-item>
295   - <el-form-item label="登记号" prop="registerMark">
296   - <el-input v-model="form.registerMark" placeholder="请输入登记号" />
297   - </el-form-item>
298   - <el-form-item label="参议人员" prop="counsellors">
299   - <el-input v-model="form.counsellors" placeholder="请输入参议人员" />
300   - </el-form-item>
301   - <el-form-item label="归档人" prop="filingName">
302   - <el-input v-model="form.filingName" placeholder="请输入归档人" />
303   - </el-form-item>
304   - <el-form-item label="纪要人" prop="summaryName">
305   - <el-input v-model="form.summaryName" placeholder="请输入纪要人" />
306   - </el-form-item>
307   - <el-form-item label="拟稿人" prop="draftName">
308   - <el-input v-model="form.draftName" placeholder="请输入拟稿人" />
309   - </el-form-item>
310   - <el-form-item label="页次" prop="page">
311   - <el-input v-model="form.page" placeholder="请输入页次" />
312   - </el-form-item>
313   - <el-form-item label="文号" prop="documentMark">
314   - <el-input v-model="form.documentMark" placeholder="请输入文号" />
315   - </el-form-item>
316   - <el-form-item label="原文" prop="text">
317   - <el-input v-model="form.text" placeholder="请输入原文" />
318   - </el-form-item>
319 268  
320   - <el-form-item label="1.待整理 2.待审批" prop="apprvoal">
321   - <el-input v-model="form.apprvoal" placeholder="请输入1.待整理 2.待审批" />
322   - </el-form-item>
323   - <el-form-item label="该文本属于哪个角色" prop="belongRole">
324   - <el-input v-model="form.belongRole" placeholder="请输入该文本属于哪个角色" />
325   - </el-form-item>
326   - <el-form-item label="盒号" prop="boxMark">
327   - <el-input v-model="form.boxMark" placeholder="请输入盒号" />
328   - </el-form-item>-->
  269 + </el-row>
  270 + <el-row>
  271 + <el-col :span="6">
  272 + <el-form-item label="在库份数" prop="zkNumber">
  273 + <el-input v-model="form.zkNumber" placeholder="请输入在库份数" />
  274 + </el-form-item>
  275 + </el-col>
  276 + <el-col :span="6">
  277 + <el-form-item label="库位码" prop="locationCode">
  278 + <el-input v-model="form.locationCode" placeholder="请输入库位码" />
  279 + </el-form-item>
  280 + </el-col>
  281 + <el-col :span="6">
  282 + <el-form-item label="归档部门" prop="filingDept">
  283 + <el-input v-model="form.filingDept" placeholder="请输入归档部门" />
  284 + </el-form-item>
  285 + </el-col>
  286 + <el-col :span="6">
  287 + <el-form-item label="档号" prop="archivalCode">
  288 + <el-input v-model="form.archivalCode" placeholder="请输入档号" />
  289 + </el-form-item>
  290 + </el-col>
  291 + </el-row>
  292 + <el-row>
  293 + <el-col :span="6">
  294 + <el-form-item label="责任者" prop="responsibilityName">
  295 + <el-input v-model="form.responsibilityName" placeholder="请输入责任者" />
  296 + </el-form-item>
  297 + </el-col>
  298 + <el-col :span="6">
  299 + <el-form-item label="序号" prop="serialMark">
  300 + <el-input v-model="form.serialMark" placeholder="请输入序号" />
  301 + </el-form-item>
  302 + </el-col>
  303 + <el-col :span="6">
  304 + <el-form-item label="件号" prop="pieceMark">
  305 + <el-input v-model="form.pieceMark" placeholder="请输入件号" />
  306 + </el-form-item>
  307 + </el-col>
  308 + <el-col :span="6">
  309 + <el-form-item label="登记号" prop="registerMark">
  310 + <el-input v-model="form.registerMark" placeholder="请输入登记号" />
  311 + </el-form-item>
  312 + </el-col>
  313 + </el-row>
  314 + <el-row>
  315 + <el-col :span="6">
  316 + <el-form-item label="参议人员" prop="counsellors">
  317 + <el-input v-model="form.counsellors" placeholder="请输入参议人员" />
  318 + </el-form-item>
  319 + </el-col>
  320 + <el-col :span="6">
  321 + <el-form-item label="归档人" prop="filingName">
  322 + <el-input v-model="form.filingName" placeholder="请输入归档人" />
  323 + </el-form-item>
  324 + </el-col>
  325 + <el-col :span="6">
  326 + <el-form-item label="纪要人" prop="summaryName">
  327 + <el-input v-model="form.summaryName" placeholder="请输入纪要人" />
  328 + </el-form-item>
  329 + </el-col>
  330 + <el-col :span="6">
  331 + <el-form-item label="拟稿人" prop="draftName">
  332 + <el-input v-model="form.draftName" placeholder="请输入拟稿人" />
  333 + </el-form-item>
  334 + </el-col>
  335 + </el-row>
  336 + <el-row>
  337 + <el-col :span="6">
  338 + <el-form-item label="页次" prop="page">
  339 + <el-input v-model="form.page" placeholder="请输入页次" />
  340 + </el-form-item>
  341 + </el-col>
  342 + <el-col :span="6">
  343 + <el-form-item label="文号" prop="documentMark">
  344 + <el-input v-model="form.documentMark" placeholder="请输入文号" />
  345 + </el-form-item>
  346 + </el-col>
  347 + <el-col :span="6">
  348 + <el-form-item label="原文" prop="text">
  349 + <el-input v-model="form.text" placeholder="请输入原文" />
  350 + </el-form-item>
  351 + </el-col>
  352 + </el-row>
329 353 </el-form>
330 354 <div slot="footer" class="dialog-footer">
331 355 <el-button type="primary" @click="submitForm">确 定</el-button>
... ... @@ -372,7 +396,11 @@ export default {
372 396 },
373 397 boxsId: {
374 398 type: Number,
  399 + },
  400 + deptId: {
  401 + type: Number,
375 402 }
  403 +
376 404 },
377 405  
378 406 data() {
... ... @@ -474,10 +502,10 @@ export default {
474 502 if (this.statusPd == "1"){ //已整理文件 固定是2
475 503 this.queryParams.apprvoal = "2";
476 504 }
477   -
478   -
  505 + this.queryParams.deptId = this.deptId; //部门
479 506 this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
480 507 this.queryParams.status = this.statusPd;
  508 + this.queryParams.remove = 0; //未删除数据
481 509 listCollerBox(this.queryParams).then(response => {
482 510 this.boxList = response.rows;
483 511 this.total = response.total;
... ... @@ -550,7 +578,7 @@ export default {
550 578 handleAdd() {
551 579 this.reset();
552 580 this.open = true;
553   - this.title = "添加【11】";
  581 + this.title = "添加档案";
554 582 },
555 583 /** 修改按钮操作 */
556 584 handleUpdate(row) {
... ... @@ -559,7 +587,7 @@ export default {
559 587 getBox(id).then(response => {
560 588 this.form = response.data;
561 589 this.open = true;
562   - this.title = "修改【22】";
  590 + this.title = "修改档案";
563 591 });
564 592 },
565 593 /** 提交按钮 */
... ... @@ -573,7 +601,7 @@ export default {
573 601 this.getList();
574 602 });
575 603 } else {
576   - this.form.approval = "0" //初始创建所有都是0.待整理
  604 + this.form.deptId = this.deptId;
577 605 addBox(this.form).then(response => {
578 606 this.$modal.msgSuccess("新增成功");
579 607 this.open = false;
... ... @@ -641,7 +669,7 @@ export default {
641 669 return;
642 670 }
643 671 let collerboxid = this.collerboxid;
644   - getBox(id).then(response => {
  672 + getBox(collerboxid).then(response => {
645 673 let from = response.data;
646 674 from.boxId = id + ""; //盒id
647 675 from.status = "2";
... ...
ruoyi-ui/src/views/archives/collerctbox/yfilingindex.vue
  View file @4eb2ddd
... ... @@ -159,8 +159,6 @@
159 159 <el-table-column label="页次" align="center" prop="page" />
160 160 <el-table-column label="文号" align="center" prop="documentMark" />
161 161 <el-table-column label="原文" align="center" prop="text" />
162   - <el-table-column label="1.待整理 2.待审批" align="center" prop="apprvoal" />
163   - <el-table-column label="该文本属于哪个角色" align="center" prop="belongRole" />
164 162 <el-table-column label="盒号" align="center" prop="boxMark" />
165 163 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="titleshow">
166 164 <template slot-scope="scope">
... ... @@ -194,103 +192,132 @@
194 192 </el-form-item>
195 193 </el-col>
196 194 <el-col :span="6">
197   - <el-form-item label="年度" prop="year">
198   - <el-input v-model="form.year" placeholder="请输入年度" />
199   - </el-form-item>
  195 + <el-form-item label="年度" prop="year">
  196 + <el-input v-model="form.year" placeholder="请输入年度" />
  197 + </el-form-item>
  198 + </el-col>
  199 + <el-col :span="6">
  200 + <el-form-item label="题名" prop="title">
  201 + <el-input v-model="form.title" placeholder="请输入题名" />
  202 + </el-form-item>
200 203 </el-col>
201   - <el-col :span="6">
202   - <el-form-item label="题名" prop="title">
203   - <el-input v-model="form.title" placeholder="请输入题名" />
204   - </el-form-item>
205   - </el-col>
206 204 <el-col :span="6">
207   - <el-form-item label="分类号" prop="sort">
208   - <el-input v-model="form.sort" placeholder="请输入分类号" />
209   - </el-form-item>
  205 + <el-form-item label="分类号" prop="sort">
  206 + <el-input v-model="form.sort" placeholder="请输入分类号" />
  207 + </el-form-item>
210 208 </el-col>
211 209 </el-row>
212 210 <el-row>
213 211 <el-col :span="6">
214 212 <el-form-item label="保管期限" prop="safekeepingDate">
215 213 <el-date-picker clearable
216   - v-model="form.safekeepingDate"
217   - type="date"
218   - value-format="yyyy-MM-dd"
219   - placeholder="请选择保管期限">
  214 + v-model="form.safekeepingDate"
  215 + type="date"
  216 + value-format="yyyy-MM-dd"
  217 + placeholder="请选择保管期限">
220 218 </el-date-picker>
221 219 </el-form-item>
222 220 </el-col>
223 221 <el-col :span="6">
224   - <el-form-item label="密级" prop="secretLevel">
225   - <el-input v-model="form.secretLevel" placeholder="请输入密级" />
226   - </el-form-item>
  222 + <el-form-item label="密级" prop="secretLevel">
  223 + <el-input v-model="form.secretLevel" placeholder="请输入密级" />
  224 + </el-form-item>
  225 + </el-col>
  226 + <el-col :span="6">
  227 + <el-form-item label="页数" prop="pages">
  228 + <el-input v-model="form.pages" placeholder="请输入页数" />
  229 + </el-form-item>
  230 + </el-col>
  231 + <el-col :span="6">
  232 + <el-form-item label="归档份数" prop="filingNumber">
  233 + <el-input v-model="form.filingNumber" placeholder="请输入归档份数" />
  234 + </el-form-item>
  235 + </el-col>
  236 +
  237 + </el-row>
  238 + <el-row>
  239 + <el-col :span="6">
  240 + <el-form-item label="在库份数" prop="zkNumber">
  241 + <el-input v-model="form.zkNumber" placeholder="请输入在库份数" />
  242 + </el-form-item>
  243 + </el-col>
  244 + <el-col :span="6">
  245 + <el-form-item label="库位码" prop="locationCode">
  246 + <el-input v-model="form.locationCode" placeholder="请输入库位码" />
  247 + </el-form-item>
  248 + </el-col>
  249 + <el-col :span="6">
  250 + <el-form-item label="归档部门" prop="filingDept">
  251 + <el-input v-model="form.filingDept" placeholder="请输入归档部门" />
  252 + </el-form-item>
  253 + </el-col>
  254 + <el-col :span="6">
  255 + <el-form-item label="档号" prop="archivalCode">
  256 + <el-input v-model="form.archivalCode" placeholder="请输入档号" />
  257 + </el-form-item>
  258 + </el-col>
  259 + </el-row>
  260 + <el-row>
  261 + <el-col :span="6">
  262 + <el-form-item label="责任者" prop="responsibilityName">
  263 + <el-input v-model="form.responsibilityName" placeholder="请输入责任者" />
  264 + </el-form-item>
  265 + </el-col>
  266 + <el-col :span="6">
  267 + <el-form-item label="序号" prop="serialMark">
  268 + <el-input v-model="form.serialMark" placeholder="请输入序号" />
  269 + </el-form-item>
  270 + </el-col>
  271 + <el-col :span="6">
  272 + <el-form-item label="件号" prop="pieceMark">
  273 + <el-input v-model="form.pieceMark" placeholder="请输入件号" />
  274 + </el-form-item>
  275 + </el-col>
  276 + <el-col :span="6">
  277 + <el-form-item label="登记号" prop="registerMark">
  278 + <el-input v-model="form.registerMark" placeholder="请输入登记号" />
  279 + </el-form-item>
  280 + </el-col>
  281 + </el-row>
  282 + <el-row>
  283 + <el-col :span="6">
  284 + <el-form-item label="参议人员" prop="counsellors">
  285 + <el-input v-model="form.counsellors" placeholder="请输入参议人员" />
  286 + </el-form-item>
  287 + </el-col>
  288 + <el-col :span="6">
  289 + <el-form-item label="归档人" prop="filingName">
  290 + <el-input v-model="form.filingName" placeholder="请输入归档人" />
  291 + </el-form-item>
  292 + </el-col>
  293 + <el-col :span="6">
  294 + <el-form-item label="纪要人" prop="summaryName">
  295 + <el-input v-model="form.summaryName" placeholder="请输入纪要人" />
  296 + </el-form-item>
  297 + </el-col>
  298 + <el-col :span="6">
  299 + <el-form-item label="拟稿人" prop="draftName">
  300 + <el-input v-model="form.draftName" placeholder="请输入拟稿人" />
  301 + </el-form-item>
  302 + </el-col>
  303 + </el-row>
  304 + <el-row>
  305 + <el-col :span="6">
  306 + <el-form-item label="页次" prop="page">
  307 + <el-input v-model="form.page" placeholder="请输入页次" />
  308 + </el-form-item>
227 309 </el-col>
228   - <el-col :span="6">
229   - <el-form-item label="页数" prop="pages">
230   - <el-input v-model="form.pages" placeholder="请输入页数" />
231   - </el-form-item>
232   - </el-col>
233 310 <el-col :span="6">
234   - <el-form-item label="归档份数" prop="filingNumber">
235   - <el-input v-model="form.filingNumber" placeholder="请输入归档份数" />
236   - </el-form-item>
  311 + <el-form-item label="文号" prop="documentMark">
  312 + <el-input v-model="form.documentMark" placeholder="请输入文号" />
  313 + </el-form-item>
  314 + </el-col>
  315 + <el-col :span="6">
  316 + <el-form-item label="原文" prop="text">
  317 + <el-input v-model="form.text" placeholder="请输入原文" />
  318 + </el-form-item>
237 319 </el-col>
238 320 </el-row>
239   -<!-- <el-form-item label="在库份数" prop="zkNumber">
240   - <el-input v-model="form.zkNumber" placeholder="请输入在库份数" />
241   - </el-form-item>
242   - <el-form-item label="库位码" prop="locationCode">
243   - <el-input v-model="form.locationCode" placeholder="请输入库位码" />
244   - </el-form-item>
245   - <el-form-item label="归档部门" prop="filingDept">
246   - <el-input v-model="form.filingDept" placeholder="请输入归档部门" />
247   - </el-form-item>
248   - <el-form-item label="档号" prop="archivalCode">
249   - <el-input v-model="form.archivalCode" placeholder="请输入档号" />
250   - </el-form-item>
251   - <el-form-item label="责任者" prop="responsibilityName">
252   - <el-input v-model="form.responsibilityName" placeholder="请输入责任者" />
253   - </el-form-item>
254   - <el-form-item label="序号" prop="serialMark">
255   - <el-input v-model="form.serialMark" placeholder="请输入序号" />
256   - </el-form-item>
257   - <el-form-item label="件号" prop="pieceMark">
258   - <el-input v-model="form.pieceMark" placeholder="请输入件号" />
259   - </el-form-item>
260   - <el-form-item label="登记号" prop="registerMark">
261   - <el-input v-model="form.registerMark" placeholder="请输入登记号" />
262   - </el-form-item>
263   - <el-form-item label="参议人员" prop="counsellors">
264   - <el-input v-model="form.counsellors" placeholder="请输入参议人员" />
265   - </el-form-item>
266   - <el-form-item label="归档人" prop="filingName">
267   - <el-input v-model="form.filingName" placeholder="请输入归档人" />
268   - </el-form-item>
269   - <el-form-item label="纪要人" prop="summaryName">
270   - <el-input v-model="form.summaryName" placeholder="请输入纪要人" />
271   - </el-form-item>
272   - <el-form-item label="拟稿人" prop="draftName">
273   - <el-input v-model="form.draftName" placeholder="请输入拟稿人" />
274   - </el-form-item>
275   - <el-form-item label="页次" prop="page">
276   - <el-input v-model="form.page" placeholder="请输入页次" />
277   - </el-form-item>
278   - <el-form-item label="文号" prop="documentMark">
279   - <el-input v-model="form.documentMark" placeholder="请输入文号" />
280   - </el-form-item>
281   - <el-form-item label="原文" prop="text">
282   - <el-input v-model="form.text" placeholder="请输入原文" />
283   - </el-form-item>
284   -
285   - <el-form-item label="1.待整理 2.待审批" prop="apprvoal">
286   - <el-input v-model="form.apprvoal" placeholder="请输入1.待整理 2.待审批" />
287   - </el-form-item>
288   - <el-form-item label="该文本属于哪个角色" prop="belongRole">
289   - <el-input v-model="form.belongRole" placeholder="请输入该文本属于哪个角色" />
290   - </el-form-item>
291   - <el-form-item label="盒号" prop="boxMark">
292   - <el-input v-model="form.boxMark" placeholder="请输入盒号" />
293   - </el-form-item>-->
294 321 </el-form>
295 322 <div slot="footer" class="dialog-footer">
296 323 <el-button type="primary" @click="submitForm">确 定</el-button>
... ... @@ -531,7 +558,7 @@ export default {
531 558 getBox(id).then(response => {
532 559 this.form = response.data;
533 560 this.open = true;
534   - this.title = "修改【22】";
  561 + this.title = "修改文件";
535 562 });
536 563 },
537 564 /** 提交按钮 */
... ...
ruoyi-ui/src/views/archives/filing.vue
  View file @4eb2ddd
... ... @@ -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 @4eb2ddd
... ... @@ -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/archives/remove/index.vue
  View file @4eb2ddd
1 1 <template>
  2 + <div class="app-container">
2 3  
  4 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" v-if="titleshow">
  5 + <el-form-item label="全宗号1" prop="general">
  6 + <el-input
  7 + v-model="queryParams.general"
  8 + placeholder="请输入全宗号"
  9 + clearable
  10 + @keyup.enter.native="handleQuery"
  11 + />
  12 + </el-form-item>
  13 + <el-form-item label="年度" prop="year">
  14 + <el-input
  15 + v-model="queryParams.year"
  16 + placeholder="请输入年度"
  17 + clearable
  18 + @keyup.enter.native="handleQuery"
  19 + />
  20 + </el-form-item>
  21 + <el-form-item label="题名" prop="title">
  22 + <el-input
  23 + v-model="queryParams.title"
  24 + placeholder="请输入题名"
  25 + clearable
  26 + @keyup.enter.native="handleQuery"
  27 + />
  28 + </el-form-item>
  29 + <el-form-item label="分类号" prop="sort">
  30 + <el-input
  31 + v-model="queryParams.sort"
  32 + placeholder="请输入分类号"
  33 + clearable
  34 + @keyup.enter.native="handleQuery"
  35 + />
  36 + </el-form-item>
  37 + <el-form-item>
  38 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  39 + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
  40 + </el-form-item>
  41 + </el-form>
  42 + <el-row :gutter="10" class="mb8">
  43 + <el-col :span="1.5" v-if="">
  44 + <el-button
  45 + type="warning"
  46 + plain
  47 + icon="el-icon-download"
  48 + size="mini"
  49 + @click="handleDelete"
  50 + v-hasPermi="['archives:collerctbox:commmit']"
  51 + >还原</el-button>
  52 + </el-col>
  53 +
  54 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
  55 + </el-row>
  56 +
  57 + <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
  58 + <el-table-column type="selection" width="55" align="center" />
  59 + <el-table-column label="操作" align="center" prop="year" >
  60 + <template slot-scope="scope">
  61 + <el-button
  62 + size="mini"
  63 + type="text"
  64 + icon="el-icon-edit"
  65 + @click="handleCheck(scope.row)"
  66 + v-hasPermi="['archives:box:check']"
  67 + >查看</el-button>
  68 + </template>
  69 + </el-table-column>
  70 + <el-table-column label="全宗号" align="center" prop="general" />
  71 + <el-table-column label="年度" align="center" prop="year" />
  72 + <el-table-column label="题名" align="center" prop="title" />
  73 + <el-table-column label="分类号" align="center" prop="sort" />
  74 + <el-table-column label="保管期限" align="center" prop="safekeepingDate" width="180">
  75 + <template slot-scope="scope">
  76 + <span>{{ parseTime(scope.row.safekeepingDate, '{y}-{m}-{d}') }}</span>
  77 + </template>
  78 + </el-table-column>
  79 + <el-table-column label="密级" align="center" prop="secretLevel" />
  80 + <el-table-column label="页数" align="center" prop="pages" />
  81 + <el-table-column label="归档份数" align="center" prop="filingNumber" />
  82 + <el-table-column label="在库份数" align="center" prop="zkNumber" />
  83 + <el-table-column label="库位码" align="center" prop="locationCode" />
  84 + <el-table-column label="归档部门" align="center" prop="filingDept" />
  85 + <el-table-column label="档号" align="center" prop="archivalCode" />
  86 + <el-table-column label="责任者" align="center" prop="responsibilityName" />
  87 + <el-table-column label="序号" align="center" prop="serialMark" />
  88 + <el-table-column label="件号" align="center" prop="pieceMark" />
  89 + <el-table-column label="登记号" align="center" prop="registerMark" />
  90 + <el-table-column label="参议人员" align="center" prop="counsellors" />
  91 + <el-table-column label="归档人" align="center" prop="filingName" />
  92 + <el-table-column label="纪要人" align="center" prop="summaryName" />
  93 + <el-table-column label="文种" align="center" prop="recordType" />
  94 + <el-table-column label="载体类型" align="center" prop="carrierType" />
  95 + <el-table-column label="拟稿人" align="center" prop="draftName" />
  96 + <el-table-column label="页次" align="center" prop="page" />
  97 + <el-table-column label="文号" align="center" prop="documentMark" />
  98 + <el-table-column label="原文" align="center" prop="text" />
  99 + <el-table-column label="盒号" align="center" prop="boxMark" />
  100 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="titleshow">
  101 + <template slot-scope="scope">
  102 + <el-button
  103 + size="mini"
  104 + type="text"
  105 + icon="el-icon-edit"
  106 + @click="handleUpdate(scope.row)"
  107 + v-hasPermi="['archives:collerctbox:edit']"
  108 + >修改</el-button>
  109 + <el-button
  110 + size="mini"
  111 + type="text"
  112 + icon="el-icon-delete"
  113 + @click="handleDelete(scope.row)"
  114 + v-hasPermi="['archives:collerctbox:remove']"
  115 + >删除</el-button>
  116 + </template>
  117 + </el-table-column>
  118 + </el-table>
  119 +
  120 + <pagination
  121 + v-show="total>0"
  122 + :total="total"
  123 + :page.sync="queryParams.pageNum"
  124 + :limit.sync="queryParams.pageSize"
  125 + @pagination="getList"
  126 + />
  127 +
  128 +
  129 +
  130 + </div>
3 131 </template>
4 132  
5 133 <script>
  134 +import { listCollerBox, getBox, delBox, addBox, updateBox,updatedelBox } from "@/api/archives/collerctbox";
  135 +import { listBox } from "@/api/archives/box";
  136 +
  137 +import file from "@/views/archives/file/index.vue";
6 138 export default {
7   - name: "index"
8   -}
9   -</script>
  139 + name: "collerctbox",
  140 + dicts: ['approval_type'],
  141 + components: { file },
  142 + data() {
  143 + return {
  144 + // 遮罩层
  145 + loading: true,
  146 + // 选中数组
  147 + ids: [],
  148 + // 非单个禁用
  149 + single: true,
  150 + // 非多个禁用
  151 + multiple: true,
  152 + // 显示搜索条件
  153 + showSearch: true,
  154 + // 总条数
  155 + total: 0,
  156 + // 【登记著录】表格数据
  157 + boxList: [],
  158 + boxtwoList: [],
  159 + // 弹出层标题
  160 + title: "",
  161 + // 是否显示弹出层
  162 + open: false,
  163 + // 查询参数
  164 + queryParams: {
  165 + pageNum: 1,
  166 + pageSize: 10,
  167 + general: null,
  168 + year: null,
  169 + title: null,
  170 + sort: null,
  171 + safekeepingDate: null,
  172 + secretLevel: null,
  173 + pages: null,
  174 + filingNumber: null,
  175 + zkNumber: null,
  176 + locationCode: null,
  177 + filingDept: null,
  178 + archivalCode: null,
  179 + responsibilityName: null,
  180 + serialMark: null,
  181 + pieceMark: null,
  182 + registerMark: null,
  183 + counsellors: null,
  184 + filingName: null,
  185 + summaryName: null,
  186 + recordType: null,
  187 + carrierType: null,
  188 + draftName: null,
  189 + page: null,
  190 + documentMark: null,
  191 + text: null,
  192 + status: null,
  193 + apprvoal: null,
  194 + belongRole: null,
  195 + boxMark: null,
  196 + },
  197 + // 表单参数
  198 + form: {},
  199 + // 表单校验
  200 + rules: {
  201 + },
  202 + remove : "1", //是否审批 //默认待整理
  203 +
  204 + };
  205 + },
  206 + //statusPd 0未整理文件 1 已整理文件 2 盒
  207 + created() {
  208 + this.getList();
  209 +
  210 + },
  211 + methods: {
  212 + /** 查询【登记著录】列表 */
  213 + getList() {
  214 + this.queryParams.remove = this.remove;
  215 + listCollerBox(this.queryParams).then(response => {
  216 + this.boxList = response.rows;
  217 + this.total = response.total;
  218 + this.loading = false;
  219 + });
  220 + },
  221 + // 取消按钮
  222 + cancel() {
  223 + this.boxOpen = false;
  224 + this.open = false;
  225 + this.reset();
  226 + },
10 227  
11   -<style scoped>
  228 + /** 搜索按钮操作 */
  229 + handleQuery() {
  230 + this.queryParams.pageNum = 1;
  231 + this.getList();
  232 + },
  233 + /** 重置按钮操作 */
  234 + resetQuery() {
  235 + this.resetForm("queryForm");
  236 + this.handleQuery();
  237 + },
  238 + // 多选框选中数据
  239 + handleSelectionChange(selection) {
  240 + this.ids = selection.map(item => item.id)
  241 + this.single = selection.length!==1
  242 + this.multiple = !selection.length
  243 + },
12 244  
13   -</style>
  245 + /** 删除按钮操作 */
  246 + handleDelete(row) {
  247 + const ids = row.id || this.ids;
  248 + let remove = 0;
  249 + this.$modal.confirm('是否确认还原【登记著录】编号为"' + ids + '"的数据项？').then(function() {
  250 + return updatedelBox(ids,remove);
  251 + }).then(() => {
  252 + this.getList();
  253 + this.$modal.msgSuccess("还原成功");
  254 + }).catch(() => {});
  255 + },
  256 +
  257 +
  258 + }
  259 +};
  260 +</script>
... ...
ruoyi-ui/src/views/borrow/index.vue
  View file @4eb2ddd
1 1 <template>
2 2 <div class="app-container">
  3 + <el-row :gutter="20">
  4 + <!--部门数据-->
  5 + <el-col :span="4" :xs="24">
3 6  
4   - <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" >
  7 +
  8 +
  9 + <div class="head-container">
  10 + <el-input
  11 + v-model="deptName"
  12 + placeholder="请输入部门名称"
  13 + clearable
  14 + size="small"
  15 + prefix-icon="el-icon-search"
  16 + style="margin-bottom: 20px"
  17 + />
  18 + </div>
  19 + <div class="head-container">
  20 + <el-tree
  21 + :data="deptOptions"
  22 + :expand-on-click-node="false"
  23 + ref="tree"
  24 + default-expand-all
  25 + highlight-current
  26 + @node-click="handleNodeClick"
  27 + />
  28 + </div>
  29 + </el-col>
  30 + <el-col :span="20" :xs="24">
  31 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" >
5 32 <el-form-item label="全宗号1" prop="general">
6 33 <el-input
7 34 v-model="queryParams.general"
... ... @@ -42,73 +69,76 @@
42 69  
43 70  
44 71  
45   - <el-row :gutter="10" class="mb8">
46   - <el-col :span="1.5" >
47   - <el-button
48   - type="warning"
49   - plain
50   - icon="el-icon-download"
51   - size="mini"
52   - :disabled="single"
53   - @click="handleupdateborrow"
54   - v-hasPermi="['archives:collerctbox:inserBox']"
55   - >借阅</el-button>
56   - </el-col>
57   - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
58   - </el-row>
  72 + <el-row :gutter="10" class="mb8">
  73 + <el-col :span="1.5" >
  74 + <el-button
  75 + type="warning"
  76 + plain
  77 + icon="el-icon-download"
  78 + size="mini"
  79 + :disabled="single"
  80 + @click="handleupdateborrow"
  81 + v-hasPermi="['archives:collerctbox:inserBox']"
  82 + >借阅</el-button>
  83 + </el-col>
  84 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
  85 + </el-row>
59 86  
60   - <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
61   - <el-table-column type="selection" width="55" align="center" />
62   - <el-table-column label="操作" align="center" prop="year" >
63   - <template slot-scope="scope">
64   - <el-button
65   - size="mini"
66   - type="text"
67   - icon="el-icon-edit"
68   - @click="handleCheck(scope.row)"
69   - v-hasPermi="['archives:box:check']"
70   - >查看</el-button>
71   - </template>
72   - </el-table-column>
73   - <el-table-column label="全宗号" align="center" prop="general" />
74   - <el-table-column label="年度" align="center" prop="year" />
75   - <el-table-column label="题名" align="center" prop="title" />
76   - <el-table-column label="分类号" align="center" prop="sort" />
77   - <el-table-column label="保管期限" align="center" prop="safekeepingDate" width="180">
78   - <template slot-scope="scope">
79   - <span>{{ parseTime(scope.row.safekeepingDate, '{y}-{m}-{d}') }}</span>
80   - </template>
81   - </el-table-column>
82   - <el-table-column label="密级" align="center" prop="secretLevel" />
83   - <el-table-column label="页数" align="center" prop="pages" />
84   - <el-table-column label="归档份数" align="center" prop="filingNumber" />
85   - <el-table-column label="在库份数" align="center" prop="zkNumber" />
86   - <el-table-column label="库位码" align="center" prop="locationCode" />
87   - <el-table-column label="归档部门" align="center" prop="filingDept" />
88   - <el-table-column label="档号" align="center" prop="archivalCode" />
89   - <el-table-column label="责任者" align="center" prop="responsibilityName" />
90   - <el-table-column label="序号" align="center" prop="serialMark" />
91   - <el-table-column label="件号" align="center" prop="pieceMark" />
92   - <el-table-column label="登记号" align="center" prop="registerMark" />
93   - <el-table-column label="参议人员" align="center" prop="counsellors" />
94   - <el-table-column label="归档人" align="center" prop="filingName" />
95   - <el-table-column label="纪要人" align="center" prop="summaryName" />
96   - <el-table-column label="文种" align="center" prop="recordType" />
97   - <el-table-column label="载体类型" align="center" prop="carrierType" />
98   - <el-table-column label="拟稿人" align="center" prop="draftName" />
99   - <el-table-column label="页次" align="center" prop="page" />
100   - <el-table-column label="文号" align="center" prop="documentMark" />
101   - <el-table-column label="原文" align="center" prop="text" />
102   - <el-table-column label="盒号" align="center" prop="boxMark" />
103   - </el-table>
  87 + <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
  88 + <el-table-column type="selection" width="55" align="center" />
  89 + <el-table-column label="操作" align="center" prop="year" >
  90 + <template slot-scope="scope">
  91 + <el-button
  92 + size="mini"
  93 + type="text"
  94 + icon="el-icon-edit"
  95 + @click="handleCheck(scope.row)"
  96 + v-hasPermi="['archives:box:check']"
  97 + >查看</el-button>
  98 + </template>
  99 + </el-table-column>
  100 + <el-table-column label="全宗号" align="center" prop="general" />
  101 + <el-table-column label="年度" align="center" prop="year" />
  102 + <el-table-column label="题名" align="center" prop="title" />
  103 + <el-table-column label="分类号" align="center" prop="sort" />
  104 + <el-table-column label="保管期限" align="center" prop="safekeepingDate" width="180">
  105 + <template slot-scope="scope">
  106 + <span>{{ parseTime(scope.row.safekeepingDate, '{y}-{m}-{d}') }}</span>
  107 + </template>
  108 + </el-table-column>
  109 + <el-table-column label="密级" align="center" prop="secretLevel" />
  110 + <el-table-column label="页数" align="center" prop="pages" />
  111 + <el-table-column label="归档份数" align="center" prop="filingNumber" />
  112 + <el-table-column label="在库份数" align="center" prop="zkNumber" />
  113 + <el-table-column label="库位码" align="center" prop="locationCode" />
  114 + <el-table-column label="归档部门" align="center" prop="filingDept" />
  115 + <el-table-column label="档号" align="center" prop="archivalCode" />
  116 + <el-table-column label="责任者" align="center" prop="responsibilityName" />
  117 + <el-table-column label="序号" align="center" prop="serialMark" />
  118 + <el-table-column label="件号" align="center" prop="pieceMark" />
  119 + <el-table-column label="登记号" align="center" prop="registerMark" />
  120 + <el-table-column label="参议人员" align="center" prop="counsellors" />
  121 + <el-table-column label="归档人" align="center" prop="filingName" />
  122 + <el-table-column label="纪要人" align="center" prop="summaryName" />
  123 + <el-table-column label="文种" align="center" prop="recordType" />
  124 + <el-table-column label="载体类型" align="center" prop="carrierType" />
  125 + <el-table-column label="拟稿人" align="center" prop="draftName" />
  126 + <el-table-column label="页次" align="center" prop="page" />
  127 + <el-table-column label="文号" align="center" prop="documentMark" />
  128 + <el-table-column label="原文" align="center" prop="text" />
  129 + <el-table-column label="盒号" align="center" prop="boxMark" />
  130 + </el-table>
104 131  
105   - <pagination
106   - v-show="total>0"
107   - :total="total"
108   - :page.sync="queryParams.pageNum"
109   - :limit.sync="queryParams.pageSize"
110   - @pagination="getList"
111   - />
  132 + <pagination
  133 + v-show="total>0"
  134 + :total="total"
  135 + :page.sync="queryParams.pageNum"
  136 + :limit.sync="queryParams.pageSize"
  137 + @pagination="getList"
  138 + />
  139 +
  140 + </el-col>
  141 + </el-row>
112 142  
113 143  
114 144 <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
... ... @@ -160,8 +190,8 @@
160 190  
161 191 <el-row>
162 192 <el-col :span="12">
163   - <el-form-item label="档案门类" prop="borrowName1">
164   - <el-input v-model="form.borrowName1" placeholder="请输入借阅登记人" />
  193 + <el-form-item label="档案门类" prop="boxType">
  194 + <el-input v-model="form.boxType" placeholder="请输入借阅登记人" />
165 195 </el-form-item>
166 196  
167 197 </el-col>
... ... @@ -174,7 +204,7 @@
174 204  
175 205 <el-row>
176 206  
177   - <el-form-item label="借阅目的" prop="borrowName">
  207 + <el-form-item label="借阅目的" prop="borrowType">
178 208 <el-select v-model="form.borrowType" placeholder="请选择借阅目的">
179 209 <el-option
180 210 v-for="dict in dict.type.borrow_type"
... ... @@ -198,11 +228,10 @@
198 228 <td>题名</td>
199 229 </tr>
200 230 <tr style="border:1px solid #FFDCDF;">
201   - <td>11111111111</td>
202   - <td>222222222</td>
  231 + <td> <span>{{ CollertBox1 }}</span>
  232 + <td> <span>{{ CollertBox2 }}</span> </td>
203 233 </tr>
204 234 <tr>
205   -
206 235 </tr>
207 236 </table>
208 237 </el-form-item>
... ... @@ -219,8 +248,8 @@
219 248 <script>
220 249 import { listCollerBox, getBox, delBox, addBox, updateBox,updatedelBox } from "@/api/archives/collerctbox";
221 250 import { addBorrow } from "@/api/archives/borrow.js";
222   -
223 251 import file from "@/views/archives/file";
  252 + import {treeselect} from "@/api/archives/dept";
224 253 export default {
225 254 dicts: ['borrow_type'],
226 255 components: { file },
... ... @@ -232,9 +261,17 @@
232 261 type: Number,
233 262 }
234 263 },
  264 + watch: {
  265 + // 根据名称筛选部门树
  266 + deptName(val) {
  267 + this.$refs.tree.filter(val);
  268 + },
  269 + },
235 270  
236 271 data() {
237 272 return {
  273 + // 部门树选项
  274 + deptOptions: undefined,
238 275 // 遮罩层
239 276 loading: true,
240 277 // 选中数组
... ... @@ -293,18 +330,31 @@
293 330 // 表单校验
294 331 rules: {
295 332 },
296   - borrowStatus : 1,//可借阅
297   - collectBoxId : null,
  333 + borrowStatus: 1,//可借阅
  334 + collectBoxId: null,
  335 + CollertBox1: null,
  336 + CollertBox2: null,
298 337 };
299 338 },
300 339 //statusPd 0未整理文件 1 已整理文件 2 盒
301 340 created() {
302 341 this.getList();
  342 + this.getTreeselect();
303 343 },
304 344 methods: {
  345 + /** 查询部门下拉树结构 */
  346 + getTreeselect() {
  347 + treeselect().then(response => {
  348 + this.deptOptions = response.data;
  349 + });
  350 + },
305 351 /** 查询【登记著录】列表 */
306 352 getList() {
  353 +
  354 + this.queryParams.deptId = this.deptId != null ? this.deptId : "000"//是否盒内文件
  355 + this.queryParams.borrowStatus = this.borrowStatus;
307 356 this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
  357 + this.queryParams.remove = 0; //未删除数据
308 358 listCollerBox(this.queryParams).then(response => {
309 359 this.boxList = response.rows;
310 360 this.total = response.total;
... ... @@ -336,6 +386,8 @@
336 386 returnDate: null,
337 387 returnedDate: null,
338 388 borrowMark: null,
  389 + deptId : null,
  390 + deptName: null,
339 391 };
340 392 this.resetForm("form");
341 393 },
... ... @@ -356,27 +408,51 @@
356 408 this.multiple = !selection.length
357 409 },
358 410  
  411 + // 节点单击事件
  412 + handleNodeClick(data) {
  413 + this.deptId = data.id;
  414 + this.deptName = data.label;
  415 + this.getList();
  416 + },
359 417  
360   -
  418 + //借阅按钮
361 419 handleupdateborrow(row){
362 420 this.open = true;
363   - this.collectBoxId = row.id;
  421 + const id = row.id || this.ids
  422 + this.collectBoxId = Number(id);
  423 + getBox(id).then(response => {
  424 + this.CollertBox1 = response.data.archivalCode;
  425 + this.CollertBox2 = response.data.title;
  426 + });
  427 + this.form.name = this.$store.state.user.name;
  428 + this.form.boxType = this.deptName;
364 429 },
365   -
366   -
  430 + //借阅
367 431 submitForm(){
368 432 this.$refs["form"].validate(valid => {
369 433 if (valid) {
370 434 this.form.collectBoxId = this.collectBoxId;
371 435 addBorrow(this.form).then(response => {
372   - this.$modal.msgSuccess("新增成功");
373 436 this.open = false;
374   - this.getList();
  437 + this.handleSelectId(this.collectBoxId,"2");//可借阅 转为可归还
375 438 });
376   -
377 439 }
378 440 });
379   - }
  441 + },
  442 + ////可借阅 转为可归还
  443 + handleSelectId(id,borrowStatus){
  444 + debugger
  445 + getBox(id).then(response => {
  446 + let from = response.data;
  447 + from.borrowStatus = borrowStatus;
  448 + updateBox(from).then(response => {
  449 + this.$modal.msgSuccess("提交成功");
  450 + this.open = false;
  451 + this.getList();
  452 + });
  453 + });
  454 + },
  455 +
380 456  
381 457  
382 458 }
... ...