bug修复

src/assets/iconfonts/light/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3966148 */
-  src: url('iconfont.woff2?t=1704793198243') format('woff2'),
-       url('iconfont.woff?t=1704793198243') format('woff'),
-       url('iconfont.ttf?t=1704793198243') format('truetype');
+  src: url('iconfont.woff2?t=1707093192160') format('woff2'),
+       url('iconfont.woff?t=1707093192160') format('woff'),
+       url('iconfont.ttf?t=1707093192160') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-zhuti:before {
+  content: "\e686";
+}
+
 .icon-gengduo:before {
   content: "\e670";
 }

src/assets/iconfonts/light/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "1263393",
+      "name": "主题",
+      "font_class": "zhuti",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
     {
       "icon_id": "38782218",
       "name": "更多",

src/layout/components/Navbar.vue

@@ -4,12 +4,23 @@
 
     <div class="right-menu">
       <!-- 主题切换 -->
-      <div class="themeBox" style="font-size:12px; margin-right:20px; cursor: pointer; padding: 21px 10px 10px 10px;" @click="changetheme">
-        <!-- <span @click="changetheme('dark')">深色主题</span>
-        <span @click="changetheme('light')">浅色主题</span> -->
-        <span class="theme-btn" />
+      <el-dropdown trigger="click" style="margin-right: 30px;">
+        <div class="message-icon" style="cursor: pointer;">
+          <span class="iconfont icon-zhuti" />
+          <!-- <i v-if="msgList.length > 0" class="message-num">{{ msgList.length }}</i> -->
         </div>
-      <div style="font-size: 18px; color: #1C1C1C; margin-right: 30px; cursor: pointer;" class="iconfont icon-jieyueche-ding" />
+        <el-dropdown-menu slot="dropdown" class="message-dropdown">
+          <el-dropdown-item @click.native="changetheme('light')">
+            浅色主题
+            <i class="el-icon-check" :style="{display: themeValue === 'light'?'':'none'}" />
+          </el-dropdown-item>
+          <el-dropdown-item @click.native="changetheme('dark')">
+            深色主题
+            <i class="el-icon-check" :style="{display: themeValue === 'dark'?'':'none'}" />
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+      <div class="iconfont icon-jieyueche-ding" />
       <!-- 消息中心 -->
       <el-dropdown ref="messageDrop" class="message-center right-menu-item hover-effect" trigger="click">
         <div class="message-icon">
@@ -17,12 +28,12 @@
           <i v-if="msgList.length > 0" class="message-num">{{ msgList.length }}</i>
         </div>
         <el-dropdown-menu slot="dropdown" class="message-dropdown" style="width: 420px;">
-          <div style="display: flex; justify-content: flex-end; padding: 0 20px; height: 40px; line-height: 40px; color: #339CFF; font-size: 14px; border-bottom: 1px solid #339CFF;">
+          <div style="display: flex; justify-content: flex-end; padding: 0 20px; height: 40px; line-height: 40px; color: #A6ADB6; font-size: 14px; border-bottom: 1px solid #E6E8ED;">
             <span style="cursor: pointer;" @click="handleAllRead">全部标记为已读</span>
             <!-- 消息中心router -->
-            <span style="color:#fff; margin-left: 10px; cursor: pointer;" @click="toAllMessage">去查看</span>
+            <!-- <span style="color:#fff; margin-left: 10px; cursor: pointer;" @click="toAllMessage">去查看</span> -->
           </div>
-          <div style="max-height: 450px; overflow: hidden; overflow-y: scroll;">
+          <div style="max-height: 450px; overflow: hidden; padding: 20px 0 10px 0; overflow-y: scroll;">
             <el-dropdown-item v-if="msgList.length===0" class="message-list-item">
               <div style="text-align:center">暂无最新消息</div>
             </el-dropdown-item>
@@ -95,7 +106,6 @@ export default {
       Avatar: Avatar,
       defaultImg: 'this.src="' + require('@/assets/images/avatar.png') + '"',
       msgList: [],
-      isTheme: false,
       themeValue: localStorage.getItem('themeValue') ? localStorage.getItem('themeValue') : 'light'
     }
   },
