bug修复

src/layout/components/Navbar.vue

@@ -218,6 +218,7 @@ export default {
     logout() {
       this.$store.dispatch('LogOut').then(() => {
         location.reload()
+        localStorage.clear()
       })
     },
     handleClose(done) {

src/views/collectReorganizi/collectionLibrary/index.vue

@@ -233,20 +233,21 @@ export default {
             return {
               label: category.cnName,
               cnName: category.cnName,
+              code: category.code,
               id: category.id,
               arrangeType: category.arrangeType,
               isType: category.isType,
               fondsId: item.fondsId,
               fondName: item.fondName,
               fondsNo: item.fondsNo,
-              children: this.transformChildren(category.children, item.fondsId, item.fondName, item.fondsNo)
+              children: this.transformChildren(category.children, category.code, item.fondsId, item.fondName, item.fondsNo)
             }
           })
         }
       })
     },
     // 递归函数，用于处理数据的子节点
-    transformChildren(children, fondsId, fondName, fondsNo) {
+    transformChildren(children, code, fondsId, fondName, fondsNo) {
       return children.map(child => {
         return {
           label: child.cnName,
@@ -254,7 +255,7 @@ export default {
           id: child.id,
           isType: child.isType,
           pid: child.pid,
-          code: child.code,
+          code: child.code || code,
           arrangeType: child.arrangeType,
           fondsId: fondsId,
           fondName: fondName,
@@ -305,6 +306,7 @@ export default {
         if (currentKey && currentKey.id) {
           this.$nextTick(() => {
             // 选中节点的门类详情
+            console.log('444')
             this.handleNodeClick(currentKey)
           })
         }
@@ -316,10 +318,17 @@ export default {
           return node.isType !== 1
         })
         this.expandAllChildren(this.$refs.categroyTree.getNode(this.crud.data[0]), currentKey)
+        console.log('currentKey', currentKey)
       } else {
         currentKey = this.crud.data[0]
         this.expandAllChildren(this.$refs.categroyTree.getNode(this.crud.data[0]), currentKey)
       }
+
+      if (currentKey && currentKey.id) {
+        this.$nextTick(() => {
+          this.handleNodeClick(currentKey)
+        })
+      }
     },
     handleNodeClick(val) {
       localStorage.removeItem('savePrevFromData')

src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue

@@ -696,8 +696,9 @@ export default {
             } else if (this.collectTitle === '卷内' && this.parentsData.parentsAnjuanRow) {
               // 全宗fonds_no、门类archival_category_code、档案分类archive_ctg_no、年度archive_year、保管期限retention、案卷号record_no、责任者signer
               const rowAjData = this.parentsData.parentsAnjuanRow
-              const fields = ['fonds_no', 'archive_ctg_no', 'archive_year', 'retention', 'record_no', 'signer']
-              const result = { is_entity: 1, archival_category_code: this.selectedCategory.code }
+              const fields = ['archive_ctg_no', 'archive_year', 'retention', 'record_no', 'signer']
+              console.log('this.selectedCategory', this.selectedCategory)
+              const result = { is_entity: 1, 'fonds_no': this.selectedCategory.fondsNo, 'archival_category_code': this.selectedCategory.code }
 
               fields.forEach(field => {
                 if (rowAjData.hasOwnProperty(field)) {

src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue

@@ -15,8 +15,8 @@
             </ul>
           </div> -->
           <div class="head-search">
-            <el-input v-model="query.search" clearable size="small" placeholder="输入题名或档号搜索" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" @keyup.enter.native="getViewTableList" @clear="getViewTableList" />
-            <el-button class="filter-item filter-search" style="margin: 0 10px;" size="mini" type="success" icon="el-icon-search" @click="getViewTableList">搜索</el-button>
+            <el-input v-model="query.search" clearable size="small" placeholder="输入题名或档号搜索" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" @keyup.enter.native="getViewTableList('search')" @clear="getViewTableList('search')" />
+            <el-button class="filter-item filter-search" style="margin: 0 10px;" size="mini" type="success" icon="el-icon-search" @click="getViewTableList('search')">搜索</el-button>
             <el-button class="filter-item filter-refresh" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
           </div>
         </div>
@@ -35,6 +35,17 @@
             @row-click="clickRowHandler"
           >
             <el-table-column type="selection" align="center" width="55" />
+            <el-table-column label="序号" width="55" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column type="index" label="序号" width="55" align="center" /> -->
+            <el-table-column :label="currentCategory.arrangeType === 1 ? '原文':'卷内'" prop="child" width="55" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.child === '' ? 0 : scope.row.child }}
+              </template>
+            </el-table-column>
             <el-table-column v-for="field in tableDisplayFields" :key="field.id" :label="field.fieldCnName" :align="field.displayformatType" :width="field.displayLength" show-overflow-tooltip>
               <template slot="header">
                 <el-tooltip
@@ -137,6 +148,8 @@ export default {
   },
   methods: {
     resetQuery() {
+      this.page.page = 1
+      this.page.size = 10
       this.query.search = null
       this.getViewTableList()
     },
@@ -147,6 +160,9 @@ export default {
       if (data) {
         this.currentCategory = data
         if (this.currentCategory.isType !== 1) {
+          this.page.page = 1
+          this.page.size = 10
+          this.query.search = null
           this.getViewTable()
         } else {
           this.tableDisplayFields = []
@@ -156,6 +172,9 @@ export default {
     },
     open() {
       if (this.currentCategory) {
+        this.page.page = 1
+        this.page.size = 10
+        this.query.search = null
         this.getViewTable()
       }
     },
@@ -191,7 +210,10 @@ export default {
         }
       })
     },
-    getViewTableList() {
+    getViewTableList(type) {
+      if (type === 'search') {
+        this.page.page = 1
+      }
       this.tableData = []
       this.loading = true
       const params = {

src/views/login.vue

@@ -124,6 +124,7 @@ export default {
     }
   },
   created() {
+    localStorage.clear()
     // 获取验证码
     this.getCode()
     // 获取用户名密码等Cookie