预归档/收集库

src/views/collectReorganizi/collectionLibrary/anjuan/content.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <ul class="tab-nav">
+  <div :class="selectedCategory.arrangeType === 1 ? 'collect-no-tab' : ''">
+    <ul v-if="!(selectedCategory.arrangeType === 1)" class="tab-nav">
       <li :class="{ 'active-tab-nav': activeIndex == 0 }" @click="changeActiveTab(0)">已整理<i /></li>
       <li :class="{ 'active-tab-nav': activeIndex == 1 }" @click="changeActiveTab(1)">未整理<i /></li>
       <!-- 最右侧装饰img -->
@@ -54,4 +54,10 @@ export default {
 [data-theme=light] .archives-container .tab-content .tab-nav{
   border-bottom: none;
 }
+.collect-no-tab{
+  padding-top: 36px !important;
+}
+[data-theme=dark] .collect-no-tab{
+  padding-top: 0 !important;
+}
 </style>

src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue

@@ -18,7 +18,7 @@
     >
       <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column :label=" selectedCategory.arrangeType === 1 ? '文件':'卷内'" prop="children_num" width="55" align="center" />
+      <el-table-column :label="selectedCategory.arrangeType === 1 || (selectedCategory.arrangeType !==1 && activeIndex===1) ? '原文':'卷内'" prop="children_num" width="55" align="center" />
       <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
@@ -156,17 +156,29 @@ export default {
       console.log('tableDoubleClick', row)
       this.arcId = row.id
 
-      if (this.selectedCategory.isType !== 5) {
+      if (this.selectedCategory.arrangeType !== 1) {
         this.$refs.archivesInfo.isHasFile = false
-      } else {
+        if (this.activeIndex === 1) {
+          this.$refs.archivesInfo.detailTitle = '文件详情'
           this.$refs.archivesInfo.isHasFile = true
-      }
-
-      if (this.selectedCategory.arrangeType === 2) {
+        } else {
           this.$refs.archivesInfo.detailTitle = '案卷详情'
+        }
       } else {
+        this.$refs.archivesInfo.isHasFile = true
         this.$refs.archivesInfo.detailTitle = '文件详情'
       }
+
+      // if (this.selectedCategory.arrangeType === 2) {
+      //   if (this.activeIndex === 1) {
+      //     this.$refs.archivesInfo.detailTitle = '文件详情'
+      //     this.$refs.archivesInfo.isHasFile = true
+      //   } else {
+      //     this.$refs.archivesInfo.detailTitle = '案卷详情'
+      //   }
+      // } else {
+      //   this.$refs.archivesInfo.detailTitle = '文件详情'
+      // }
       this.$refs.archivesInfo.archivesInfoVisible = true
       this.$refs.archivesInfo.archivesTabIndex = 0
       // this.$refs.archivesInfo.getDetial(row.id)

src/views/collectReorganizi/collectionLibrary/file/index.vue

@@ -6,7 +6,7 @@
     :wrapper-closable="false"
     :show-close="false"
     direction="rtl"
-    :size="(selectedCategory.arrangeType ===3 && isAjNo === 1 ) ? '80%' : (isAjNo === 1) ? '90%' : (selectedCategory.arrangeType === 1) ? '90%' : '70%'"
+    :size="((selectedCategory.arrangeType === 2 && isAjNo === 0) || (selectedCategory.arrangeType === 3 && isAjNo === 1)) ? '80%' : (isAjNo === 1) ? '90%' : (selectedCategory.arrangeType === 1) ? '90%' : '70%'"
   >
     <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" :selections="selections" :test="test" />
     <span class="closed-btn" @click="closeDrawer" />

src/views/collectReorganizi/collectionLibrary/index.vue

@@ -48,28 +48,23 @@
               </el-tree>
             </div>
             <h3 class="arc-title arc-title-bottom">快速筛选</h3>
+            <!-- @node-click="handleNodeClick" -->
             <el-tree
               ref="tree"
               v-loading="crud.loading"
               class="arc-tree arc-tree-02"
-              :data="crud.data"
-              :props="defaultProps"
+              :data="classifyTree"
+              :props="defaultClassifyProps"
               node-key="id"
               :expand-on-click-node="false"
               highlight-current
-              :default-expanded-keys="[1]"
-              :default-checked-keys="[1]"
-              @node-click="handleNodeClick"
             >
               <span slot-scope="{ node, data }" class="custom-tree-node">
-                <span v-if="data.isType===1 " class="iconClassify">
-                  {{ data.cnName }}
-                </span>
-                <span v-if="data.isType===2 || data.isType === 3 || data.isType===5" class="iconClassify-child">
-                  {{ data.cnName }}
+                <span v-if="data.pid === null " class="iconClassify">
+                  {{ data.name }}
                 </span>
-                <span v-if="data.isType===4" class="iconClassify-child">
-                  {{ data.cnName }}
+                <span v-if="data.pid" class="iconClassify-child">
+                  {{ data.name }}
                 </span>
               </span>
             </el-tree>
@@ -93,10 +88,11 @@
 
 <script>
 import crudCategory from '@/api/category/category'
+import { FetchArchivesClassTree } from '@/api/system/archivesClass'
 import CRUD, { presenter, header } from '@crud/crud'
-import Project from './project/index.vue'
+import Project from './project/index'
 import Anjuan from './anjuan/index'
-import Juannei from './juannei/index.vue'
+import Juannei from './juannei/index'
 import File from './file/index'
 import treeJson from './tree.json'
 export default {
@@ -124,8 +120,13 @@ export default {
         children: 'children',
         label: 'cnName'
       },
+      defaultClassifyProps: {
+        children: 'childArchivesClass',
+        label: 'name'
+      },
       sharedData: '',
-      selectedCategory: {}
+      selectedCategory: {},
+      classifyTree: []
     }
   },
   created() {
@@ -176,7 +177,6 @@ export default {
     },
     [CRUD.HOOK.afterRefresh]() {
       this.crud.data = this.filterData(this.crud.data)
-      console.log(this.crud.data)
       this.$nextTick(() => {
         let currentKey
         if (localStorage.getItem('currentArchivesKey')) {
@@ -219,9 +219,8 @@ export default {
       })
     },
     handleNodeClick(val) {
-      console.log(val)
-      console.log(val.arrangeType)
       this.selectedCategory = val
+      this.getInitArchivesClass(val.id)
       // 缓存当前的选中的
       localStorage.setItem('currentArchivesKey', JSON.stringify(val))
       if (this.$refs.anjuanEle) {
@@ -235,14 +234,24 @@ export default {
         this.$refs.fileEle.fileDrawer = false
       }
     },
+    getInitArchivesClass(categoryId) {
+      const params = {
+        'categoryId': categoryId
+      }
+      FetchArchivesClassTree(params).then((res) => {
+        this.classifyTree = res
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     handleOpenAnjuan(data) {
       this.$refs.anjuanEle.anjuanDrawer = true
+      this.$refs.anjuanEle.$refs.ajContent.activeIndex = 0
       this.$nextTick(() => {
         this.$refs.anjuanEle.$refs.ajContent.test = data
       })
     },
     handleOpenJuannei(data) {
-      // selectedCategory.arrangeType !== 0 && selectedCategory.arrangeType !== null
       if (this.selectedCategory.arrangeType === 1 || (this.selectedCategory.arrangeType === 3 && this.$refs.anjuanEle.$refs.ajContent.activeIndex === 1) || (this.selectedCategory.arrangeType === 2 && this.$refs.anjuanEle.$refs.ajContent.activeIndex === 1)) {
         this.$refs.fileEle.fileDrawer = true
         this.$nextTick(() => {

src/views/collectReorganizi/collectionLibrary/juannei/index.vue

@@ -26,7 +26,7 @@
     >
       <el-table-column type="selection" width="55" :reserve-selection="true" align="center" />
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="文件" prop="children_num" width="55" align="center" />
+      <el-table-column label="原文" prop="children_num" width="55" align="center" />
       <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

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

@@ -1,6 +1,6 @@
 <template>
   <div class="collect-header">
-    <h4 :class="classType">{{ collectTitle }} <span v-if="isTitleType !== 2 && !(isTitleType === 3 && (selectedCategory.arrangeType === 1 || selectedCategory.isType === 2) )"> > {{ test }}</span></h4>
+    <h4 :class="classType">{{ collectTitle }} <span v-if="isTitleType !== 2 && !(isTitleType === 3 && (selectedCategory.arrangeType === 1 || selectedCategory.arrangeType === 2) )"> > {{ test }}</span></h4>
     <div v-if="isTitleType !== 6" class="head-search">
       <!-- 搜索 -->
       <el-input v-model="query.blurry" clearable size="small" :placeholder="placeholderType" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" />
@@ -24,7 +24,7 @@
             <el-menu-item v-if="isTitleType !== 4" index="1-3" @click="toDelete">删除</el-menu-item>
             <el-menu-item v-if="isTitleType === 4" index="1-4" @click="toMove">移出</el-menu-item>
           </el-menu-item-group>
-          <el-menu-item-group v-if="(isTitleType === 3 && selectedCategory.isType === 5) || isTitleType === 4 || isTitleType === 6 || (isTitleType === 3 && activeIndex === 1)" class="collect-submenu-group submenu-tree">
+          <el-menu-item-group v-if="(isTitleType === 3 && selectedCategory.arrangeType === 1) || isTitleType === 4 || isTitleType === 6 || (isTitleType === 3 && activeIndex === 1)" class="collect-submenu-group submenu-tree">
             <template slot="title">原文上传</template>
             <el-menu-item index="1-5" @click="fileUpload(0)">普通上传</el-menu-item>
             <el-menu-item index="1-6" @click="fileUpload(1)">大文件上传</el-menu-item>
@@ -38,22 +38,22 @@
           <el-menu-item-group class="collect-submenu-group">
             <el-menu-item v-if="isTitleType !== 2" index="2-1" @click="handleBlukImport">批量导入</el-menu-item>
             <!-- 项目 / 案卷 / 卷内 / 文件-->
-            <el-menu-item v-if="activeIndex !== 1 || (isTitleType === 3 && selectedCategory.isType === 5 && activeIndex === 1)" index="2-2" @click="handleBlukEditing">批量修改</el-menu-item>
-            <el-menu-item v-if="isTitleType !== 2 && !(isTitleType === 3 && (selectedCategory.isType === 3 || selectedCategory.isType === 2) && activeIndex === 1)" index="2-3" @click="handleAdjustment">档案调整</el-menu-item>
-            <el-menu-item v-if="isTitleType !== 2 && !(isTitleType === 3 && (selectedCategory.isType === 3 || selectedCategory.isType === 2) && activeIndex === 1)" index="2-4" @click="handleFileNumberUpdate">档号更新</el-menu-item>
+            <el-menu-item v-if="activeIndex !== 1 || (isTitleType === 3 && selectedCategory.arrangeType === 1 && activeIndex === 1)" index="2-2" @click="handleBlukEditing">批量修改</el-menu-item>
+            <el-menu-item v-if="isTitleType !== 2 && !(isTitleType === 3 && (selectedCategory.arrangeType === 3 || selectedCategory.arrangeType === 2) && activeIndex === 1)" index="2-3" @click="handleAdjustment">档案调整</el-menu-item>
+            <el-menu-item v-if="isTitleType !== 2 && !(isTitleType === 3 && (selectedCategory.arrangeType === 3 || selectedCategory.arrangeType === 2) && activeIndex === 1)" index="2-4" @click="handleFileNumberUpdate">档号更新</el-menu-item>
             <!-- 案卷 -->
-            <el-menu-item v-if="isTitleType === 3 && activeIndex === 0 && selectedCategory.isType !== 5 " index="2-5" @click="handleFileNumberUpdate">卷内档号更新</el-menu-item>
-            <el-menu-item v-if="isTitleType === 3 && activeIndex === 0 && selectedCategory.isType !== 5" index="2-6" @click="handleUncoil">拆卷</el-menu-item>
-            <el-menu-item v-if="isTitleType === 3 && activeIndex === 0 && selectedCategory.isType !== 5" index="2-7" @click="handleCombineFile">合卷</el-menu-item>
-            <el-menu-item v-if="isTitleType === 3 && selectedCategory.isType !== 5" index="2-8" @click="handleInsertFile">插件</el-menu-item>
+            <el-menu-item v-if="isTitleType === 3 && activeIndex === 0 && selectedCategory.arrangeType !== 1 " index="2-5" @click="handleFileNumberUpdate">卷内档号更新</el-menu-item>
+            <el-menu-item v-if="isTitleType === 3 && activeIndex === 0 && selectedCategory.arrangeType !== 1" index="2-6" @click="handleUncoil">拆卷</el-menu-item>
+            <el-menu-item v-if="isTitleType === 3 && activeIndex === 0 && selectedCategory.arrangeType !== 1" index="2-7" @click="handleCombineFile">合卷</el-menu-item>
+            <el-menu-item v-if="isTitleType === 3 && selectedCategory.arrangeType !== 1" index="2-8" @click="handleInsertFile">插件</el-menu-item>
             <!-- 案卷 / 卷内 / 文件 -->
             <el-menu-item v-if="isTitleType !== 2" index="2-9" @click="handleCollectMoveFile">移动</el-menu-item>
             <!-- 案卷 -->
             <el-menu-item v-if="isTitleType === 3 && activeIndex === 0" index="2-10" @click="handleFiling">归档</el-menu-item>
             <!-- 文件 -->
-            <el-menu-item v-if="(isTitleType === 3 && selectedCategory.isType === 5) || (isTitleType === 3 && activeIndex === 1)" index="2-11" @click="handleReturn">退回预归档库</el-menu-item>
+            <el-menu-item v-if="(isTitleType === 3 && selectedCategory.arrangeType === 1) || (isTitleType === 3 && activeIndex === 1)" index="2-11" @click="handleReturn">退回预归档库</el-menu-item>
           </el-menu-item-group>
-          <el-menu-item-group v-if="isTitleType === 3 && activeIndex === 1 && selectedCategory.isType !== 5" class="collect-submenu-group submenu-tree">
+          <el-menu-item-group v-if="isTitleType === 3 && activeIndex === 1 && selectedCategory.arrangeType !== 1" class="collect-submenu-group submenu-tree">
             <template slot="title">组卷</template>
             <el-menu-item index="2-12" @click="handleQuickPaper">快速组卷</el-menu-item>
             <el-menu-item index="2-13" @click="handlePaper">手工组卷</el-menu-item>
@@ -66,11 +66,11 @@
           </template>
           <el-menu-item-group class="collect-submenu-group">
             <el-menu-item v-if="isTitleType !== 6" index="3-1" @click="handleExport">导出</el-menu-item>
-            <el-menu-item v-if="!(isTitleType === 3 && (selectedCategory.isType === 3 || selectedCategory.isType === 2) && activeIndex === 1) && (isTitleType !== 2 && isTitleType !== 6)" index="3-2" @click="handlePrint">打印</el-menu-item>
-            <el-menu-item v-if="!(isTitleType === 3 && (selectedCategory.isType === 3 || selectedCategory.isType === 2) && activeIndex === 1) && (isTitleType !== 2 && isTitleType !== 6)" index="3-3" @click="handleFourTest">四性检测</el-menu-item>
+            <el-menu-item v-if="!(isTitleType === 3 && (selectedCategory.arrangeType === 3 || selectedCategory.arrangeType === 2) && activeIndex === 1) && (isTitleType !== 2 && isTitleType !== 6)" index="3-2" @click="handlePrint">打印</el-menu-item>
+            <el-menu-item v-if="!(isTitleType === 3 && (selectedCategory.arrangeType === 3 || selectedCategory.arrangeType === 2) && activeIndex === 1) && (isTitleType !== 2 && isTitleType !== 6)" index="3-3" @click="handleFourTest">四性检测</el-menu-item>
             <el-menu-item v-if="isTitleType === 6" index="3-4" @click="handleOriginalDownload">下载</el-menu-item>
           </el-menu-item-group>
-          <el-menu-item-group v-if="!(isTitleType === 3 && (selectedCategory.isType === 3 || selectedCategory.isType === 2) && activeIndex === 1) && (isTitleType !== 2 && isTitleType !== 6)" class="collect-submenu-group submenu-tree">
+          <el-menu-item-group v-if="!(isTitleType === 3 && (selectedCategory.arrangeType === 3 || selectedCategory.arrangeType === 2) && activeIndex === 1) && (isTitleType !== 2 && isTitleType !== 6)" class="collect-submenu-group submenu-tree">
             <template slot="title">电子文件目录</template>
             <el-menu-item index="3-5" @click="handleCatalogDownload">目录下载</el-menu-item>
             <el-menu-item index="3-6" @click="fileUpload(2)">目录上传</el-menu-item>

src/views/collectReorganizi/collectionLibrary/project/index.vue

@@ -2,7 +2,6 @@
   <div class="collect-no-tab">
     <CollectHeader ref="collectHeaderRef" :is-title-type="isTitleType" :selected-category="selectedCategory" :arc-id="arcId" :selections="selections" />
     <!-- <el-button type="text" @click="openAnjuan">打开案卷的Drawer</el-button> -->
-
     <el-table
       ref="table"
       v-loading="crud.loading || getTableDisplayFieldsLoading"

src/views/prearchiveLibrary/index.vue

@@ -13,10 +13,7 @@
                 <span v-if="data.isType === 1 " class="iconFolder">
                   {{ data.cnName }}
                 </span>
-                <span v-if="data.isType === 2" class="iconArch">
-                  {{ data.cnName }}
-                </span>
-                <span v-if="data.isType === 3" class="iconFile">
+                <span v-if="data.isType === 2" class="iconFile">
                   {{ data.cnName }}
                 </span>
               </span>
@@ -194,6 +191,7 @@ export default {
     [CRUD.HOOK.beforeToAdd](crud, form, btn) {
     },
     [CRUD.HOOK.afterRefresh]() {
+      this.crud.data = this.filterData(this.crud.data)
       let currentKey
       if (localStorage.getItem('documentCategoryKey')) {
         currentKey = JSON.parse(localStorage.getItem('documentCategoryKey'))

src/views/system/user/center.vue

@@ -19,15 +19,15 @@
               />
             </div>
             <ul class="user-info">
-              <li><div style="height: 100%"><i class="iconfont icon-zhanghao" />账号<div class="user-right">{{ user.username }}</div></div></li>
-              <li><i class="iconfont icon-yonghuming" style="font-size: 13px;" />用户名<div class="user-right">{{ user.nickName }}</div></li>
-              <li><i class="iconfont icon-xingbie" />性别<div class="user-right">{{ user.gender ? user.gender : '/' }}</div></li>
-              <li><i class="iconfont icon-yonghujiaose" style="font-size: 12px;" />用户角色<div class="user-right"><span v-for="item in user.roles" :key="item.id">{{ item.name + ' ' }}</span></div></li>
-              <li><i class="iconfont icon-suoshuquanzong" />所属全宗<div class="user-right">{{ user.fondsId ? user.fondsId : '/' }}</div></li>
-              <li><i class="iconfont icon-suoshubumen" />所属部门<div class="user-right">{{ user.dept ? user.dept.deptsName : '/' }}</div></li>
-              <li><i class="iconfont icon-shoujihaoma" />手机号码<div class="user-right">{{ user.email ? user.phone : '/' }}</div></li>
-              <li><i class="iconfont icon-yonghuyouxiang" style="font-size: 12px;" />用户邮箱<div class="user-right">{{ user.email ? user.email : '/' }}</div></li>
-              <li><i class="iconfont icon-yanzhengma" />安全设置<div class="user-right"><a @click="$refs.pass.dialog = true">修改密码</a></div></li>
+              <li><p><i class="iconfont icon-zhanghao" />账号</p><div class="user-right">{{ user.username }}</div></li>
+              <li><p><i class="iconfont icon-yonghuming" style="font-size: 13px;" />用户名</p><div class="user-right">{{ user.nickName }}</div></li>
+              <li><p><i class="iconfont icon-xingbie" />性别</p><div class="user-right">{{ user.gender ? user.gender : '-' }}</div></li>
+              <li><p><i class="iconfont icon-yonghujiaose" style="font-size: 12px;" />用户角色</p><div class="user-right"><span v-for="item in user.roles" :key="item.id">{{ item.name }}</span></div></li>
+              <li><p><i class="iconfont icon-suoshuquanzong" />所属全宗</p><div class="user-right">{{ user.fondsId ? user.fondsId : '/' }}</div></li>
+              <li><p><i class="iconfont icon-suoshubumen" />所属部门</p><div class="user-right">{{ user.dept ? user.dept.deptsName : '/' }}</div></li>
+              <li><p><i class="iconfont icon-shoujihaoma" />手机号码</p><div class="user-right">{{ user.email ? user.phone : '-' }}</div></li>
+              <li><p><i class="iconfont icon-yonghuyouxiang" style="font-size: 12px;" />用户邮箱</p><div class="user-right">{{ user.email ? user.email : '-' }}</div></li>
+              <li><p><i class="iconfont icon-yanzhengma" />安全设置</p><div class="user-right"><a @click="$refs.pass.dialog = true">修改密码</a></div></li>
             </ul>
           </div>
         </div>
@@ -312,15 +312,22 @@ export default {
   list-style: none;
   @include user-info-list-style;
   li{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     font-size: 14px;
-    height: 41px;
-    line-height: 40px;
+    // height: 41px;
+    line-height: 34px;
   }
   .user-right {
-    float: right;
     a{
       margin-left: 20px;
     }
+    span{
+      display: block;
+      text-align: right;
+      line-height: 30px;
+    }
   }
 }
 // [data-theme=dark] .tab-item {