@@ -129,6 +139,8 @@ export default {
     this.getMsgList()
     if (!localStorage.getItem('themeValue')) {
       this.changetheme('light')
+    } else {
+      this.changetheme(localStorage.getItem('themeValue'))
     }
   },
   methods: {
@@ -213,14 +225,8 @@ export default {
     handleClose(done) {
       done()
     },
-    changetheme() {
-      this.isTheme = !this.isTheme
-      let theme = ''
-      if (this.isTheme) {
-        theme = 'light'
-      } else {
-        theme = 'dark'
-      }
+    changetheme(theme) {
+      this.themeValue = theme
       window.document.documentElement.setAttribute('data-theme', theme)
       localStorage.setItem('themeValue', theme)
     }
@@ -324,11 +330,18 @@ export default {
     }
   }
 }
-.theme-btn{
-  display: block;
-  width: 20px;
-  height: 20px;
-  background: url("~@/assets/images/icon/theme.png") no-repeat;
-  background-size: 100% 100%;
+.icon-jieyueche-ding{
+  font-size: 20px;
+  margin-right: 30px;
+  cursor: pointer;
+  @include icon_color;
+}
+.icon-zhuti{
+  font-size: 22px;
+  @include icon_color;
+}
+::v-deep .el-dropdown-menu__item.is-active {
+  color: #409EFF;
+  background-color: red;
 }
 </style>

src/views/collectReorganizi/collectionLibrary/index.vue

@@ -29,6 +29,8 @@
               </el-tree>
             </div>
             <h3 class="arc-title arc-title-bottom">快速筛选</h3>
+            <!-- show-checkbox
+              @check-change="handleCheckChange" -->
             <el-tree
               ref="classifyTree"
               v-loading="classifyLoading"
@@ -395,6 +397,19 @@ export default {
         }
       }
     },
+    handleCheckChange(data, checked, indeterminate) {
+      // 获取所有选中的节点 start
+      const res = this.$refs.classifyTree.getCheckedNodes()
+      const arrClassify = []
+      res.forEach((item) => {
+        arrClassify.push(item)
+      })
+      // this.dataTree 就是选中的数据
+      // this.dataTree = arrDeptId
+      console.log(arrClassify)
+
+      console.log(data, checked, indeterminate)
+    },
     handleOpenAnjuan(data, parentId, parentsRow) {
       this.parentsProjectId = parentId
       this.parentsProjectRow = parentsRow

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

@@ -557,7 +557,29 @@ export default {
         type: 'warning',
         dangerouslyUseHTMLString: true
       }).then(() => {
+        if (this.activeIndex === 1) {
+          const archivesIds = []
+          this.selections.forEach(val => {
+            archivesIds.push(val.id)
+          })
+          const params = {
+            'categoryId': this.selectedCategory.id,
+            'categoryLevel': this.collectLevel,
+            'archivesIds': archivesIds
+          }
+          FetchCompleteDelArchives(params).then((res) => {
+            if (res.code !== 500) {
+              this.$message({ message: res, type: 'success', offset: 8 })
+              this.handleSearch(this.collectLevel)
+            } else {
+              this.$message({ message: '删除所选档案失败', type: 'error', offset: 8 })
+            }
+          }).catch(err => {
+            console.log(err)
+          })
+        } else {
           this.handleDelConfirm()
+        }
       }).catch(() => {
       })
     },

src/views/components/category/PreviewForm.vue

@@ -55,13 +55,14 @@
       </el-row>
       <el-row v-if="isDesFormType === 'prearchiveLibrary'" class="preview-form-bottom prearch-bottom">
         <el-col>
-          <el-form-item label="电子原件" prop="fileOriginal" class="prearch-upload" :rules="[{ required: true, message: '请上传原文',trigger: 'blur' }]">
-            <el-input
+          <el-form-item label="电子原件" prop="fileOriginal" class="prearch-upload">
+            <!-- <el-input
               v-model="addOrUpdateForm['fileOriginal']"
               type="text"
               style="width: 446px"
-              readonly
-            />
+            /> -->
+            <p :class="['input-style', fileOriginal === null ? 'error-box' :'']">{{ fileOriginal }}</p>
+            <span v-if="fileOriginal === null" class="error-tip">请上传原文</span>
             <div class="upload-btn">
               <input id="upFile" type="file" name="upFile" @change="changeFile($event)">
               <el-button size="small" type="primary"><i class="iconfont icon-shangchuan" />上传</el-button>
@@ -668,6 +669,10 @@ export default {
     // 动态生成表单
     editFormRow() {
       this.rules = {}
+      // if (this.isDesFormType === 'prearchiveLibrary' && this.archivesType === 'add') {
+      //   this.$set(this.addOrUpdateForm, 'fileOriginal', null)
+      // }
+
       this.formPreviewData.map(item => {
         if (item.isInputClass === 'select') {
           this.$set(item, 'options', [])
@@ -708,6 +713,14 @@ export default {
             trigger: item.isInputClass === 'text' ? 'blur' : 'change'
           }
         ])
+
+        // this.$set(this.rules, 'fileOriginal', [
+        //   {
+        //     required: fas,
+        //     message: '请上传电子原文',
+        //     trigger: 'blur'
+        //   }
+        // ])
       })
     },
     // 预览界面排序
