From 272d53c3f1ba4e6baaadb359c31a7facdbbbc908 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Wed, 10 Apr 2024 17:19:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=BE=97=E5=88=A9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../utillizeRecord/myUtilizeList.vue | 343 ++++++++++++++++++
.../utillizeRecord/recordList.vue | 11 +-
src/views/system/user/center.vue | 4 +-
src/views/system/user/messageCenter/index.vue | 28 +-
src/views/system/user/processCenter/index.vue | 1 +
5 files changed, 369 insertions(+), 18 deletions(-)
create mode 100644 src/views/archiveUtilize/utillizeRecord/myUtilizeList.vue
diff --git a/src/views/archiveUtilize/utillizeRecord/myUtilizeList.vue b/src/views/archiveUtilize/utillizeRecord/myUtilizeList.vue
new file mode 100644
index 0000000..45dc866
--- /dev/null
+++ b/src/views/archiveUtilize/utillizeRecord/myUtilizeList.vue
@@ -0,0 +1,343 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ {{ scope.row.giveStartTime }}
+
+
+
+
+ {{ scope.row.giveEndTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已完成
+ 已完成
+ 利用中
+ 即将到期
+ 已过期
+
+
+
+
+
+
+
+
+
+ - 标题:{{ rowCurrent && rowCurrent.title }}
+ - 申请时间:{{ rowCurrent && rowCurrent.createTime }}
+ - 利用人:{{ rowCurrent && rowCurrent.applicant }}
+ - 申请部门:{{ rowCurrent && rowCurrent.deptsName }}
+ - 申请理由:{{ rowCurrent && rowCurrent.borrowReason }}
+ - 开始时间:{{ rowCurrent && rowCurrent.giveStartTime | parseTime }}
+ - 结束时间:{{ rowCurrent && rowCurrent.giveEndTime | parseTime }}
+
+ -
+ 已完成
+ 已完成
+ 利用中
+ 即将到期
+ 已过期
+
+
+
+
+
+
+ 文件【{{ scope.row.archiveNo }}】{{ scope.row.maintitle }}
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+ 审批中
+
+ 同意借阅
+ 不允许借阅
+ 已归还
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/archiveUtilize/utillizeRecord/recordList.vue b/src/views/archiveUtilize/utillizeRecord/recordList.vue
index 2770a35..ff15e79 100644
--- a/src/views/archiveUtilize/utillizeRecord/recordList.vue
+++ b/src/views/archiveUtilize/utillizeRecord/recordList.vue
@@ -78,7 +78,7 @@
{{ scope.row.borrowType }}
- {{ scope.row.borrowType }}
+ {{ scope.row.borrowType }}
{{ scope.row.borrowType }}
@@ -98,10 +98,9 @@
结束时间:{{ rowCurrent && rowCurrent.giveEndTime | parseTime }}
- 进行中
- 已取消
- 已完成
- 不通过
+ {{ useRowStatus.borrowType }}
+ {{ useRowStatus.borrowType }}
+ {{ useRowStatus.borrowType }}
-
+
@@ -102,7 +102,7 @@ import { editUser } from '@/api/system/user'
import Avatar from '@/assets/images/avatar.png'
import messageCenter from './messageCenter/index'
import processCenter from './processCenter/index'
-import utillizeList from '@/views/archiveUtilize/utillizeRecord/recordList'
+import utillizeList from '@/views/archiveUtilize/utillizeRecord/myUtilizeList'
import OperateLog from '@/views/system/log/operateLog/index'
export default {
name: 'Center',
diff --git a/src/views/system/user/messageCenter/index.vue b/src/views/system/user/messageCenter/index.vue
index e349ee8..e8939c8 100644
--- a/src/views/system/user/messageCenter/index.vue
+++ b/src/views/system/user/messageCenter/index.vue
@@ -84,8 +84,8 @@ export default {
items: [],
page: {
total: 0,
- size: 10,
- page: 1,
+ size: 2,
+ page: 10,
totalPages: 0
},
loading: false,
@@ -114,27 +114,33 @@ export default {
}
return params
},
- getTableData() {
+ getListMessage() {
this.loading = true
FetchMySystemNotice(this.getParams()).then(res => {
- this.page.total = res.totalElements
- this.page.totalPages = res.totalPages
- const table = res.content
+ const listData = res.content
// table.forEach(item => {
// item.pushUserName = item.noticeUsers[0].pushUserName
// item.isRead = item.noticeUsers[0].isRead
// })
- this.items = table.concat(table)
+ if (listData.length === 0) {
+ this.loading = false
+ } else {
+ this.loading = true
+ }
+ this.page.total = res.totalElements
+ this.page.totalPages = res.totalPages
+ // this.items = this.items.concat(table)
+ this.items = [...listData, ...this.items]
this.loading = false
})
},
loadData() {
this.loading = true
setTimeout(() => {
- this.getTableData()
+ this.getListMessage()
this.page.page++
this.loading = false
- if (this.page.page >= this.page.totalPages) {
+ if (this.page.page > this.page.totalPages) {
this.hasMore = false
}
}, 1000)
@@ -193,7 +199,7 @@ export default {
handleRead() {
isread(this.getUserMsgId(this.selections)).then(res => {
if (res) {
- // this.getTableData()
+ // this.getListMessage()
this.reload()
}
})
@@ -210,7 +216,7 @@ export default {
isread(this.getUserMsgId(allList)).then(res => {
if (res) {
this.reload()
- // this.getTableData()
+ // this.getListMessage()
}
})
},
diff --git a/src/views/system/user/processCenter/index.vue b/src/views/system/user/processCenter/index.vue
index 2a94fde..14736f3 100644
--- a/src/views/system/user/processCenter/index.vue
+++ b/src/views/system/user/processCenter/index.vue
@@ -195,6 +195,7 @@ export default {
this.$refs.eForm.formVisible = true
this.$refs.eForm.selectRow = row
this.$refs.eForm.activeIndex = 0
+ this.$refs.eForm.form.opinion = null
this.$refs.eForm.setPage.page = 0
this.$refs.eForm.getBusinessFlowDetails()
},