diff --git a/src/components/company/BusinessSelect.vue b/src/components/company/BusinessSelect.vue index 4190fb3..2673b49 100644 --- a/src/components/company/BusinessSelect.vue +++ b/src/components/company/BusinessSelect.vue @@ -35,7 +35,7 @@ :dataSource="dataSource" :pagination="ipagination" :loading="loading" - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio'}" + :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: isMultiple ? 'checkbox' : 'radio'}" @change="handleTableChange" class="j-table-force-nowrap"> @@ -50,6 +50,12 @@ export default { type:Boolean, required:false, default:false + }, + // 是否多选-默认false + isMultiple: { + type:Boolean, + required:false, + default:false } }, methods: { @@ -71,9 +77,22 @@ export default { * @param value */ handleOk(value) { - let company = { - id: value.id, - companyName: value.companyName + console.log('--------value---------', 'value') + let company = {id: undefined, companyName: undefined} + // 多选的时候 全部放在一起,以逗号分隔 + if (this.isMultiple) { + if(value.length > 0) { + let ids = [], nameArr = [] + value.forEach(item => { + ids.push(item.id) + nameArr.push(item.companyName) + }) + company.id = ids.join() + company.companyName= nameArr.join() + } + } else { + company.id = value.id + company.companyName= value.companyName } this.$emit('change', company) }, diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index 38db2b1..108cd2c 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -13,9 +13,13 @@ - + {{ item.workingGroupProject }} @@ -971,7 +975,13 @@ export default { this.$nextTick(() => { this.form.setFieldsValue({ payWorkingGroupSubItemContactsList: formData }) }) - } + }, + // 下拉框的搜索 + filterOption(input, option) { + return ( + option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + ) + }, } } diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue index 77ce6c1..07c64e9 100644 --- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue +++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue @@ -9,7 +9,7 @@ -