lijingjia
/
ds-wms-client-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zth' into dev

Browse Source
szh-new
张同海 3 months ago
parent 8ed049ef11 e98cab7a94
commit b9c82b0217
2 changed files with 251 additions and 236 deletions
Show Stats Download Patch File Download Diff File

426
src/views/baseinfo/infoclient/columns.tsx
Unescape Escape View File

@ -212,7 +212,7 @@ export const columns: BasicColumn[] = [
width: 150,
},
{
title: '负责人',
title: '法人',
dataIndex: 'chief',
sorter: true,
width: 150,
@ -529,12 +529,6 @@ export const formSchema: FormSchema[] = [
defaultValue: '',
show: false,
},
{
field: 'divider-selects',
component: 'Divider',
label: '基本信息',
colProps: { span: 24 },
},
{
field: 'description',
label: '客户全称',
@ -543,6 +537,14 @@ export const formSchema: FormSchema[] = [
defaultValue: '',
colProps: { span: 4 },
},
{
field: 'shortName',
label: '客户简称',
required: true,
component: 'Input',
defaultValue: '',
colProps: { span: 4 },
},
{
field: 'enFullName',
label: '客户英文全称',
@ -552,24 +554,25 @@ export const formSchema: FormSchema[] = [
colProps: { span: 8 },
},
{
field: 'codeName',
label: '助记码',
field: 'enShortName',
label: '英文简称',
// required: true,
component: 'Input',
defaultValue: '',
dynamicDisabled: ({ values }) => {
return true
},
colProps: { span: 4 },
},
{
field: 'shortName',
label: '客户简称',
required: true,
field: 'codeName',
label: '助记码',
// required: true,
component: 'Input',
defaultValue: '',
dynamicDisabled: ({ values }) => {
return true
},
colProps: { span: 4 },
},
{
field: 'ediCode',
label: 'EDI代码',
@ -588,8 +591,16 @@ export const formSchema: FormSchema[] = [
colProps: { span: 4 },
},
{
field: 'enShortName',
label: '英文简称',
field: 'registrationNo',
label: '海关备案号',
// required: true,
component: 'Input',
defaultValue: '',
colProps: { span: 4 },
},
{
field: 'inspectionNo',
label: '商检备案号',
// required: true,
component: 'Input',
defaultValue: '',
@ -639,29 +650,14 @@ export const formSchema: FormSchema[] = [
},
},
{
field: 'saleOrgIdList',
label: '所属分部',
// required: true,
component: 'Select',
colProps: { span: 12 },
componentProps: {
options: DeptList,
allowClear: true,
mode: 'multiple',
class: 'NoLimitHeight',
},
},
{
field: 'registrationNo',
label: '海关备案号',
// required: true,
component: 'Input',
defaultValue: '',
colProps: { span: 4 },
field: 'Divider1',
component: 'Divider',
label: '',
colProps: { span: 24 },
},
{
field: 'inspectionNo',
label: '商检备案号',
field: 'chief',
label: '法人',
// required: true,
component: 'Input',
defaultValue: '',
@ -683,22 +679,6 @@ export const formSchema: FormSchema[] = [
defaultValue: '',
colProps: { span: 4 },
},
{
field: 'address',
label: '通讯地址',
// required: true,
component: 'Input',
defaultValue: '',
colProps: { span: 12 },
},
{
field: 'chief',
label: '负责人',
// required: true,
component: 'Input',
defaultValue: '',
colProps: { span: 4 },
},
{
field: 'web',
label: '网址',
@ -740,123 +720,18 @@ export const formSchema: FormSchema[] = [
},
},
{
field: 'divider-selects2',
component: 'Divider',
label: '业务属性及干系人',
colProps: { span: 24 },
},
// {
// field: 'sourceId',
// label: '业务来源',
// component: 'Select',
// colProps: { span: 4 },
// defaultValue: '',
// componentProps: {
// options: ClientSourceList,
// allowClear: true,
// showSearch: true,
// filterOption: (input: string, option: any) => {
// return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
// },
// },
// },
{
label: '业务来源Name',
field: 'sourceName',
component: 'Input',
defaultValue: '',
show: false,
},
{
label: '业务来源',
field: 'sourceId',
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
// defaultValue: '',
colProps: { span: 4 },
componentProps: ({ formActionType, formModel }) => {
return {
allowClear: true,
showSearch: true,
option: optionsStore.getOptionsByCode('GetClientSourceSelectList'),
labelField: 'sourceName',
valueField: 'id',
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
onChange: async (e, obj) => {
console.log(obj)
if (e && obj) {
formModel.sourceId = obj.value
formModel.sourceName = obj.label
}
if (!e && !obj) {
formModel.sourceId = ''
formModel.sourceName = ''
}
if (e) {
if (formActionType) {
const { updateSchema } = formActionType
let Arr: any = []
await GetClientSourceDetailSelectList({ id: e }).then((res) => {
res.data.forEach((item) => {
Arr.push({ label: item.detailName, value: item.id })
})
})
updateSchema({
label: '来源明细',
field: 'sourceDetailId',
component: 'Select',
required: false,
dynamicDisabled: ({ values }) => {
return !values.sourceId
},
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
allowClear: true,
options: Arr,
showSearch: true,
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
onChange: (e, obj) => {
if (e && obj) {
formModel.sourceDetailId = obj.value
formModel.sourceDetailName = obj.label
}
if (!e && !obj) {
formModel.sourceDetailId = ''
formModel.sourceDetailName = ''
}
},
}
},
})
}
}
formModel.sourceDetailId = ''
},
}
},
},
{
label: '来源明细Name',
field: 'sourceDetailName',
field: 'address',
label: '通讯地址',
// required: true,
component: 'Input',
defaultValue: '',
show: false,
colProps: { span: 12 },
},
{
label: '来源明细',
field: 'sourceDetailId',
component: 'Select',
required: false,
dynamicDisabled: ({ values }) => {
return !values.sourceId
},
colProps: { span: 4 },
field: 'Divider2',
component: 'Divider',
label: '',
colProps: { span: 24 },
},
{
label: '',
@ -998,14 +873,125 @@ export const formSchema: FormSchema[] = [
}
},
},
// {
// field: 'unitPrice',
// label: '冷藏费率',
// // required: true,
// component: 'Input',
// defaultValue: '',
// colProps: { span: 4 },
// },
{
field: 'commissionUserId',
label: '提成参与人',
component: 'Select',
defaultValue: '',
colProps: { span: 4 },
},
{
field: 'Divider3',
component: 'Divider',
label: '',
colProps: { span: 24 },
},
{
label: '业务来源Name',
field: 'sourceName',
component: 'Input',
defaultValue: '',
show: false,
},
{
label: '业务来源',
field: 'sourceId',
component: 'ApiSelect',
required: false,
dynamicDisabled: false,
// defaultValue: '',
colProps: { span: 4 },
componentProps: ({ formActionType, formModel }) => {
return {
allowClear: true,
showSearch: true,
option: optionsStore.getOptionsByCode('GetClientSourceSelectList'),
labelField: 'sourceName',
valueField: 'id',
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
onChange: async (e, obj) => {
console.log(obj)
if (e && obj) {
formModel.sourceId = obj.value
formModel.sourceName = obj.label
}
if (!e && !obj) {
formModel.sourceId = ''
formModel.sourceName = ''
}
if (e) {
if (formActionType) {
const { updateSchema } = formActionType
let Arr: any = []
await GetClientSourceDetailSelectList({ id: e }).then((res) => {
res.data.forEach((item) => {
Arr.push({ label: item.detailName, value: item.id })
})
})
updateSchema({
label: '来源明细',
field: 'sourceDetailId',
component: 'Select',
required: false,
dynamicDisabled: ({ values }) => {
return !values.sourceId
},
colProps: { span: 4 },
componentProps: ({ formModel }) => {
return {
allowClear: true,
options: Arr,
showSearch: true,
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
onChange: (e, obj) => {
if (e && obj) {
formModel.sourceDetailId = obj.value
formModel.sourceDetailName = obj.label
}
if (!e && !obj) {
formModel.sourceDetailId = ''
formModel.sourceDetailName = ''
}
},
}
},
})
}
}
formModel.sourceDetailId = ''
},
}
},
},
{
label: '来源明细Name',
field: 'sourceDetailName',
component: 'Input',
defaultValue: '',
show: false,
},
{
label: '来源明细',
field: 'sourceDetailId',
component: 'Select',
required: false,
dynamicDisabled: ({ values }) => {
return !values.sourceId
},
colProps: { span: 4 },
},
{
field: 'unitPrice',
label: '冷藏费率',
// required: true,
component: 'Input',
defaultValue: '',
colProps: { span: 4 },
},
{
field: 'commissionRate',
label: '提成比例',
@ -1020,13 +1006,7 @@ export const formSchema: FormSchema[] = [
colProps: { span: 4 },
defaultValue: 0,
},
{
field: 'commissionUserId',
label: '提成参与人',
component: 'Select',
defaultValue: '',
colProps: { span: 4 },
},
{
field: 'feeFRT',
label: '默认付费方式',
@ -1043,24 +1023,6 @@ export const formSchema: FormSchema[] = [
},
},
},
// {
// field: 'wmsFeeRateType',
// label: '仓储费开始日期模式',
// // required: true,
// component: 'Select',
// colProps: { span: 4 },
// labelWidth: 140,
// defaultValue: '',
// componentProps: {
// options: wmsFeeRateTypeList,
// allowClear: true,
// showSearch: true,
// filterOption: (input: string, option: any) => {
// return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
// },
// },
// },
{
label: '开票方式',
field: 'invoicingMethod',
@ -1140,7 +1102,25 @@ export const formSchema: FormSchema[] = [
unCheckedChildren: '否',
},
},
{
field: 'Divider4',
component: 'Divider',
label: '',
colProps: { span: 24 },
},
{
field: 'saleOrgIdList',
label: '所属分部',
// required: true,
component: 'Select',
colProps: { span: 12 },
componentProps: {
options: DeptList,
allowClear: true,
mode: 'multiple',
class: 'NoLimitHeight',
},
},
{
label: '客户属性',
field: 'ArrclientTag',
@ -1185,8 +1165,9 @@ export const formSchema: FormSchema[] = [
},
},
{
field: 'note',
label: '备注',
field: 'blContent',
label: '提单信息',
// required: true,
component: 'InputTextArea',
defaultValue: '',
colProps: { span: 12 },
@ -1195,9 +1176,8 @@ export const formSchema: FormSchema[] = [
},
},
{
field: 'blContent',
label: '提单信息',
// required: true,
field: 'note',
label: '备注',
component: 'InputTextArea',
defaultValue: '',
colProps: { span: 12 },
@ -1205,6 +1185,40 @@ export const formSchema: FormSchema[] = [
rows: 4,
},
},
// {
// field: 'sourceId',
// label: '业务来源',
// component: 'Select',
// colProps: { span: 4 },
// defaultValue: '',
// componentProps: {
// options: ClientSourceList,
// allowClear: true,
// showSearch: true,
// filterOption: (input: string, option: any) => {
// return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
// },
// },
// },
// {
// field: 'wmsFeeRateType',
// label: '仓储费开始日期模式',
// // required: true,
// component: 'Select',
// colProps: { span: 4 },
// labelWidth: 140,
// defaultValue: '',
// componentProps: {
// options: wmsFeeRateTypeList,
// allowClear: true,
// showSearch: true,
// filterOption: (input: string, option: any) => {
// return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
// },
// },
// },
// {
// label: '客户属性',
// field: 'ArrclientTag',

61
src/views/baseinfo/infoclient/index.vue
Unescape Escape View File

@ -1,37 +1,27 @@
<template>
<div>
<BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
<template #toolbar>
<a-button
v-repeat
type="link"
@click="handleCreate"
:disabled="checkPermissions('op:infoclient:add')"
>
<span class="iconfont icon-new_document"></span>
添加
</a-button>
<a-popconfirm
title="确定删除当前选中数据？"
ok-text="是"
cancel-text="否"
@confirm="handleDel"
>
<a-button v-repeat type="link">
<span class="iconfont icon-shanchu21"></span>
删除
<template #tableTitle>
<div class="tableTitleBox">
<a-button
v-repeat
type="link"
@click="handleCreate"
:disabled="checkPermissions('op:infoclient:add')"
>
<span class="iconfont icon-new_document"></span>
</a-button>
<!-- :disabled="checkPermissions('op:infoclient:del')" -->
</a-popconfirm>
<!-- <Divider type="vertical" />
<a-button
type="link"
@click="importFlow"
:disabled="checkPermissions('op:infoclient:hebing')"
>
<span class="iconfont icon-hebing"></span>
重复客户合并
</a-button> -->
<a-popconfirm
title="确定删除当前选中数据？"
ok-text="是"
cancel-text="否"
@confirm="handleDel"
>
<a-button v-repeat type="link">
<span class="iconfont icon-shanchu21"></span>
</a-button>
</a-popconfirm>
</div>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
@ -237,3 +227,14 @@
}
}
</script>
<style lang="less" scoped>
.tableTitleBox {
.ant-btn-link {
border-radius: 2px;
background: rgba(245, 249, 252, 1);
margin-right: 8px;
color: #000;
font-size: 16px;
}
}
</style>

Write Preview
Loading…
Cancel
Save