20240418需求bug修复

.env.development

@@ -3,20 +3,19 @@ ENV = 'development'
 # 接口地址
 
 #内网服务地址
-VUE_APP_BASE_API  = 'http://192.168.99.107:7070'
-VUE_APP_WS_API = 'ws://192.168.99.107:7071'
+# VUE_APP_BASE_API  = 'http://192.168.99.107:7077'
+# VUE_APP_WS_API = 'ws://192.168.99.107:7077'
 VUE_APP_CAMERA_API = '192.168.99.107:3000'
-
-# 刘力-本地服地址
-#VUE_APP_BASE_API  = 'http://192.168.99.65:7070'
-#VUE_APP_WS_API = 'ws://192.168.99.65:7071'
+# VUE_APP_BASE_API  = 'http://192.168.99.107:7070'
+# VUE_APP_WS_API = 'ws://192.168.99.107:7070'
 
 # 许镇-本地服地址
 #VUE_APP_BASE_API  = 'http://192.168.99.84:7070'
 #VUE_APP_WS_API = 'ws://192.168.99.84:7070'
 
-# VUE_APP_BASE_API  = 'http://192.168.99.67:7070'
-# VUE_APP_WS_API = 'ws://192.168.99.67:7070'
+VUE_APP_BASE_API  = 'http://192.168.99.67:7070'
+VUE_APP_WS_API = 'ws://192.168.99.67:7070'
+
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -5,9 +5,9 @@
   "author": "刘力",
   "license": "",
   "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
+    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "build:stage": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",

src/views/archivesManage/archivesList/index.vue

@@ -16,11 +16,12 @@
         <div v-if="!isRecycle" class="container-left left-tree-item">
           <span class="right-top-line" />
           <span class="left-bottom-line" />
-          <div class="tree-title">智能分类</div>
+          <div class="tree-title">智能检索</div>
           <!--智能分类树状结构-->
           <!-- @node-click="handleIntellNodeClick" -->
           <!-- @check="nodeCheck" -->
           <div class="tree-scroll">
+            <!-- :default-expand-all="true" -->
             <el-tree
               ref="smartTree"
               v-loading="intellClassifyLoading"
@@ -28,7 +29,6 @@
               :props="intellDefaultProps"
               node-key="dicName"
               :check-strictly="true"
-              :default-expand-all="true"
               :default-checked-keys="defaultCheckedKeys"
               :expand-on-click-node="false"
               @node-click="handleIntellNodeClick"
@@ -278,6 +278,7 @@ export default {
           this.intellClassifyTree.forEach(item => {
             item.disabled = item.dicPid === null
           })
+          this.intellClassifyTree = this.sortData(this.intellClassifyTree)
         }
       })
     },
@@ -434,9 +435,7 @@ export default {
       if (this.$refs.smartTree) {
         this.intellClassifyLoading = true
         setTimeout(() => {
-          if (this.intellClassifyTree[0].dicName === '年度') {
-            this.intellClassifyTree = this.intellClassifyTree.slice(1)
-          }
+          console.log('this.$refs[obj].yearGroup.length', this.$refs[obj].yearGroup.length)
           if (this.$refs[obj].yearGroup.length !== 0) {
             const newYearArr = this.$refs[obj].yearGroup.map((item, index) => {
               const json = {}
@@ -446,14 +445,29 @@ export default {
               json.dicPid = 0
               return json
             })
-            this.intellClassifyTree.unshift({ id: 0, dicName: '年度', dicPid: null, dicCode: 'Search_year', disabled: true, childMenus: newYearArr })
-
-            console.log(this.intellClassifyTree)
+            const index = this.intellClassifyTree.findIndex(item => item.dicName === '年度')
+            if (index !== -1) {
+              this.intellClassifyTree.splice(index, 1)
             }
+            this.intellClassifyTree.splice(1, 0, { id: 0, dicName: '年度', dicPid: null, dicCode: 'Search_year', disabled: true, childMenus: newYearArr })
+          } else {
+            const index = this.intellClassifyTree.findIndex(item => item.dicName === '年度')
+            if (index !== -1) {
+              this.intellClassifyTree.splice(index, 1)
+            }
+          }
+          console.log(this.intellClassifyTree)
+
           this.intellClassifyLoading = false
-        }, 1000)
+        }, 2000)
       }
     },
