LK/income_payments_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

会议变更修改

Browse Source
This commit is contained in:
fengachen
2021-09-16 19:46:02 +08:00
parent a0c45be5fc
commit 4a160534df
9 changed files with 191 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
+10 -8
View File
@@ -7,8 +7,8 @@
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row> <a-row>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="分表委名称" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="分标委名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入分表委名称" v-model="queryParam.fenBiaoWeiName"></a-input> <a-input placeholder="请输入分标委名称" v-model="queryParam.fenBiaoWeiName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -34,8 +34,8 @@
<!-- 操作按钮区域--> <!-- 操作按钮区域-->
<div class="table-operator"> <div class="table-operator">
<a-button type="primary" icon="plus" @click="handleAdd">新增分表委</a-button> <a-button type="primary" icon="plus" @click="handleAdd">新增分标委</a-button>
<a-button type="primary" icon="export" @click="handleExportXls('分表委维护')">导出</a-button> <a-button type="primary" icon="export" @click="handleExportXls('分标委维护')">导出</a-button>
<a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button> <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
</div> </div>
<!-- 操作按钮区域-end--> <!-- 操作按钮区域-end-->
@@ -84,7 +84,7 @@
</div> </div>
<!-- /table表格区域--> <!-- /table表格区域-->
<!-- 新增分表委--> <!-- 新增分标委-->
<committee-module ref="modalForm" @ok="modalFormOk"></committee-module> <committee-module ref="modalForm" @ok="modalFormOk"></committee-module>
<committee-member-module ref="memberModalForm" @ok="modalFormOk"></committee-member-module> <committee-member-module ref="memberModalForm" @ok="modalFormOk"></committee-member-module>
</a-card> </a-card>
@@ -133,7 +133,7 @@ export default {
return parseInt(index) + 1 return parseInt(index) + 1
} }
}, { }, {
title: '分表委名称', title: '分标委名称',
align: 'center', align: 'center',
dataIndex: 'name', dataIndex: 'name',
scopedSlots: {customRender: 'text'} scopedSlots: {customRender: 'text'}
@@ -196,7 +196,7 @@ export default {
}, },
handleAdd() { handleAdd() {
this.$refs.modalForm.add() this.$refs.modalForm.add()
this.$refs.modalForm.title = '新增分表委' this.$refs.modalForm.title = '新增分标委'
this.$refs.modalForm.disableSubmit = false this.$refs.modalForm.disableSubmit = false
}, },
/** /**
@@ -249,7 +249,9 @@ export default {
this.$router.push({ this.$router.push({
path:'/projectManagement/CommitteeMeeting', path:'/projectManagement/CommitteeMeeting',
query:{ query:{
id:record.id id:record.id,
title:record.name,
meetingType:'5'
} }
}) })
} }
src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue
+2 -2
View File
@@ -12,8 +12,8 @@
<a-form :form="form"> <a-form :form="form">
<a-row> <a-row>
<a-col :xl="12" :sm="24"> <a-col :xl="12" :sm="24">
<a-form-item label="分表委名称" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="分标委名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入分表委名称" <a-input placeholder="请输入分标委名称"
v-decorator="['name',validatorRules.name]" v-decorator="['name',validatorRules.name]"
:disabled="true" :disabled="true"
:maxLength='50' :maxLength='50'
src/views/dataNetworkDiskManagement/dataMaintenance/modules/DistributeModal.vue
+8 -8
View File
@@ -23,11 +23,11 @@
</a-row> </a-row>
<a-row> <a-row>
<a-col> <a-col>
<a-form-item label="分表委名称" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="分标委名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select <a-select
v-decorator="['name', validatorRules.name]" v-decorator="['name', validatorRules.name]"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
placeholder="请选择分表委名称" placeholder="请选择分标委名称"
@select="select" @select="select"
> >
<a-select-option v-for="item in list" :key="item.id" :value="item.id"> <a-select-option v-for="item in list" :key="item.id" :value="item.id">
@@ -90,7 +90,7 @@ export default {
sm: { span: 17 } sm: { span: 17 }
}, },
fileList: [], // 文件数据 fileList: [], // 文件数据
list: [], // 分表委名称 list: [], // 分标委名称
memberList: [], // 成员树 memberList: [], // 成员树
checkedKeys: [], // 已选中的成员数组 checkedKeys: [], // 已选中的成员数组
businessSelectedRowKeys: [], businessSelectedRowKeys: [],
@@ -102,7 +102,7 @@ export default {
}, },
validatorRules: { validatorRules: {
name: { name: {
rules: [{ required: true, message: '请选择分表委名称' }], rules: [{ required: true, message: '请选择分标委名称' }],
validateTrigger: 'change' validateTrigger: 'change'
}, },
dataId: { dataId: {
@@ -115,15 +115,15 @@ export default {
} }
}, },
url: { url: {
list: 'payCaseCommittee/payCaseCommittee/list', // 分标委列表---分表委列表 list: 'payCaseCommittee/payCaseCommittee/list', // 分标委列表---分标委列表
memberList: 'payCaseCommitteeSubitem/payCaseCommitteeSubitem/list', // 分表委成员列表 memberList: 'payCaseCommitteeSubitem/payCaseCommitteeSubitem/list', // 分标委成员列表
distribute: 'payDataFile/payDataFile/distribute', // 分发 distribute: 'payDataFile/payDataFile/distribute', // 分发
distributeBatch: 'payDataFile/payDataFile/distributes' // 批量分发 distributeBatch: 'payDataFile/payDataFile/distributes' // 批量分发
} }
} }
}, },
created(){ created(){
// 获取分表委名称 // 获取分标委名称
getAction(this.url.list).then(res => { getAction(this.url.list).then(res => {
if (res.success) { if (res.success) {
this.list = res.result.records this.list = res.result.records
@@ -132,7 +132,7 @@ export default {
}, },
methods: { methods: {
select(value) { select(value) {
// 分表委value===id去获取成员数据 // 分标委value===id去获取成员数据
if (value) { if (value) {
getAction(this.url.memberList, { id: value }).then(res=>{ getAction(this.url.memberList, { id: value }).then(res=>{
if (res.success) { if (res.success) {
src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+35 -38
View File
@@ -10,14 +10,15 @@
<a-row :gutter="24"> <a-row :gutter="24">
<!--如果是工作组项目的会议维护跳转的 需要隐藏会议类型--> <!--如果是工作组项目的会议维护跳转的 需要隐藏会议类型-->
<a-col :xxl="8" :xl="12" :sm="24" v-if="isWorkGroupMeetType"> <!-- 会议拆分不需要会议类型了 需要在调接口的时候传相应的会议类型-->
<a-form-item label="会议类型" :labelCol="labelCol" :wrapperCol="wrapperCol"> <!-- <a-col :xxl="8" :xl="12" :sm="24" v-if="isWorkGroupMeetType">-->
<j-dict-select-tag style="width: 100%" v-decorator="['meetingType',validatorRules.meetingType]" <!-- <a-form-item label="会议类型" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
@change="changeMeetingType" <!-- <j-dict-select-tag style="width: 100%" v-decorator="['meetingType',validatorRules.meetingType]"-->
:trigger-change="true" dict-code="meeting_type" <!-- @change="changeMeetingType"-->
placeholder="请选择会议类型"></j-dict-select-tag> <!-- :trigger-change="true" dict-code="meeting_type"-->
</a-form-item> <!-- placeholder="请选择会议类型"></j-dict-select-tag>-->
</a-col> <!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xxl="8" :xl="12" :sm="24"> <a-col :xxl="8" :xl="12" :sm="24">
<a-form-item label="会议名称" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="会议名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -221,7 +222,7 @@
<a-col :xxl="8" :xl="12" :sm="24" v-if="QRcodeBool"> <a-col :xxl="8" :xl="12" :sm="24" v-if="QRcodeBool">
<a-form-item label="收款二维码" :labelCol="{ xs: {span: 24},sm: {span: 8}}" <a-form-item label="收款二维码" :labelCol="{ xs: {span: 24},sm: {span: 8}}"
:wrapperCol="{ xs: {span: 24},xl:{span:14},sm: {span: 16}}"> :wrapperCol="{ xs: {span: 24},xl:{span:14},sm: {span: 16}}">
<j-image-upload :return-id="true" v-decorator="[ 'QRcode']"></j-image-upload> <j-image-upload :return-id="true" v-decorator="[ 'QRcode']"></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@@ -340,7 +341,7 @@
</template> </template>
<script> <script>
import {getUserInfo, getMeetInfoById, getAllWorkProjects} from '@api/incomeMeetingApi' import {getUserInfo, getMeetInfoById} from '@api/incomeMeetingApi'
import {isRepeat} from '@/utils/util' import {isRepeat} from '@/utils/util'
import {httpAction} from '@api/manage' import {httpAction} from '@api/manage'
import JDictSelectTag from '@comp/dict/JDictSelectTag' import JDictSelectTag from '@comp/dict/JDictSelectTag'
@@ -404,8 +405,6 @@ export default {
}, },
// 详细地址 // 详细地址
address: '', address: '',
// 会议类型 新增时默认为其他会议
meetingType: '4',
validatorRules: meetingValidate, validatorRules: meetingValidate,
validateInviteCode: { validateInviteCode: {
invitationCode: { invitationCode: {
@@ -452,6 +451,8 @@ export default {
workGroupList: [], workGroupList: [],
// 收费二维码显示 // 收费二维码显示
QRcodeBool: true, QRcodeBool: true,
// 会议类型
meetingType:'',
} }
}, },
computed: { computed: {
@@ -466,13 +467,16 @@ export default {
}, },
mounted() { mounted() {
this.pcaData = new AreaPca() this.pcaData = new AreaPca()
// 编辑获取会议信息 // 编辑获取会议信息 有id就是编辑走编辑
if (this.$route.query.id) { if (this.$route.query.id) {
getMeetInfoById({id: this.$route.query.id}).then(res => { getMeetInfoById({id: this.$route.query.id}).then(res => {
if (res.success) { if (res.success) {
this.edit(res.result) this.edit(res.result)
} }
}) })
}else {
// 没有id走新增
this.add()
} }
}, },
methods: { methods: {
@@ -493,19 +497,29 @@ export default {
let dateFormat = 'YYYY-MM-DD HH:mm:ss' let dateFormat = 'YYYY-MM-DD HH:mm:ss'
if (this.model.id) { if (this.model.id) {
this.title = '编辑会议' this.title = '编辑会议'
// 修改会议类型 控制dom显示 编辑取接口查到的会议类型
this.meetingType = record.meetingType + ''
} else { } else {
this.title = '新增会议' this.title = '新增会议'
// 如果是标协会会议需要显示酒店联系人
if (this.$route.query.meetingType && this.$route.query.meetingType === '2') {
this.model.hotelContactsList = [{
hotelContacts: '',
hotelContactsPhone: ''
}]
}
// 新增取路由参数
this.meetingType = this.$route.query.meetingType
} }
// 修改会议类型 控制dom显示 console.log(this.model)
this.meetingType = record.meetingType + ''
// 当为工作组会议的时候 需要获取工作组
if (this.meetingType === '1') {
this.getWorkSelectList()
}
// 召开时间回显 // 召开时间回显
this.model.convokeTime = [moment(this.model.startTime, dateFormat), moment(this.model.endTime, dateFormat)] if(this.model.startTime){
this.model.convokeTime = [moment(this.model.startTime, dateFormat), moment(this.model.endTime, dateFormat)]
}
// 注册签到时间回显 // 注册签到时间回显
this.model.signInTime = [moment(this.model.startSignInTime, dateFormat), moment(this.model.endSignInTime, dateFormat)] if( this.model.startSignInTime){
this.model.signInTime = [moment(this.model.startSignInTime, dateFormat), moment(this.model.endSignInTime, dateFormat)]
}
// 后端需要的召开时间 // 后端需要的召开时间
this.newConvokeTime = [this.model.startTime, this.model.endTime] this.newConvokeTime = [this.model.startTime, this.model.endTime]
// 后端需要的注册签到时间 // 后端需要的注册签到时间
@@ -756,23 +770,6 @@ export default {
callback('请输入合法的金额数字，最多2位小数,10位正数') callback('请输入合法的金额数字，最多2位小数,10位正数')
} }
}, },
/*
* 获取所有的工作组
* */
getWorkSelectList() {
getAllWorkProjects().then(res => {
if (res.success) {
this.workGroupList = [...res.result]
}
})
},
moenyQRcode() {
let meetingCosts = this.form.getFieldValue('meetingCosts')
let meetingCostsVip = this.form.getFieldValue('meetingCostsVip')
console.log('meetingCostsVip', meetingCostsVip)
console.log('meetingCostsVip', meetingCosts)
},
} }
} }
</script> </script>
src/views/incomePayments/meetManage/Attendance.vue
+3 -3
View File
@@ -123,10 +123,10 @@
dictCode="signup_status"/> dictCode="signup_status"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 只有工作组会议与分标委会议才有审核信息-->
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24" v-show="currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5' ">
<a-form-item label="审核报名信息"> <a-form-item label="审核报名信息">
<j-dict-select-tag v-model="queryParam.checkSingInResult" placeholder="请选择" <j-dict-select-tag v-model="queryParam.checkSingInResult" placeholder="请选择"
dictCode="signup_status"/> dictCode="signup_status"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
src/views/incomePayments/memberManage/StardsMemberProjectList.vue
+3 -2
View File
@@ -55,7 +55,7 @@
</template> </template>
<span slot="action" slot-scope="text, record" class="action-span-cell"> <span slot="action" slot-scope="text, record" class="action-span-cell">
<a @click="handleStandardMeeting(record.id)">会议维护</a> <a @click="handleStandardMeeting(record)">会议维护</a>
</span> </span>
</a-table> </a-table>
@@ -132,7 +132,8 @@ export default {
path:'/projectManagement/CommitteeMeeting', path:'/projectManagement/CommitteeMeeting',
query:{ query:{
id:record.id, id:record.id,
title:record.projectName title:record.projectName,
meetingType:'2'
} }
}) })
} }
src/views/projectManagement/CommitteeMeeting.vue
+123 -115
View File
@@ -1,122 +1,123 @@
<template> <template>
<div> <div>
<page-header-title :is-level-one="false" :level-two-title="pageTitle"></page-header-title> <page-header-title :is-level-one="false" :level-two-title="pageTitle"></page-header-title>
<a-card :bordered="false"> <a-card :bordered="false">
<!-- 查询区域--> <!-- 查询区域-->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row> <a-row>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="会议名称" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="会议名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入会议名称" v-model="queryParam.meetingName"></a-input> <a-input placeholder="请输入会议名称" v-model="queryParam.meetingName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="10" :lg="12" :md="12" :sm="24"> <a-col :xl="10" :lg="12" :md="12" :sm="24">
<a-form-item label="会议时间"> <a-form-item label="会议时间">
<j-date <j-date
placeholder="请选择开始日期" placeholder="请选择开始日期"
class="query-group-cust" class="query-group-cust"
v-model="queryParam.meetingStartTime" v-model="queryParam.meetingStartTime"
:disabled-date="disabledStartDate"> :disabled-date="disabledStartDate">
</j-date> </j-date>
<span class="query-group-split-cust"></span> <span class="query-group-split-cust"></span>
<j-date <j-date
placeholder="请选择结束日期" placeholder="请选择结束日期"
class="query-group-cust" class="query-group-cust"
v-model="queryParam.meetingEndTime" v-model="queryParam.meetingEndTime"
:disabled-date="disabledEndDate"> :disabled-date="disabledEndDate">
</j-date> </j-date>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="年份" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择年份" <j-year-date style="width:100%" placeholder="请选择年份"
v-model="queryParam.particularYear"></j-year-date> v-model="queryParam.particularYear"></j-year-date>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="10" :lg="12" :md="12" :sm="24"> <a-col :xl="10" :lg="12" :md="12" :sm="24">
<a-form-item label="创建时间"> <a-form-item label="创建时间">
<j-date <j-date
placeholder="请选择开始日期" placeholder="请选择开始日期"
class="query-group-cust" class="query-group-cust"
v-model="queryParam.createTime_begin" v-model="queryParam.createTime_begin"
:disabled-date="disabledStartCreateDate"> :disabled-date="disabledStartCreateDate">
</j-date> </j-date>
<span class="query-group-split-cust"></span> <span class="query-group-split-cust"></span>
<j-date <j-date
placeholder="请选择结束日期" placeholder="请选择结束日期"
class="query-group-cust" class="query-group-cust"
v-model="queryParam.createTime_end" v-model="queryParam.createTime_end"
:disabled-date="disabledEndCreateDate"> :disabled-date="disabledEndCreateDate">
</j-date> </j-date>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="已提醒" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="已提醒" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag style="width: 100%" <j-dict-select-tag style="width: 100%"
dict-code="yn" dict-code="yn"
v-model="queryParam.remind" v-model="queryParam.remind"
placeholder="请选择提醒类型"></j-dict-select-tag> placeholder="请选择提醒类型"></j-dict-select-tag>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<span class="table-page-search-submitButtons"> <span class="table-page-search-submitButtons">
<a-button type="primary" icon="search" @click="searchQuery">查询</a-button> <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
<a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button> <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<!-- /查询区域--> <!-- /查询区域-->
<!-- 操作按钮区域--> <!-- 操作按钮区域-->
<div class="table-operator"> <div class="table-operator">
<a-button type="primary" icon="plus" @click="handleAdd">新增</a-button> <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
<a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')">导出</a-button> <a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')">导出</a-button>
<a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button> <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
<a-button type="primary" @click="publishRemind">发布</a-button> <!--只有工作会议与分标委会议才有-->
</div> <a-button type="primary" @click="publishRemind" v-if="meetingType === '5' ">发布</a-button>
<!-- /操作按钮区域-end--> </div>
<!-- /操作按钮区域-end-->
<!-- table表格区域--> <!-- table表格区域-->
<div> <div>
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
bordered bordered
rowKey="id" rowKey="id"
:scroll="{x:true}" :scroll="{x:true}"
:columns="columns" :columns="columns"
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" :pagination="ipagination"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange" @change="handleTableChange"
class="j-table-force-nowrap"> class="j-table-force-nowrap">
<!-- 工作组名称--> <!-- 工作组名称-->
<template slot="projectName" slot-scope="text, record"> <template slot="projectName" slot-scope="text, record">
<div class="project-name" @click="goMemberUnitMaintenance(record)">{{ text }}</div> <div class="project-name" @click="goMemberUnitMaintenance(record)">{{ text }}</div>
</template> </template>
<template slot="text" slot-scope="text"> <template slot="text" slot-scope="text">
<j-ellipsis :value="text" :length="20"></j-ellipsis> <j-ellipsis :value="text" :length="20"></j-ellipsis>
</template> </template>
<span slot="action" class="action-span-cell" slot-scope="text, record"> <span slot="action" class="action-span-cell" slot-scope="text, record">
<a @click="uploadFile(record)">上传文件</a> <a @click="uploadFile(record)">上传文件</a>
<!-- <a @click="applyMsg">报名信息</a>--> <!-- <a @click="applyMsg">报名信息</a>-->
<a @click="handleEdit(record)">编辑</a> <a @click="handleEdit(record)">编辑</a>
<a @click="handleDelete(record.id)">删除</a> <a @click="handleDelete(record.id)">删除</a>
</span> </span>
</a-table> </a-table>
</div> </div>
<publish-remind-modal ref="publishRemindModal" @ok="modalFormOk"></publish-remind-modal> <publish-remind-modal ref="publishRemindModal" @ok="modalFormOk"></publish-remind-modal>
<upload-meet-file-modal ref="modalForm" @ok="modalFormOk"></upload-meet-file-modal> <upload-meet-file-modal ref="modalForm" @ok="modalFormOk"></upload-meet-file-modal>
</a-card> </a-card>
</div> </div>
</template> </template>
<script> <script>
@@ -144,8 +145,6 @@ export default {
mixins: [JeroListMixin, RangeDateMixin], mixins: [JeroListMixin, RangeDateMixin],
data() { data() {
return { return {
workingGroupProject: '',
workingGroupProjectId: '',
disableMixinCreated: true, disableMixinCreated: true,
list: [], list: [],
labelCol: { labelCol: {
@@ -238,18 +237,28 @@ export default {
delete: '/meeting/payMeeting/delete', delete: '/meeting/payMeeting/delete',
deleteBatch: '/meeting/payMeeting/deleteBatch', deleteBatch: '/meeting/payMeeting/deleteBatch',
exportXlsUrl: '/meeting/payMeeting/exportWorkingGroupXls', exportXlsUrl: '/meeting/payMeeting/exportWorkingGroupXls',
} },
} }
}, },
created() { created() {
this.workingGroupProject = this.$route.query.workingGroupProject this.filters.meetingType = this.meetingType
this.workingGroupProjectId = this.$route.query.workingGroupProjectId
this.filters.workingGroupId = this.workingGroupProjectId
this.loadData(1) this.loadData(1)
// 不是分标委会议去掉提醒字段
if (this.meetingType !== 5) {
console.log(this.columns)
// 找出提醒字段的索引
let index = this.columns.findIndex(item => item.dataIndex === 'remind_dictText')
this.columns.splice(index, 1)
}
}, },
computed:{ computed: {
pageTitle(){ pageTitle() {
return `${this.$route.query.title}` return `${this.$route.query.title}`
},
// 会议类型
meetingType() {
return this.$route.query.meetingType + ''
} }
}, },
methods: { methods: {
@@ -257,12 +266,11 @@ export default {
* 新增 * 新增
* */ * */
handleAdd() { handleAdd() {
// 记录当前的工作组id // 分表委的新增应该是需要分表委的i
let currentId = this.$route.query.workingGroupProjectId
this.$router.push({ this.$router.push({
path: '/incomePayments/meetManage/AddOrDetailMeet', path: '/incomePayments/meetManage/AddOrDetailMeet',
query: { query: {
workingGroupProjectId: currentId meetingType:this.meetingType
} }
}) })
}, },
src/views/projectManagement/InternationalSeminar.vue
+4 -1
View File
@@ -90,7 +90,7 @@
<span v-else></span> <span v-else></span>
</template> </template>
<template slot="meetingName" slot-scope="text"> <template slot="meetingName" slot-scope="text,record">
<j-ellipsis class="primary-color" v-if="text" :value="text" @click="toAttendance(record)" :length="20"></j-ellipsis> <j-ellipsis class="primary-color" v-if="text" :value="text" @click="toAttendance(record)" :length="20"></j-ellipsis>
<span v-else></span> <span v-else></span>
</template> </template>
@@ -260,6 +260,9 @@ export default {
handleAdd() { handleAdd() {
this.$router.push({ this.$router.push({
path: '/incomePayments/meetManage/AddOrDetailMeet', path: '/incomePayments/meetManage/AddOrDetailMeet',
query:{
meetingType:'3'
}
}) })
}, },
/* /*
src/views/projectManagement/OtherMeeting.vue
+3
View File
@@ -265,6 +265,9 @@ name: 'OtherMeeting',
handleAdd() { handleAdd() {
this.$router.push({ this.$router.push({
path: '/incomePayments/meetManage/AddOrDetailMeet', path: '/incomePayments/meetManage/AddOrDetailMeet',
query:{
meetingType:'4'
}
}) })
}, },
/* /*