From d52a93ab1030a1cfc8be5d561848b493e781cab9 Mon Sep 17 00:00:00 2001 From: zy Date: Wed, 28 May 2025 22:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/crm/contract/ContractChange.vue | 10 +++++++--- src/views/crm/contract/ContractForm.vue | 2 ++ .../crm/contract/components/ContractExtension.vue | 5 +++-- .../crm/contract/detail/ContractChangeDetail.vue | 3 +++ src/views/crm/contract/index.vue | 14 +++++++------- .../crm/customer/detail/authorizedPersonForm.vue | 2 +- .../crm/customercompany/CustomerCompanyForm.vue | 4 ++-- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/views/crm/contract/ContractChange.vue b/src/views/crm/contract/ContractChange.vue index 1e81eb2d6..d8410f493 100644 --- a/src/views/crm/contract/ContractChange.vue +++ b/src/views/crm/contract/ContractChange.vue @@ -145,6 +145,7 @@ import ContractProductForm from '@/views/crm/contract/components/ContractProduct import ContractAAuthorizedCompanyForm from './components/ContractAAuthorizedCompanyForm.vue' import ContractBAuthorizedPersonForm from './components/ContractAAuthorizedPersonForm.vue' import ContractForm from './ContractForm.vue' +import moment from 'moment' const { t } = useI18n() // 国际化 @@ -288,10 +289,13 @@ const open = async (type: string) => { formLoading.value = true try { let data = await ContractApi.getContract(type) + data.agreementDeadline = moment(data.endTime).format('YYYY-MM-DD') if(!route.query.id) delete data.customerId +console.log('%csrc/views/crm/contract/ContractChange.vue:295 formData.value, data', 'color: #007acc;', formData.value, data); formData.value = Object.assign(formData.value, data) + } finally { formLoading.value = false } @@ -320,8 +324,8 @@ if(ContractBAuthorizedPersonFormRef.value) { } if(contractAAuthorizedCompanyFormRef1.value) { - const Authalid1 = await contractAAuthorizedCompanyFormRef1.value.validate() - if (!Authalid1) return + const Authalid1 = await contractAAuthorizedCompanyFormRef1.value.getData() + if (!Authalid1.length) return } if(limitFormRef.value) { @@ -374,7 +378,7 @@ if(contractFormRef.value) { 2: 'contractAAuthorizedPersons', 3: 'contractExtensionFormRef', 4: 'contractStopFormRef', - 5: 'contractAAuthorizedCompanyFormRef1', + 5: 'contractAAuthorizedCompanys', 6: 'contractFormRef' } let dataFormList = proChangeObj[formData.value.changeItem].value.getData() diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue index eab1c597e..d07211a1c 100644 --- a/src/views/crm/contract/ContractForm.vue +++ b/src/views/crm/contract/ContractForm.vue @@ -718,6 +718,8 @@ const formRules = reactive({ customerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }], quotationId: [{ required: true, message: '报价单编号不能为空', trigger: 'blur' }], orderDate: [{ required: true, message: '下单日期不能为空', trigger: 'blur' }], + startTime: [{ required: true, message: '合同签订日期不能为空', trigger: 'change' }], + contractTerm: [{ required: true, message: '合同期限不能为空', trigger: 'blur' }], // ownerUserId: [{ required: true, message: '负责人不能为空', trigger: 'blur' }], // statementDate: [{ required: true, message: '账单日不能为空', trigger: 'change' }], contractType: [{ required: true, message: '合同类型不能为空', trigger: 'change' }], diff --git a/src/views/crm/contract/components/ContractExtension.vue b/src/views/crm/contract/components/ContractExtension.vue index 3efbab6c7..3353e88df 100644 --- a/src/views/crm/contract/components/ContractExtension.vue +++ b/src/views/crm/contract/components/ContractExtension.vue @@ -161,7 +161,7 @@ v-model="formData.extensionDate" :disabled="formFields.extensionDate !== 2 || isTrue" type="date" - value-format="x" + value-format="YYYY-MM-DD" placeholder="调整金额截止日期" style="width: 100%" /> @@ -285,6 +285,7 @@ watch( async (val) => { // 1. 重置表单 formData.value = val + console.log('%csrc/views/crm/contract/components/ContractExtension.vue:288 formData.value', 'color: #007acc;', formData.value); }, { immediate: true } ) @@ -386,7 +387,7 @@ const open = async (type: string) => { } /** 表单校验 */ const validate = () => { - return formRef.value.validate() + return formRef.value.innerFormRef.validate() } /** 表单值 */ diff --git a/src/views/crm/contract/detail/ContractChangeDetail.vue b/src/views/crm/contract/detail/ContractChangeDetail.vue index f853d1a35..8cddde13e 100644 --- a/src/views/crm/contract/detail/ContractChangeDetail.vue +++ b/src/views/crm/contract/detail/ContractChangeDetail.vue @@ -303,6 +303,9 @@ const open = async (type: string) => { formData.value.changeAmount = data.changeAmount formData.value.afterAmount = data.afterAmount formData.value.changeAmountDeadline = data.changeAmountDeadline + formData.value.agreementDeadline = data.agreementDeadline + formData.value.extensionYears = data.extensionYears + formData.value.extensionDate = data.extensionDate formData.value.note = data.note // formData.value.creditAmount = data.creditAmount formData.value.creditLimit = data.beforeAmount diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue index e9230b8eb..2d8ac84a0 100644 --- a/src/views/crm/contract/index.vue +++ b/src/views/crm/contract/index.vue @@ -202,7 +202,7 @@