From 9cdf7e44075c028fbbd68fb5c26f106c85979947 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 6 Sep 2021 18:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A=E8=AE=AE?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/incomePaymentsApi.js | 3 +
src/mixins/RangeDateMixin.js | 37 ++
.../meetManage/AddOrDetailMeet.vue | 585 ++++++++++--------
.../incomePayments/meetManage/Attendance.vue | 52 +-
.../meetManage/MeetManageList.vue | 100 ++-
.../ConferenceMaintenance.vue | 123 +++-
.../modules/PublishRemindModal.vue | 154 +++++
7 files changed, 733 insertions(+), 321 deletions(-)
create mode 100644 src/mixins/RangeDateMixin.js
create mode 100644 src/views/projectManagement/modules/PublishRemindModal.vue
diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 506db19..12b26dd 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -4,6 +4,8 @@ import { getAction, postAction } from '@api/manage'
const getWorkingGroupById = (params) => getAction('/project/payWorkingGroup/queryById', params)
// 判断工作组成员是否设置来款通知
const getChargeNotice = (param) => getAction('/project/payWorkingGroupSubitem/getCharge', param)
+// 工作组会议的发布提醒
+const publishRemind = (param) => getAction('',param)
// 通过id获取收入合同信息
const getRevenueContractById = (param) => getAction('/contract/payIncomeContract/queryById', param)
// 收入合同审核
@@ -12,6 +14,7 @@ const aduitRevenueContract = (param) => postAction('/contract/payIncomeContract/
export {
getWorkingGroupById,
getChargeNotice,
+ publishRemind,
getRevenueContractById,
aduitRevenueContract
}
\ No newline at end of file
diff --git a/src/mixins/RangeDateMixin.js b/src/mixins/RangeDateMixin.js
new file mode 100644
index 0000000..2271988
--- /dev/null
+++ b/src/mixins/RangeDateMixin.js
@@ -0,0 +1,37 @@
+/* 查询条件有时间范围的 混入方法 */
+import moment from 'moment'
+export const RangeDateMixin = {
+ data() {
+ return {
+ dateKeyObj: {
+ beginKey: 'beginRegisterTime',
+ endKey: 'endRegisterTime'
+ },
+ rangeDateFormat: {
+ begin: 'YYYY-MM-DD 00:00:00',
+ end: 'YYYY-MM-DD 23:59:59'
+ }
+ }
+ },
+
+ methods: {
+ disabledStartDate(startValue) {
+ const endValue = this.queryParam[this.dateKeyObj.endKey] && moment(this.queryParam[this.dateKeyObj.endKey], this.rangeDateFormat.end)
+ if (!startValue || !endValue) {
+ return false
+ }
+ return startValue.valueOf() > endValue.valueOf()
+ },
+
+ disabledEndDate(endValue) {
+ const startValue = this.queryParam[this.dateKeyObj.beginKey] && moment(this.queryParam[this.dateKeyObj.beginKey], this.rangeDateFormat.begin)
+ if (!endValue || !startValue) {
+ return false
+ }
+ return startValue.valueOf() > endValue.valueOf()
+ },
+ disabledDateBeforeToday(current) {
+ return current < moment().subtract(1, 'day') // 当天之前的不可选，不包括当天
+ }
+ }
+}
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 41499aa..aaf00dc 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -1,307 +1,319 @@
-
-
-
-
-
-
- 会议信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.workingGroupProject }}
-
-
-
+
+
+
+
+
+
+ 会议信息
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+ {{ item.workingGroupProject }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 邀请码
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 会议费用
-
+
+
+
+
+
+
+
-
-
-
- 元/人
-
-
-
-
-
-
- 元/人
-
-
-
-
+
-
- 联系方式
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 邀请码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 会议费用
+
+
+
+
+
+ 元/人
+
+
+
+
+
+
+ 元/人
+
+
+
+
+
+
+ 联系方式
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+