From ef96a76cfa7f672e9dabad8864467d5217545712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Fri, 30 Aug 2024 17:54:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/baseinfo/infoclient/EditColumns.tsx | 71 +--- .../FeeCustTemplate/TenantAuditStepModal.vue | 2 - .../ReleaseType/TenantAuditStepModal.vue | 4 - .../infoclient/ReleaseType/columns.tsx | 4 - .../baseinfo/infoclient/ReleaseType/index.vue | 1 - .../infoclient/TenantAuditStepModal.vue | 149 ++++---- src/views/baseinfo/infoclient/columns.tsx | 352 ++++-------------- .../infoclient/custTemplateDetail/columns.tsx | 7 +- .../infoclient/custTemplateDetail/index.vue | 2 +- src/views/baseinfo/infoclient/importFlow.vue | 118 ------ .../infoclient/menu2/TenantAuditStepModal.vue | 10 +- src/views/baseinfo/infoclient/menu2/index.vue | 1 - .../infoclient/menu3/TenantAuditStepModal.vue | 2 - .../infoclient/menu4/TenantAuditStepModal.vue | 6 +- .../baseinfo/infoclient/menu4/columns.tsx | 2 +- .../infoclient/menu5/TenantAuditStepModal.vue | 6 +- .../baseinfo/infoclient/menu5/importFlow.vue | 1 - .../infoclient/tabs3/TenantAuditStepModal.vue | 2 - 18 files changed, 169 insertions(+), 571 deletions(-) delete mode 100644 src/views/baseinfo/infoclient/importFlow.vue diff --git a/src/views/baseinfo/infoclient/EditColumns.tsx b/src/views/baseinfo/infoclient/EditColumns.tsx index a9edc38e..59590d24 100644 --- a/src/views/baseinfo/infoclient/EditColumns.tsx +++ b/src/views/baseinfo/infoclient/EditColumns.tsx @@ -12,6 +12,7 @@ import { getCustomerServiceList, getDeptList, GetUserList, + GetAllClientList, } from '/@/api/common' let ClientCountryList = [] const res4: API.DataResult = await getClientCountrySelectList() @@ -22,11 +23,11 @@ if (res4.succeeded) { }) } let OrgTree = [] -const res11: API.DataResult = await getOrgTree() +const res11: API.DataResult = await GetAllClientList() if (res11.succeeded) { OrgTree = [] res11.data.forEach((e) => { - OrgTree.push(e) + OrgTree.push({ label: e.shortName, value: e.id }) }) } let SaleUserList = [] @@ -622,28 +623,6 @@ export const EditformSchema: FormSchema[] = [ defaultValue: '', show: false, }, - // { - // label: '来源明细', - // field: 'sourceDetailId', - // component: 'DEdit', - // required: false, - // colProps: { span: 4 }, - // dynamicDisabled: ({ values }) => { - // return !values.sourceId - // }, - // componentProps: async (e) => { - // const { formModel } = e - // console.log(formModel, 2222) - - // return { - // formModel: formModel, - // onEdit: () => { - // const { formActionType } = e - // formActionType ? formActionType.linkageForm(e) : null - // }, - // } - // }, - // }, { label: '来源明细', field: 'sourceDetailId', @@ -659,21 +638,6 @@ export const EditformSchema: FormSchema[] = [ } }, }, - // { - // field: 'unitPrice', - // label: '冷藏费率', - // component: 'DEdit', - // defaultValue: '', - // colProps: { span: 4 }, - // componentProps: (e) => { - // return { - // onEdit: () => { - // const { formActionType } = e - // formActionType ? formActionType.linkageForm(e) : null - // }, - // } - // }, - // }, { field: 'commissionRate', label: '提成比例', @@ -739,8 +703,6 @@ export const EditformSchema: FormSchema[] = [ ], allowClear: true, onEdit: () => { - console.log('onEdit') - const { formActionType } = e formActionType ? formActionType.linkageForm(e) : null }, @@ -781,29 +743,20 @@ export const EditformSchema: FormSchema[] = [ componentProps: (e) => { const { formModel } = e return { - treeData: OrgTree, + options: OrgTree, allowClear: true, showSearch: true, filterOption: (input: string, option: any) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 }, - onChange: (e) => { - if (e) { - const ForTree = (data, key, callback) => { - for (let i = 0; i < data.length; i++) { - if (data[i].value == key) { - return callback(data[i], i, data) - } - if (data[i].children) { - ForTree(data[i].children, key, callback) - } - } - } - let obj: any = {} - ForTree(OrgTree, e, (item, index, arr) => { - obj = item - }) - formModel.pcorpName = obj.title + onChange: (e, obj) => { + if (e && obj) { + formModel.pcorpId = obj.value + formModel.pcorpName = obj.label + } + if (!e && !obj) { + formModel.pcorpId = '' + formModel.pcorpName = '' } }, onEdit: () => { diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue index a69d690b..143beef0 100644 --- a/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue +++ b/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue @@ -65,13 +65,11 @@ rowId.value = data.record.id const res: API.DataResult = await ApiInfo({ id: unref(rowId) }) if (res.succeeded) { - console.log(res.data) let RshipperType = [] res.data.shipperType.split(',').forEach((e) => { RshipperType.push(parseInt(e)) }) res.data.shipperType = RshipperType - console.log(res.data) setFieldsValue({ ...res.data, diff --git a/src/views/baseinfo/infoclient/ReleaseType/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/ReleaseType/TenantAuditStepModal.vue index 1694cf56..a3778621 100644 --- a/src/views/baseinfo/infoclient/ReleaseType/TenantAuditStepModal.vue +++ b/src/views/baseinfo/infoclient/ReleaseType/TenantAuditStepModal.vue @@ -84,11 +84,7 @@ try { const values = await validate() setModalProps({ confirmLoading: true, loading: true }) - // TODO custom api - console.log(values) - // loading.value = true; const res: API.DataResult = await ApiEdit(values) - console.log(res) if (res.succeeded) { createMessage.success(res.message) emit('success') diff --git a/src/views/baseinfo/infoclient/ReleaseType/columns.tsx b/src/views/baseinfo/infoclient/ReleaseType/columns.tsx index 8968ba9d..a437d5a0 100644 --- a/src/views/baseinfo/infoclient/ReleaseType/columns.tsx +++ b/src/views/baseinfo/infoclient/ReleaseType/columns.tsx @@ -38,8 +38,6 @@ export const searchFormSchema: FormSchema[] = [ resultField: 'data', immediate: false, onChange: (e, obj) => { - console.log(obj) - if (e && obj) { formModel.carrierId = obj.id } @@ -107,8 +105,6 @@ export const formSchema: FormSchema[] = [ resultField: 'data', immediate: false, onChange: (e, obj) => { - console.log(obj) - if (e && obj) { formModel.carrierId = obj.id } diff --git a/src/views/baseinfo/infoclient/ReleaseType/index.vue b/src/views/baseinfo/infoclient/ReleaseType/index.vue index 3e8e339f..2b1965fc 100644 --- a/src/views/baseinfo/infoclient/ReleaseType/index.vue +++ b/src/views/baseinfo/infoclient/ReleaseType/index.vue @@ -105,7 +105,6 @@ } ApiDel(ApiData).then((res) => { - console.log(res) notification.success({ message: res.message, duration: 3 }) reload() }) diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue index f6995c51..f107b708 100644 --- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue +++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue @@ -1,67 +1,76 @@