diff --git a/src/components/relateCompany/index.vue b/src/components/relateCompany/index.vue index 452f0d78c..5c38db8c2 100644 --- a/src/components/relateCompany/index.vue +++ b/src/components/relateCompany/index.vue @@ -153,13 +153,13 @@ const submitForm = async () => { const setSelections = async () => { const selections = multipleSelection.value.map(item => { return { - id: item.id + id: item.customerName } }) if (selections && selections.length > 0) { list.value.forEach((row: any) => { - if (selections.some(item => item.id === row.id)) { + if (selections.some(item => item.id === row.companyName)) { multipleTableRef.value.toggleRowSelection(row, true); // 设置选择状态。 } }); diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 1b3c38840..8dfb394fc 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -247,6 +247,10 @@ export enum DICT_TYPE { CRM_URGENCY_LEVEL = "crm_urgency_level", // 紧急程度 CRM_FEEDBACK_LEVEL = "crm_feedback_level", // 反馈级别 CRM_FEEDBACK_TYPE = "crm_feedback_type", // 反馈类型 + CRM_QUOTA_CONFIG_TYPE = "crm_quota_config_type",//额度类型 + CRM_QUOTA_CONFIG_ITEM_TYPE = "crm_quota_config_item_type",//配置项 + CRM_EXPECT_RESULT_TYPE = "crm_expect_result_type",//期望结果 + // ========== ERP - 企业资源计划模块 ========== diff --git a/src/views/crm/business/components/BusinessProductForm.vue b/src/views/crm/business/components/BusinessProductForm.vue index ba72a858a..0cf30775a 100644 --- a/src/views/crm/business/components/BusinessProductForm.vue +++ b/src/views/crm/business/components/BusinessProductForm.vue @@ -105,6 +105,13 @@ watch( () => props.products, (val) => { formData.value = val || []; // 确保 formData 是一个数组 + listData.value.forEach(item => { + let arr = val.filter( v => v.productId === item.productId) + if(arr.length) { + item.onlinePrice = arr[0]['onlinePrice'] + item.offlinePrice = arr[0]['offlinePrice'] + } + }) // listData.value = JSON.parse(JSON.stringify(formData.value)) }, { immediate: true } @@ -123,7 +130,6 @@ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成 watch( () => formData.value, (val) => { - console.log('%csrc/views/crm/business/components/BusinessProductForm.vue:126 formData.value', 'color: #007acc;', formData.value); if (!val || val.length === 0) { return; } diff --git a/src/views/crm/customercompany/CustomerCompanyForm.vue b/src/views/crm/customercompany/CustomerCompanyForm.vue index d6fb78d66..d79c3cc76 100644 --- a/src/views/crm/customercompany/CustomerCompanyForm.vue +++ b/src/views/crm/customercompany/CustomerCompanyForm.vue @@ -94,7 +94,9 @@ const formRules = reactive({ companyName: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }], unifiedCreditCode: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }], invoicingAddress: [{ required: true, message: '开票地址不能为空', trigger: 'blur' }], - invoicingTelephone: [{ required: true, message: '开票电话不能为空', trigger: 'blur' }], + invoicingTelephone: [{ required: true, message: '开票电话不能为空', trigger: 'blur' }, + {pattern: /^(1[3-9][0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/, message: '请输入正确联系电话'} + ], companyBank: [{ required: true, message: '开户行不能为空', trigger: 'blur' }], companyAccount: [{ required: true, message: '开户账号不能为空', trigger: 'blur' }], companyAddress: [{ required: true, message: '通讯地址不能为空', trigger: 'blur' }],