diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 76bdadb..d2408d2 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -15,25 +15,30 @@
+ v-decorator="['meetingName']">
-
+
-
-
-
-
-
+
+
+
+
+
+
+
@@ -41,7 +46,7 @@
-
+
@@ -49,13 +54,24 @@
+ v-decorator="[ 'estimatedNumber']">
+
+
+
+
+
+
-
+
@@ -71,7 +87,7 @@
@@ -84,12 +100,15 @@
+ placeholder="请选择省市"
+ v-decorator="['meetingContent']"
+ >
@@ -99,51 +118,45 @@
-
-
-
-
-
-
-
-
-
- 邀请码
-
-
-
-
-
-
+
+
+ 邀请码
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
会议费用
@@ -153,15 +166,16 @@
+ v-decorator="[ 'meetingCosts']">
元/人
-
+
+
+ v-decorator="[ 'meetingCostsVip']">
元/人
@@ -182,44 +196,59 @@
+ v-decorator="['directorPhone']">
-
-
+
+
+ v-decorator="['hotelName']">
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+ v-decorator="[ 'hotelAddress']">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -227,7 +256,7 @@
@@ -270,7 +299,12 @@ export default {
confirmLoading: false,
visible: false,
form: this.$form.createForm(this),
- model: {},
+ model: {
+ hotelList: [{
+ contactPerson: '',
+ telephoneNumber: ''
+ }]
+ },
labelCol: {
xs: {span: 24},
sm: {span: 6}
@@ -287,7 +321,15 @@ export default {
xs: {span: 24},
sm: {span: 21}
},
- validatorRules: {}
+ // 详细地址
+ address: '',
+ // 会议类型 新增时默认为其他会议
+ meetingType:"4",
+ validatorRules: {},
+ url: {
+ add: "/meeting/payMeeting/add",
+ edit: "/meeting/payMeeting/edit",
+ }
}
},
methods: {
@@ -295,7 +337,27 @@ export default {
* 发布会议
* */
handleOk() {
- console.log('发布')
+ const that = this
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ let httpurl = ''
+ let method = 'post'
+ httpurl = this.url.add
+ const formData = Object.assign(this.model, values)
+ console.log('表单提交数据', formData)
+ httpAction(httpurl, formData, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.$emit('ok')
+ that.close()
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.confirmLoading = false
+ })
+ }
+ })
},
/*
* 取消
@@ -310,6 +372,55 @@ export default {
handleReback() {
this.$router.go(-1)
},
+ /*
+ * 监听会议类型变化
+ * */
+ changeMeetingType(val) {
+ this.meetingType = val
+ },
+ /*
+ * 添加酒店联系人
+ * */
+ addNew(index) {
+ if (this.model.hotelList.length >= 5) {
+ this.$message.warning('最多添加5个酒店联系人')
+ return
+ }
+ const { form } = this
+ const obj = {
+ contactPerson: '',
+ telephoneNumber: ''
+ }
+ const keys = form.getFieldValue('hotelList')
+ // 增加数据后重新赋值
+ this.model.hotelList.splice(index + 1, 0, obj)
+ keys.splice(index + 1, 0, obj)
+ this.$nextTick(() => {
+ form.setFieldsValue({
+ hotelList: keys
+ })
+ })
+ },
+ /*
+ * 删减酒店联系人
+ * */
+ remove(k) {
+ // 如果长度是1的话则不进行删除操作
+ if (this.model.hotelList.length === 1) {
+ return
+ }
+ const { form } = this
+ // // can use data-binding to get
+ const hotelList = form.getFieldValue('hotelList')
+ // 把循环的dom元素删除
+ this.model.hotelList.splice(k, 1)
+ // 把绑定在dom里面的值删除
+ hotelList.splice(k, 1)
+ // 重新赋值
+ form.setFieldsValue({
+ hotelList: hotelList
+ })
+ },
}
}
@@ -376,8 +487,19 @@ export default {
.submit {
margin-right: 8px;
}
+
.yuan {
position: absolute;
right: -40px;
}
+
+.add-icon {
+ height: 100%;
+ margin-right: 10px;
+ cursor: pointer;
+}
+.remove-icon {
+ height: 100%;
+ cursor: pointer;
+}
diff --git a/src/views/incomePayments/meetManage/MeetManageList.vue b/src/views/incomePayments/meetManage/MeetManageList.vue
index 7563b17..f3c4b00 100644
--- a/src/views/incomePayments/meetManage/MeetManageList.vue
+++ b/src/views/incomePayments/meetManage/MeetManageList.vue
@@ -128,39 +128,41 @@ export default {
{
title: '会议名称',
align: "center",
- dataIndex: '',
+ dataIndex: 'meetingName',
scopedSlots: {customRender: 'htmlSlot'}
},
{
title: '会议类型',
align: "center",
- dataIndex: '',
-
+ dataIndex: 'tbMeetingType',
},
{
title: '负责人',
align: "center",
- dataIndex: ''
+ dataIndex: 'directorName'
},
{
title: '召开时间',
align: "center",
- dataIndex: ''
+ dataIndex: 'startTime',
+ customRender:function (text) {
+ return !text?"":(text.length> 10?text.substr(0,10):text)
+ }
},
{
title: '召开地点',
align: "center",
- dataIndex: ''
+ dataIndex: 'venue'
},
{
title: '年份',
align: "center",
- dataIndex: ''
+ dataIndex: 'particularYear'
},
{
title: '创建时间',
align: "center",
- dataIndex: ''
+ dataIndex: 'createTime'
},
{
title: '操作',
@@ -169,11 +171,11 @@ export default {
},
],
url: {
- list: "/jero/memberProject/page",
- delete: "/jero/memberProject/delete",
- deleteBatch: "/jero/memberProject/deleteBatch",
- exportXlsUrl: "/jero/memberProject/exportXls",
- importExcelUrl: "jero/memberProject/importExcel",
+ list: "/meeting/payMeeting/page",
+ delete: "/meeting/payMeeting/delete",
+ deleteBatch: "/meeting/payMeeting/deleteBatch",
+ exportXlsUrl: "/meeting/payMeeting/exportXls",
+ importExcelUrl: "meeting/payMeeting/importExcel",
},
}
},
diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
index dea0006..e3a5683 100644
--- a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
@@ -8,7 +8,7 @@
-
+