diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index b933fbf..552d2fd 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -54,7 +54,7 @@
{e.target.value = e.target.value.replace(/[^0-9]/g,'')}" :maxLength="50"
v-decorator="[ 'postContacCode']">
@@ -90,7 +90,15 @@
-
+
+
+
+ {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+ v-decorator="[ 'housiwei',validatorRules.housiwei]">
+
+
@@ -134,9 +142,9 @@ export default {
required: false
},
// 会议费用是否为0
- meetingCostBool:{
- type:Boolean,
- required:false,
+ meetingCostBool: {
+ type: Boolean,
+ required: false,
}
},
data() {
@@ -161,6 +169,8 @@ export default {
},
// 缴费方式为打包
payModeBool: false,
+ // 缴费方式为线上缴费
+ onlinePayModeBool:false,
// 回显的邮寄联系人
selectPostPerson: null,
validatorRules: {
@@ -175,6 +185,10 @@ export default {
needInvoice: {
rules: [{required: true, message: '请选择发票类型'}],
validateTrigger: 'change'
+ },
+ housiwei:{
+ rules: [{required: true, message: '请输入订单号后四位'}],
+ validateTrigger: 'blur'
}
}
}
@@ -229,6 +243,10 @@ export default {
} else {
this.payModeBool = false
}
+ // 缴费方式为线上 要输入订单后四位
+ if(e.target.value === 2){
+ this.onlinePayModeBool = true
+ }
},
/*
* 编辑回显值
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index a5aa379..6f1e3b3 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -263,6 +263,10 @@ export default {
if(record.payMode === 3){
this.$refs.formother.payModeBool = true
}
+ // 缴费方式为线上的需要回显订单号后四位
+ if(record.payMode === 2){
+ this.$refs.formother.onlinePayModeBool = true
+ }
this.$refs.formother.setFormVal(this.model)
}
//国际研讨会的嘉宾前三个的编辑回显值
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index b89bff2..bbbbb47 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -97,13 +97,13 @@
@change="handleTableChange"
class="j-table-force-nowrap">
-
-
- {{ text }}
+
+ {{ text }}
-
+
+
@@ -182,47 +182,48 @@ export default {
align: 'center',
dataIndex: 'meetingType_dictText',
width: 100,
+ scopedSlots: {customRender: 'text'}
},
{
title: '负责人',
align: 'center',
dataIndex: 'directorName',
width: 160,
+ scopedSlots: {customRender: 'text'}
},
{
title: '召开时间',
align: 'center',
dataIndex: 'startTime',
width: 160,
- customRender: function (text, record) {
- return `${record.startTime}~${record.endTime}`
- }
+ customRender: (text, record) => ()
},
{
title: '召开地点',
align: 'center',
dataIndex: 'venue',
width: 160,
- customRender: function (text, record) {
- return text + '/' + record.address
- }
+ customRender: (text, record) => ()
},
{
title: '年份',
align: 'center',
dataIndex: 'particularYear',
width: 100,
+ scopedSlots: {customRender: 'text'}
},
{
title: '已提醒',
align: 'center',
dataIndex: 'remind_dictText',
width: 100,
+ scopedSlots: {customRender: 'text'}
},
{
title: '创建时间',
align: 'center',
dataIndex: 'createTime',
+ scopedSlots: {customRender: 'text'}
},
{
title: '操作',
@@ -266,7 +267,7 @@ export default {
* 新增
* */
handleAdd() {
- // 分表委的新增应该是需要分表委的i
+ // 分表委的新增应该是需要分表委的id
this.$router.push({
path: '/incomePayments/meetManage/AddOrDetailMeet',
query: {
@@ -288,6 +289,18 @@ export default {
}
})
},
+ /*
+ * 参会情况
+ * */
+ toAttendance(record) {
+ this.$router.push({
+ path: '/incomePayments/meetManage/Attendance',
+ query: {
+ id: record.id,
+ meetingName: record.meetingName
+ }
+ })
+ },
/*
* 发布
* */