@@ -74,7 +78,7 @@
:class="{
'row-state row-packing': scope.row.read_type === '未传阅',
'row-state row-binding state-active': scope.row.read_type === '传阅中',
- 'row-state row-physical state-active': scope.row.read_type === '已传阅',
+ 'row-state row-physical state-active': scope.row.read_type === '已完成',
}"
>
{{ scope.row[field.fieldName] }}
@@ -219,7 +223,8 @@ export default {
archivesType: null,
search: '',
parentInfo: null,
- pageType: null
+ pageType: null,
+ allDownloadLoading: false
}
},
computed: {
@@ -452,18 +457,25 @@ export default {
})
},
// 导出
- doExport(datas) {
- this.crud.downloadLoading = true
- this.$confirm('此操作将导出所选数据' + '
你是否还要继续?', '提示', {
+ doExport(type, datas) {
+ if (type === '0') {
+ this.crud.downloadLoading = true
+ } else {
+ this.allDownloadLoading = true
+ }
+ const tip = type === '0' ? '此操作将导出所选数据' : '此操作将批量导出所有数据'
+ this.$confirm(tip + '
你是否还要继续?', '提示', {
confirmButtonText: '继续',
cancelButtonText: '取消',
type: 'warning',
dangerouslyUseHTMLString: true
}).then(() => {
const ids = []
- datas.forEach(val => {
- ids.push(val.id)
- })
+ if (type === '0') {
+ datas.forEach(val => {
+ ids.push(val.id)
+ })
+ }
let documentId
if (this.selectedDocument.isType === 2) {
documentId = this.selectedDocument.id
@@ -472,12 +484,22 @@ export default {
}
const params = {
'documentId': documentId,
- 'ids': ids
+ 'ids': ids,
+ 'docDepartment': type === '1' ? this.selectedDocument.dictionaryName : null,
+ 'archivesYear': type === '1' ? this.selectedDocument.label : null
+ }
+ exportFile(this.baseApi + '/api/documentArchives/downloadDocumentArchives?' + qs.stringify(params, { indices: false, allowDots: true, skipNulls: false }))
+ if (type === '0') {
+ this.crud.downloadLoading = false
+ } else {
+ this.allDownloadLoading = false
}
- exportFile(this.baseApi + '/api/documentArchives/downloadDocumentArchives?' + qs.stringify(params, { indices: false }))
- this.crud.downloadLoading = false
}).catch(() => {
- this.crud.downloadLoading = false
+ if (type === '0') {
+ this.crud.downloadLoading = false
+ } else {
+ this.allDownloadLoading = false
+ }
})
},
doPrint(datas) {
diff --git a/src/views/archivesMIOD/miodLibrary/module/detail.vue b/src/views/archivesMIOD/miodLibrary/module/detail.vue
index 1f1a848..7f33432 100644
--- a/src/views/archivesMIOD/miodLibrary/module/detail.vue
+++ b/src/views/archivesMIOD/miodLibrary/module/detail.vue
@@ -364,7 +364,7 @@ export default {
return 'defalut-state'
case '传阅中':
return 'end-state'
- case '已传阅':
+ case '已完成':
return 'ing-state'
default:
return 'defalut-state'
diff --git a/src/views/archivesMIOD/miodSearch/module/resultList.vue b/src/views/archivesMIOD/miodSearch/module/resultList.vue
index 3c44096..ad5a1c1 100644
--- a/src/views/archivesMIOD/miodSearch/module/resultList.vue
+++ b/src/views/archivesMIOD/miodSearch/module/resultList.vue
@@ -66,7 +66,7 @@
来文字号:{{ item.doc_no }}
-
所属位置
+
{{ item.pass_location }}
-
-
+
+
+
+
+
+
+ [{{ scope.row.reg_no }}] - {{ scope.row.maintitle }}
+
+
+
+
+ {{ scope.row.latest_time }}
+
+
+
+
+
+
+
@@ -115,8 +142,8 @@ import PanelGroup from './dashboard/PanelGroup'
// 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 serverProgress from '@/views/components/echarts/serverProgress.vue'
-import { FetchInitStatisBase, FetchDocumentTypeByTime, FetchDocumentByDocDepartment, FetchHomeBorrowLog } from '@/api/system/documentArchives'
+// import serverProgress from '@/views/components/echarts/serverProgress.vue'
+import { FetchInitStatisBase, FetchDocumentTypeByTime, FetchDocumentByDocDepartment, FetchHomeBorrowLog, FetchHomeRemindHandle } from '@/api/system/documentArchives'
import { FetchSystemInfo } from '@/api/home/cpu/index'
import { mapGetters } from 'vuex'
@@ -126,8 +153,8 @@ export default {
PanelGroup,
// lendAcross,
catePie,
- typePie,
- serverProgress
+ typePie
+ // serverProgress
},
data() {
return {
@@ -158,7 +185,8 @@ export default {
cpuPercentage: 0,
memPercentage: 0,
sysFilesPercentage: 0
- }
+ },
+ remindData: []
}
},
computed: {
@@ -169,6 +197,7 @@ export default {
created() {
this.getTopData()
this.getHomeBorrowLog()
+ this.getHomeRemindHandle()
this.getSystemInfo()
this.getDocumentTypeByTime()
this.getDocumentByDocDepartment()
@@ -208,6 +237,18 @@ export default {
this.miodTableData = res
})
},
+ getHomeRemindHandle() {
+ FetchHomeRemindHandle().then(res => {
+ console.log('remindData', res)
+ this.remindData = res.map(item => {
+ return {
+ reg_no: item[0],
+ maintitle: item[1],
+ latest_time: item[2]
+ }
+ })
+ })
+ },
getSystemInfo() {
FetchSystemInfo().then(res => {
console.log('res', res)