ljq / archives · Commits

Commit 0da383a3211994d98ed7a827b9985108c7356b84

Authored by ljq
1 parent f23b2b66

档案合并

Inline Side-by-side
Showing 12 changed files with 2283 additions and 40 deletions
ruoyi-archives/src/main/java/com/ruoyi/controller/ArchivesController.java
  View file @0da383a
@@ -16,4 +16,24 @@ public class ArchivesController { @@ -16,4 +16,24 @@ public class ArchivesController {
16 @RequestMapping("/index") 16 @RequestMapping("/index")
17 public void ArchivesController(){ 17 public void ArchivesController(){
18 } 18 }
  19 +
  20 +
  21 + /**
  22 + * 登记著录
  23 + */
  24 + @PreAuthorize("@ss.hasPermi('archives:list')")
  25 + @RequestMapping("/yfiling")
  26 + public void ArchivesYfilingController(){
  27 + }
  28 +
  29 +
  30 + /**
  31 + * 登记著录
  32 + */
  33 + @PreAuthorize("@ss.hasPermi('archives:list')")
  34 + @RequestMapping("/filing")
  35 + public void ArchivesFilingController(){
  36 + }
  37 +
  38 +
19 } 39 }
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesBox.java
  View file @0da383a
@@ -38,6 +38,10 @@ public class ArchivesBox extends BaseEntity @@ -38,6 +38,10 @@ public class ArchivesBox extends BaseEntity
38 @Excel(name = "描述") 38 @Excel(name = "描述")
39 private String describes; 39 private String describes;
40 40
  41 + /** 1.待整理 2.待审批 */
  42 + @Excel(name = "2.文件著录 3.预归档 4.归档")
  43 + private String apprvoal;
  44 +
41 public void setId(Long id) 45 public void setId(Long id)
42 { 46 {
43 this.id = id; 47 this.id = id;
@@ -93,6 +97,14 @@ public class ArchivesBox extends BaseEntity @@ -93,6 +97,14 @@ public class ArchivesBox extends BaseEntity
93 return describes; 97 return describes;
94 } 98 }
95 99
  100 + public String getApprvoal() {
  101 + return apprvoal;
  102 + }
  103 +
  104 + public void setApprvoal(String apprvoal) {
  105 + this.apprvoal = apprvoal;
  106 + }
  107 +
96 @Override 108 @Override
97 public String toString() { 109 public String toString() {
98 return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) 110 return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -106,6 +118,7 @@ public class ArchivesBox extends BaseEntity @@ -106,6 +118,7 @@ public class ArchivesBox extends BaseEntity
106 .append("createTime", getCreateTime()) 118 .append("createTime", getCreateTime())
107 .append("updateBy", getUpdateBy()) 119 .append("updateBy", getUpdateBy())
108 .append("updateTime", getUpdateTime()) 120 .append("updateTime", getUpdateTime())
  121 + .append("apprvoal", getApprvoal())
109 .toString(); 122 .toString();
110 } 123 }
111 } 124 }
ruoyi-archives/src/main/resources/mapper/archives/ArchivesBoxMapper.xml
  View file @0da383a
@@ -15,10 +15,11 @@ @@ -15,10 +15,11 @@
15 <result property="createTime" column="create_time" /> 15 <result property="createTime" column="create_time" />
16 <result property="updateBy" column="update_by" /> 16 <result property="updateBy" column="update_by" />
17 <result property="updateTime" column="update_time" /> 17 <result property="updateTime" column="update_time" />
  18 + <result property="apprvoal" column="apprvoal" />
18 </resultMap> 19 </resultMap>
19 20
20 <sql id="selectArchivesBoxVo"> 21 <sql id="selectArchivesBoxVo">
21 - select id, year, box_rule, box_mark, deport_node_id, describes, create_by, create_time, update_by, update_time from archives_box 22 + select id, year, box_rule, box_mark, deport_node_id, describes, create_by, create_time, update_by, update_time, apprvoal from archives_box
22 </sql> 23 </sql>
23 24
24 <select id="selectArchivesBoxList" parameterType="ArchivesBox" resultMap="ArchivesBoxResult"> 25 <select id="selectArchivesBoxList" parameterType="ArchivesBox" resultMap="ArchivesBoxResult">
@@ -29,6 +30,7 @@ @@ -29,6 +30,7 @@
29 <if test="boxMark != null and boxMark != ''"> and box_mark = #{boxMark}</if> 30 <if test="boxMark != null and boxMark != ''"> and box_mark = #{boxMark}</if>
30 <if test="deportNodeId != null and deportNodeId != ''"> and deport_node_id = #{deportNodeId}</if> 31 <if test="deportNodeId != null and deportNodeId != ''"> and deport_node_id = #{deportNodeId}</if>
31 <if test="describes != null and describes != ''"> and describes = #{describes}</if> 32 <if test="describes != null and describes != ''"> and describes = #{describes}</if>
  33 + <if test="apprvoal != null and apprvoal != ''"> and apprvoal = #{apprvoal}</if>
32 </where> 34 </where>
33 </select> 35 </select>
34 36
@@ -49,6 +51,7 @@ @@ -49,6 +51,7 @@
49 <if test="createTime != null">create_time,</if> 51 <if test="createTime != null">create_time,</if>
50 <if test="updateBy != null">update_by,</if> 52 <if test="updateBy != null">update_by,</if>
51 <if test="updateTime != null">update_time,</if> 53 <if test="updateTime != null">update_time,</if>
  54 + <if test="apprvoal != null">apprvoal,</if>
52 </trim> 55 </trim>
53 <trim prefix="values (" suffix=")" suffixOverrides=","> 56 <trim prefix="values (" suffix=")" suffixOverrides=",">
54 <if test="year != null">#{year},</if> 57 <if test="year != null">#{year},</if>
@@ -60,6 +63,7 @@ @@ -60,6 +63,7 @@
60 <if test="createTime != null">#{createTime},</if> 63 <if test="createTime != null">#{createTime},</if>
61 <if test="updateBy != null">#{updateBy},</if> 64 <if test="updateBy != null">#{updateBy},</if>
62 <if test="updateTime != null">#{updateTime},</if> 65 <if test="updateTime != null">#{updateTime},</if>
  66 + <if test="apprvoal != null">#{apprvoal},</if>
63 </trim> 67 </trim>
64 </insert> 68 </insert>
65 69
@@ -75,6 +79,7 @@ @@ -75,6 +79,7 @@
75 <if test="createTime != null">create_time = #{createTime},</if> 79 <if test="createTime != null">create_time = #{createTime},</if>
76 <if test="updateBy != null">update_by = #{updateBy},</if> 80 <if test="updateBy != null">update_by = #{updateBy},</if>
77 <if test="updateTime != null">update_time = #{updateTime},</if> 81 <if test="updateTime != null">update_time = #{updateTime},</if>
  82 + <if test="apprvoal != null">apprvoal = #{apprvoal},</if>
