图书，人事档案修改

src/const/crud/archives/rsArchiveRecordinfo.js

@@ -166,7 +166,7 @@ export const rsTableOption = {
     {
       label: '备注',
       prop: 'remark',
-      search: true
+      //search: true
     },
   ]
 }

src/const/crud/archives/tsArchiveRecordinfo.js

@@ -130,6 +130,7 @@ export const tsTableOption = {
       label: '图书载体',
       prop: 'type',
       type: 'select',
+      search:true,
       dicUrl: process.env.VUE_APP_BASE_API+'/system/dict/data/type/pro_book_type',
       props:{
         label:'dictLabel',
@@ -139,12 +140,22 @@ export const tsTableOption = {
     {
       label: '年度',
       prop: 'year',
+      search:true,
+      // rules: [{
+      //   required: true,
+      //   message: '请输入年度',
+      //   trigger: 'change'
+      // }],
+      type:'year',
+      format: "yyyy",
+      valueFormat: "yyyy",
       rules: [{
         required: true,
-        message: '请输入年度',
+        message: '请选择年度',
         trigger: 'change'
-      }],
+      }]
-      value:new Date().getFullYear()
+      // ,
+      // value:new Date().getFullYear()
     },
     {
       label: '册/套',

src/views/archives/commonComponent/storageTime.vue

@@ -3,14 +3,17 @@
     class="el-form-item el-form-item--feedback el-form-item--small avue-form__item--"
     style="padding-left:18px">
 
-    <label for="storageTime" class="el-form-item__label" style="width: 80px;">保管期限:</label>
+    <div v-if="$props.archiveScopeValue!='TS'">
-    <div class="el-form-item__content" style="margin-left: 83px;">
+      <label for="storageTime" class="el-form-item__label" style="width: 80px;">保管期限:</label>
-      <el-radio-group v-model="storageTime" size="mini" id="storageTime">
+      <div class="el-form-item__content" style="margin-left: 83px;">
-        <el-radio-button label="0" key="0">全部</el-radio-button>
+        <el-radio-group v-model="storageTime" size="mini" id="storageTime">
-        <el-radio-button v-for="item in storageTimeList" :label="item.dictValue" :key="item.id">{{ item.dictLabel }}
+          <el-radio-button label="0" key="0">全部</el-radio-button>
-        </el-radio-button>
+          <el-radio-button v-for="item in storageTimeList" :label="item.dictValue" :key="item.id">{{ item.dictLabel }}
-      </el-radio-group>
+          </el-radio-button>
+        </el-radio-group>
+      </div>
     </div>
+
     <div v-if="$props.archiveScopeValue=='JJ'||$props.archiveScopeValue=='SW'||$props.archiveScopeValue=='SX'||
                $props.archiveScopeValue=='ZXXM'||$props.archiveScopeValue=='ZX'||$props.archiveScopeValue=='TS'">
     <br>

src/views/archives/preFiling/index.vue

@@ -391,13 +391,18 @@ export default {
           let lables=data.label.split("-");
           this.paramsSearch['fileNum']=lables[0];
           this.paramsSearch.project_name =lables[1]
-        }else{
+        }else if (code=='TS'){
+          //如果是图书档案
+          this.archiveScopeValue = data.code.slice(data.code.length-2);
+        }else {
           this.year=data.label;
         }
       }else{
         //一级查询如果是基建档案，则滞空fileNum;和右侧档号查询只取其一
         if (code=='JJ'){
           this.paramsSearch['fileNum']=null;
+        }else if (code=='TS'){
+          this.archiveScopeValue = null;
         }
       }
       //选中的档案类目赋给当前code
@@ -444,15 +449,17 @@ export default {
     },
 
     getPage(page, params) {
-
+      console.log(this.archiveScopeValue)
       this.paramsSearch.status=this.activeTabs;
       this.paramsSearch.archiveCategory=this.code;
-      this.paramsSearch.year=this.year;
+      this.paramsSearch.year=params == undefined ? this.year : params.year;
       this.paramsSearch.storageTime=this.storageTimeValue;
       this.paramsSearch.archiveScope=this.archiveScopeValue;
       if (this.recordType!=null){
         this.paramsSearch.recordType=this.recordType;
       }
+
+      console.log( this.paramsSearch)
       this.tableLoading = true;
       listInfo(Object.assign({
         pageNum: page.currentPage,