diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 265c60a..2cf86d4 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -143,7 +143,8 @@ const copyDraftingGroup = (param) => postAction('/drafting/payDraftingGroup/copy
const getWorkingGroupList = (param) => getAction('/drafting/payDraftingGroup/queryAllWorkingGroupsIdAndName', param)
// 通过id获取起草组详情
const getDraftingGroupById = (params) => getAction('/drafting/payDraftingGroup/queryById', params)
-
+// 起草组会议的发布提醒
+const draftGroupPublishRemind = (param) => postAction('/meeting/draftGroupMeeting/publishReminder', param)
export {
getWorkingGroupById,
getChargeNotice,
@@ -219,4 +220,5 @@ export {
copyDraftingGroup,
getWorkingGroupList,
getDraftingGroupById,
+ draftGroupPublishRemind,
}
diff --git a/src/views/draftingGroup/ConferenceMaintenance.vue b/src/views/draftingGroup/ConferenceMaintenance.vue
index bc3c95a..d6259da 100644
--- a/src/views/draftingGroup/ConferenceMaintenance.vue
+++ b/src/views/draftingGroup/ConferenceMaintenance.vue
@@ -63,7 +63,7 @@
查询
+ v-has="'draftGroupMeeting:search'">查询
重置
@@ -74,15 +74,15 @@
-
新增
+ 新增
导出
+ v-has="'draftGroupMeeting:export'">导出
-
+
批量删除
- 发布
+ 发布
![报名二维码]()
复制
+
+
+
+
+
+
+
成员信息
@@ -137,6 +156,8 @@
+
+ 审核
编辑
删除
@@ -146,6 +167,8 @@
+
+
@@ -159,6 +182,8 @@ import DraftingGroupMemberUnitModule from './modules/DraftingGroupMemberUnitModu
import Vue from 'vue'
import { ACCESS_TOKEN } from '../../store/mutation-types'
import PreviewFile from '../../components/jero/PreviewFile'
+import {createQcCode} from '@api/incomeMeetingApi'
+import DraftingGroupMemberUnitCheckModule from '@views/draftingGroup/modules/DraftingGroupMemberUnitCheckModule'
// eslint-disable-next-line no-undef,no-unused-vars
const Base64 = require('js-base64').Base64
@@ -166,6 +191,7 @@ const Base64 = require('js-base64').Base64
export default {
name: 'DraftingGroupMemberUnitMaintenance',
components: {
+ DraftingGroupMemberUnitCheckModule,
PageHeaderTitle,
StatusSlot,
ProjectDetailModal,
@@ -174,12 +200,21 @@ export default {
},
mixins: [JeroListMixin],
computed: {
+ // 报名链接
+ signUpHerfUrl() {
+ return `${ window._CONFIG['singUpQRCodeURL'] }?id=${ this.$route.query.draftingGroupProjectId }`
+ },
importExcelUrl: function () {
return `${ window._CONFIG['domianURL'] }/${ this.url.importExcelUrl }`
}
},
+ async mounted() {
+ // 生成会议报名二维码
+ this.signUpQRCode = await this.generateQRCode(this.signUpHerfUrl)
+ },
data() {
return {
+ signUpQRCode: '',
disableMixinCreated: true,
draftingGroupProject: '',
draftingGroupProjectId: '',
@@ -338,6 +373,26 @@ export default {
this.initWorkGroupData()
},
methods: {
+ handleCheck (record) {
+ this.$refs.draftingGroupMemberUnitCheckModule.open(record)
+ },
+ /*
+ * 生成二维码
+ * */
+ generateQRCode(params) {
+ return new Promise(resolve => {
+ let code = ''
+ createQcCode({ contact: params }).then(res => {
+ if (res.success) {
+ code = res.result
+ } else {
+ console.error('生成二维码失败')
+ }
+ }).finally(() => {
+ resolve(code)
+ })
+ })
+ },
/**
* 初始化起草组信息
*/
@@ -360,7 +415,29 @@ export default {
this.spinning = false
})
},
-
+ /*
+ * 复制地址
+ * */
+ copy(data) {
+ // 存储传递过来的数据
+ let OrderNumber = data
+ // 创建一个input 元素
+ // createElement() 方法通过指定名称创建一个元素
+ let newInput = document.createElement('input')
+ // 讲存储的数据赋值给input的value值
+ newInput.value = OrderNumber
+ // appendChild() 方法向节点添加最后一个子节点。
+ document.body.appendChild(newInput)
+ // 选中input元素中的文本
+ // select() 方法用于选择该元素中的文本。
+ newInput.select()
+ // 执行浏览器复制命令
+ // execCommand方法是执行一个对当前文档，当前选择或者给出范围的命令
+ document.execCommand('Copy')
+ // 清空输入框
+ newInput.remove()
+ this.$message.success('复制成功')
+ },
handleAdd: function () {
this.$refs.modalForm.draftingGroupId = this.draftingGroupProjectId
this.$refs.modalForm.add()
@@ -445,4 +522,37 @@ export default {
overflow: hidden;
text-overflow: ellipsis;
}
+
+.flex-col {
+ .ant-col {
+ display: flex;
+ }
+ label {
+ flex-shrink: 0;
+ }
+}
+
+.qr-code {
+ width: 100px;
+ height: 100px;
+}
+
+.copy {
+ font-style: normal;
+ cursor: pointer;
+}
+.ant-row {
+ line-height: 3;
+
+ .ant-col {
+
+ label {
+ color: #999;
+ }
+
+ span {
+ color: black;
+ }
+ }
+}
diff --git a/src/views/draftingGroup/modules/DraftingGroupMemberUnitCheckModule.vue b/src/views/draftingGroup/modules/DraftingGroupMemberUnitCheckModule.vue
new file mode 100644
index 0000000..a8881df
--- /dev/null
+++ b/src/views/draftingGroup/modules/DraftingGroupMemberUnitCheckModule.vue
@@ -0,0 +1,212 @@
+
+
+
+
+ 报名信息
+
+
+
+ {{ model.chargeCompanyTemporaryName }}
+
+
+
+
+
+
+ {{ item.contactsTemporaryName }}
+
+
+ {{ item.phone }}
+
+
+
+ 审核
+
+
+
+
+
+
+
+ 通过
+
+
+ 驳回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关闭
+ 确定
+
+
+
+
+
+
+
diff --git a/src/views/draftingGroup/modules/DraftingGroupMemberUnitModule.vue b/src/views/draftingGroup/modules/DraftingGroupMemberUnitModule.vue
index 92d5beb..9d8f7b9 100644
--- a/src/views/draftingGroup/modules/DraftingGroupMemberUnitModule.vue
+++ b/src/views/draftingGroup/modules/DraftingGroupMemberUnitModule.vue
@@ -113,7 +113,7 @@ import { checkAssociatedProject } from '../../../utils/projectCheck'
import { CalcAmountMixin } from '@/mixins/CalcAmountMixin'
export default {
- name: 'WorkingGroupMemberUnitModule',
+ name: 'DraftingGroupMemberUnitModule',
components: { CompanySelect, SelectContacts },
mixins: [CalcAmountMixin],
props: {
@@ -411,6 +411,8 @@ export default {
let method = 'post'
if (!this.model.id) {
httpurl += this.url.add
+ // 通过添加成员来的，默认状态为通过
+ values.checkResult = 2
} else {
httpurl += this.url.edit
}
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index cbc9f4a..c57e9e9 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -916,6 +916,7 @@ export default {
formData.meetingType = '2'
formData.standardsId = this.$route.query.standardsId
}
+ // 如果是起草组会议需要加上起草组id与会议类型
if (this.isDraftGroupMeetType) {
formData.meetingType = '7'
formData.draftingGroupId = this.$route.query.draftingGroupProjectId
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index 7301275..8c74e80 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -238,6 +238,12 @@ export default {
uploadFile: '/meeting/councilMeeting/uploadFile',
uploadCouncilFile: '/meeting/councilMeeting/uploadCouncilFile',
}
+ // 起草组会议
+ case '7':
+ return {
+ uploadFile: '/meeting/draftGroupMeeting/uploadFile',
+ uploadCouncilFile: '/meeting/draftGroupMeeting/uploadCouncilFile',
+ }
}
},
handleOk() {
diff --git a/src/views/projectManagement/modules/PublishRemindModal.vue b/src/views/projectManagement/modules/PublishRemindModal.vue
index 2f2e6f6..9e4c913 100644
--- a/src/views/projectManagement/modules/PublishRemindModal.vue
+++ b/src/views/projectManagement/modules/PublishRemindModal.vue
@@ -85,7 +85,12 @@