78 </trim> 83 </trim>
79 where id = #{id} 84 where id = #{id}
80 </update> 85 </update>
ruoyi-ui/src/views/archives/box/filingindex.vue 0 → 100644
  View file @0da383a
  1 +<template>
  2 + <div class="app-container">
  3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
  4 + <el-form-item label="年度" prop="year">
  5 + <el-input
  6 + v-model="queryParams.year"
  7 + placeholder="请输入年度"
  8 + clearable
  9 + @keyup.enter.native="handleQuery"
  10 + />
  11 + </el-form-item>
  12 + <el-form-item label="卷盒规则" prop="boxRule">
  13 + <el-input
  14 + v-model="queryParams.boxRule"
  15 + placeholder="请输入卷盒规则"
  16 + clearable
  17 + @keyup.enter.native="handleQuery"
  18 + />
  19 + </el-form-item>
  20 + <el-form-item label="盒号" prop="boxMark">
  21 + <el-input
  22 + v-model="queryParams.boxMark"
  23 + placeholder="请输入盒号"
  24 + clearable
  25 + @keyup.enter.native="handleQuery"
  26 + />
  27 + </el-form-item>
  28 + <el-form-item label="库位码" prop="deportNodeId">
  29 + <el-input
  30 + v-model="queryParams.deportNodeId"
  31 + placeholder="请输入库位码"
  32 + clearable
  33 + @keyup.enter.native="handleQuery"
  34 + />
  35 + </el-form-item>
  36 + <el-form-item>
  37 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  38 + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
  39 + </el-form-item>
  40 + </el-form>
  41 +
  42 + <el-row :gutter="10" class="mb8">
  43 + <el-col :span="1.5">
  44 + <el-button
  45 + type="success"
  46 + plain
  47 + icon="el-icon-edit"
  48 + size="mini"
  49 + :disabled="single"
  50 + @click="handleUpdate"
  51 + v-hasPermi="['archives:box:edit']"
  52 + >修改</el-button>
  53 + </el-col>
  54 + <el-col :span="1.5">
  55 + <el-button
  56 + type="warning"
  57 + plain
  58 + icon="el-icon-download"
  59 + size="mini"
  60 + @click="handleExport"
  61 + v-hasPermi="['archives:box:export']"
  62 + >导出</el-button>
  63 + </el-col>
  64 + <el-col :span="1.5" v-if="updateyfiling">
  65 + <el-button
  66 + type="warning"
  67 + plain
  68 + icon="el-icon-download"
  69 + size="mini"
  70 + :disabled="single"
  71 + @click="handleupdateyreturn"
  72 + v-hasPermi="['archives:collerctbox:inserBox']"
  73 + >退回</el-button>
  74 + </el-col>
  75 + <el-col :span="1.5" v-if="updateyfiling">
  76 + <el-button
  77 + type="warning"
  78 + plain
  79 + icon="el-icon-download"
  80 + size="mini"
  81 + :disabled="single"
  82 + @click="handleupdateyreturn1"
  83 + v-hasPermi="['archives:collerctbox:inserBox']"
  84 + >上架</el-button>
  85 + </el-col>
  86 + <el-col :span="1.5" v-if="updateyfiling">
  87 + <el-button
  88 + type="warning"
  89 + plain
  90 + icon="el-icon-download"
  91 + size="mini"
  92 + :disabled="single"
  93 + @click="handleupdateyreturn2"
  94 + v-hasPermi="['archives:collerctbox:inserBox']"
  95 + >下架</el-button>
  96 + </el-col>
  97 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
  98 + </el-row>
  99 +
  100 + <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
  101 + <el-table-column type="selection" width="55" align="center" />
  102 + <el-table-column label="主键" align="center" prop="id" />
  103 + <el-table-column label="年度" align="center" prop="year" />
  104 + <el-table-column label="操作" align="center" prop="year" >
  105 + <template slot-scope="scope">
  106 + <el-button
  107 + size="mini"
  108 + type="text"
  109 + icon="el-icon-edit"
  110 + @click="handleCheck(scope.row)"
  111 + v-hasPermi="['archives:box:check']"
  112 + >查看</el-button>
  113 + </template>
  114 + </el-table-column>
  115 + <el-table-column label="卷盒规则" align="center" prop="boxRule" />
  116 + <el-table-column label="盒号" align="center" prop="boxMark" />
  117 + <el-table-column label="库位码" align="center" prop="deportNodeId" />
  118 + <el-table-column label="描述" align="center" prop="describes" />
  119 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
  120 + <template slot-scope="scope">
  121 + <el-button
  122 + size="mini"
  123 + type="text"
  124 + icon="el-icon-edit"
  125 + @click="handleUpdate(scope.row)"
  126 + v-hasPermi="['archives:box:edit']"
  127 + >修改</el-button>
  128 + </template>
  129 + </el-table-column>
  130 + </el-table>
  131 +
  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 + <!-- 添加或修改【著录盒】对话框 -->
  141 + <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
  142 + <el-form ref="form" :model="form" :rules="rules" label-width="80px">
  143 + <el-form-item label="年度" prop="year">
  144 + <el-input v-model="form.year" placeholder="请输入年度" />
  145 + </el-form-item>
  146 + <el-form-item label="卷盒规则" prop="boxRule">
  147 + <el-input v-model="form.boxRule" placeholder="请输入卷盒规则" />
  148 + </el-form-item>
  149 + <el-form-item label="盒号" prop="boxMark">
  150 + <el-input v-model="form.boxMark" placeholder="请输入盒号" />
  151 + </el-form-item>
  152 + <el-form-item label="库位码" prop="deportNodeId">
  153 + <el-input v-model="form.deportNodeId" placeholder="请输入库位码" />
  154 + </el-form-item>
  155 + <el-form-item label="描述" prop="describes">
  156 + <el-input v-model="form.describes" placeholder="请输入描述" />
  157 + </el-form-item>
  158 + </el-form>
  159 + <div slot="footer" class="dialog-footer">
  160 + <el-button type="primary" @click="submitForm">确 定</el-button>
  161 + <el-button @click="cancel">取 消</el-button>
  162 + </div>
  163 + </el-dialog>
  164 +
  165 +
  166 +
  167 +
  168 + <el-dialog :title="title" :visible.sync="boxtOpen" width="80%" append-to-body>
  169 + <indexbox :boxsId= boxsId :statusPd= "2" v-if="boxtOpen"/>
  170 + </el-dialog>
  171 + </div>
  172 +</template>
  173 +
  174 +<script>
  175 +import { listBox, getBox, delBox, addBox, updateBox } from "@/api/archives/box";
  176 +
  177 +import indexbox from "@/views/archives/collerctbox/index.vue";
  178 +
  179 +export default {
  180 + name: "Box",
  181 + components: { indexbox },
  182 + data() {
  183 + return {
  184 + // 遮罩层
  185 + loading: true,
  186 + // 选中数组
  187 + ids: [],
  188 + // 非单个禁用
  189 + single: true,
  190 + // 非多个禁用
  191 + multiple: true,
  192 + // 显示搜索条件
  193 + showSearch: true,
  194 + // 总条数
  195 + total: 0,
  196 + // 【著录盒】表格数据
  197 + boxList: [],
  198 + // 弹出层标题
  199 + title: "",
  200 + // 是否显示弹出层
  201 + open: false,
  202 + // 查询参数
  203 + queryParams: {
  204 + pageNum: 1,
  205 + pageSize: 10,
  206 + year: null,
  207 + boxRule: null,
  208 + boxMark: null,
  209 + deportNodeId: null,
  210 + describes: null,
  211 + },
  212 + // 表单参数
  213 + form: {},
  214 + // 表单校验
  215 + rules: {
  216 + },
  217 + boxtOpen : false,
  218 + boxsId : null, //盒id
  219 + updateyfiling :true, //预归档
  220 + updatefiling: true,//归档
  221 + apprvoal: 4, //归档
  222 + };
  223 + },
  224 + created() {
  225 + this.getList();
  226 + },
  227 + methods: {
  228 + /** 查询【著录盒】列表 */
  229 + getList() {
  230 + this.loading = true;
  231 + this.queryParams.apprvoal = this.apprvoal;
  232 + listBox(this.queryParams).then(response => {
  233 + this.boxList = response.rows;
  234 + this.total = response.total;
  235 + this.loading = false;
  236 + });
  237 + },
  238 + // 取消按钮
  239 + cancel() {
  240 + this.open = false;
  241 + this.reset();
  242 + },
  243 + // 表单重置
  244 + reset() {
  245 + this.form = {
  246 + id: null,
  247 + year: null,
  248 + boxRule: null,
  249 + boxMark: null,
  250 + deportNodeId: null,
  251 + describes: null,
  252 + createBy: null,
  253 + createTime: null,
  254 + updateBy: null,
  255 + updateTime: null
  256 + };
  257 + this.resetForm("form");
  258 + },
  259 + /** 搜索按钮操作 */
  260 + handleQuery() {
  261 + this.queryParams.pageNum = 1;
  262 + this.getList();
  263 + },
  264 + /** 重置按钮操作 */
  265 + resetQuery() {
  266 + this.resetForm("queryForm");
  267 + this.handleQuery();
  268 + },
  269 + // 多选框选中数据
  270 + handleSelectionChange(selection) {
  271 + this.ids = selection.map(item => item.id)
  272 + this.single = selection.length!==1
  273 + this.multiple = !selection.length
  274 + },
  275 +
  276 + /** 修改按钮操作 */
  277 + handleUpdate(row) {
  278 + this.reset();
  279 + const id = row.id || this.ids
  280 + getBox(id).then(response => {
  281 + this.form = response.data;
  282 + this.open = true;
  283 + this.title = "修改【著录盒】";
  284 + });
  285 + },
  286 + /** 提交按钮 */
  287 + submitForm() {
  288 + this.$refs["form"].validate(valid => {
  289 + if (valid) {
  290 + if (this.form.id != null) {
  291 + updateBox(this.form).then(response => {
  292 + this.$modal.msgSuccess("修改成功");
  293 + this.open = false;
  294 + this.getList();
  295 + });
  296 + } else {
  297 + addBox(this.form).then(response => {
  298 + this.$modal.msgSuccess("新增成功");
  299 + this.open = false;
  300 + this.getList();
  301 + });
  302 + }
  303 + }
  304 + });
  305 + },
  306 +
  307 + /** 导出按钮操作 */
  308 + handleExport() {
  309 + this.download('archives/box/export', {
  310 + ...this.queryParams
  311 + }, `box_${new Date().getTime()}.xlsx`)
  312 + },
  313 + /* 查看 */
  314 + handleCheck(row){
  315 + this.boxsId = row.id;
  316 + this.boxtOpen = true;
  317 + },
  318 + /** 退回 **/
  319 + handleupdateyreturn(row){
  320 +
  321 + },
  322 +
  323 +
  324 +
  325 + }
  326 +};
  327 +</script>
ruoyi-ui/src/views/archives/box/index.vue
  View file @0da383a
