bug修复

src/views/archivesManage/managementLibrary/mixins/index.js

@@ -115,7 +115,7 @@ export const manageLibraryCrud = {
         'categoryId': this.selectedCategory.id,
         'categoryLevel': categoryLevel,
         'ignore': false,
-        'isdel': this.parentsData.isdel,
+        'isdel': (this.parentsData.isdel && categoryLevel === 3) ? false : this.parentsData.isdel,
         'checkTypes': this.selectStatus && this.selectStatus.length !== 0 ? this.selectStatus.join(',') : null,
         'search': this.query.search,
         'retention': this.smartQuery.retention,

src/views/archivesManage/managementLibrary/module/collectHeader.vue

@@ -136,7 +136,7 @@
         </el-menu>
       </div>
 
-      <div v-if="isRecycle && (isTitleType === 2 || (isTitleType === 3 && selectedCategory.arrangeType !== 3))" class="collect-menu">
+      <div v-if="isRecycle && (isTitleType === 2 || isTitleType === 3)" class="collect-menu">
         <el-button class="filter-item" size="mini" type="success" @click="toRecover"><i class="iconfont icon-huifu" />恢复</el-button>
         <el-button class="filter-item" size="mini" type="success" @click="toCompletelyDelete"><i class="iconfont icon-shanchu" />彻底删除</el-button>
         <el-button class="filter-item" size="mini" type="success" :disabled="selections.length === 0" @click="handleExport"><i class="iconfont icon-daochu" />导出</el-button>
@@ -713,7 +713,8 @@ export default {
         const params = {
           'categoryId': this.selectedCategory.id,
           'categoryLevel': this.collectLevel,
-          'archivesIds': archivesIds
+          'archivesIds': archivesIds,
+          'collectFormal': this.isTitleType === 2 ? 3 : null
         }
         FetchRestoreArchives(params).then((res) => {
           if (res.code !== 500) {
@@ -721,7 +722,7 @@ export default {
             this.$message({ message: res, type: 'success', offset: 8 })
             this.handleSearch(this.collectLevel)
           } else {
-            this.$message({ message: '回复所选档案失败', type: 'error', offset: 8 })
+            this.$message({ message: '恢复所选档案失败', type: 'error', offset: 8 })
           }
         }).catch(err => {
           console.log(err)
@@ -893,6 +894,7 @@ export default {
   flex-wrap: wrap;
   height: 94px;
   .head-search{
+    height: 32px;
     margin-right: 0 !important;
     margin-bottom: 10px !important;
   }

src/views/collectReorganizi/batchConnection/index.vue

@@ -44,7 +44,7 @@
           </el-table-column>
           <el-table-column prop="matchingMode" label="匹配模式" align="center">
             <template slot-scope="scope">
-              {{ scope.row.matchingMode === 1 ? '全量匹配' : (scope.row.checkRepeatType === 2 ? '前缀模糊匹配' : '后缀模糊匹配') }}
+              {{ scope.row.matchingMode === 1 ? '全量匹配' : (scope.row.matchingMode === 2 ? '前缀模糊匹配' : '后缀模糊匹配') }}
             </template>
           </el-table-column>
           <el-table-column prop="total" label="挂接结果" width="240">

src/views/collectReorganizi/batchConnection/module/form.vue

@@ -169,7 +169,7 @@ export default {
     },
     handleComfired() {
       if (this.fileList.length === 0) {
-        this.$message.info('请先选择相关文件！')
+        this.$message({ message: '请先选择相关文件！', offset: 8 })
         return false
       }
 
@@ -195,14 +195,12 @@ export default {
             this.fileList,
             params
           ).then(res => {
-            console.log(res)
             if (res.data.code === 200) {
-              console.log(res.data.data)
-              this.$message.success('操作成功')
-              this.localHitchVisible = false
+              this.$message({ message: '操作成功', type: 'success', offset: 8 })
             } else {
-              this.$message.error('上传附件失败!')
+              this.$message({ message: '上传附件失败', type: 'error', offset: 8 })
             }
+            this.handleCancel()
             this.crud.refresh()
           })
         } else {
@@ -228,7 +226,7 @@ export default {
     selectFiled(val) {
       if (val) {
         if (this.hitchRemarkArray && this.hitchRemarkArray.includes('$' + val + '$')) {
-          this.$message.info('请注意当前选择的挂接字段，在挂接详情内已存在!')
+          this.$message({ message: '请注意当前选择的挂接字段，在挂接详情内已存在！', offset: 8 })
         } else {
           const lastItemIndex = this.hitchRemarkArray.length - 1
           const index = this.hitchRemarkArray.indexOf('*')

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

@@ -1,5 +1,5 @@
 <template>
-  <div :class="selectedCategory.arrangeType === 1 || isRecycle ? 'collect-no-tab' : ''">
+  <div :class="selectedCategory.arrangeType ===1 || (selectedCategory.arrangeType ===2 && isRecycle) ? 'collect-no-tab' : isRecycle ? 'collect-no-tab-del': ''">
     <ul v-if="!isRecycle && 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>
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import TableListMoudle from './tableList.vue'
+import TableListMoudle from './tableList'
 export default {
   name: 'AnjuanContent',
   components: { TableListMoudle },
@@ -64,7 +64,10 @@ export default {
   border-bottom: none;
 }
 .collect-no-tab{
-  padding-top: 36px !important;
+  padding-top: 33px !important;
+}
+.collect-no-tab-del{
+  padding-top: 31px !important;
 }
 [data-theme=dark] .collect-no-tab{
   padding-top: 0 !important;

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

@@ -58,6 +58,7 @@ export default {
     closeDrawer() {
       this.anjuanDrawer = false
       this.$parent.parentsProjectId = null
+      this.$parent.parentsProjectRow = null
     }
   }
 }

src/views/collectReorganizi/collectionLibrary/index.vue

@@ -129,6 +129,7 @@ export default {
       selectedCategory: {},
       yearChildData: '',
       parentsAnjuanRow: null,
+      parentsProjectRow: null,
       parentsProjectId: null,
       parentsAnjuanId: null,
       parentsJuanneiId: null,
@@ -148,6 +149,12 @@ export default {
     isdel: function(newValue, oldValue) {
     },
     isRecycle: function(newValue, oldValue) {
+    },
+    parentsProjectRow: function(newValue, oldValue) {
+      console.log('parentsProjectRow - newValue', newValue)
+      if (newValue) {
+        this.$refs.projectEle.$refs.collectHeaderRef.getDictsList()
+      }
     }
   },
   created() {
@@ -256,6 +263,8 @@ export default {
       this.parentsProjectId = null
       this.parentsAnjuanId = null
       this.parentsJuanneiId = null
+      this.parentsAnjuanRow = null
+      this.parentsProjectRow = null
       // 缓存当前的选中的
       localStorage.setItem('currentArchivesKey', JSON.stringify(val))
       this.selectedCategory = val
@@ -391,9 +400,11 @@ export default {
         }
       }
     },
-    handleOpenAnjuan(data, parentId) {
+    handleOpenAnjuan(data, parentId, parentsRow) {
       this.parentsProjectId = parentId
+      this.parentsProjectRow = parentsRow
       this.$refs.anjuanEle.anjuanDrawer = true
+
       this.activeIndex = 0
       if (this.$refs.anjuanEle.$refs.ajContent) {
         this.$refs.anjuanEle.$refs.ajContent.activeIndex = 0

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

@@ -137,6 +137,7 @@ export default {
     closeDrawer() {
       this.juanneiDrawer = false
       this.$parent.parentsAnjuanId = null
+      this.$parent.parentsAnjuanRow = null
     },
     rowKey(row) {
       return row.id

src/views/collectReorganizi/collectionLibrary/mixins/index.js

@@ -110,7 +110,7 @@ export const collectionLibraryCrud = {
         'categoryId': this.selectedCategory.id,
         'categoryLevel': categoryLevel,
         'ignore': false,
-        'isdel': this.parentsData.isdel,
+        'isdel': (this.parentsData.isdel && categoryLevel === 3) ? false : this.parentsData.isdel,
         'search': this.query.search,
         'retention': this.smartQuery.retention,
         'security_class': this.smartQuery.security_class,

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

@@ -19,13 +19,13 @@
             slot="option-label"
             slot-scope="{node}"
             style="display:flex; justify-content: space-between ;overflow: hidden;white-space: nowrap;text-overflow: ellipsis; width: 90%;"
-            :title="node.label"
+            :title="node.label"
           >
             <template> {{ node.label }} </template>
           </p>
         </treeselect>
         <treeselect
-          v-if="isTitleType !== 6"
+          v-if="isTitleType !== 6 && isTitleType !== 2"
           v-model="query.archive_ctg_no"
           :options="classifyOptions"
           style="width: 180px;"
@@ -40,7 +40,7 @@
             slot="option-label"
             slot-scope="{node}"
             style="display:flex; justify-content: space-between ;overflow: hidden;white-space: nowrap;text-overflow: ellipsis; width: 90%;"
-            :title="node.label"
+            :title="node.label"
           >
             <template> {{ node.label }} </template>
           </p>
@@ -126,7 +126,7 @@
         </el-menu>
       </div>
 
-      <div v-if="isRecycle && (isTitleType === 2 || (isTitleType === 3 && selectedCategory.arrangeType !== 3))" class="collect-menu">
+      <div v-if="isRecycle && (isTitleType === 2 || isTitleType === 3)" class="collect-menu">
         <el-button class="filter-item" size="mini" type="success" @click="toRecover"><i class="iconfont icon-huifu" />恢复</el-button>
         <el-button class="filter-item" size="mini" type="success" @click="toCompletelyDelete"><i class="iconfont icon-shanchu" />彻底删除</el-button>
       </div>
@@ -156,20 +156,6 @@
         </div>
       </el-dialog>
 
-      <!--删除对话框组件-->
-      <el-dialog class="tip-dialog" title="提示" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="deleteVisible">
-        <div class="setting-dialog">
-          <div class="tip-content">
-            <p class="tipMsg">此删除将把会所选条目与其子集放入回收站</p>
-            <span>你是否还要继续?</span>
-          </div>
-          <div slot="footer" class="dialog-footer">
-            <el-button type="text" @click="deleteVisible = false">取消</el-button>
-            <el-button type="primary" @click.native="handleDelConfirm">确定</el-button>
-          </div>
-        </div>
-      </el-dialog>
-
       <!--卷内移出 组件-->
       <el-dialog class="tip-dialog" title="提示" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="moveVisible">
         <div class="setting-dialog">
@@ -297,11 +283,8 @@ export default {
       formPreviewData: [], // 预览界面data
       projectOptions: [],
       classifyOptions: [],
-      delAllLoading: false,
-      deleteVisible: false,
       moveVisible: false,
       recoverVisible: false,
-      completelyDeleteVisible: false,
       isDesFormType: 'arcives', // 区分是门类得还是档案得
       arcId: null,
       quickPaper: false,
@@ -454,9 +437,37 @@ export default {
         let filteredItems = JSON.parse(JSON.stringify(res)).filter(item => filterCodes.includes(item.dictionaryCode))
         filteredItems = this.addLevelToDictionaryList(filteredItems, 1)
         if (this.selectedCategory.arrangeType === 3 && this.isTitleType === 3) {
-          this.projectOptions = filteredItems
+          console.log('项目下的案卷')
+          let fiterData = []
+          fiterData = filteredItems.flatMap(item => {
+            const level2Childs = item.childDictionarys.filter(child => {
+              return child.dictionaryParents === item.id && child.level === 2
+            })
+            return level2Childs
+          })
+          if (this.parentsData.parentsProjectRow) {
+            if (this.parentsData.parentsProjectRow.project_class !== null || this.parentsData.parentsProjectRow.project_class !== '') {
+              console.log('project_class', this.parentsData.parentsProjectRow.project_class)
+              const findDic = fiterData.find(item => item.dictionaryName === this.parentsData.parentsProjectRow.project_class)
+              console.log('findDic', findDic)
+              this.projectOptions.push(findDic)
+              console.log('444', this.projectOptions)
+            } else {
+              this.projectOptions = fiterData
+            }
+          }
         } else {
-          this.projectOptions = this.filterData(filteredItems, filteredItems[0].id)
+          // this.projectOptions = this.filterData(filteredItems, filteredItems[0].id)
+          this.projectOptions = filteredItems.flatMap(item => {
+            const level2Childs = item.childDictionarys.filter(child => {
+              return child.dictionaryParents === item.id && child.level === 2
+            })
+            // 将满足条件的子项目的childDictionarys设置为空数组,因为项目页不需要
+            level2Childs.forEach(child => {
+              child.childDictionarys = []
+            })
+            return level2Childs
+          })
         }
       }).catch(err => {
         console.log(err)
@@ -490,7 +501,7 @@ export default {
       }
       return {
         id: node.dictionaryName,
-        label: node.level !== 1 ? `${node.dictionaryName} - ${node.dictionaryCode}` : `${node.dictionaryName}`,
+        label: `${node.dictionaryName} - ${node.dictionaryCode}`,
         children: node.childDictionarys,
         isDisabled: this.isTitleType === 3 ? node.level !== 3 : node.level === 1
       }
@@ -501,10 +512,17 @@ export default {
     // 著录界面-form/详情-api
     handleForm(type, isPaper) {
       if (type === 'add') {
-        if (this.parentsData.parentsAnjuanRow && this.parentsData.parentsAnjuanRow.collect_formal === 2) {
-          this.$message({ message: '当前档案处于归档流程中，不可操作新增，请先确认！', offset: 8 })
-          return false
+        console.log('parentsProjectId', this.parentsData.parentsProjectId)
+        console.log(this.parentsData.parentsAnjuanRow)
+        if (this.parentsData.parentsProjectId && this.isTitleType === 3) {
+          console.log('项目下的案卷')
+        } else {
+          if (this.parentsData.parentsAnjuanRow && this.parentsData.parentsAnjuanRow.collect_formal === 2) {
+            this.$message({ message: '当前档案处于归档流程中，不可操作新增，请先确认！', offset: 8 })
+            return false
+          }
         }
+
         this.arcId = null
         if (isPaper) {
           this.quickPaper = true
@@ -600,7 +618,21 @@ export default {
           return false
         }
       }
-      this.deleteVisible = true
+      let messageTip
+      if (this.activeIndex === 1) {
+        messageTip = '此删除将把会所选条目与其子集彻底删除'
+      } else {
+        messageTip = '此删除将把会所选条目与其子集放入回收站'
+      }
+      this.$confirm(messageTip + '<span>你是否还要继续？</span>', '提示', {
+        confirmButtonText: '继续',
+        cancelButtonText: '取消',
+        type: 'warning',
+        dangerouslyUseHTMLString: true
+      }).then(() => {
+        this.handleDelConfirm()
+      }).catch(() => {
+      })
     },
     // 卷内 - 移除
     toMove() {
@@ -617,7 +649,6 @@ export default {
     },
     // 删除 - 确认
     handleDelConfirm() {
-      this.delAllLoading = true
       if (this.collectLevel === 4) {
         const params = this.selections.map((item) => {
           const json = {}
@@ -631,14 +662,11 @@ export default {
         FetchDeleteArchivesFile(params).then((res) => {
           if (res === 'SUCCESS') {
             this.$message({ message: '删除成功', type: 'success', offset: 8 })
-            this.delAllLoading = false
-            this.deleteVisible = false
             this.handleSearch(this.collectLevel)
           } else {
             this.$message({ message: '删除所选电子原文失败', type: 'error', offset: 8 })
           }
         }).catch(err => {
-          this.delAllLoading = false
           console.log(err)
         })
       } else {
@@ -654,14 +682,11 @@ export default {
         collectDel(params).then((res) => {
           if (res.includes('成功')) {
             this.$message({ message: '删除成功', type: 'success', offset: 8 })
-            this.delAllLoading = false
-            this.deleteVisible = false
             this.handleSearch(this.collectLevel)
           } else {
-            this.$message({ message: '删除所选档案失败', type: 'error', offset: 8 })
+            this.$message({ message: res, type: 'error', offset: 8 })
           }
         }).catch(err => {
-          this.delAllLoading = false
           console.log(err)
         })
       }
@@ -1129,15 +1154,20 @@ export default {
         const params = {
           'categoryId': this.selectedCategory.id,
           'categoryLevel': this.collectLevel,
-          'archivesIds': archivesIds
+          'archivesIds': archivesIds,
+          'collectFormal': this.isTitleType === 2 ? 1 : null
         }
         FetchRestoreArchives(params).then((res) => {
           if (res.code !== 500) {
             console.log(res)
-            this.$message({ message: res, type: 'success', offset: 8 })
+            if (res.includes('成功')) {
+              this.$message({ message: res, type: 'success', offset: 8 })
+            } else {
+              this.$message({ message: res, type: 'error', offset: 8 })
+            }
             this.handleSearch(this.collectLevel)
           } else {
-            this.$message({ message: '回复所选档案失败', type: 'error', offset: 8 })
+            this.$message({ message: '恢复所选档案失败', type: 'error', offset: 8 })
           }
         }).catch(err => {
           console.log(err)
@@ -1192,6 +1222,6 @@ export default {
 
 <style lang='scss' scoped>
 ::v-deep .vue-treeselect__list-item{
-  width: 220px;
+  width: 200px;
 }
 </style>

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

@@ -125,8 +125,8 @@ export default {
     sendYearDataToParent() {
       this.$emit('myYearEvent', this.yearData)
     },
-    openAnjuan(data, parentId) {
-      this.$emit('openAnjuan', data, parentId)
+    openAnjuan(data, parentId, parentRow) {
+      this.$emit('openAnjuan', data, parentId, parentRow)
     },
     rowKey(row) {
       return row.id
@@ -173,7 +173,7 @@ export default {
       }
       this.timer = setTimeout(() => {
         this.parentId = row.id
-        this.openAnjuan('所属项目：' + row.project_no, this.parentId)
+        this.openAnjuan('所属项目：' + row.project_no, this.parentId, row)
       }, 300)
       // this.selections = this.crud.selections
     },

src/views/components/category/PreviewForm.vue

@@ -759,7 +759,7 @@ export default {
             console.log(params)
             prearchEdit(params).then(res => {
               if (res) {
-                this.$message({ message: res, type: 'success', offset: 8 })
+                this.$message({ message: res.message, type: 'success', offset: 8 })
                 this.$emit('close-dialog')
                 this.crud.refresh()
               }
@@ -775,7 +775,7 @@ export default {
             }
             FetchMergeToFile(params).then(res => {
               if (res) {
-                this.$message({ message: res, type: 'success', offset: 8 })
+                this.$message({ message: res.message, type: 'success', offset: 8 })
                 this.$emit('close-dialog')
                 this.crud.refresh()
               }
@@ -834,7 +834,7 @@ export default {
             if (this.archivesType === 'add') {
               collectAdd(params).then(res => {
                 if (res.code === 200) {
-                  this.$message({ message: res, type: 'success', offset: 8 })
+                  this.$message({ message: res.message, type: 'success', offset: 8 })
                   this.$emit('close-dialog', parentsId)
                 }
               })
@@ -842,7 +842,7 @@ export default {
               collectEdit(params).then(res => {
                 console.log(res)
                 if (res.code === 200) {
-                  this.$message({ message: res, type: 'success', offset: 8 })
+                  this.$message({ message: res.message, type: 'success', offset: 8 })
                   this.$emit('close-dialog', parentsId)
                 } else {
                   this.$message({ message: res.message, type: 'error', offset: 8 })