From 172f28e90fa593ea5fc259a4ab2c78ed01e64f3f Mon Sep 17 00:00:00 2001
From: yzj <2239426921@qq.com>
Date: Thu, 30 Jun 2022 02:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E9=89=B4=E4=BA=8C=E7=BA=A7=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../crud/archives/zxArchiveRecordinfo.js | 19 ++---
src/views/archives/catalog/index.vue | 62 +++++++++-----
.../archives/commonComponent/storageTime.vue | 2 +-
src/views/archives/preFiling/index.vue | 81 ++++++++++++++-----
4 files changed, 110 insertions(+), 54 deletions(-)
diff --git a/src/const/crud/archives/zxArchiveRecordinfo.js b/src/const/crud/archives/zxArchiveRecordinfo.js
index 410dd91..7b0bab2 100644
--- a/src/const/crud/archives/zxArchiveRecordinfo.js
+++ b/src/const/crud/archives/zxArchiveRecordinfo.js
@@ -43,6 +43,15 @@ export const zxTableOption = {
viewDisplay:false,
width: '150px'
},
+ {
+ label: '档号',
+ prop: 'fileNum',
+ search: true,
+ editDisplay:false,
+ addDisplay:false,
+ display:false,
+ width:'150px'
+ },
{
label: '状态',
prop: 'status',
@@ -138,15 +147,7 @@ export const zxTableOption = {
label: '全宗号',
prop: 'totalNum',
},
- {
- label: '档号',
- prop: 'fileNum',
- search: true,
- editDisplay:false,
- addDisplay:false,
- display:false,
- width:'150px'
- },
+
{
label: '档案类别',
prop: 'archiveCategory',
diff --git a/src/views/archives/catalog/index.vue b/src/views/archives/catalog/index.vue
index e63574e..a07b156 100644
--- a/src/views/archives/catalog/index.vue
+++ b/src/views/archives/catalog/index.vue
@@ -5,13 +5,19 @@
-
-
-
- {{ (node || {}).label }}
-
-
-
+
+
+
+
+ {{ node.label }}
+
+
+
@@ -545,25 +551,37 @@ export default {
},
// 节点单击事件
handleNodeClick(data) {
- if (data.code.indexOf("-")!=-1){
- let split= data.code.split("-");
- this.code=split[0];
- this.year=split[1]
+ //是否二级查询
+ let isSecond = data.code.indexOf("-")!=-1;
+ //节点单击选中的档案类目
+ let code = isSecond?data.code.split("-")[0]:data.code;
+ //如果选中的code不等于当前code则需要滞空查询条件;因为一定是选了其他类型的档案(二级查询不能滞空)
+ this.year=null;
+ if (code!=this.code){
+ this.archiveScopeValue=null;
+ this.storageTimeValue=null;
+ this.paramsSearch={};
+ this.$refs.crud.searchReset();
+ }
+ //如果二级查询
+ if (isSecond){
+ //如果是基建档案
+ if (code=='JJ'){
+ this.paramsSearch['fileNum']=data.label.split("-")[0];
}else{
- if (data.code!=this.code){
- this.archiveScopeValue=null;
- this.storageTimeValue=null;
- this.paramsSearch={};
- this.$refs.crud.searchReset();
- }
- this.code=data.code;
- this.year=null
+ this.year=data.label;
}
+ }else{
+ //一级查询如果是基建档案，则滞空fileNum;和右侧档号查询只取其一
+ if (code=='JJ'){
+ this.paramsSearch['fileNum']=null;
+ }
+ }
+ //选中的档案类目赋给当前code
+ this.code=code;
+ this.$set(this.form,'archiveCategory',this.code);
this.page.currentPage=1
this.getPage(this.page)
- setTimeout(n=>{
- this.form.archiveCategory=this.code;
- },1000)
},
// 筛选节点
filterNode(value, data) {
diff --git a/src/views/archives/commonComponent/storageTime.vue b/src/views/archives/commonComponent/storageTime.vue
index 8d9417e..e43275a 100644
--- a/src/views/archives/commonComponent/storageTime.vue
+++ b/src/views/archives/commonComponent/storageTime.vue
@@ -12,7 +12,7 @@
+ $props.archiveScopeValue=='ZXXM'||$props.archiveScopeValue=='ZX'">
diff --git a/src/views/archives/preFiling/index.vue b/src/views/archives/preFiling/index.vue
index a0dbefe..226ac71 100644
--- a/src/views/archives/preFiling/index.vue
+++ b/src/views/archives/preFiling/index.vue
@@ -5,14 +5,19 @@
-
-
-
-
- {{ (node || {}).label }}
-
-
-
+
+
+
+
+ {{ node.label }}
+
+
+
@@ -327,25 +332,57 @@ export default {
},
// 节点单击事件
handleNodeClick(data) {
- if (data.code.indexOf("-")!=-1){
- let split= data.code.split("-");
- this.code=split[0];
- this.year=split[1]
+
+ //是否二级查询
+ let isSecond = data.code.indexOf("-")!=-1;
+ //节点单击选中的档案类目
+ let code = isSecond?data.code.split("-")[0]:data.code;
+ //如果选中的code不等于当前code则需要滞空查询条件;因为一定是选了其他类型的档案(二级查询不能滞空)
+ this.year=null;
+ if (code!=this.code){
+ this.archiveScopeValue=null;
+ this.storageTimeValue=null;
+ this.paramsSearch={};
+ this.$refs.crud.searchReset();
+ }
+ //如果二级查询
+ if (isSecond){
+ //如果是基建档案
+ if (code=='JJ'){
+ this.paramsSearch['fileNum']=data.label.split("-")[0];
+ }else{
+ this.year=data.label;
+ }
}else{
- if (data.code!=this.code){
- this.archiveScopeValue=null;
- this.storageTimeValue=null;
- this.paramsSearch={};
- this.$refs.crud.searchReset();
+ //一级查询如果是基建档案，则滞空fileNum;和右侧档号查询只取其一
+ if (code=='JJ'){
+ this.paramsSearch['fileNum']=null;
}
- this.code=data.code;
- this.year=null
}
+ //选中的档案类目赋给当前code
+ this.code=code;
+ this.$set(this.form,'archiveCategory',this.code);
this.page.currentPage=1
this.getPage(this.page)
- setTimeout(n=>{
- this.form.archiveCategory=this.code;
- },1000)
+ // if (data.code.indexOf("-")!=-1){
+ // let split= data.code.split("-");
+ // this.code=split[0];
+ // this.year=split[1]
+ // }else{
+ // if (data.code!=this.code){
+ // this.archiveScopeValue=null;
+ // this.storageTimeValue=null;
+ // this.paramsSearch={};
+ // this.$refs.crud.searchReset();
+ // }
+ // this.code=data.code;
+ // this.year=null
+ // }
+ // this.page.currentPage=1
+ // this.getPage(this.page)
+ // setTimeout(n=>{
+ // this.form.archiveCategory=this.code;
+ // },1000)
},
// 筛选节点