diff --git a/src/api/common/index.ts b/src/api/common/index.ts index 8556bf7b..e11ea4da 100644 --- a/src/api/common/index.ts +++ b/src/api/common/index.ts @@ -29,7 +29,7 @@ enum Api { getUserTenants = '/mainApi/Common/GetUserTenants', ChangeTenant = '/mainApi/Common/ChangeTenant', getClientList = '/mainApi/WxUser/GetInfoClientList', - getCountryList = '/mainApi/Common/GetCountryList', + getCountryList = '/mainApi/Common/GetClientCountrySelectList', getTrainSelectList = '/mainApi/Common/GetTrainSelectList', registerCompany = '/mainApi/Common/CompanyRegister', getClientRoleList = '/mainApi/Common/GetClientRoleList', @@ -380,11 +380,10 @@ export function getClientList(data: PageRequest) { }) } -export function getCountryList(data: PageRequest) { +export function getCountryList() { return request({ url: Api.getCountryList, - method: 'post', - data, + method: 'get' }) } diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index f19febc5..a06deff1 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -1533,7 +1533,7 @@ export const Tablecolumns: BasicColumn[] = [ title: '备注', dataIndex: 'note', align: 'left', - width: 80, + width: 150, }, ] export const CADformSchema: FormSchema[] = [ diff --git a/src/views/system/user/UserModal.vue b/src/views/system/user/UserModal.vue index 8948d4cf..38a26232 100644 --- a/src/views/system/user/UserModal.vue +++ b/src/views/system/user/UserModal.vue @@ -79,6 +79,7 @@ @@ -149,7 +150,6 @@ async function handleSave(exit) { try { const values = await validate() - console.log(values) setModalProps({ confirmLoading: true, loading: true }) const res: API.DataResult = await editUser(values) if (res.succeeded) { diff --git a/src/views/system/user/bankInfo.vue b/src/views/system/user/bankInfo.vue index c712356c..c6a22d46 100644 --- a/src/views/system/user/bankInfo.vue +++ b/src/views/system/user/bankInfo.vue @@ -23,8 +23,7 @@ { icon: 'clarity:note-edit-line', tooltip: '编辑', - onClick: handleAudit.bind(null, record), - disabled: checkPermissions('op:edi:edit'), + onClick: handleAudit.bind(null, record) }, ]" /> @@ -40,6 +39,7 @@ import { formatParams } from '/@/hooks/web/common' import { BasicTable, useTable, TableAction } from '/@/components/Table' import { GetClientBankList } from './api' + import { cbDelete } from '/@/views/baseinfo/infoclient/api' import { useModal } from '/@/components/Modal' import BankModal from './bankInfoModal.vue' import { Tablecolumns } from '/@/views/baseinfo/infoclient/columns' @@ -64,7 +64,7 @@ }) }, beforeFetch: (p) => { - p[''] + p['clientId'] = props.id return formatParams(p) }, columns: Tablecolumns, @@ -88,6 +88,7 @@ openModal(true, { isParent: false, isUpdate: false, + id: props.id }) } function handleDel() { @@ -96,21 +97,20 @@ createMessage.warning('请选择一条数据') return false } - const removeArr = select.map((item) => { + const ids = select.map((item) => { return item.id }) - // ApiDel({ ids: removeArr }).then((res) => { - // createMessage.warning(res.message) - // reload() - // }) + cbDelete({ ids }).then(res => { + createMessage.success('删除成功!') + reload() + }) } function handleAudit(record: Recordable) { - if (!checkPermissions('op:edi:edit')) { openModal(true, { record, - isUpdate: true, - }) - } + isUpdate: true, + id: props.id + }) } function handleSuccess() { reload() diff --git a/src/views/system/user/bankInfoModal.vue b/src/views/system/user/bankInfoModal.vue index e180bf8c..c7f782c1 100644 --- a/src/views/system/user/bankInfoModal.vue +++ b/src/views/system/user/bankInfoModal.vue @@ -8,12 +8,19 @@ v-bind="$attrs" :use-wrapper="true" :title="getTitle" - width="30%" + width="40%" @register="registerModal" @ok="handleSave" @close="closeModal" > - + + +