+    sortData(data) {
+      // 定义排序顺序
+      const order = ['QZH', 'Search_year', 'Search_BGQX', 'Search_MJ', 'WZ', 'ZT']
+      // 按照指定顺序排序
+      return data.sort((a, b) => order.indexOf(a.dicCode) - order.indexOf(b.dicCode))
+    },
     unique(arr) {
       return Array.from(new Set(arr))
     },

src/views/archivesManage/archivesList/mixins/archives.js

@@ -109,7 +109,7 @@ export const archivesCrud = {
           this.arrySort = []
           this.tableDisplayFields = data
           this.getTableDisplayFieldsLoading = false
-          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 => {
             this.arrySort.push(item.fieldName + ',' + item.displayOrderBy)
           })

src/views/archivesManage/fileImport/dataImport/index.vue

@@ -1,5 +1,9 @@
 <template>
-  <div class="import-container">
+  <div
+    v-loading="loading1"
+    class="import-container"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+  >
     <ul class="import-header">
       <li><i class="step-img01" /><span>上传数据包</span></li>
       <li :class="['dot-img', {'dot-img-active':isShow02 || isShow03}]" />
@@ -7,7 +11,10 @@
       <li :class="['dot-img', {'dot-img-active':isShow03}]" />
       <li><i :class="['step-img03', {'step-img03-active':isShow03}]" /><span>导入数据</span></li>
     </ul>
-    <div v-if="isShow01" class="step-content step-upload">
+    <div
+      v-if="isShow01"
+      class="step-content step-upload"
+    >
       <div class="upload-container">
         <input ref="fileInput" :key="key" type="file" accept=".zip" @change="handleFileChange">
         <div class="upload-zip"><i class="el-icon-upload2" />选择文件</div>
@@ -21,7 +28,7 @@
     <div v-if="isShow01" class="step-bottom-btn">
       <el-button type="primary" @click="handleStep01">下一步</el-button>
     </div>
-    <div v-if="isShow02" class="step-content">
+    <div v-show="isShow02" class="step-content">
       <div class="import-data-number">案卷：<span>{{ ajnum }}</span> 条 / 卷内：<span>{{ danum }}</span> 条 / 资料：<span>{{ djnum }}</span> 条</div>
       <detail ref="importTableList" :is-log-or-preview="isLogOrPreview" />
     </div>
