0913需求修改

src/views/archivesManage/archivesList/archivesAnjuan/index.vue

@@ -299,7 +299,8 @@ export default {
         this.queryOption = [
           { value: 'queryTitle', label: '题名' },
           { value: 'archiveNo', label: '档号' },
-          { value: 'responsibleby', label: '责任者' }
+          { value: 'responsibleby', label: '责任者' },
+          { value: 'docNo', label: '发文字号 ' }
         ]
       } else {
         this.queryOption = [
@@ -329,6 +330,8 @@ export default {
       this.query.archiveNo = ''
       this.query.archiveCtgNo = ''
       this.query.responsibleby = ''
+      this.query.docNo = ''
+      this.query.documentNo = ''
       switch (this.anjuanInputSelect) {
         case 'queryTitle': // 题名
           this.query.queryTitle = this.anjuanQuery[this.anjuanInputSelect]
@@ -342,6 +345,9 @@ export default {
         case 'responsibleby': // 责任者
           this.query.responsibleby = this.anjuanQuery[this.anjuanInputSelect]
           break
+        case 'docNo': // 发文字号
+          this.query.docNo = this.anjuanQuery[this.anjuanInputSelect]
+          break
       }
       this.getListCommon('anjuanData', 'anjuanTableHeight', 1)
     },

src/views/archivesManage/archivesList/archivesJuannei/index.vue

@@ -221,7 +221,8 @@ export default {
       queryOption: [
         { value: 'queryTitle', label: '题名' },
         { value: 'archiveNo', label: '档号' },
-        { value: 'responsibleby', label: '责任者' }
+        { value: 'responsibleby', label: '责任者' },
+        { value: 'documentNo', label: '文件编号 ' }
       ],
       juanneiInputSelect: '',
       lengingVisible: false // 借阅
@@ -276,6 +277,8 @@ export default {
       this.query.queryTitle = ''
       this.query.archiveNo = ''
       this.query.responsibleby = ''
+      this.query.docNo = ''
+      this.query.documentNo = ''
       switch (this.juanneiInputSelect) {
         case 'queryTitle': // 题名
           this.query.queryTitle = this.juanneiQuery[this.juanneiInputSelect]
@@ -286,6 +289,9 @@ export default {
         case 'responsibleby': // 责任者
           this.query.responsibleby = this.juanneiQuery[this.juanneiInputSelect]
           break
+        case 'documentNo': // 文件编号
+          this.query.documentNo = this.juanneiQuery[this.juanneiInputSelect]
+          break
       }
       this.getListCommon('junneiData', 'juanneiTableHeight', 2)
     },

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

@@ -166,7 +166,9 @@ export const archivesCrud = {
           'organizationMatter': this.smartQuery.organizationMatter,
           'fondsNo': this.smartQuery.fondsNo,
           'recordType': this.smartQuery.recordType,
-          'mediumType': this.smartQuery.mediumType
+          'mediumType': this.smartQuery.mediumType,
+          'documentNo': this.query.documentNo,
+          'docNo': this.query.docNo
         }
         FetchInitArchivesView(params).then(data => {
           this.getTableDisplayFieldsLoading = false

src/views/archivesManage/archivesSearch/index.vue

@@ -2,6 +2,11 @@
   <div class="search-main">
     <div class="head-container">
       <h2 v-if="this.$route.path.indexOf('dashboard') === -1">模糊检索</h2>
+      <div class="search-header">
+        <el-checkbox-group v-model="checkList" @change="handleCategoryTypes">
+          <el-checkbox v-for="item in categoryTypesOptions" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
+        </el-checkbox-group>
+      </div>
       <div class="search-input">
         <el-input v-model="keywords" placeholder="请输入内容" class="input-with-select" style="width:50%;" @keyup.enter.native="dimSearch">
           <el-select
@@ -39,7 +44,19 @@
           style="width: 100%;"
           height="calc(100vh - 493px)"
           @row-dblclick="handleDbClick"
+        > <el-table-column
+            align="right"
           >
+            <template slot-scope="scope">
+              <!-- @click="handleEdit(scope.$index, scope.row)" -->
+              <el-button
+                v-if="scope.row.category_type !== 3"
+                class="lending-btn"
+                size="mini"
+              >借阅</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column prop="doc_no" label="发文字号" show-overflow-tooltip width="140" align="center" />
           <el-table-column prop="child" label="子条数目" align="center" width="100" />
           <el-table-column prop="security_class" label="密级" align="center" min-width="100" />
           <el-table-column prop="retention" label="保管期限" align="center" min-width="100" />
@@ -52,14 +69,13 @@
               <span v-if="scope.row.category_type === 3" style="width:56px">案卷级</span>
             </template>
           </el-table-column>
-          <el-table-column prop="category_name" label="门类名称" align="center" min-width="170" />
-          <el-table-column prop="archive_no" label="档号" align="center" min-width="200" />
-          <el-table-column prop="maintitle" label="题名" align="center" min-width="240" />
-          <el-table-column type="serial_no" label="序号" width="100" align="center" />
-          <el-table-column type="arrive_class" label="收发类别" width="140" align="center" />
-          <el-table-column type="doc_no" label="发文字号" width="140" align="center" />
-          <el-table-column type="temp_no" label="临时卷号" width="140" align="center" />
-          <el-table-column prop="case_name" label="盒名称" align="center" min-width="200" />
+          <el-table-column prop="category_name" label="门类名称" align="center" show-overflow-tooltip min-width="170" />
+          <el-table-column prop="archive_no" label="档号" align="center" show-overflow-tooltip min-width="220" />
+          <el-table-column prop="maintitle" label="题名" show-overflow-tooltip align="center" min-width="240" />
+          <el-table-column prop="serial_no" label="序号" width="100" align="center" />
+          <el-table-column prop="arrive_class" label="收发类别" width="140" align="center" />
+          <el-table-column prop="temp_no" label="临时卷号" show-overflow-tooltip width="140" align="center" />
+          <el-table-column prop="case_name" label="盒名称" show-overflow-tooltip align="center" min-width="200" />
           <el-table-column prop="folder_location_details" label="所在位置" align="center" min-width="300">
             <template slot-scope="scope">
               <span v-if="!scope.row.folder_location_details">-</span>
@@ -69,6 +85,32 @@
             </template>
           </el-table-column>
           <el-table-column prop="created_date" label="成文日期" align="center" min-width="180" />
+          <!-- 未绑 / 已绑 -->
+          <!-- <el-table-column label="标签" width="100" align="center" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.category_type !== 3" :class="['row-state', 'row-binding', scope.row.tid ? 'state-active' : '' ]">{{ scope.row.tid ? '已绑': '未绑' }}</span>
+            </template>
+          </el-table-column> -->
+          <!-- state-active 已装/已入/已借/已绑 -->
+          <!-- 未装 / 已装 -->
+          <!-- <el-table-column label="装盒" width="100" align="center" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.category_type !== 3" :class="['row-state', 'row-packing', scope.row.case_no ? 'state-active' : '' ]">{{ scope.row.case_no ? '已装': '未装' }}</span>
+            </template>
+          </el-table-column> -->
+          <!-- is_storage 为空的情况下即没装盒 / 0 未入 / 1 待入 / 2 已入 / 3 待出-->
+          <!-- <span class="row-state row-warehousing">{{ storageTxt[scope.$index] }}</span> -->
+          <!-- <el-table-column label="入库" width="100" align="center" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.category_type !== 3" :class="['row-state', 'row-warehousing', (storageTxt[scope.$index] === '已入' )? 'state-active' : '' ]">{{ storageTxt[scope.$index] }}</span>
+            </template>
+          </el-table-column> -->
+          <!-- is_borrow 4 已归还 / 为空 - 未加入待借列表 - 在库 / 2 待借阅（在待借列表/借出确认列表） - 待借 / 1待登记 - 不可借-用“—” 表示 / 3 待归还 - 已借 -->
+          <!-- <el-table-column label="借阅" width="100" align="center" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.category_type !== 3" :class="['row-state', 'row-lending', (borrowTxt[scope.$index] === '已借' )? 'state-active' : '' ]">{{ borrowTxt[scope.$index] }}</span>
+            </template>
+          </el-table-column> -->
         </el-table>
         <el-pagination :page-size.sync="page.size" :total="page.total" :current-page.sync="page.page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChangeHandler($event)" @current-change="pageChangeHandler" />
       </div>
@@ -119,7 +161,22 @@ export default {
       homeSearchWords: '',
       homeSearchSelect: [],
       openLocation: null,
-      deviceData: null
+      deviceData: null,
+      checkList: [3],
+      categoryTypesOptions: [
+        {
+          label: '案卷级',
+          value: 3
+        },
+        {
+          label: '卷内级',
+          value: 4
+        },
+        {
+          label: '文件级',
+          value: 5
+        }
+      ]
     }
   },
   async created() {
@@ -143,6 +200,14 @@ export default {
         return
       }
     },
+    handleCategoryTypes(val) {
+      if (val.length < 1) {
+        this.$nextTick(() => {
+          this.checkList = [3] // 重新设置 v-model 的值
+        })
+        return
+      }
+    },
     getSelectLabel(option) {
       const selectedOption = this.options.find((c) => c.value === option)
       return selectedOption ? selectedOption.label : ''
@@ -206,6 +271,7 @@ export default {
         localStorage.removeItem('homeSearchWords')
         localStorage.removeItem('homeSearchSelect')
       } else {
+        this.params.categoryTypes = this.checkList.join(',')
         this.params.criteria = this.select.join(',')
         this.params.query = this.keywords.replace(/\s+/ig, ' ')
         this.params.page = this.page.page - 1
@@ -305,6 +371,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "~@/assets/styles/archives-manage.scss";
 .search-main{
   width: 100%;
 }
@@ -316,6 +383,18 @@ export default {
     margin-bottom: 30px;
   }
 }
+.search-header{
+  width: 50%;
+  text-align: left;
+  margin: 0 auto 10px auto;
+  ::v-deep .el-checkbox-group{
+    margin-left: 15px;
+
+    .el-checkbox__label{
+      color: #fff;
+    }
+  }
+}
 .search-area {
   height: 100%;
   margin: 0;
@@ -399,4 +478,12 @@ export default {
   }
 }
 
+.lending-btn{
+  border-color: #F65163;
+  background-color: #F65163;
+  &.is-disabled{
+    border-color:#7A2831;
+    background-color: #7A2831;
+  }
+}
 </style>

src/views/archivesManage/caseManage/caseList/index.vue

@@ -158,7 +158,7 @@ export default {
         download: false,
         group: false
       },
-      sort: ['update_time,desc']
+      sort: ['case_name,asc']
 
     })
   },

src/views/archivesManage/caseManage/caseList/module/detailDialog.vue

@@ -24,6 +24,7 @@
         </div>
         <el-table :data="tableData" style="margin-top:15px;" height="342px">
           <el-table-column type="index" label="序号" align="center" width="80" />
+          <el-table-column prop="docNo" label="发文字号" show-overflow-tooltip width="140" align="center" />
           <el-table-column prop="child" label="子条数目" align="center" width="100" />
           <el-table-column prop="categoryType" label="门类级别" align="center" width="100">
             <template slot-scope="scope">

src/views/archivesManage/lendManage/toLend/module/lendRecord.vue

@@ -36,7 +36,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="证件类型" prop="cardType" class="down-select">
+          <!-- <el-form-item label="证件类型" prop="cardType" class="down-select">
             <el-select v-model="recordForm.cardType" placeholder="请选择">
               <el-option
                 v-for="(item,index) in idTypeOptions"
@@ -48,7 +48,7 @@
           </el-form-item>
           <el-form-item label="证件号码" prop="idcard">
             <el-input v-model="recordForm.idcard" />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="借阅时间" prop="lendDates">
             <!-- <date-range-picker v-model="recordForm.lendDates" /> -->
             <el-date-picker
@@ -84,7 +84,7 @@
 <script>
 import { FetchFindBorrowerByQuery, FetchRegisterBorrow } from '@/api/archivesManage/lendManage'
 import { form } from '@crud/crud'
-import { validatePhone } from '@/utils/validate'
+// import { validatePhone } from '@/utils/validate'
 import { lendingCrud } from '../../mixins/lending'
 // import DateRangePicker from '@/components/DateRangePicker'
 
@@ -107,9 +107,10 @@ export default {
         lendDates: [],
         purpose: null
       },
+      // , validator: validatePhone
       rules: {
         borrowerName: [{ required: true, message: '请输入姓名', trigger: 'blur, change' }],
-        phone: [{ required: true, trigger: 'blur', validator: validatePhone }],
+        phone: [{ required: true, trigger: 'blur', message: '请输入电话号码' }],
         lendDates: [{ required: true, trigger: 'change', message: '请选择借阅时间' }]
         // idcard: [{ trigger: 'blur', validator: validateIdNo }]
       },

src/views/system/archiveStatistics/index.vue

@@ -86,8 +86,19 @@
             <span class="right-top-line" />
             <span class="left-bottom-line" />
             <h3 class="table-title">
-              <p class="title-arrow">档案检索排名</p>
+              <p class="title-arrow">档案检索关键字排名</p>
             </h3>
+            <div class="selectTopNum">
+              <p>数量：</p>
+              <el-select v-model="numTop" placeholder="请选择" style="width:70px" @change="selectNumTop">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </div>
             <el-date-picker
               v-model="arcSearchDate"
               type="month"
@@ -134,23 +145,25 @@
 </template>
 
 <script>
-import lendAcross from '@/views/components/echarts/lendAcross.vue'
-import catePie from '@/views/components/echarts/catePie.vue'
-import typePie from '@/views/components/echarts/typePie.vue'
-import BarEcharts from './module/barEcharts.vue'
-import AcrossBar from './module/acrossBar.vue'
-import LineEchart from './module/lineEchart.vue'
+import lendAcross from '@/views/components/echarts/lendAcross'
+import catePie from '@/views/components/echarts/catePie'
+import typePie from '@/views/components/echarts/typePie'
+import BarEcharts from './module/barEcharts'
+import AcrossBar from './module/acrossBar'
+import LineEchart from './module/lineEchart'
 import { statisticsCrud } from './mixins/statistics'
 export default {
   components: { lendAcross, catePie, typePie, BarEcharts, AcrossBar, LineEchart },
   mixins: [statisticsCrud],
   data() {
     return {
+
     }
   },
   mounted() {
   },
   methods: {
+
   }
 }
 </script>
@@ -195,4 +208,26 @@ export default {
     flex: 1;
   }
 }
+.selectTopNum{
+  position: absolute;
+  left: 20px;
+  top: 10px;
+  display: flex;
+  justify-content: flex-start;
+  p{
+    font-size: 14px;
+    line-height: 30px;
+    color: #fff;
+  }
+  ::v-deep .el-select{
+    .el-input__inner{
+      height: 28px;
+      line-height: 30px;
+      border: 1px solid #339cff;
+      background-color: #021941;
+      color: #fff;
+    }
+
+  }
+}
 </style>

src/views/system/archiveStatistics/mixins/statistics.js

@@ -1,5 +1,6 @@
 import { FetchInitBorrowerNumStatistics, FetchInitArchivesTypeNum, FetchInitArchivesTypeStatistics, FetchStorageStatistics, FetchInitArchivesSearchRanking, FetchInitAddArchivesStatistics } from '@/api/archivesManage/statistics'
 // import qs from 'qs'
+
 export const statisticsCrud = {
   // 组件共用属性
   data() {
@@ -29,7 +30,24 @@ export const statisticsCrud = {
       addArcivesData: {
         addArcivesMonth: [],
         addArcivesNum: []
-      }
+      },
+      numTop: '10',
+      options: [{
+        value: '10',
+        label: '10'
+      }, {
+        value: '20',
+        label: '20'
+      }, {
+        value: '30',
+        label: '30'
+      }, {
+        value: '40',
+        label: '40'
+      }, {
+        value: '50',
+        label: '50'
+      }]
     }
   },
   // 组件挂载时的共用方法
@@ -160,16 +178,26 @@ export const statisticsCrud = {
     handleSearchDate() {
       this.getArchivesSearchRanking()
     },
+    selectNumTop(val) {
+      this.numTop = val
+      this.searchAcrivesData = {
+        searchName: [],
+        searchValue: []
+      }
+      this.getArchivesSearchRanking()
+    },
     // 档案检索排名
     getArchivesSearchRanking() {
       let params
       if (this.arcSearchDate) {
         params = {
-          'yearMonth': this.arcSearchDate
+          'yearMonth': this.arcSearchDate,
+          'top': this.numTop
         }
       } else {
         params = {
-          'yearMonth': null
+          'yearMonth': null,
+          'top': this.numTop
         }
       }
       FetchInitArchivesSearchRanking(params).then(res => {

src/views/system/archiveStatistics/module/acrossBar.vue

@@ -51,6 +51,14 @@ export default {
     drawChart() {
       const chartDom = document.getElementById('main2')
       this.chart = echarts.init(chartDom)
+
+      let showEchart = false
+      if (this.searchAcrivesData.searchValue.length > 10) {
+        showEchart = true // 显示滚动条
+      } else {
+        showEchart = false // 隐藏滚动条
+      }
+
       let option = null
       option = {
         tooltip: {
@@ -67,6 +75,30 @@ export default {
           top: '3%',
           containLabel: true
         },
+        dataZoom: [
+          {
+            type: 'inside', // 支持内部鼠标滚动平移
+            zoomOnMouseWheel: false, // 关闭滚轮缩放
+            moveOnMouseWheel: true, // 开启滚轮平移
+            moveOnMouseMove: true // 鼠标移动能触发数据窗口平移
+          },
+          {
+            show: showEchart, // 是否展示
+            yAxisIndex: 0,
+            filterMode: 'empty',
+            width: 15,
+            height: '80%',
+            showDataShadow: false,
+            left: '95%', // 左边的距离
+            top: 16,
+            showDetail: false, // 拖拽时是否展示滚动条两侧的文字
+            zoomLock: true, // 是否只平移不缩放
+            startValue: 0, // 从头开始。
+            endValue: 10, // 最多六个
+            minValueSpan: 10, // 放大到最少几个
+            maxValueSpan: 10 //  缩小到最多几个
+          }
+        ],
         xAxis: {
           type: 'value',
           boundaryGap: [0, 0.01],
@@ -79,7 +111,7 @@ export default {
             show: true,
             textStyle: {
               color: '#fff',
-              fontSize: '14'
+              fontSize: '12'
             }
           },
           axisLine: {// 轴线的颜色以及宽度
@@ -104,11 +136,11 @@ export default {
               normal: {
                 label: {
                   show: true,		// 开启显示
-                  distance: 20, // 条柱之间的距离
+                  distance: 12, // 条柱之间的距离
                   position: 'right',	// 在上方top在右侧right显示
                   textStyle: { // 数值样式
                     color: '#fff',
-                    fontSize: 14
+                    fontSize: 12
                   }
                 },
                 // 设置柱子圆角
@@ -117,7 +149,10 @@ export default {
                 color: function(params) {
                   // 定义一个颜色数组colorList
                   const colorList = ['#0FBED9', '#F65163', '#FF8447', '#76AF50', '#8378E8']
-                  return colorList[params.dataIndex]
+                  // 根据数据索引取模获取对应的颜色
+                  var colorIndex = params.dataIndex % 5
+
+                  return colorList[colorIndex]
                 }
               }