diff --git a/src/hooks/web/common.ts b/src/hooks/web/common.ts index 9ceeabfe..7c0e435a 100644 --- a/src/hooks/web/common.ts +++ b/src/hooks/web/common.ts @@ -156,7 +156,7 @@ export function formatParams(params = {}, equal: any = [], otherQuery: any = []) }) } // 排除不是分页排序等字段 - if (key != 'page' && key != 'pageSize' && key != 'order' && key != 'field') { + if (IsContinue && key != 'page' && key != 'pageSize' && key != 'order' && key != 'field') { if (key == 'advancedSearchParams') { // 高级查询 conditions.push(params[key]) @@ -229,10 +229,9 @@ export function formatParams(params = {}, equal: any = [], otherQuery: any = []) // } // 其他普通查询(模糊/等于) 1-模糊 0-等于 if (params[key] || params[key] === 0) { - console.log(key) - console.log(otherQuery) - if (otherQuery && otherQuery.includes(key) ) { - + console.log(key) + console.log(otherQuery) + if (otherQuery && otherQuery.includes(key)) { } else { conditions.push({ FieldName: key, @@ -257,7 +256,7 @@ export function formatParams(params = {}, equal: any = [], otherQuery: any = []) } else { postData.pageCondition.sortConditions = [] } - + if (Object.keys(otherQueryCondition).length) { postData.otherQueryCondition = otherQueryCondition } @@ -275,8 +274,8 @@ export function updateColumns(code, data) { return new Promise((resolve, reject) => { // 获取数据列 GetCustomColumnSetInfo({ - code - }).then(res => { + code, + }).then((res) => { const oldSchema = data let updateData = [] if (res.data) { @@ -317,7 +316,7 @@ export function updateColumns(code, data) { } }) } - resolve({ data: schema, id: res?.data?.id || null}) + resolve({ data: schema, id: res?.data?.id || null }) }) }) -} \ No newline at end of file +} diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue index 72c9ec02..b2c48555 100644 --- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue +++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue @@ -812,16 +812,9 @@ customerName.value = res.data.shortName auditStatusText.value = res.data.auditStatusText res.data.ArrclientTag = [] - if (res.data.clientTag) { - res.data.others = res.data.clientTag.others - Object.keys(res.data.clientTag).forEach((item) => { - if (item.indexOf('is') != -1) { - if (res.data.clientTag[item]) { - res.data.ArrclientTag.push(item) - } - } else { - clientTag_o.value[item] = res.data.clientTag[item] - } + if (res.data.attributes) { + res.data.attributes.forEach((item) => { + res.data.ArrclientTag.push(item.value) }) } @@ -889,23 +882,21 @@ notification.warning({ message: '请补全客户全称/客户简称！', duration: 3 }) }) if (values) { - values.clientTag = {} - let ClientTag = await getDictOption('infoclient-ArrclientTag') - ClientTag.forEach((item) => { - let type = false - if (values.ArrclientTag) { - values.ArrclientTag.forEach((item2) => { + values.attributes = [] + if (getFieldsValue().ArrclientTag) { + let ClientTag = await getDictOption('infoclient-ArrclientTag') + ClientTag.forEach((item) => { + getFieldsValue().ArrclientTag.forEach((item2) => { if (item2 == item.value) { - type = true + values.attributes.push({ + clientId: rowId.value, + value: item.value, + name: item.label, + }) } }) - } - values.clientTag[item.value] = type - }) - - values.clientTag = { ...values.clientTag, ...clientTag_o.value } - - values.clientTag.others = values.others + }) + } values.grade = grade.value if (CustomerOrSupplier.value == 'isCustomerAndisSupplier') { @@ -931,15 +922,9 @@ let SaleData: any = '' if (err.clientId) { const clientRes = await getCodeGoodsTypeInfo({ id: err.clientId }) - if (clientRes.data.clientTag) { - values.clientTag = {} - let ClientTag = await getDictOption('infoclient-ArrclientTag') - Object.keys(clientRes.data.clientTag).forEach((item, index) => { - ClientTag.forEach((e) => { - if (item == e.value && clientRes.data.clientTag[item]) { - clientTagData = clientTagData == '' ? e.name : `${clientTagData},${e.name}` - } - }) + if (clientRes.data.attributes) { + clientRes.data.attributes.forEach((item) => { + clientTagData = clientTagData == '' ? item.name : `${clientTagData},${item.name}` }) } if (clientRes.data.saleId) { @@ -1001,24 +986,19 @@ notification.warning({ message: '请补全基本信息中必填内容！', duration: 3 }) }) if (values) { - values.clientTag = {} + values.attributes = [] let ClientTag = await getDictOption('infoclient-ArrclientTag') ClientTag.forEach((item) => { - let type = false - if (values.ArrclientTag) { - values.ArrclientTag.forEach((item2) => { - if (item2 == item.value) { - type = true - } - }) - } - values.clientTag[item.value] = type + values.ArrclientTag.forEach((item2) => { + if (item2 == item.value) { + values.attributes.push({ + clientId: rowId.value, + value: item.value, + name: item.label, + }) + } + }) }) - - values.clientTag = { ...values.clientTag, ...clientTag_o.value } - - values.clientTag.others = values.others - values.grade = grade.value if (CustomerOrSupplier.value == 'isCustomerAndisSupplier') { values.isCustomer = true diff --git a/src/views/baseinfo/infoclient/abc.json b/src/views/baseinfo/infoclient/abc.json deleted file mode 100644 index 1b151abb..00000000 --- a/src/views/baseinfo/infoclient/abc.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "code": 0, - "multiCode": "string", - "count": 0, - "message": "string", - "succeeded": true, - "data": { - "id": 0, - "codeName": "string", - "shortName": "string", - "description": "string", - "name": "string", - "enFullName": "string", - "address": "string", - "email": "string", - "web": "string", - "tel": "string", - "fax": "string", - "chief": "string", - "country": "string", - "province": "string", - "city": "string", - "blContent": "string", - "isStop": true, - "level": "string", - "qq": "string", - "msn": "string", - "farCode": "string", - "fapCode": "string", - "unitPrice": "string", - "registrationNo": "string", - "orderNo": "string", - "taxNo": "string", - "ediCode": "string", - "ediCode2": "string", - "ediCode3": "string", - "organizationCode": "string", - "pcorpId": 0, - "pcorpName": "string", - "inspectionNo": "string", - "auditStatus": 0, - "auditStatusText": "string", - "auditTime": "2024-09-19T06:55:51.134Z", - "auditNote": "string", - "feeFRT": "string", - "sourceId": 0, - "invoiceBank": "string", - "invoiceAddrTel": "string", - "saleOrgId": "string", - "saleOrgIdList": [0], - "saleOrgNames": "string", - "commissionRate": 0, - "proportionRate": 0, - "commissionUserId": 0, - "carrierList": "string", - "ctnType": "string", - "enShortName": "string", - "wmsFeeRateType": "string", - "status": 0, - "note": "string", - "createTime": "2024-09-19T06:55:51.134Z", - "clientTag": { - "id": 0, - "clientId": 0, - "isCarrier": true, - "isBooking": true, - "isYard": true, - "isTruck": true, - "isController": true, - "isCustom": true, - "isAgent": true, - "isAgentCn": true, - "isExpress": true, - "isAirLines": true, - "isShipper": true, - "isConsignee": true, - "isNotifyParty": true, - "isWareHouse": true, - "isWharf": true, - "isInsurer": true, - "isLeasing": true, - "isTradingAgency": true, - "isOther": true, - "others": "string", - "isShipAgency": true, - "isEnterprise": true, - "isShipperCn": true, - "isContract": true, - "note": "string", - "createTime": "2024-09-19T06:55:51.134Z" - }, - "clientContactList": [ - { - "id": 0, - "clientId": 0, - "name": "string", - "enName": "string", - "job": "string", - "jobs": ["string"], - "address": "string", - "email": "string", - "mobile": "string", - "tel": "string", - "fax": "string", - "qq": "string", - "isDefault": true, - "isOperator": true, - "isFinancialStaff": true, - "isSaleMan": true, - "isOther": true, - "isInsurance": true, - "isCheckAccount": true, - "anniversary1": "2024-09-19T06:55:51.134Z", - "anniversary2": "2024-09-19T06:55:51.134Z", - "anniversaryNote1": "string", - "anniversaryNote2": "string", - "status": 0, - "note": "string", - "createTime": "2024-09-19T06:55:51.134Z" - } - ], - "saleId": 0, - "sale": "string", - "doc": 0, - "docName": "string", - "operatorId": 0, - "operatorName": "string", - "customerService": 0, - "customerServiceName": "string", - "isShared": true, - "invoicingMethod": 1, - "invoicingMethodText": "string", - "notification": 0, - "notifications": [0], - "isOverdueDeduction": true, - "overdueDays": 0, - "isMortgageLastOrder": true, - "invoiceHeaders": [ - { - "id": 0, - "relativeId": 0, - "header": "string", - "addressTel": "string" - } - ], - "sourceDetailId": 0, - "sourceName": "string", - "sourceDetailName": "string", - "saleOrgName": "string", - "serviceItemCodes": ["string"], - "isCustomer": true, - "isSupplier": true, - "grade": "string", - "registeredCapital": 0, - "registrationTime": "2024-09-19T06:55:51.134Z", - "defaultContact": { - "id": 0, - "clientId": 0, - "name": "string", - "enName": "string", - "job": "string", - "jobs": ["string"], - "address": "string", - "email": "string", - "mobile": "string", - "tel": "string", - "fax": "string", - "qq": "string", - "isDefault": true, - "isOperator": true, - "isFinancialStaff": true, - "isSaleMan": true, - "isOther": true, - "isInsurance": true, - "isCheckAccount": true, - "anniversary1": "2024-09-19T06:55:51.134Z", - "anniversary2": "2024-09-19T06:55:51.134Z", - "anniversaryNote1": "string", - "anniversaryNote2": "string", - "status": 0, - "note": "string", - "createTime": "2024-09-19T06:55:51.134Z" - }, - "lastAccountDate": { - "id": 0, - "clientId": 0, - "sourceId": 0, - "beginDate": "2024-09-19T06:55:51.134Z", - "endDate": "2024-09-19T06:55:51.134Z", - "businessType": "string", - "saleId": 0, - "accountType": "string", - "accountTypeName": "string", - "accountStartDate": "string", - "accountStartDateName": "string", - "accountMonth": 0, - "accountDays": 0, - "accountFirstHalf": 0, - "accountSecondHalf": 0, - "allowAmount": 0, - "contractId": 0, - "commissionRate": 0, - "status": 0, - "note": "string", - "createTime": "2024-09-19T06:55:51.134Z", - "isSpecial": true - } - }, - "additionalData": { - "additionalProp1": "string", - "additionalProp2": "string", - "additionalProp3": "string" - } -} diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx index cae6f3f5..dfc8d2eb 100644 --- a/src/views/baseinfo/infoclient/columns.tsx +++ b/src/views/baseinfo/infoclient/columns.tsx @@ -489,7 +489,7 @@ export const searchFormSchema: FormSchema[] = [ }, { label: '客户属性', - field: 'clientTag', + field: 'attributes', component: 'ApiSelect', colProps: { span: 4 }, componentProps: () => { diff --git a/src/views/baseinfo/infoclient/index.vue b/src/views/baseinfo/infoclient/index.vue index bd5d5dee..f8fa8e11 100644 --- a/src/views/baseinfo/infoclient/index.vue +++ b/src/views/baseinfo/infoclient/index.vue @@ -120,13 +120,6 @@ }) }, beforeFetch: (p) => { - if (p.clientTag && p.clientTag.length) { - let obj = {} - p.clientTag.forEach((e) => { - obj[e] = true - }) - p.clientTag = obj - } if (route.path == '/Customerinfoclient') { p.isCustomer = 1 } else if (route.path == '/Supplierinfoclient') { @@ -135,7 +128,7 @@ let Rdata = formatParams( p, ['isCustomer', 'isSupplier', 'isFrozen'], - ['contactInfo', 'isContractExpired', 'clientTag'], + ['contactInfo', 'isContractExpired', 'attributes'], ) // -----------------------临时处理 后期李工调整 formatParams 再改--------------------