@@ -237,6 +237,7 @@ export default { @@ -237,6 +237,7 @@ export default {
237 boxsId : null, //盒id 237 boxsId : null, //盒id
238 updateyfiling :true, //预归档 238 updateyfiling :true, //预归档
239 updatefiling: true,//归档 239 updatefiling: true,//归档
  240 + apprvoal: 2, //文件著录
240 }; 241 };
241 }, 242 },
242 created() { 243 created() {
@@ -246,6 +247,7 @@ export default { @@ -246,6 +247,7 @@ export default {
246 /** 查询【著录盒】列表 */ 247 /** 查询【著录盒】列表 */
247 getList() { 248 getList() {
248 this.loading = true; 249 this.loading = true;
  250 + this.queryParams.apprvoal = this.apprvoal;
249 listBox(this.queryParams).then(response => { 251 listBox(this.queryParams).then(response => {
250 this.boxList = response.rows; 252 this.boxList = response.rows;
251 this.total = response.total; 253 this.total = response.total;
@@ -348,13 +350,26 @@ export default { @@ -348,13 +350,26 @@ export default {
348 }, 350 },
349 /** 预归档 **/ 351 /** 预归档 **/
350 handleupdateyfiling(row){ 352 handleupdateyfiling(row){
351 - 353 + const id = row.id || this.ids
  354 + this.handleSelectId(id,"3")
352 }, 355 },
353 -  
354 /** 归档 **/ 356 /** 归档 **/
355 handleupdatefiling(row){ 357 handleupdatefiling(row){
  358 + this.handleSelectId(id,"4")
  359 + },
  360 +
  361 + handleSelectId(id,apprvoal,status){
  362 + getBox(id).then(response => {
  363 + let from = response.data;
  364 + from.apprvoal = apprvoal;
  365 + updateBox(from).then(response => {
  366 + this.$modal.msgSuccess("提交成功");
  367 + this.open = false;
  368 + this.getList();
  369 + });
  370 + });
  371 + },
356 372
357 - }  
358 373
359 } 374 }
360 }; 375 };
ruoyi-ui/src/views/archives/box/yfilingindex.vue 0 → 100644
  View file @0da383a
  1 +<template>
  2 + <div class="app-container">
  3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
  4 + <el-form-item label="年度" prop="year">
  5 + <el-input
  6 + v-model="queryParams.year"
  7 + placeholder="请输入年度"
  8 + clearable
  9 + @keyup.enter.native="handleQuery"
  10 + />
  11 + </el-form-item>
  12 + <el-form-item label="卷盒规则" prop="boxRule">
  13 + <el-input
  14 + v-model="queryParams.boxRule"
  15 + placeholder="请输入卷盒规则"
  16 + clearable
  17 + @keyup.enter.native="handleQuery"
  18 + />
  19 + </el-form-item>
  20 + <el-form-item label="盒号" prop="boxMark">
  21 + <el-input
  22 + v-model="queryParams.boxMark"
  23 + placeholder="请输入盒号"
  24 + clearable
  25 + @keyup.enter.native="handleQuery"
  26 + />
  27 + </el-form-item>
  28 + <el-form-item label="库位码" prop="deportNodeId">
  29 + <el-input
  30 + v-model="queryParams.deportNodeId"
  31 + placeholder="请输入库位码"
  32 + clearable
  33 + @keyup.enter.native="handleQuery"
  34 + />
  35 + </el-form-item>
  36 + <el-form-item>
  37 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  38 + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
  39 + </el-form-item>
  40 + </el-form>
  41 +
  42 + <el-row :gutter="10" class="mb8">
  43 +
  44 + <el-col :span="1.5">
  45 + <el-button
  46 + type="success"
  47 + plain
  48 + icon="el-icon-edit"
  49 + size="mini"
  50 + :disabled="single"
  51 + @click="handleUpdate"
  52 + v-hasPermi="['archives:box:edit']"
  53 + >修改</el-button>
  54 + </el-col>
  55 +
  56 + <el-col :span="1.5">
  57 + <el-button
  58 + type="warning"
  59 + plain
  60 + icon="el-icon-download"
  61 + size="mini"
  62 + @click="handleExport"
  63 + v-hasPermi="['archives:box:export']"
  64 + >导出</el-button>
  65 + </el-col>
  66 + <el-col :span="1.5" v-if="updateyfiling">
  67 + <el-button
  68 + type="warning"
  69 + plain
  70 + icon="el-icon-download"
  71 + size="mini"
  72 + :disabled="single"
  73 + @click="handleupdateyreturn"
  74 + v-hasPermi="['archives:collerctbox:inserBox']"
  75 + >打回</el-button>
  76 + </el-col>
  77 +
  78 + <el-col :span="1.5" v-if="updatefiling">
  79 + <el-button
  80 + type="warning"
  81 + plain
  82 + icon="el-icon-download"
  83 + size="mini"
  84 + :disabled="single"
  85 + @click="handleupdatefiling"
  86 + v-hasPermi="['archives:collerctbox:inserBox']"
  87 + >归档</el-button>
  88 + </el-col>
  89 +
  90 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
  91 + </el-row>
  92 +
  93 + <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
  94 + <el-table-column type="selection" width="55" align="center" />
  95 + <el-table-column label="主键" align="center" prop="id" />
  96 + <el-table-column label="年度" align="center" prop="year" />
  97 + <el-table-column label="操作" align="center" prop="year" >
  98 + <template slot-scope="scope">
  99 + <el-button
  100 + size="mini"
  101 + type="text"
  102 + icon="el-icon-edit"
  103 + @click="handleCheck(scope.row)"
  104 + v-hasPermi="['archives:box:check']"
  105 + >查看</el-button>
  106 + </template>
  107 + </el-table-column>
  108 + <el-table-column label="卷盒规则" align="center" prop="boxRule" />
  109 + <el-table-column label="盒号" align="center" prop="boxMark" />
  110 + <el-table-column label="库位码" align="center" prop="deportNodeId" />
  111 + <el-table-column label="描述" align="center" prop="describes" />
  112 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
  113 + <template slot-scope="scope">
  114 + <el-button
  115 + size="mini"
  116 + type="text"
  117 + icon="el-icon-edit"
  118 + @click="handleUpdate(scope.row)"
  119 + v-hasPermi="['archives:box:edit']"
  120 + >修改</el-button>
  121 +
  122 + </template>
  123 + </el-table-column>
  124 + </el-table>
  125 +
  126 + <pagination
  127 + v-show="total>0"
  128 + :total="total"
  129 + :page.sync="queryParams.pageNum"
  130 + :limit.sync="queryParams.pageSize"
  131 + @pagination="getList"
  132 + />
  133 +
  134 + <!-- 添加或修改【著录盒】对话框 -->
  135 + <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
  136 + <el-form ref="form" :model="form" :rules="rules" label-width="80px">
  137 + <el-form-item label="年度" prop="year">
  138 + <el-input v-model="form.year" placeholder="请输入年度" />
  139 + </el-form-item>
  140 + <el-form-item label="卷盒规则" prop="boxRule">
  141 + <el-input v-model="form.boxRule" placeholder="请输入卷盒规则" />
  142 + </el-form-item>
  143 + <el-form-item label="盒号" prop="boxMark">
  144 + <el-input v-model="form.boxMark" placeholder="请输入盒号" />
  145 + </el-form-item>
  146 + <el-form-item label="库位码" prop="deportNodeId">
  147 + <el-input v-model="form.deportNodeId" placeholder="请输入库位码" />
  148 + </el-form-item>
  149 + <el-form-item label="描述" prop="describes">
  150 + <el-input v-model="form.describes" placeholder="请输入描述" />
  151 + </el-form-item>
  152 + </el-form>
  153 + <div slot="footer" class="dialog-footer">
  154 + <el-button type="primary" @click="submitForm">确 定</el-button>
  155 + <el-button @click="cancel">取 消</el-button>
  156 + </div>
  157 + </el-dialog>
  158 +
  159 +
  160 +
  161 +
  162 + <el-dialog :title="title" :visible.sync="boxtOpen" width="80%" append-to-body>
  163 + <indexbox :boxsId= boxsId :statusPd= "2" v-if="boxtOpen"/>
  164 + </el-dialog>
  165 + </div>
  166 +</template>
  167 +
  168 +<script>
  169 +import { listBox, getBox, delBox, addBox, updateBox } from "@/api/archives/box";
  170 +
  171 +import indexbox from "@/views/archives/collerctbox/index.vue";
  172 +
  173 +export default {
  174 + name: "Box",
  175 + components: { indexbox },
  176 + data() {
  177 + return {
  178 + // 遮罩层
  179 + loading: true,
  180 + // 选中数组
  181 + ids: [],
  182 + // 非单个禁用
  183 + single: true,
  184 + // 非多个禁用
  185 + multiple: true,
  186 + // 显示搜索条件
  187 + showSearch: true,
  188 + // 总条数
  189 + total: 0,
  190 + // 【著录盒】表格数据
  191 + boxList: [],
  192 + // 弹出层标题
  193 + title: "",
  194 + // 是否显示弹出层
  195 + open: false,
  196 + // 查询参数
  197 + queryParams: {
  198 + pageNum: 1,
  199 + pageSize: 10,
  200 + year: null,
  201 + boxRule: null,
  202 + boxMark: null,
  203 + deportNodeId: null,
  204 + describes: null,
  205 + },
  206 + // 表单参数
  207 + form: {},
  208 + // 表单校验
  209 + rules: {
  210 + },
  211 + boxtOpen : false,
  212 + boxsId : null, //盒id
  213 + updateyfiling :true, //打回
  214 + updatefiling: true,//归档
  215 + apprvoal: 3, //预归档
  216 + };
  217 + },
  218 + created() {
  219 + this.getList();
  220 + },
  221 + methods: {
  222 + /** 查询【著录盒】列表 */
  223 + getList() {
  224 + this.loading = true;
  225 + this.queryParams.apprvoal = this.apprvoal;
  226 + listBox(this.queryParams).then(response => {
  227 + this.boxList = response.rows;
  228 + this.total = response.total;
  229 + this.loading = false;
  230 + });
  231 + },
  232 + // 取消按钮
  233 + cancel() {
  234 + this.open = false;
  235 + this.reset();
  236 + },
  237 + // 表单重置
  238 + reset() {
  239 + this.form = {
  240 + id: null,
  241 + year: null,
  242 + boxRule: null,
  243 + boxMark: null,
  244 + deportNodeId: null,
  245 + describes: null,
  246 + createBy: null,
  247 + createTime: null,
  248 + updateBy: null,
  249 + updateTime: null
  250 + };
  251 + this.resetForm("form");
  252 + },
  253 + /** 搜索按钮操作 */
  254 + handleQuery() {
  255 + this.queryParams.pageNum = 1;
  256 + this.getList();
  257 + },
  258 + /** 重置按钮操作 */
  259 + resetQuery() {
  260 + this.resetForm("queryForm");
  261 + this.handleQuery();
  262 + },
  263 + // 多选框选中数据
  264 + handleSelectionChange(selection) {
  265 + this.ids = selection.map(item => item.id)
  266 + this.single = selection.length!==1
  267 + this.multiple = !selection.length
  268 + },
  269 +
  270 + /** 修改按钮操作 */
  271 + handleUpdate(row) {
  272 + this.reset();
  273 + const id = row.id || this.ids
  274 + getBox(id).then(response => {
  275 + this.form = response.data;
  276 + this.open = true;
  277 + this.title = "修改【著录盒】";
  278 + });
  279 + },
  280 + /** 提交按钮 */
  281 + submitForm() {
  282 + this.$refs["form"].validate(valid => {
  283 + if (valid) {
  284 + if (this.form.id != null) {
  285 + updateBox(this.form).then(response => {
  286 + this.$modal.msgSuccess("修改成功");
  287 + this.open = false;
  288 + this.getList();
  289 + });
  290 + } else {
  291 + addBox(this.form).then(response => {
  292 + this.$modal.msgSuccess("新增成功");
  293 + this.open = false;
  294 + this.getList();
  295 + });
  296 + }
  297 + }
  298 + });
  299 + },
  300 + /** 导出按钮操作 */
  301 + handleExport() {
  302 + this.download('archives/box/export', {
  303 + ...this.queryParams
  304 + }, `box_${new Date().getTime()}.xlsx`)
  305 + },
  306 + /* 查看 */
  307 + handleCheck(row){
  308 + this.boxsId = row.id;
  309 + this.boxtOpen = true;
  310 + },
  311 + /** 打回 **/
  312 + handleupdateyreturn(row){
  313 + const id = row.id || this.ids
  314 + this.handleSelectId(id,"2")
  315 + },
  316 +
  317 + /** 归档 **/
  318 + handleupdatefiling(row){
  319 + this.handleSelectId(id,"4")
  320 + },
  321 +
  322 + handleSelectId(id,apprvoal){
  323 + getBox(id).then(response => {
  324 + let from = response.data;
  325 + from.apprvoal = apprvoal;
  326 + updateBox(from).then(response => {
  327 + this.$modal.msgSuccess("提交成功");
  328 + this.open = false;
  329 + this.getList();
  330 + });
  331 + });
  332 + },
  333 +
  334 + }
  335 +};
  336 +</script>
ruoyi-ui/src/views/archives/collerctbox/filingindex.vue 0 → 100644
  View file @0da383a
  1 +<template>
  2 + <div class="app-container">
  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 +
  43 +
  44 +
  45 + <el-row :gutter="10" class="mb8" v-if="titleshow">
  46 + <el-col :span="1.5" v-if="approvalStatus">
  47 + <el-select v-model="approval" @change="approvalpuRefresh">
  48 + <el-option
  49 + v-for="dict in dict.type.approval_type"
  50 + :key="dict.value"
  51 + :label="dict.label"
  52 + :value="dict.value"
  53 + ></el-option>
  54 + </el-select>
  55 + </el-col>
  56 +
  57 +
  58 + <el-col :span="1.5">
  59 + <el-button
  60 + type="success"
  61 + plain
  62 + icon="el-icon-edit"
  63 + size="mini"
  64 + :disabled="single"
  65 + @click="handleUpdate"
  66 + v-hasPermi="['archives:collerctbox:edit']"
  67 + >修改</el-button>
  68 + </el-col>
  69 + <el-col :span="1.5">
  70 + <el-button
  71 + type="warning"
  72 + plain
  73 + icon="el-icon-download"
  74 + size="mini"
  75 + @click="handleExport"
  76 + v-hasPermi="['archives:collerctbox:export']"
  77 + >导出</el-button>
  78 + </el-col>
  79 + <el-col :span="1.5" v-if="inserBox">
  80 + <el-button
  81 + type="warning"
  82 + plain
  83 + icon="el-icon-download"
  84 + size="mini"
  85 + :disabled="single"
  86 + @click="handleinserBox"
  87 + v-hasPermi="['archives:collerctbox:inserBox']"
  88 + >加入盒</el-button>
  89 + </el-col>
  90 +
  91 +
  92 + <el-col :span="1.5" v-if="updateyfiling">
  93 + <el-button
  94 + type="warning"
  95 + plain
  96 + icon="el-icon-download"
  97 + size="mini"
  98 + :disabled="single"
  99 + @click="handleupdateyreturn"
  100 + v-hasPermi="['archives:collerctbox:inserBox']"
  101 + >打回</el-button>
  102 + </el-col>
  103 +
  104 +
  105 +
  106 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
  107 + </el-row>
  108 +
  109 + <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
  110 + <el-table-column type="selection" width="55" align="center" />
  111 + <el-table-column label="操作" align="center" prop="year" >
  112 + <template slot-scope="scope">
  113 + <el-button
  114 + size="mini"
  115 + type="text"
  116 + icon="el-icon-edit"
  117 + @click="handleCheck(scope.row)"
  118 + v-hasPermi="['archives:box:check']"
  119 + >查看</el-button>
  120 + </template>
  121 + </el-table-column>
  122 + <el-table-column label="全宗号" align="center" prop="general" />
  123 + <el-table-column label="年度" align="center" prop="year" />
  124 + <el-table-column label="题名" align="center" prop="title" />
  125 + <el-table-column label="分类号" align="center" prop="sort" />
  126 + <el-table-column label="保管期限" align="center" prop="safekeepingDate" width="180">
  127 + <template slot-scope="scope">
  128 + <span>{{ parseTime(scope.row.safekeepingDate, '{y}-{m}-{d}') }}</span>
  129 + </template>
  130 + </el-table-column>
  131 + <el-table-column label="密级" align="center" prop="secretLevel" />
  132 + <el-table-column label="页数" align="center" prop="pages" />
  133 + <el-table-column label="归档份数" align="center" prop="filingNumber" />
  134 + <el-table-column label="在库份数" align="center" prop="zkNumber" />
  135 + <el-table-column label="库位码" align="center" prop="locationCode" />
  136 + <el-table-column label="归档部门" align="center" prop="filingDept" />
  137 + <el-table-column label="档号" align="center" prop="archivalCode" />
  138 + <el-table-column label="责任者" align="center" prop="responsibilityName" />
  139 + <el-table-column label="序号" align="center" prop="serialMark" />
  140 + <el-table-column label="件号" align="center" prop="pieceMark" />
  141 + <el-table-column label="登记号" align="center" prop="registerMark" />
  142 + <el-table-column label="参议人员" align="center" prop="counsellors" />
  143 + <el-table-column label="归档人" align="center" prop="filingName" />
  144 + <el-table-column label="纪要人" align="center" prop="summaryName" />
  145 + <el-table-column label="文种" align="center" prop="recordType" />
  146 + <el-table-column label="载体类型" align="center" prop="carrierType" />
  147 + <el-table-column label="拟稿人" align="center" prop="draftName" />
  148 + <el-table-column label="页次" align="center" prop="page" />
  149 + <el-table-column label="文号" align="center" prop="documentMark" />
  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 + <el-table-column label="盒号" align="center" prop="boxMark" />
  154 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="titleshow">
  155 + <template slot-scope="scope">
  156 + <el-button
  157 + size="mini"
  158 + type="text"
  159 + icon="el-icon-edit"
  160 + @click="handleUpdate(scope.row)"
  161 + v-hasPermi="['archives:collerctbox:edit']"
  162 + >修改</el-button>
  163 +
  164 + </template>
  165 + </el-table-column>
  166 + </el-table>
  167 +
  168 + <pagination
  169 + v-show="total>0"
  170 + :total="total"
  171 + :page.sync="queryParams.pageNum"
  172 + :limit.sync="queryParams.pageSize"
  173 + @pagination="getList"
  174 + />
  175 +
  176 + <!-- 添加或修改【登记著录】对话框 -->
  177 + <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
  178 + <el-form ref="form" :model="form" :rules="rules" label-width="80px">
  179 + <el-row>
  180 + <el-col :span="6">
  181 + <el-form-item label="全宗号" prop="general">
  182 + <el-input v-model="form.general" placeholder="请输入全宗号" />
  183 + </el-form-item>
  184 + </el-col>
  185 + <el-col :span="6">
  186 + <el-form-item label="年度" prop="year">
  187 + <el-input v-model="form.year" placeholder="请输入年度" />
  188 + </el-form-item>
  189 + </el-col>
  190 + <el-col :span="6">
  191 + <el-form-item label="题名" prop="title">
  192 + <el-input v-model="form.title" placeholder="请输入题名" />
  193 + </el-form-item>
  194 + </el-col>
  195 + <el-col :span="6">
  196 + <el-form-item label="分类号" prop="sort">
  197 + <el-input v-model="form.sort" placeholder="请输入分类号" />
  198 + </el-form-item>
  199 + </el-col>
  200 + </el-row>
  201 + <el-row>
  202 + <el-col :span="6">
  203 + <el-form-item label="保管期限" prop="safekeepingDate">
  204 + <el-date-picker clearable
  205 + v-model="form.safekeepingDate"
  206 + type="date"
  207 + value-format="yyyy-MM-dd"
  208 + placeholder="请选择保管期限">
  209 + </el-date-picker>
  210 + </el-form-item>
  211 + </el-col>
  212 + <el-col :span="6">
  213 + <el-form-item label="密级" prop="secretLevel">
  214 + <el-input v-model="form.secretLevel" placeholder="请输入密级" />
  215 + </el-form-item>
  216 + </el-col>
  217 + <el-col :span="6">
  218 + <el-form-item label="页数" prop="pages">
  219 + <el-input v-model="form.pages" placeholder="请输入页数" />
  220 + </el-form-item>
  221 + </el-col>
  222 + <el-col :span="6">
  223 + <el-form-item label="归档份数" prop="filingNumber">
  224 + <el-input v-model="form.filingNumber" placeholder="请输入归档份数" />
  225 + </el-form-item>
  226 + </el-col>
  227 + </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 + </el-form>
  284 + <div slot="footer" class="dialog-footer">
  285 + <el-button type="primary" @click="submitForm">确 定</el-button>
  286 + <el-button @click="cancel">取 消</el-button>
  287 + </div>
  288 + </el-dialog>
  289 +
  290 +
  291 +
  292 + <el-dialog :title="title" :visible.sync="fileOpen" width="80%" append-to-body>
  293 + <file :collboxId=collboxId />
  294 + </el-dialog>
  295 +
  296 + <el-dialog :title="title" :visible.sync="boxOpen" width="80%" append-to-body>
  297 + <el-table v-loading="loading" :data="boxtwoList" @selection-change="handleSelectionChange">
  298 + <el-table-column type="selection" width="55" align="center" />
  299 + <el-table-column label="年度" align="center" prop="year" />
  300 + <el-table-column label="卷盒规则" align="center" prop="boxRule" />
  301 + <el-table-column label="盒号" align="center" prop="boxMark" />
  302 + <el-table-column label="库位码" align="center" prop="deportNodeId" />
  303 + <el-table-column label="描述" align="center" prop="describes" />
  304 + </el-table>
  305 +
  306 + <el-col :span="1.5">
  307 + <el-button
  308 + type="success"
  309 + plain
  310 + icon="el-icon-edit"
  311 + size="mini"
  312 + :disabled="single"
  313 + @click="handleUpdate"
  314 + v-hasPermi="['archives:box:edit']"
  315 + >修改</el-button>
  316 + </el-col>
  317 + <div slot="footer" class="dialog-footer">
  318 + <el-button type="primary" @click="insetBox">确 定</el-button>
  319 + <el-button @click="cancel">取 消</el-button>
  320 + </div>
  321 +
  322 + <!--
  323 + <pagination
  324 + v-show="total>0"
  325 + :total="total"
  326 + :page.sync="queryParams.pageNum"
  327 + :limit.sync="queryParams.pageSize"
  328 + @pagination="getList"
  329 + />-->
  330 +
  331 + </el-dialog>
  332 +
  333 + </div>
  334 +</template>
  335 +
  336 +<script>
  337 +import { listCollerBox, getBox, delBox, addBox, updateBox } from "@/api/archives/collerctbox";
  338 +import { listBox } from "@/api/archives/box";
  339 +
  340 +import file from "@/views/archives/file/index.vue";
  341 +export default {
  342 + name: "collerctbox",
  343 + dicts: ['approval_type'],
  344 + components: { file },
  345 + props: {
  346 + statusPd: {
  347 + type: Number, // 这里你接收的值是什么类型就写什么类型
  348 + },
  349 + boxsId: {
  350 + type: Number,
  351 + }
  352 + },
  353 +
  354 + data() {
  355 + return {
  356 + // 遮罩层
  357 + loading: true,
  358 + // 选中数组
  359 + ids: [],
  360 + // 非单个禁用
  361 + single: true,
  362 + // 非多个禁用
  363 + multiple: true,
  364 + // 显示搜索条件
  365 + showSearch: true,
  366 + // 总条数
  367 + total: 0,
  368 + // 【登记著录】表格数据
  369 + boxList: [],
  370 + boxtwoList: [],
  371 + // 弹出层标题
  372 + title: "",
  373 + // 是否显示弹出层
  374 + open: false,
  375 + // 查询参数
  376 + queryParams: {
  377 + pageNum: 1,
  378 + pageSize: 10,
  379 + general: null,
  380 + year: null,
  381 + title: null,
  382 + sort: null,
  383 + safekeepingDate: null,
  384 + secretLevel: null,
  385 + pages: null,
  386 + filingNumber: null,
  387 + zkNumber: null,
  388 + locationCode: null,
  389 + filingDept: null,
  390 + archivalCode: null,
  391 + responsibilityName: null,
  392 + serialMark: null,
  393 + pieceMark: null,
  394 + registerMark: null,
  395 + counsellors: null,
  396 + filingName: null,
  397 + summaryName: null,
  398 + recordType: null,
  399 + carrierType: null,
  400 + draftName: null,
  401 + page: null,
  402 + documentMark: null,
  403 + text: null,
  404 + status: null,
  405 + apprvoal: null,
  406 + belongRole: null,
  407 + boxMark: null,
  408 + },
  409 + // 表单参数
  410 + form: {},
  411 + // 表单校验
  412 + rules: {
  413 + },
  414 + approval : "4", //归档 //默认待整理
  415 + // statusPd : null, //页面传递参数 1.未整理 2.已整理 3.盒
  416 + titleshow : true,//2.盒 不显示查询条件
  417 + fileOpen : false,
  418 + collboxId: null,//本次Id
  419 + lecommit: false, //提交按钮
  420 + inserBox: false,//加入盒按钮
  421 + boxOpen:false, //盒遮罩层
  422 + collerboxid : null, //盒id
  423 + updateyfiling :false, //预归档
  424 + updatefiling: false,//归档
  425 + approvalStatus: false, //待整理 待审核
  426 + };
  427 + },
  428 + //statusPd 0未整理文件 1 已整理文件 2 盒
  429 + created() {
  430 +
  431 + this.getList();
  432 +
  433 +
  434 + if (this.statusPd == 1){ //已整理
  435 + this.inserBox = true; //加入盒
  436 + this.updateyfiling = true; //预归档
  437 + this.updatefiling = true; //归档
  438 + }
  439 + },
  440 + methods: {
  441 + /** 查询【登记著录】列表 */
  442 + getList() {
  443 + this.loading = true;
  444 + this.queryParams.apprvoal = this.approval; //预归档
  445 + this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
  446 + this.queryParams.status = this.statusPd;
  447 + listCollerBox(this.queryParams).then(response => {
  448 + this.boxList = response.rows;
  449 + this.total = response.total;
  450 + this.loading = false;
  451 + });
  452 + },
  453 + // 取消按钮
  454 + cancel() {
  455 + this.boxOpen = false;
  456 + this.open = false;
  457 + this.reset();
  458 + },
  459 + // 表单重置
  460 + reset() {
  461 + this.form = {
  462 + id: null,
  463 + boxId: null,
  464 + general: null,
  465 + year: null,
  466 + title: null,
  467 + sort: null,
  468 + safekeepingDate: null,
  469 + secretLevel: null,
  470 + pages: null,
  471 + filingNumber: null,
  472 + zkNumber: null,
  473 + locationCode: null,
  474 + filingDept: null,
  475 + archivalCode: null,
  476 + responsibilityName: null,
  477 + serialMark: null,
  478 + pieceMark: null,
  479 + registerMark: null,
  480 + counsellors: null,
  481 + filingName: null,
  482 + summaryName: null,
  483 + recordType: null,
  484 + carrierType: null,
  485 + draftName: null,
  486 + page: null,
  487 + documentMark: null,
  488 + text: null,
  489 + createBy: null,
  490 + createTime: null,
  491 + updateBy: null,
  492 + updateTime: null,
  493 + status: "0",
  494 + apprvoal: null,
  495 + belongRole: null,
  496 + boxMark: null,
  497 + };
  498 + this.resetForm("form");
  499 + },
  500 + /** 搜索按钮操作 */
  501 + handleQuery() {
  502 + this.queryParams.pageNum = 1;
  503 + this.getList();
  504 + },
  505 + /** 重置按钮操作 */
  506 + resetQuery() {
  507 + this.resetForm("queryForm");
  508 + this.handleQuery();
  509 + },
  510 + // 多选框选中数据
  511 + handleSelectionChange(selection) {
  512 + this.ids = selection.map(item => item.id)
  513 + this.single = selection.length!==1
  514 + this.multiple = !selection.length
  515 + },
  516 +
  517 + /** 修改按钮操作 */
  518 + handleUpdate(row) {
  519 + this.reset();
  520 + const id = row.id || this.ids
  521 + getBox(id).then(response => {
  522 + this.form = response.data;
  523 + this.open = true;
  524 + this.title = "修改【22】";
  525 + });
  526 + },
  527 + /** 提交按钮 */
  528 + submitForm() {
  529 + this.$refs["form"].validate(valid => {
  530 + if (valid) {
  531 + if (this.form.id != null) {
  532 + updateBox(this.form).then(response => {
  533 + this.$modal.msgSuccess("修改成功");
  534 + this.open = false;
  535 + this.getList();
  536 + });
  537 + } else {
  538 + this.form.approval = "0" //初始创建所有都是0.待整理
  539 + addBox(this.form).then(response => {
  540 + this.$modal.msgSuccess("新增成功");
  541 + this.open = false;
  542 + this.getList();
  543 + });
  544 + }
  545 + }
  546 + });
  547 + },
  548 +
  549 + /** 导出按钮操作 */
  550 + handleExport() {
  551 + this.download('archives/box/export', {
  552 + ...this.queryParams
  553 + }, `box_${new Date().getTime()}.xlsx`)
  554 + },
  555 +
  556 + /** 查看按钮 **/
  557 + handleCheck(row){
  558 + this.fileOpen = true;
  559 + this.collboxId = row.id;
  560 + },
  561 +
  562 +
  563 + //打开加入盒页面 并保存id
  564 + handleinserBox(row){
  565 + const collerboxid = row.id || this.ids;
  566 + this.boxOpen = true;
  567 + this.collerboxid = collerboxid;
  568 + this.queryParams.apprvoal = "4"; //只能加入归档盒中
  569 + listBox(this.queryParams).then(response => {
  570 + this.boxtwoList = response.rows;
  571 + });
  572 + },
  573 +
  574 + //加入盒
  575 + insetBox(row){
  576 + let id = row.id || this.ids;
  577 + if (id.length > 1){
  578 + alert("请选择1个盒")
  579 + return;
  580 + }
  581 + let collerboxid = this.collerboxid;
  582 + getBox(id).then(response => {
  583 + let from = response.data;
  584 + from.boxId = id + ""; //盒id
  585 + from.status = "2";
  586 + updateBox(from).then(response => {
  587 + this.$modal.msgSuccess("提交成功");
  588 + this.boxOpen = false;
  589 + });
  590 + });
  591 + },
  592 +
  593 +
  594 +
  595 + /** 打回 **/
  596 + handleupdateyreturn(row){
  597 + const id = row.id || this.ids
  598 + this.handleSelectId(id,"2")
  599 + },
  600 +
  601 + handleSelectId(id,apprvoal){
  602 + getBox(id).then(response => {
  603 + let from = response.data;
  604 + from.apprvoal = apprvoal;
  605 + updateBox(from).then(response => {
  606 + this.$modal.msgSuccess("提交成功");
  607 + this.open = false;
  608 + this.getList();
  609 + });
  610 + });
  611 + },
  612 +
  613 + approvalpuRefresh(){
  614 + this.getList();
  615 + }
  616 + }
  617 +};
  618 +</script>
ruoyi-ui/src/views/archives/collerctbox/index.vue
  View file @0da383a
@@ -381,7 +381,7 @@ @@ -381,7 +381,7 @@
381 381
382 <script> 382 <script>
383 import { listCollerBox, getBox, delBox, addBox, updateBox } from "@/api/archives/collerctbox"; 383 import { listCollerBox, getBox, delBox, addBox, updateBox } from "@/api/archives/collerctbox";
384 - 384 +import { listBox } from "@/api/archives/box";
385 385
386 import file from "@/views/archives/file/index.vue"; 386 import file from "@/views/archives/file/index.vue";
387 export default { 387 export default {
@@ -473,7 +473,6 @@ export default { @@ -473,7 +473,6 @@ export default {
473 }, 473 },
474 //statusPd 0未整理文件 1 已整理文件 2 盒 474 //statusPd 0未整理文件 1 已整理文件 2 盒
475 created() { 475 created() {
476 - debugger  
477 this.getList(); 476 this.getList();
478 this.titleshow =this.statusPd == 2 ? false : true; //提交 477 this.titleshow =this.statusPd == 2 ? false : true; //提交
479 if (this.statusPd == 0){ //未整理 478 if (this.statusPd == 0){ //未整理
@@ -491,9 +490,14 @@ export default { @@ -491,9 +490,14 @@ export default {
491 /** 查询【登记著录】列表 */ 490 /** 查询【登记著录】列表 */
492 getList() { 491 getList() {
493 this.loading = true; 492 this.loading = true;
494 - if (this.statusPd == "0"){ //待整理 待审核 493 + if (this.statusPd == "0"){ //待整理 待审核 未整理文件
495 this.queryParams.apprvoal = this.approval; 494 this.queryParams.apprvoal = this.approval;
496 } 495 }
  496 + if (this.statusPd == "1"){ //已整理文件 固定是2
  497 + this.queryParams.apprvoal = "2";
  498 + }
  499 +
  500 +
497 this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件 501 this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
498 this.queryParams.status = this.statusPd; 502 this.queryParams.status = this.statusPd;
499 listCollerBox(this.queryParams).then(response => { 503 listCollerBox(this.queryParams).then(response => {
@@ -504,6 +508,7 @@ export default { @@ -504,6 +508,7 @@ export default {
504 }, 508 },
505 // 取消按钮 509 // 取消按钮
506 cancel() { 510 cancel() {
  511 + this.boxOpen = false;
507 this.open = false; 512 this.open = false;
508 this.reset(); 513 this.reset();
509 }, 514 },
@@ -625,15 +630,18 @@ export default { @@ -625,15 +630,18 @@ export default {
625 }, 630 },
626 631
627 /** 编号按钮操作 */ 632 /** 编号按钮操作 */
628 - handleCommit(row){ 633 + async handleCommit(row){
  634 + debugger
629 const id = row.id || this.ids 635 const id = row.id || this.ids
630 - let from = this.handleSelectId(id)  
631 - from.status = "1"; //1.已整理文件  
632 - from.apprvoal = "3"; //3.专职档案提交通过  
633 - updateBox(from).then(response => {  
634 - this.$modal.msgSuccess("提交成功");  
635 - this.open = false;  
636 - this.getList(); 636 + getBox(id).then(response => {
  637 + let from = response.data;
  638 + from.status = "1"; //1.已整理文件
  639 + from.apprvoal = "2"; //2.审批通过
  640 + updateBox(from).then(response => {
  641 + this.$modal.msgSuccess("提交成功");
  642 + this.open = false;
  643 + this.getList();
  644 + });
637 }); 645 });
638 }, 646 },
639 //打开加入盒页面 并保存id 647 //打开加入盒页面 并保存id
@@ -654,42 +662,36 @@ export default { @@ -654,42 +662,36 @@ export default {
654 return; 662 return;
655 } 663 }
656 let collerboxid = this.collerboxid; 664 let collerboxid = this.collerboxid;
657 - let from = this.handleSelectId(id)  
658 - from.boxId = id + ""; //盒id  
659 - from.status = "2";  
660 - updateBox(from).then(response => {  
661 - this.$modal.msgSuccess("提交成功");  
662 - this.boxOpen = false; 665 + getBox(id).then(response => {
  666 + let from = response.data;
  667 + from.boxId = id + ""; //盒id
  668 + from.status = "2";
  669 + updateBox(from).then(response => {
  670 + this.$modal.msgSuccess("提交成功");
  671 + this.boxOpen = false;
  672 + });
663 }); 673 });
664 }, 674 },
  675 +
665 /** 预归档 **/ 676 /** 预归档 **/
666 handleupdateyfiling(row){ 677 handleupdateyfiling(row){
667 const id = row.id || this.ids 678 const id = row.id || this.ids
668 - let from = this.handleSelectId(id)  
669 - from.apprvoal = "3";  
670 - updateBox(from).then(response => {  
671 - this.$modal.msgSuccess("提交成功");  
672 - this.open = false;  
673 - this.getList();  
674 - }); 679 + this.handleSelectId(id,"3")
675 }, 680 },
676 -  
677 /** 归档 **/ 681 /** 归档 **/
678 handleupdatefiling(row){ 682 handleupdatefiling(row){
679 - const id = row.id || this.ids  
680 - let from = this.handleSelectId(id)  
681 - from.apprvoal = "4";  
682 - updateBox(from).then(response => {  
683 - this.$modal.msgSuccess("提交成功");  
684 - this.open = false;  
685 - this.getList();  
686 - }); 683 + this.handleSelectId(id,"4")
687 }, 684 },
688 685
689 -  
690 - handleSelectId(id){ 686 + handleSelectId(id,apprvoal,status){
691 getBox(id).then(response => { 687 getBox(id).then(response => {
692 - return response.data; 688 + let from = response.data;
  689 + from.apprvoal = apprvoal;
  690 + updateBox(from).then(response => {
  691 + this.$modal.msgSuccess("提交成功");
  692 + this.open = false;
  693 + this.getList();
  694 + });
693 }); 695 });
694 }, 696 },
695 697
ruoyi-ui/src/views/archives/collerctbox/yfilingindex.vue 0 → 100644
  View file @0da383a
  1 +<template>
  2 + <div class="app-container">
  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 +
  43 +
  44 +
  45 + <el-row :gutter="10" class="mb8" v-if="titleshow">
  46 + <el-col :span="1.5" v-if="approvalStatus">
  47 + <el-select v-model="approval" @change="approvalpuRefresh">
  48 + <el-option
  49 + v-for="dict in dict.type.approval_type"
  50 + :key="dict.value"
  51 + :label="dict.label"
  52 + :value="dict.value"
  53 + ></el-option>
  54 + </el-select>
  55 + </el-col>
  56 +
  57 +
  58 + <el-col :span="1.5">
  59 + <el-button
  60 + type="success"
  61 + plain
  62 + icon="el-icon-edit"
  63 + size="mini"
  64 + :disabled="single"
  65 + @click="handleUpdate"
  66 + v-hasPermi="['archives:collerctbox:edit']"
  67 + >修改</el-button>
  68 + </el-col>
  69 + <el-col :span="1.5">
  70 + <el-button
  71 + type="warning"
  72 + plain
  73 + icon="el-icon-download"
  74 + size="mini"
  75 + @click="handleExport"
  76 + v-hasPermi="['archives:collerctbox:export']"
  77 + >导出</el-button>
  78 + </el-col>
  79 +
  80 + <el-col :span="1.5" v-if="inserBox">
  81 + <el-button
  82 + type="warning"
  83 + plain
  84 + icon="el-icon-download"
  85 + size="mini"
  86 + :disabled="single"
  87 + @click="handleinserBox"
  88 + v-hasPermi="['archives:collerctbox:inserBox']"
  89 + >加入盒</el-button>
  90 + </el-col>
  91 +
  92 +
  93 + <el-col :span="1.5" v-if="updateyfiling">
  94 + <el-button
  95 + type="warning"
  96 + plain
  97 + icon="el-icon-download"
  98 + size="mini"
  99 + :disabled="single"
  100 + @click="handleupdateyreturn"
  101 + v-hasPermi="['archives:collerctbox:inserBox']"
  102 + >打回</el-button>
  103 + </el-col>
  104 +
  105 + <el-col :span="1.5" v-if="updatefiling">
  106 + <el-button
  107 + type="warning"
  108 + plain
  109 + icon="el-icon-download"
  110 + size="mini"
  111 + :disabled="single"
  112 + @click="handleupdatefiling"
  113 + v-hasPermi="['archives:collerctbox:inserBox']"
  114 + >归档</el-button>
  115 + </el-col>
  116 +
  117 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
  118 + </el-row>
  119 +
  120 + <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
  121 + <el-table-column type="selection" width="55" align="center" />
  122 + <el-table-column label="操作" align="center" prop="year" >
  123 + <template slot-scope="scope">
  124 + <el-button
  125 + size="mini"
  126 + type="text"
  127 + icon="el-icon-edit"
  128 + @click="handleCheck(scope.row)"
  129 + v-hasPermi="['archives:box:check']"
  130 + >查看</el-button>
  131 + </template>
  132 + </el-table-column>
  133 + <el-table-column label="全宗号" align="center" prop="general" />
  134 + <el-table-column label="年度" align="center" prop="year" />
  135 + <el-table-column label="题名" align="center" prop="title" />
  136 + <el-table-column label="分类号" align="center" prop="sort" />
  137 + <el-table-column label="保管期限" align="center" prop="safekeepingDate" width="180">
  138 + <template slot-scope="scope">
  139 + <span>{{ parseTime(scope.row.safekeepingDate, '{y}-{m}-{d}') }}</span>
  140 + </template>
  141 + </el-table-column>
  142 + <el-table-column label="密级" align="center" prop="secretLevel" />
  143 + <el-table-column label="页数" align="center" prop="pages" />
  144 + <el-table-column label="归档份数" align="center" prop="filingNumber" />
  145 + <el-table-column label="在库份数" align="center" prop="zkNumber" />
  146 + <el-table-column label="库位码" align="center" prop="locationCode" />
  147 + <el-table-column label="归档部门" align="center" prop="filingDept" />
  148 + <el-table-column label="档号" align="center" prop="archivalCode" />
  149 + <el-table-column label="责任者" align="center" prop="responsibilityName" />
  150 + <el-table-column label="序号" align="center" prop="serialMark" />
  151 + <el-table-column label="件号" align="center" prop="pieceMark" />
  152 + <el-table-column label="登记号" align="center" prop="registerMark" />
  153 + <el-table-column label="参议人员" align="center" prop="counsellors" />
  154 + <el-table-column label="归档人" align="center" prop="filingName" />
  155 + <el-table-column label="纪要人" align="center" prop="summaryName" />
  156 + <el-table-column label="文种" align="center" prop="recordType" />
  157 + <el-table-column label="载体类型" align="center" prop="carrierType" />
  158 + <el-table-column label="拟稿人" align="center" prop="draftName" />
  159 + <el-table-column label="页次" align="center" prop="page" />
  160 + <el-table-column label="文号" align="center" prop="documentMark" />
  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 + <el-table-column label="盒号" align="center" prop="boxMark" />
  165 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="titleshow">
  166 + <template slot-scope="scope">
  167 + <el-button
  168 + size="mini"
  169 + type="text"
  170 + icon="el-icon-edit"
  171 + @click="handleUpdate(scope.row)"
  172 + v-hasPermi="['archives:collerctbox:edit']"
  173 + >修改</el-button>
  174 +
  175 + </template>
  176 + </el-table-column>
  177 + </el-table>
  178 +
  179 + <pagination
  180 + v-show="total>0"
  181 + :total="total"
  182 + :page.sync="queryParams.pageNum"
  183 + :limit.sync="queryParams.pageSize"
  184 + @pagination="getList"
  185 + />
  186 +
  187 + <!-- 添加或修改【登记著录】对话框 -->
  188 + <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
  189 + <el-form ref="form" :model="form" :rules="rules" label-width="80px">
  190 + <el-row>
  191 + <el-col :span="6">
  192 + <el-form-item label="全宗号" prop="general">
  193 + <el-input v-model="form.general" placeholder="请输入全宗号" />
  194 + </el-form-item>
  195 + </el-col>
  196 + <el-col :span="6">
  197 + <el-form-item label="年度" prop="year">
  198 + <el-input v-model="form.year" placeholder="请输入年度" />
  199 + </el-form-item>
  200 + </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 + <el-col :span="6">
  207 + <el-form-item label="分类号" prop="sort">
  208 + <el-input v-model="form.sort" placeholder="请输入分类号" />
  209 + </el-form-item>
  210 + </el-col>
  211 + </el-row>
  212 + <el-row>
  213 + <el-col :span="6">
  214 + <el-form-item label="保管期限" prop="safekeepingDate">
  215 + <el-date-picker clearable
  216 + v-model="form.safekeepingDate"
  217 + type="date"
  218 + value-format="yyyy-MM-dd"
  219 + placeholder="请选择保管期限">
  220 + </el-date-picker>
  221 + </el-form-item>
  222 + </el-col>
  223 + <el-col :span="6">
  224 + <el-form-item label="密级" prop="secretLevel">
  225 + <el-input v-model="form.secretLevel" placeholder="请输入密级" />
  226 + </el-form-item>
  227 + </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 + <el-col :span="6">
  234 + <el-form-item label="归档份数" prop="filingNumber">
  235 + <el-input v-model="form.filingNumber" placeholder="请输入归档份数" />
  236 + </el-form-item>
  237 + </el-col>
  238 + </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 + </el-form>
  295 + <div slot="footer" class="dialog-footer">
  296 + <el-button type="primary" @click="submitForm">确 定</el-button>
  297 + <el-button @click="cancel">取 消</el-button>
  298 + </div>
  299 + </el-dialog>
  300 +
  301 +
  302 +
  303 + <el-dialog :title="title" :visible.sync="fileOpen" width="80%" append-to-body>
  304 + <file :collboxId=collboxId />
  305 + </el-dialog>
  306 +
  307 + <el-dialog :title="title" :visible.sync="boxOpen" width="80%" append-to-body>
  308 + <el-table v-loading="loading" :data="boxtwoList" @selection-change="handleSelectionChange">
  309 + <el-table-column type="selection" width="55" align="center" />
  310 + <el-table-column label="年度" align="center" prop="year" />
  311 + <el-table-column label="卷盒规则" align="center" prop="boxRule" />
  312 + <el-table-column label="盒号" align="center" prop="boxMark" />
  313 + <el-table-column label="库位码" align="center" prop="deportNodeId" />
  314 + <el-table-column label="描述" align="center" prop="describes" />
  315 + </el-table>
  316 +
  317 + <el-col :span="1.5">
  318 + <el-button
  319 + type="success"
  320 + plain
  321 + icon="el-icon-edit"
  322 + size="mini"
  323 + :disabled="single"
  324 + @click="handleUpdate"
  325 + v-hasPermi="['archives:box:edit']"
  326 + >修改</el-button>
  327 + </el-col>
  328 + <div slot="footer" class="dialog-footer">
  329 + <el-button type="primary" @click="insetBox">确 定</el-button>
  330 + <el-button @click="cancel">取 消</el-button>
  331 + </div>
  332 +
  333 + <!--
  334 + <pagination
  335 + v-show="total>0"
  336 + :total="total"
  337 + :page.sync="queryParams.pageNum"
  338 + :limit.sync="queryParams.pageSize"
  339 + @pagination="getList"
  340 + />-->
  341 +
  342 + </el-dialog>
  343 + </div>
  344 +</template>
  345 +
  346 +<script>
  347 +import { listCollerBox, getBox, delBox, addBox, updateBox } from "@/api/archives/collerctbox";
  348 +import { listBox } from "@/api/archives/box";
  349 +
  350 +import file from "@/views/archives/file/index.vue";
  351 +export default {
  352 + name: "collerctbox",
  353 + dicts: ['approval_type'],
  354 + components: { file },
  355 + props: {
  356 + statusPd: {
  357 + type: Number, // 这里你接收的值是什么类型就写什么类型
  358 + },
  359 + boxsId: {
  360 + type: Number,
  361 + }
  362 + },
  363 +
  364 + data() {
  365 + return {
  366 + // 遮罩层
  367 + loading: true,
  368 + // 选中数组
  369 + ids: [],
  370 + // 非单个禁用
  371 + single: true,
  372 + // 非多个禁用
  373 + multiple: true,
  374 + // 显示搜索条件
  375 + showSearch: true,
  376 + // 总条数
  377 + total: 0,
  378 + // 【登记著录】表格数据
  379 + boxList: [],
  380 + boxtwoList: [],
  381 + // 弹出层标题
  382 + title: "",
  383 + // 是否显示弹出层
  384 + open: false,
  385 + // 查询参数
  386 + queryParams: {
  387 + pageNum: 1,
  388 + pageSize: 10,
  389 + general: null,
  390 + year: null,
  391 + title: null,
  392 + sort: null,
  393 + safekeepingDate: null,
  394 + secretLevel: null,
  395 + pages: null,
  396 + filingNumber: null,
  397 + zkNumber: null,
  398 + locationCode: null,
  399 + filingDept: null,
  400 + archivalCode: null,
  401 + responsibilityName: null,
  402 + serialMark: null,
  403 + pieceMark: null,
  404 + registerMark: null,
  405 + counsellors: null,
  406 + filingName: null,
  407 + summaryName: null,
  408 + recordType: null,
  409 + carrierType: null,
  410 + draftName: null,
  411 + page: null,
  412 + documentMark: null,
  413 + text: null,
  414 + status: null,
  415 + apprvoal: null,
  416 + belongRole: null,
  417 + boxMark: null,
  418 + },
  419 + // 表单参数
  420 + form: {},
  421 + // 表单校验
  422 + rules: {
  423 + },
  424 + approval : "3", //是否审批 //默认待整理
  425 + // statusPd : null, //页面传递参数 1.未整理 2.已整理 3.盒
  426 + titleshow : true,//2.盒 不显示查询条件
  427 + fileOpen : false,
  428 + collboxId: null,//本次Id
  429 + lecommit: false, //提交按钮
  430 + inserBox: false,//加入盒按钮
  431 + boxOpen:false, //盒遮罩层
  432 + collerboxid : null, //盒id
  433 + updateyfiling :false, //预归档
  434 + updatefiling: false,//归档
  435 + approvalStatus: false, //待整理 待审核
  436 + };
  437 + },
  438 + //statusPd 0未整理文件 1 已整理文件 2 盒
  439 + created() {
  440 +
  441 + this.getList();
  442 +
  443 +
  444 + if (this.statusPd == 1){ //已整理
  445 + this.inserBox = true; //加入盒
  446 + this.updateyfiling = true; //预归档
  447 + this.updatefiling = true; //归档
  448 + }
  449 + },
  450 + methods: {
  451 + /** 查询【登记著录】列表 */
  452 + getList() {
  453 + this.loading = true;
  454 + this.queryParams.apprvoal = this.approval; //预归档
  455 + this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
  456 + this.queryParams.status = this.statusPd;
  457 + listCollerBox(this.queryParams).then(response => {
  458 + this.boxList = response.rows;
  459 + this.total = response.total;
  460 + this.loading = false;
  461 + });
  462 + },
  463 + // 取消按钮
  464 + cancel() {
  465 + this.boxOpen = false;
  466 + this.open = false;
  467 + this.reset();
  468 + },
  469 + // 表单重置
  470 + reset() {
  471 + this.form = {
  472 + id: null,
  473 + boxId: null,
  474 + general: null,
  475 + year: null,
  476 + title: null,
  477 + sort: null,
  478 + safekeepingDate: null,
  479 + secretLevel: null,
  480 + pages: null,
  481 + filingNumber: null,
  482 + zkNumber: null,
  483 + locationCode: null,
  484 + filingDept: null,
  485 + archivalCode: null,
  486 + responsibilityName: null,
  487 + serialMark: null,
  488 + pieceMark: null,
  489 + registerMark: null,
  490 + counsellors: null,
  491 + filingName: null,
  492 + summaryName: null,
  493 + recordType: null,
  494 + carrierType: null,
  495 + draftName: null,
  496 + page: null,
  497 + documentMark: null,
  498 + text: null,
  499 + createBy: null,
  500 + createTime: null,
  501 + updateBy: null,
  502 + updateTime: null,
  503 + status: "0",
  504 + apprvoal: null,
  505 + belongRole: null,
  506 + boxMark: null,
  507 + };
  508 + this.resetForm("form");
  509 + },
  510 + /** 搜索按钮操作 */
  511 + handleQuery() {
  512 + this.queryParams.pageNum = 1;
  513 + this.getList();
  514 + },
  515 + /** 重置按钮操作 */
  516 + resetQuery() {
  517 + this.resetForm("queryForm");
  518 + this.handleQuery();
  519 + },
  520 + // 多选框选中数据
  521 + handleSelectionChange(selection) {
  522 + this.ids = selection.map(item => item.id)
  523 + this.single = selection.length!==1
  524 + this.multiple = !selection.length
  525 + },
  526 +
  527 + /** 修改按钮操作 */
  528 + handleUpdate(row) {
  529 + this.reset();
  530 + const id = row.id || this.ids
  531 + getBox(id).then(response => {
  532 + this.form = response.data;
  533 + this.open = true;
  534 + this.title = "修改【22】";
  535 + });
  536 + },
  537 + /** 提交按钮 */
  538 + submitForm() {
  539 + this.$refs["form"].validate(valid => {
  540 + if (valid) {
  541 + if (this.form.id != null) {
  542 + updateBox(this.form).then(response => {
  543 + this.$modal.msgSuccess("修改成功");
  544 + this.open = false;
  545 + this.getList();
  546 + });
  547 + } else {
  548 + this.form.approval = "0" //初始创建所有都是0.待整理
  549 + addBox(this.form).then(response => {
  550 + this.$modal.msgSuccess("新增成功");
  551 + this.open = false;
  552 + this.getList();
  553 + });
  554 + }
  555 + }
  556 + });
  557 + },
  558 +
  559 + /** 导出按钮操作 */
  560 + handleExport() {
  561 + this.download('archives/box/export', {
  562 + ...this.queryParams
  563 + }, `box_${new Date().getTime()}.xlsx`)
  564 + },
  565 +
  566 + /** 查看按钮 **/
  567 + handleCheck(row){
  568 + this.fileOpen = true;
  569 + this.collboxId = row.id;
  570 + },
  571 + //打开加入盒页面 并保存id
  572 + handleinserBox(row){
  573 + const collerboxid = row.id || this.ids;
  574 + this.boxOpen = true;
  575 + this.collerboxid = collerboxid;
  576 + this.queryParams.apprvoal = "3"; //只能加入预归档盒中
  577 + listBox(this.queryParams).then(response => {
  578 + this.boxtwoList = response.rows;
  579 + });
  580 + },
  581 +
  582 + //加入盒
  583 + insetBox(row){
  584 + let id = row.id || this.ids;
  585 + if (id.length > 1){
  586 + alert("请选择1个盒")
  587 + return;
  588 + }
  589 + let collerboxid = this.collerboxid;
  590 + getBox(id).then(response => {
  591 + let from = response.data;
  592 + from.boxId = id + ""; //盒id
  593 + from.status = "2"; //盒内 2
  594 + updateBox(from).then(response => {
  595 + this.$modal.msgSuccess("提交成功");
  596 + this.boxOpen = false;
  597 + });
  598 + });
  599 + },
  600 +
  601 +
  602 + /** 打回 **/
  603 + handleupdateyreturn(row){
  604 + const id = row.id || this.ids
  605 + this.handleSelectId(id,"2")
  606 + },
  607 +
  608 + /** 归档 **/
  609 + handleupdatefiling(row){
  610 + this.handleSelectId(id,"4")
  611 + },
  612 +
  613 +
  614 + handleSelectId(id,apprvoal){
  615 + getBox(id).then(response => {
  616 + let from = response.data;
  617 + from.apprvoal = apprvoal;
  618 + updateBox(from).then(response => {
  619 + this.$modal.msgSuccess("提交成功");
  620 + this.open = false;
  621 + this.getList();
  622 + });
  623 + });
  624 + },
  625 +
  626 + approvalpuRefresh(){
  627 + this.getList();
  628 + }
  629 + }
  630 +};
  631 +</script>
ruoyi-ui/src/views/archives/file/index.vue
  View file @0da383a
@@ -270,6 +270,7 @@ export default { @@ -270,6 +270,7 @@ export default {
270 /** 查询文件列表 */ 270 /** 查询文件列表 */
271 getList() { 271 getList() {
272 this.loading = true; 272 this.loading = true;
  273 + this.queryParams.colletctId = this.collboxId;
273 listFile(this.queryParams).then(response => { 274 listFile(this.queryParams).then(response => {
274 this.fileList = response.rows; 275 this.fileList = response.rows;
275 this.total = response.total; 276 this.total = response.total;
ruoyi-ui/src/views/archives/filing.vue 0 → 100644
  View file @0da383a
  1 +<template>
  2 + <div class="app-container">
  3 +
  4 + <el-row :gutter="20">
  5 + <!--部门数据-->
  6 + <el-col :span="4" :xs="24">
  7 +
  8 +
  9 +
  10 + <div class="head-container">
  11 + <el-input
  12 + v-model="deptName"
  13 + placeholder="请输入部门名称"
  14 + clearable
  15 + size="small"
  16 + prefix-icon="el-icon-search"
  17 + style="margin-bottom: 20px"
  18 + />
  19 + </div>
  20 + <div class="head-container">
  21 + <el-tree
  22 + :data="deptOptions"
  23 + :expand-on-click-node="false"
  24 + ref="tree"
  25 + default-expand-all
  26 + highlight-current
  27 + @node-click="handleNodeClick"
  28 + />
  29 + </div>
  30 + </el-col>
  31 + <!--用户数据-->
  32 + <el-col :span="20" :xs="24">
  33 +
  34 + <div class="text-center" style="height: 804px ;overflow:auto; ">
  35 +
  36 +
  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>
  40 + </el-tabs>
  41 +
  42 + <el-tabs v-model="tactiveName" type="card" @tab-click="thandleClick" v-if="stat">
  43 + <el-tab-pane label="未整理文件" name="tfirst" > <indexvolume :statusPd=0 v-if="itFirst"/></el-tab-pane>
  44 + <el-tab-pane label="未整理案卷" name="tsecond" ><indexvolume :statusPd="1" v-if="itSecond" /></el-tab-pane>
  45 + <el-tab-pane label="已整理案卷" name="tthird" ><indexvolume v-if="itThird" /></el-tab-pane>
  46 + </el-tabs>
  47 +
  48 +
  49 + </div>
  50 + </el-col>
  51 + </el-row>
  52 + </div>
  53 +</template>
  54 +
  55 +<script >
  56 +import {treeselect} from "@/api/archives/dept";
  57 +import indexbox from "@/views/archives/collerctbox/filingindex";
  58 +import box from "@/views/archives/box/filingindex";
  59 +import indexvolume from "@/views/archives/volume/index";
  60 +export default {
  61 + components: { indexbox ,indexvolume,box},
  62 + name: "archiveindex",
  63 + data() {
  64 + return {
  65 + // 部门树选项
  66 + deptOptions: undefined,
  67 + // 部门名称
  68 + deptName: undefined,
  69 + deptId : null,
  70 + activeName: 'second',
  71 + tactiveName: 'tfirst',
  72 + isSecond: true,
  73 + isThird: false,
  74 + itFirst: true,
  75 + itSecond: false,
  76 + itThird: false,
  77 + shellOpen: false,
  78 + stat:false,
  79 + stattwo : true,
  80 + reportUrl : null
  81 + };
  82 + },
  83 +
  84 + watch: {
  85 + // 根据名称筛选部门树
  86 + deptName(val) {
  87 + this.$refs.tree.filter(val);
  88 + },
  89 + },
  90 +
  91 + created() {
  92 + this.getTreeselect();
  93 + },
  94 + methods: {
  95 + /** 查询部门下拉树结构 */
  96 + getTreeselect() {
  97 + treeselect().then(response => {
  98 + this.deptOptions = response.data;
  99 + });
  100 + },
  101 + // 节点单击事件
  102 + handleNodeClick(data) {
  103 + this.deptId = data.id;
  104 +
  105 + this.stattwo = this.stattwo == false ? true : false;
  106 + this.stat = this.stat == false ? true : false;
  107 + },
  108 +
  109 + handleClick(tab) {
  110 + if (tab.name == 'second') {
  111 + this.isSecond = true
  112 + this.isThird = false
  113 + }else if (tab.name == 'third') {
  114 + this.isSecond = false
  115 + this.isThird = true
  116 + }
  117 + },
  118 +
  119 + thandleClick(tab) {
  120 + if (tab.name == 'tfirst') {
  121 + this.itFirst = true
  122 + this.itSecond = false
  123 + this.itThird = false
  124 + }else if (tab.name == 'tsecond') {
  125 + this.itFirst = false
  126 + this.itSecond = true
  127 + this.itThird = false
  128 + }else if (tab.name == 'tthird') {
  129 + this.itFirst = false
  130 + this.itSecond = false
  131 + this.itThird = true
  132 + }
  133 + },
  134 +
  135 + }
  136 +};
  137 +</script>
ruoyi-ui/src/views/archives/yfiling.vue 0 → 100644
  View file @0da383a
  1 +<template>
  2 + <div class="app-container">
  3 +
  4 + <el-row :gutter="20">
  5 + <!--部门数据-->
  6 + <el-col :span="4" :xs="24">
  7 +
  8 +
  9 +
  10 + <div class="head-container">
  11 + <el-input
  12 + v-model="deptName"
  13 + placeholder="请输入部门名称"
  14 + clearable
  15 + size="small"
  16 + prefix-icon="el-icon-search"
  17 + style="margin-bottom: 20px"
  18 + />
  19 + </div>
  20 + <div class="head-container">
  21 + <el-tree
  22 + :data="deptOptions"
  23 + :expand-on-click-node="false"
  24 + ref="tree"
  25 + default-expand-all
  26 + highlight-current
  27 + @node-click="handleNodeClick"
  28 + />
  29 + </div>
  30 + </el-col>
  31 + <!--用户数据-->
  32 + <el-col :span="20" :xs="24">
  33 +
  34 + <div class="text-center" style="height: 804px ;overflow:auto; ">
  35 +
  36 +
  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>
  41 + </el-tabs>
  42 +
  43 + <el-tabs v-model="tactiveName" type="card" @tab-click="thandleClick" v-if="stat">
  44 + <el-tab-pane label="未整理文件" name="tfirst" > <indexvolume :statusPd=0 v-if="itFirst"/></el-tab-pane>
  45 + <el-tab-pane label="未整理案卷" name="tsecond" ><indexvolume :statusPd="1" v-if="itSecond" /></el-tab-pane>
  46 + <el-tab-pane label="已整理案卷" name="tthird" ><indexvolume v-if="itThird" /></el-tab-pane>
  47 + </el-tabs>
  48 +
  49 +
  50 + </div>
  51 + </el-col>
  52 + </el-row>
  53 + </div>
  54 +</template>
  55 +
  56 +<script >
  57 +import {treeselect} from "@/api/archives/dept";
  58 +import indexbox from "@/views/archives/collerctbox/yfilingindex";
  59 +import box from "@/views/archives/box/yfilingindex";
  60 +import indexvolume from "@/views/archives/volume/index";
  61 +export default {
  62 + components: { indexbox ,indexvolume,box},
  63 + name: "archiveindex",
  64 + data() {
  65 + return {
  66 + // 部门树选项
  67 + deptOptions: undefined,
  68 + // 部门名称
  69 + deptName: undefined,
  70 + deptId : null,
  71 + activeName: 'second',
  72 + tactiveName: 'tfirst',
  73 + isSecond: true,
  74 + isThird: false,
  75 + itFirst: true,
  76 + itSecond: false,
  77 + itThird: false,
  78 + shellOpen: false,
  79 + stat:false,
  80 + stattwo : true,
  81 + reportUrl : null
  82 + };
  83 + },
  84 +
  85 + watch: {
  86 + // 根据名称筛选部门树
  87 + deptName(val) {
  88 + this.$refs.tree.filter(val);
  89 + },
  90 + },
  91 +
  92 + created() {
  93 + this.getTreeselect();
  94 + },
  95 + methods: {
  96 + /** 查询部门下拉树结构 */
  97 + getTreeselect() {
  98 + treeselect().then(response => {
  99 + this.deptOptions = response.data;
  100 + });
  101 + },
  102 + // 节点单击事件
  103 + handleNodeClick(data) {
  104 + this.deptId = data.id;
  105 +
  106 + this.stattwo = this.stattwo == false ? true : false;
  107 + this.stat = this.stat == false ? true : false;
  108 + },
  109 +
  110 + handleClick(tab) {
  111 + if (tab.name == 'second') {
  112 + this.isSecond = true
  113 + this.isThird = false
  114 + }else if (tab.name == 'third') {
  115 + this.isSecond = false
  116 + this.isThird = true
  117 + }
  118 + },
  119 +
  120 + thandleClick(tab) {
  121 + if (tab.name == 'tfirst') {
  122 + this.itFirst = true
  123 + this.itSecond = false
  124 + this.itThird = false
  125 + }else if (tab.name == 'tsecond') {
  126 + this.itFirst = false
  127 + this.itSecond = true
  128 + this.itThird = false
  129 + }else if (tab.name == 'tthird') {
  130 + this.itFirst = false
  131 + this.itSecond = false
  132 + this.itThird = true
  133 + }
  134 + },
  135 +
  136 + }
  137 +};
  138 +</script>