From f68af4c07c4ca474967f67e5449c326c5b4c86fe Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Thu, 18 Aug 2022 10:16:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86-=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archivesList/archivesAnjuan/index.vue     | 34 ++++++++++++-------
 .../archivesList/archivesJuannei/index.vue    |  2 ++
 .../archivesList/archivesProject/index.vue    |  3 ++
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
index 9f5af23..a259ff7 100644
--- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
@@ -20,9 +20,9 @@
       </div>
       <div class="head-search">
         <!-- 搜索 -->
-        <el-select v-if="!recycleMain.isRecycle" v-model="anjuanQuery.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 100px" @change="stateSelect">
+        <el-select v-if="!recycleMain.isRecycle" v-model="query.queryType" clearable size="small" placeholder="状态" class="filter-item" style="width: 100px" @change="stateSelect">
           <i slot="prefix" class="iconfont icon-zhuangtai-fanbai" />
-          <el-option v-for="item in stateOptions" :key="item.key" :label="item.label" :value="item.key" />
+          <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         <el-input v-model="anjuanQuery[anjuanInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 220px;" class="input-prepend filter-item" @clear="getTableList()" @keyup.enter.native="getTableList">
           <el-select slot="prepend" v-model="anjuanInputSelect" style="width: 112px" @change="querySelect(anjuanInputSelect)">
@@ -236,15 +236,16 @@ export default {
       anjuanData: [],
       anjuanQuery: {},
       queryOption: [],
-      tableHeight: null,
       anjuanInputSelect: '',
+      anjuanTableHeight: null,
       stateOptions: [ // 搜索 - 状态选择
-        { key: '全部', label: '全部' },
-        { key: '未装', label: '未装' },
-        { key: '未入', label: '未入' },
-        { key: '在库', label: '在库' },
-        { key: '待借', label: '待借' },
-        { key: '已借', label: '已借' }
+        { value: '0', label: '全部' },
+        { value: '1', label: '未装' },
+        { value: '2', label: '未入' },
+        { value: '3', label: '待入' },
+        { value: '4', label: '在库' },
+        { value: '5', label: '待借' },
+        { value: '6', label: '已借' }
       ],
       isAnjuan: true, // 用于判断卷内-新增/导出按钮
       lengingVisible: false // 借阅
@@ -281,11 +282,20 @@ export default {
   created() {
     this.resetQuery()
     this.selections = []
+    this.query.queryType = this.stateOptions[0].value
   },
   mounted() {
-    this.$nextTick(() => {
-      this.tableHeight = window.innerHeight - 50
-    })
+    // this.$nextTick(() => {
+    //   console.log(this.anjuanData.length)
+    //   if (this.anjuanData.length === 0 || this.anjuanData.length < 10) {
+    //     console.log('tres')
+    //     this.anjuanTableHeight = null
+    //   } else {
+    //     console.log('666')
+    //     const h = '100vh'
+    //     this.anjuanTableHeight = `calc(${h} - 434px)`
+    //   }
+    // })
   },
   methods: {
     // 文件/案卷重置query
diff --git a/src/views/archivesManage/archivesList/archivesJuannei/index.vue b/src/views/archivesManage/archivesList/archivesJuannei/index.vue
index ec5d1fc..b6c2588 100644
--- a/src/views/archivesManage/archivesList/archivesJuannei/index.vue
+++ b/src/views/archivesManage/archivesList/archivesJuannei/index.vue
@@ -180,6 +180,7 @@ export default {
     return {
       junneiData: [],
       juanneiQuery: {},
+      juanneiTableHeight: null,
       queryOption: [
         { value: 'queryTitle', label: '题名' },
         { value: 'archiveNo', label: '档号' },
@@ -214,6 +215,7 @@ export default {
   created() {
     // 初始化带select的输入框的 - 搜索
     this.juanneiInputSelect = this.queryOption[0].value
+    this.query.queryType = null
     this.selections = []
   },
   mounted() {
diff --git a/src/views/archivesManage/archivesList/archivesProject/index.vue b/src/views/archivesManage/archivesList/archivesProject/index.vue
index f400c60..b2f84c7 100644
--- a/src/views/archivesManage/archivesList/archivesProject/index.vue
+++ b/src/views/archivesManage/archivesList/archivesProject/index.vue
@@ -57,6 +57,7 @@
         :data="projectData"
         highlight-current-row
         style="width: 100%;"
+        height="calc(100vh - 434px)"
         @select-all="selectAll"
         @selection-change="crud.selectionChangeHandler"
         @row-click="clickRowHandler"
@@ -143,6 +144,7 @@ export default {
         { value: 'itemNo', label: '项目代号' }
       ],
       projectInputSelect: '',
+      projectTableHeight: null,
       isProject: true // 用于判断案卷-新增/导出按钮
     }
   },
@@ -161,6 +163,7 @@ export default {
   created() {
     // 初始化带select的输入框的 - 搜索
     this.projectInputSelect = this.queryOption[0].value
+    this.query.queryType = null
     this.selections = []
   },
   mounted() {