diff --git a/src/api/api.js b/src/api/api.js index 40edea8..d021653 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -106,6 +106,8 @@ export const transitRESTful = { // 通过企业名称获取该企业下的联系人 const getContactsByCompany = (params) => getAction('/company/payContactsManagement/queryByCompany', params) +// 通过联系人id获取联系人信息 +const getContactsById = (param) => getAction('/company/payContactsManagement/queryById', param) export { addRole, @@ -165,7 +167,8 @@ export { getDictItemsFromCache, resetUserPassword, getContactsByCompany, - queryallRoles + queryallRoles, + getContactsById } diff --git a/src/components/company/CompanySelect.vue b/src/components/company/CompanySelect.vue index 1b44fe9..72c1dcf 100644 --- a/src/components/company/CompanySelect.vue +++ b/src/components/company/CompanySelect.vue @@ -39,7 +39,7 @@ export default { return } this.$refs.businessSelect.visible = true - this.$refs.businessSelect.selectedRowKeys.push(this.value.id) + this.$refs.businessSelect.selectedRowKeys[0] = this.value.id }, /** * 选中后抛出企业信息(id, companyName) diff --git a/src/views/businessManagement/BusinessManagement.vue b/src/views/businessManagement/BusinessManagement.vue index 6e5cd4e..49942b2 100644 --- a/src/views/businessManagement/BusinessManagement.vue +++ b/src/views/businessManagement/BusinessManagement.vue @@ -40,7 +40,7 @@ bordered rowKey="id" :columns="columns" - :scroll="{x: 1300}" + :scroll="{x: 1500}" :dataSource="dataSource" :pagination="ipagination" :loading="loading" @@ -49,7 +49,7 @@ class="j-table-force-nowrap"> @@ -115,12 +115,11 @@ export default { }, { title: '创建时间', align: 'center', - width: 180, dataIndex: 'createTime' }, { title: '银行户名', align: 'center', - width: 140, + width: 300, dataIndex: 'bankAccountName', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/businessManagement/ContactManagement.vue b/src/views/businessManagement/ContactManagement.vue index f1f658d..a342c60 100644 --- a/src/views/businessManagement/ContactManagement.vue +++ b/src/views/businessManagement/ContactManagement.vue @@ -50,7 +50,7 @@ bordered rowKey="id" :columns="columns" - :scroll="{x: 1000}" + :scroll="{x: 1500}" :dataSource="dataSource" :pagination="ipagination" :loading="loading" @@ -63,7 +63,7 @@ @@ -138,6 +138,7 @@ export default { }, { title: '手机号', align: 'center', + width: 140, dataIndex: 'phone' }, { title: '创建时间', @@ -146,7 +147,6 @@ export default { }, { title: '企业名称', align: 'center', - width: 140, dataIndex: 'companyName', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue index 8634b41..ecefa91 100644 --- a/src/views/businessManagement/modules/BusinessManagementModule.vue +++ b/src/views/businessManagement/modules/BusinessManagementModule.vue @@ -51,7 +51,7 @@ @@ -59,7 +59,7 @@ @@ -90,7 +90,7 @@ placeholder="请输入备注" v-decorator="['remarks']" :auto-size="{ minRows: 3, maxRows: 6 }" - :maxLength='300' + :maxLength='200' @change="e => {e.target.value = (e.target.value + '').trim()}"/> @@ -152,16 +152,28 @@ export default { validateTrigger: 'blur' }, companyPhone: { - rules: [{ required: false, validator: this.checkCompanyPhone }] + rules: [{ required: true, validator: this.checkCompanyPhone }], + validateTrigger: 'blur' }, postalCode: { - rules: [{ required: false, validator: this.checkPostcode }] + rules: [{ required: true, validator: this.checkPostcode }], + validateTrigger: 'blur' + }, + bankAccountName: { + rules: [{ required: true, message: '请输入银行户名'}], + validateTrigger: 'blur' + }, + openingBank: { + rules: [{ required: true, message: '请输入开户行'}], + validateTrigger: 'blur' }, bankAccount: { - rules: [{ validator: this.checkBankAccount }] + rules: [{ required: true, validator: this.checkBankAccount }], + validateTrigger: 'blur' }, dutyCode: { - rules: [{ validator: this.checkDutyCode }] + rules: [{ required: true, validator: this.checkDutyCode }], + validateTrigger: 'blur' } }, url: { @@ -234,7 +246,7 @@ export default { } return } - callback() + callback('请填写电话号码') }, /** * 邮编校验 @@ -247,11 +259,11 @@ export default { if (postcode(value)) { callback() } else { - callback('请输入正确格式的邮编') + callback('请输入正确格式的邮政编码') } return } - callback() + callback('请输入邮政编码') }, /** * 限制银行账号只能输入数字 @@ -268,7 +280,7 @@ export default { } return } - callback() + callback('请输入银行账号') }, /** * 校验税号 @@ -285,7 +297,7 @@ export default { } return } - callback() + callback('请输入税号') }, /** * 企业名称唯一性校验 @@ -304,7 +316,7 @@ export default { if (res.success) { callback() } else { - callback(res.message) + callback('企业名称已存在') } }) return diff --git a/src/views/businessManagement/modules/ContactManagementModule.vue b/src/views/businessManagement/modules/ContactManagementModule.vue index 50403cf..0dec913 100644 --- a/src/views/businessManagement/modules/ContactManagementModule.vue +++ b/src/views/businessManagement/modules/ContactManagementModule.vue @@ -88,7 +88,7 @@ placeholder="请输入备注" :auto-size="{ minRows: 3, maxRows: 6 }" v-decorator="['remarks']" - :maxLength='300' + :maxLength='200' @change="e => {e.target.value = (e.target.value + '').trim()}"/> @@ -165,8 +165,8 @@ export default { }, validatorRules: { company: { - rules: [{ required: true, message: '请选择企业' }], - validateTrigger: 'blur' + rules: [{ required: true, validator: this.checkCompany }], + validateTrigger: 'change' }, name: { rules: [{ required: true, message: '请输入姓名' }], @@ -205,7 +205,6 @@ export default { } }, edit(record) { - console.log(record, '-------edit') let company = { id: record.companyId, companyName: record.companyName @@ -259,6 +258,20 @@ export default { handleCancel() { this.close() }, + /** + * 企业必填校验 + * @param rules + * @param value + * @param callback + */ + checkCompany(rules, value, callback) { + console.log('---check---', value) + if (value.id && value.companyName) { + callback() + return + } + callback('请选择企业') + }, /** * 手机号校验 * @param rules @@ -285,7 +298,7 @@ export default { callback() return } - callback('请填写正确手机号') + callback('请输入正确手机号') }, /** * 邮箱校验 @@ -297,7 +310,7 @@ export default { if (isEmail(value)) { callback() } else { - callback('请填写正确邮箱') + callback('请输入正确邮箱') } }, /**