@@ -747,7 +760,10 @@ export default {
         if (valid) {
           // 预归档库
           if (this.isDesFormType === 'prearchiveLibrary') {
-            delete this.addOrUpdateForm.fileOriginal
+            if (this.fileOriginal === null) {
+              return false
+            }
+            // delete this.addOrUpdateForm.fileOriginal
             const params = {
               'id': this.arcId,
               'ids': null,
@@ -762,6 +778,7 @@ export default {
                 this.$message({ message: res.message, type: 'success', offset: 8 })
                 this.$emit('close-dialog')
                 this.crud.refresh()
+                this.fileOriginal = null
               }
             })
           } else if (this.isDesFormType === 'mergeFile') {
@@ -864,6 +881,7 @@ export default {
       this.popoverTableData = []
       this.popoverTableDataClassify = []
       this.popoverTableDataFonds = []
+
       done()
     },
     // 选择附件
@@ -909,8 +927,10 @@ export default {
       }
       const arrayUpload = []
       arrayUpload.push(json)
-      // this.addOrUpdateForm.fileOriginal = this.fileNames
-      this.$set(this.addOrUpdateForm, 'fileOriginal', this.fileNames)
+      this.fileOriginal = this.fileNames
+      // this.$set(this.addOrUpdateForm, 'fileOriginal', this.fileNames)
+      console.log('ddd', this.fileOriginal)
+
       this.fileJsonString = JSON.stringify(arrayUpload)
     },
     // 将上传的图片转为base64
@@ -1057,10 +1077,41 @@ export default {
 
 .prearch-upload{
   margin-right: 0 !important;
+  ::v-deep .el-form-item__label{
+    position: relative;
+    &::before{
+      position: absolute;
+      top: -2px;
+      right: 70px;
+      content: "*";
+      font-size: 10px;
+      color: #ff4949;
+      font-style: normal;
+    }
+  }
   ::v-deep .el-form-item__content{
+    position: relative;
     width: 540px !important;
     display: flex;
     justify-content: space-between;
+    .input-style{
+      width: 500px;
+      height: 34px;
+      line-height: 34px;
+      padding: 0 20px;
+      border: 1px solid #e6e8ed;
+      border-radius: 3px;
+      &.error-box{
+        border-color: #ed4a41;
+      }
+    }
+    .error-tip{
+      position: absolute;
+      left: 0;
+      bottom: -26px;
+      font-size: 12px;
+      color: #ff4949;
+    }
     .upload-btn{
       position: relative;
       width:96px;

src/views/prearchiveLibrary/index.vue

@@ -217,7 +217,7 @@ export default {
         if (data) {
           this.arrySort = []
           this.tableDisplayFields = data
-          const orderSortArry = this.tableDisplayFields.filter(item => item.displayOrder).sort((a, b) => a.displayOrder - b.displayOrder)
+          const orderSortArry = this.tableDisplayFields.filter(item => item.queue).sort((a, b) => a.queue - b.queue)
           orderSortArry.forEach(item => {
             if (item.displayOrderBy) {
               this.arrySort.push(item.fieldName + ',' + item.displayOrderBy)
@@ -258,14 +258,15 @@ export default {
           this.formPreviewData = showFiledAll
           this.formVisible = true
           this.$nextTick(() => {
-            this.$refs.previewForm.addOrUpdateForm.fileOriginal = null
+            this.$refs.previewForm.fileOriginal = null
             this.$refs.previewForm.fileJsonString = null
             if (type === 'edit') {
               this.$refs.previewForm.archivesType = 'edit'
               this.$refs.previewForm.addOrUpdateForm = data.echo
               const fileecho = []
               fileecho.push(data.fileecho)
-              this.$refs.previewForm.addOrUpdateForm.fileOriginal = fileecho[0].file_name
+              // this.$refs.previewForm.addOrUpdateForm.fileOriginal = fileecho[0].file_name
+              this.$refs.previewForm.fileOriginal = fileecho[0].file_name
               this.$refs.previewForm.fileJsonString = JSON.stringify(fileecho)
             } else {
               this.$refs.previewForm.archivesType = 'add'