@@ -99,7 +106,8 @@ export default {
       isShow02: false,
       isShow03: false,
       timer: null,
-      isLogOrPreview: 'preview'
+      isLogOrPreview: 'preview',
+      loading1: false
     }
   },
   computed: {
@@ -147,27 +155,59 @@ export default {
     },
     // 上传文件
     handleStep01() {
+      this.loading1 = true
+      const notifyInstance = this.$notify.info({
+        title: '温馨提示',
+        message: '当前批量数据导入所需的时间较长，请用户耐心等待，谢谢！',
+        customClass: 'centered-notify',
+        showClose: false,
+        duration: 0 // 设置为0表示不自动关闭
+      })
       if (this.fileList.length !== 0) {
         this.zipName = this.file.name.split('.')[0]
         // 选择文件
         crudFileImport.zipUpload(this.baseApi + '/api/unzip/preview', this.file).then(res => {
           if (res.data.code === 200) {
             if (res.data.data) {
-              this.isShow01 = false
-              this.isShow02 = true
               // 导入预览
               crudFileImport.FetchInitImportPreview({ page: 0, size: 10, type: 1 }).then(res => {
                 this.ajnum = res.ajnum
                 this.danum = res.danum
                 this.djnum = res.djnum
+                this.djnum = res.djnum
                 this.$refs.importTableList.tableData = res.list.content
                 this.$refs.importTableList.page.total = res.list.totalElements
+                this.timer = setTimeout(() => {
+                  this.loading1 = false
+                  notifyInstance.close()
+                  this.isShow01 = false
+                  this.isShow02 = true
+                  clearTimeout(this.timer)
+                }, 1000)
+              }).catch(() => {
+                this.loading1 = false
+                notifyInstance.close()
+                this.isShow01 = false
+                this.isShow02 = true
               })
+            } else {
+              this.loading1 = false
+              notifyInstance.close()
+              this.isShow01 = false
+              this.isShow02 = true
             }
+          } else {
+            this.loading1 = false
+            notifyInstance.close()
           }
+        }).catch(() => {
+          this.loading1 = false
+          notifyInstance.close()
         })
       } else {
         this.$message.warning('请上传相关文件 ！')
+        this.loading1 = false
+        notifyInstance.close()
         return
       }
     },
@@ -194,6 +234,14 @@ export default {
     },
     // 确认导入
     submitForm(formName) {
+      // this.loading1 = true
+      // const notifyInstance = this.$notify.info({
+      //   title: '温馨提示',
+      //   message: '当前批量数据导入所需的时间较长，请用户耐心等待，谢谢！',
+      //   customClass: 'centered-notify',
+      //   showClose: false,
+      //   duration: 0 // 设置为0表示不自动关闭
+      // })
       this.$refs[formName].validate((valid) => {
         if (valid) {
           const params = {
@@ -204,17 +252,21 @@ export default {
             'name': this.zipName
           }
           crudFileImport.FetchImportZip(params).then(res => {
-            if (res) {
+            console.log('resZip', res)
             this.$message({
               type: 'success',
               message: '导入成功!'
             })
+          }).catch(() => {
             this.timer = setTimeout(() => {
               this.$emit('step-end', '1')
               clearTimeout(this.timer)
             }, 1000)
-            }
           })
+          this.timer = setTimeout(() => {
+            this.$emit('step-end', '1')
+            clearTimeout(this.timer)
+          }, 1000)
         } else {
           console.log('error submit!!')
           return false
@@ -224,9 +276,28 @@ export default {
   }
 }
 </script>
-
+<style>
+  .centered-notify{
+    top: calc(50% + 80px) !important;
+    left: calc(50% + 160px) !important;
+    right: 0 !important;
+    transform: translate(-50%,-50%) !important;
+    background-color: #031435!important;
+    border: 1px solid #339CFF!important;
+    & h2{
+      color: #fff!important;
+    }
+    & .el-notification__content{
+      color: #fff!important;
+    }
+  }
+</style>
 <style lang="scss" scoped>
+::v-deep .el-loading-spinner{
+  top: 60%;
+}
 .import-container{
+  position: relative;
   padding: 30px;
   height: calc(100vh - 234px);
 }
@@ -425,4 +496,5 @@ export default {
   border-color: #3a99fd;
   margin-top: 20px;
 }
+
 </style>

src/views/archivesManage/fileImport/importLog/index.vue

@@ -13,7 +13,8 @@
       <el-table-column prop="name" label="导入数据包" />
       <el-table-column prop="status" label="导入状态">
         <template slot-scope="scope">
-          <div>{{ scope.row.status === 1 ? '已完成' : '' }}</div>
+          <div v-if="scope.row.status === 0" class="import-loading">导入中</div>
+          <div v-if="scope.row.status === 1">已完成</div>
         </template>
       </el-table-column>
       <el-table-column prop="create_by" label="操作人" />
@@ -80,11 +81,18 @@ export default {
     // 双击详情
     handleDbClick(row) {
       this.zipSelect = row
+      if (row.status === 0) {
+        this.$message({
+          type: 'info',
+          message: '当前批量数据导入中，请用户耐心等待，谢谢！'
+        })
+      } else {
         this.detailVisible = true
         crudFileImport.FetchInitImportLogDetail({ page: 0, size: 10, zipid: row.id, type: 1 }).then(res => {
           this.$refs.importTableList.tableData = res.content
           this.$refs.importTableList.page.total = res.totalElements
         })
+      }
     },
     handleClose() {
       this.detailVisible = false
@@ -106,4 +114,7 @@ export default {
     }
   }
 }
+.import-loading{
+  color: #fd8042;
+}
 </style>

src/views/archivesManage/fileImport/module/detail.vue

@@ -27,70 +27,70 @@
         </template>
       </el-table-column>
       <!-- 资料 -->
-      <el-table-column v-if=" archivesTabIndex == 2" prop="serialNo" label="序号" align="center" width="100px" />
-      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveDate" label="收发日期" align="center" width="100px" />
-      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveClass" label="收发类别" align="center" width="100px" />
-      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveNo" label="类别编号" align="center" width="100px" />
-      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveMark" label="收发标识" align="center" width="100px" />
-      <el-table-column v-if=" archivesTabIndex == 2" prop="sourcePartNo" label="源份号" align="center" width="80px" />
-      <el-table-column v-if=" archivesTabIndex == 2" prop="docNo" label="发文字号" align="center" width="120px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="serialNo" label="序号" align="center" width="60px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveDate" label="收发日期" align="center" show-overflow-tooltip min-width="160px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveClass" label="收发类别" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveNo" label="类别编号" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="arriveMark" label="收发标识" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="sourcePartNo" label="源份号" align="center" show-overflow-tooltip min-width="80px" />
+      <el-table-column v-if=" archivesTabIndex == 2" prop="docNo" label="发文字号" align="center" show-overflow-tooltip min-width="160px" />
       <!-- 案卷 / 文件 / 资料 -->
-      <el-table-column prop="securityClass" label="密级" align="center" width="80px" />
+      <el-table-column prop="securityClass" label="密级" align="center" show-overflow-tooltip min-width="80px" />
       <!-- 案卷 / 文件 -->
-      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="mediumType" label="载体类型" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="mediumType" label="载体类型" align="center" show-overflow-tooltip min-width="100px" />
       <!-- 资料 -->
-      <el-table-column v-if="archivesTabIndex == 2" prop="recordType" label="公文种类" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="recordType" label="公文种类" align="center" show-overflow-tooltip min-width="100px" />
       <!-- 文件 -->
-      <el-table-column v-if=" archivesTabIndex == 1" prop="recordType" label="文种" align="center" width="80px" />
-      <el-table-column v-if=" archivesTabIndex == 1" prop="documentNo" label="文件编号" align="center" width="100px" />
+      <el-table-column v-if=" archivesTabIndex == 1" prop="recordType" label="文种" align="center" show-overflow-tooltip min-width="80px" />
+      <el-table-column v-if=" archivesTabIndex == 1" prop="documentNo" label="文件编号" align="center" show-overflow-tooltip min-width="100px" />
       <!-- 案卷 / 文件 -->
-      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="microfilm" label="缩微号" align="center" width="80px" />
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="microfilm" label="缩微号" align="center" show-overflow-tooltip min-width="80px" />
       <!-- 文件 -->
-      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="fileNo" label="电子文件号" align="center" width="120px" />
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="fileNo" label="电子文件号" align="center" show-overflow-tooltip min-width="120px" />
       <!-- 案卷 / 文件 -->
-      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="archiveNo" label="档号" align="center" width="240px" />
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="archiveNo" label="档号" align="center" show-overflow-tooltip min-width="240px" />
       <!-- 文件 -->
-      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="maintitle" label="题名" align="center" width="80px" />
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="maintitle" label="题名" align="center" show-overflow-tooltip min-width="240px" />
 
       <!-- 资料 -->
-      <el-table-column v-if="archivesTabIndex == 2" prop="createdDate" label="成文日期" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 2" prop="organizer" label="承办单位" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 2" prop="undertaker" label="承办人" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 2" prop="endorsementLeader" label="签批领导" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 2" prop="readingLeader" label="阅文领导" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 2" prop="arriveOrgan" label="发文机关" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 2" prop="sendOrgan" label="主送机关" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 2" prop="copyOrgan" label="抄送机关" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="createdDate" label="成文日期" align="center" show-overflow-tooltip min-width="140px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="organizer" label="承办单位" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="undertaker" label="承办人" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="endorsementLeader" label="签批领导" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="readingLeader" label="阅文领导" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="arriveOrgan" label="发文机关" align="center" show-overflow-tooltip min-width="180px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="sendOrgan" label="主送机关" align="center" show-overflow-tooltip min-width="180px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="copyOrgan" label="抄送机关" align="center" show-overflow-tooltip min-width="180px" />
 
-      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="version" label="文本" align="center" width="80px" />
-      <el-table-column v-if="archivesTabIndex == 1" prop="responsibleby" label="责任者" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 1" prop="created_date" label="时间" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="mediumQty" label="载体数量" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="mediumUnit" label="载体单位" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="mediumSpecs" label="载体规格" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="version" label="文本" align="center" show-overflow-tooltip min-width="80px" />
+      <el-table-column v-if="archivesTabIndex == 1" prop="responsibleby" label="责任者" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="archivesTabIndex == 1" prop="created_date" label="时间" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="mediumQty" label="载体数量" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="mediumUnit" label="载体单位" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="archivesTabIndex == 1 || archivesTabIndex == 2" prop="mediumSpecs" label="载体规格" align="center" show-overflow-tooltip min-width="100px" />
       <!-- 案卷 -->
-      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 2" prop="pieceQty" label="文件件数" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 2" prop="tempNo" label="临时卷号" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 2" prop="pieceQty" label="文件件数" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="archivesTabIndex == 2" prop="tempNo" label="临时卷号" align="center" show-overflow-tooltip min-width="100px" />
 
-      <el-table-column v-if="archivesTabIndex == 0" prop="maintitle" label="案卷题名" align="center" show-overflow-tooltip width="240px" />
-      <el-table-column v-if="archivesTabIndex == 0" prop="beginDate" label="起始时间" align="center" width="140px" />
-      <el-table-column v-if="archivesTabIndex == 0" prop="endDate" label="终止时间" align="center" width="140px" />
+      <el-table-column v-if="archivesTabIndex == 0" prop="maintitle" label="案卷题名" align="center" show-overflow-tooltip min-width="240px" />
+      <el-table-column v-if="archivesTabIndex == 0" prop="beginDate" label="起始时间" align="center" show-overflow-tooltip min-width="140px" />
+      <el-table-column v-if="archivesTabIndex == 0" prop="endDate" label="终止时间" align="center" show-overflow-tooltip min-width="140px" />
       <!-- 案卷 / 文件 -->
-      <el-table-column prop="archiveCtgNo" label="分类号" align="center" width="140px" />
-      <el-table-column prop="keyword" label="主题词" align="center" width="140px" />
-      <el-table-column prop="remarks" label="附注" align="center" width="120px" />
+      <el-table-column prop="archiveCtgNo" label="分类号" align="center" show-overflow-tooltip min-width="140px" />
+      <el-table-column prop="keyword" label="主题词" align="center" show-overflow-tooltip min-width="140px" />
+      <el-table-column prop="remarks" label="附注" align="center" show-overflow-tooltip min-width="120px" />
       <!-- 资料 -->
-      <el-table-column v-if=" archivesTabIndex ==2" prop="dividedQty" label="已分份数" align="center" width="120px" />
+      <el-table-column v-if=" archivesTabIndex ==2" prop="dividedQty" label="已分份数" align="center" show-overflow-tooltip min-width="120px" />
 
-      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="retention" label="保管期限" align="center" width="120px" />
-      <el-table-column prop="archiveYear" label="年度" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="fondsNo" label="全宗" align="center" width="100px" />
-      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="recordNo" label="卷号" align="center" width="100px" />
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="retention" label="保管期限" align="center" show-overflow-tooltip min-width="120px" />
+      <el-table-column prop="archiveYear" label="年度" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="fondsNo" label="全宗" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="archivesTabIndex == 0 || archivesTabIndex == 1" prop="recordNo" label="卷号" align="center" show-overflow-tooltip min-width="100px" />
       <!-- 文件 -->
-      <el-table-column v-if=" archivesTabIndex ==1" prop="pieceNo" label="件号" align="center" width="100px" />
+      <el-table-column v-if=" archivesTabIndex ==1" prop="pieceNo" label="件号" align="center" show-overflow-tooltip min-width="100px" />
       <!-- 资料 -->
-      <el-table-column v-if=" archivesTabIndex ==2" prop="fileQty" label="归档份数" align="center" width="100px" />
-      <el-table-column v-if=" archivesTabIndex ==2" prop="classSerialNo" label="类别序号" align="center" width="100px" />
+      <el-table-column v-if=" archivesTabIndex ==2" prop="fileQty" label="归档份数" align="center" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if=" archivesTabIndex ==2" prop="classSerialNo" label="类别序号" align="center" show-overflow-tooltip min-width="100px" />
     </el-table>
     <!--分页组件-->
     <el-pagination

src/views/archivesManage/outInStorage/inStorage/index.vue

@@ -110,7 +110,8 @@ import pagination from '@crud/Pagination'
 import detailDialog from '../module/detailDialog.vue'
 import inDialog from './module/inDialog.vue'
 import handDialog from './module/handDialog.vue'
-import { initCasesByArchives, readyCollectConfirm, collectConfirm, initStorageDetailes } from '@/api/archivesManage/outInStorage'
+// initCasesByArchives
+import { readyCollectConfirm, collectConfirm, initStorageDetailes } from '@/api/archivesManage/outInStorage'
 // import { getDetail } from '../module/outIn'
 export default {
   name: 'InStorage',
@@ -192,16 +193,21 @@ export default {
     },
     // 入库
     handleIn() {
-      const caseIds = this.selections.map(item => { return item.id })
+      // const caseIds = this.selections.map(item => { return item.id })
       const index = this.selections.every((item) => item.storageType === 0)
       if (index) {
-        const params = {
-          caseIds: caseIds
-        }
-        initCasesByArchives(params).then(res => {
-          this.$refs.inDialogDom.childData = res
-        })
+        this.$refs.inDialogDom.childData = this.selections
         this.$refs.inDialogDom.dialogVisible = true
+        // const params = {
+        //   caseIds: caseIds
+        // }
+        // initCasesByArchives(params).then(res => {
+        //   this.$refs.inDialogDom.childData = res
+        //   console.log('this.$refs.inDialogDom.childData', this.$refs.inDialogDom.childData)
+        //   if (this.$refs.inDialogDom.childData) {
+        //     this.$refs.inDialogDom.dialogVisible = true
+        //   }
+        // })
       } else {
         this.msgVisible = true
       }

src/views/archivesManage/outInStorage/outInHistory/index.vue

@@ -70,6 +70,7 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column prop="create_by" label="操作人" align="center" min-width="100" />
       <el-table-column align="center" prop="update_time" label="操作时间" width="200">
         <template slot-scope="scope">
           <div>{{ scope.row.update_time | parseTime }}</div>

src/views/system/logManage/loginLog/index.vue

@@ -79,7 +79,7 @@ export default {
   cruds() {
     return CRUD({
       url: 'api/loginlogs/list',
-      // sort: ['update_time,desc'],
+      sort: ['createTime,desc'],
       // crudMethod: caseCrudMethod,
       optShow: {
         add: false,

src/views/system/menu/index.vue

@@ -110,13 +110,13 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" align="center" width="55" />
-        <el-table-column :show-overflow-tooltip="true" label="菜单标题" width="125px" prop="title" />
+        <el-table-column :show-overflow-tooltip="true" label="菜单标题" min-width="100px" prop="title" />
         <el-table-column prop="icon" label="图标" align="center" width="60px">
           <template slot-scope="scope">
             <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
           </template>
         </el-table-column>
-        <el-table-column prop="menuSort" align="center" label="排序">
+        <el-table-column prop="menuSort" align="center" label="排序" width="60px">
           <template slot-scope="scope">
             {{ scope.row.menuSort }}
           </template>

src/views/system/role/index.vue

@@ -19,7 +19,7 @@
           <el-form-item label="角色名称" prop="name">
             <el-input v-model="form.name" style="width: 380px;" />
           </el-form-item>
-          <el-form-item label="角色级别" prop="level">
+          <!-- <el-form-item label="角色级别" prop="level">
             <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
           </el-form-item>
           <el-form-item label="数据范围" prop="dataScope">
@@ -31,7 +31,7 @@
                 :value="item"
               />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
             <treeselect
               v-model="deptDatas"

src/views/system/user/index.vue

@@ -55,7 +55,8 @@
                 <el-form-item label="部门" prop="dept.id">
                   <treeselect v-model="form.dept.id" :options="depts" :load-options="loadDepts" style="width: 184px" placeholder="选择部门" />
                 </el-form-item>
-                <el-form-item label="岗位" prop="jobs" class="is-required">
+                <!--  class="is-required" -->
+                <el-form-item label="岗位" prop="jobs">
                   <el-select v-model="jobDatas" style="width: 184px" multiple placeholder="请选择" @remove-tag="deleteTag" @change="changeJob">
                     <el-option v-for="item in jobs" :key="item.name" :label="item.name" :value="item.id" />
                   </el-select>
@@ -134,7 +135,7 @@
 <script>
 import { getToken } from '@/utils/auth'
 import crudUser, { resetpassword } from '@/api/system/user'
-import { isvalidPhone } from '@/utils/validate'
+// import { isvalidPhone } from '@/utils/validate'
 import { getDepts, getDeptSuperior } from '@/api/system/dept'
 import { getAll, getLevel } from '@/api/system/role'
 import { getAllJob } from '@/api/system/job'
@@ -162,15 +163,15 @@ export default {
   dicts: ['user_status'],
   data() {
     // 自定义验证
-    const validPhone = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error('请输入电话号码'))
-      } else if (!isvalidPhone(value)) {
-        callback(new Error('请输入正确的11位手机号码'))
-      } else {
-        callback()
-      }
-    }
+    // const validPhone = (rule, value, callback) => {
+    //   if (!value) {
+    //     callback(new Error('请输入电话号码'))
+    //   } else if (!isvalidPhone(value)) {
+    //     callback(new Error('请输入正确的11位手机号码'))
+    //   } else {
+    //     callback()
+    //   }
+    // }
     // var validateJob = (rule, value, callback) => {
     //   console.log(value)
     //   if (this.jobDatas.length > 0) {
@@ -207,17 +208,16 @@ export default {
           { required: true, message: '请输入用户昵称', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ],
-        email: [
-          { required: true, message: '请输入邮箱地址', trigger: 'blur' },
-          { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }
-        ],
-        phone: [
-          { required: true, trigger: 'blur', validator: validPhone }
-        ],
+        // email: [
+        //   { required: true, message: '请输入邮箱地址', trigger: 'blur' },
+        //   { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }
+        // ],
+        // phone: [
+        //   { required: true, trigger: 'blur', validator: validPhone }
+        // ],
         'dept.id': [
           { required: true, trigger: 'blur', message: '请选择部门' }
         ]
-        // ,
         // jobs: [
         //   { trigger: 'blur', validator: validateJob }
         // ]
@@ -328,19 +328,27 @@ export default {
     },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {
-      if (!crud.form.dept.id) {
-        this.$message({
-          message: '部门不能为空',
-          type: 'warning'
-        })
-        return false
-      } else if (this.jobDatas.length === 0) {
-        this.$message({
-          message: '岗位不能为空',
-          type: 'warning'
-        })
-        return false
-      } else if (this.roleDatas.length === 0) {
+      // if (!crud.form.dept.id) {
+      //   this.$message({
+      //     message: '部门不能为空',
+      //     type: 'warning'
+      //   })
+      //   return false
+      // } else if (this.jobDatas.length === 0) {
+      //   this.$message({
+      //     message: '岗位不能为空',
+      //     type: 'warning'
+      //   })
+      //   return false
+      // } else if (this.roleDatas.length === 0) {
+      //   this.$message({
+      //     message: '角色不能为空',
+      //     type: 'warning'
+      //   })
+      //   return false
+      // }
+
+      if (this.roleDatas.length === 0) {
         this.$message({
           message: '角色不能为空',
           type: 'warning'