diff --git a/src/views/crm/billtemplate/components/index.vue b/src/views/crm/billtemplate/components/index.vue
index fe3184e8a..f0a44f25e 100644
--- a/src/views/crm/billtemplate/components/index.vue
+++ b/src/views/crm/billtemplate/components/index.vue
@@ -44,7 +44,7 @@
-
+
-
+
-
+
{{ item.name }}
- {{ item.link }}
@@ -176,16 +175,16 @@
-->
-
+
+
@@ -195,7 +194,7 @@
- -->
+
@@ -225,6 +224,18 @@
-->
+
+
+
+
+
([]) // 用户列表
const formData = ref({
id: undefined,
name: undefined,
+ startDate: undefined,
contactNextTime: undefined,
ownerUserId: 0,
mobile: undefined,
@@ -397,12 +409,8 @@ const querySearchAsync = async (queryString: string, cb: (arg: any) => void) =>
companyName: queryString
})
restaurants.value = data.list.map(v => {
- return {
- name: v.name,
- value: v.name,
- }
+ return Object.assign(v, {value: v.name})
})
- console.log('%csrc/views/crm/customer/CustomerForm.vue:400 restaurants.value', 'color: #007acc;', restaurants.value);
const results = queryString
? restaurants.value.filter(createFilter(queryString))
: restaurants.value
@@ -421,13 +429,17 @@ const createFilter = (queryString: string) => {
}
const handleSelect = (item: Record) => {
- console.log(item)
+ formData.value.legalPersonName = item.legalPersonName
+ formData.value.registerCapital = item.regCapital
+ formData.value.startDate = item.regDate
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
name: undefined,
+ regCapital: undefined,
+ regDate: undefined,
contactNextTime: undefined,
ownerUserId: 0,
mobile: undefined,
diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue
index 60a359349..d15c8dd2f 100644
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
@@ -128,7 +128,7 @@
-
+
diff --git a/src/views/crm/quotation/QuotationForm.vue b/src/views/crm/quotation/QuotationForm.vue
index 8a34c3630..5405e1bf8 100644
--- a/src/views/crm/quotation/QuotationForm.vue
+++ b/src/views/crm/quotation/QuotationForm.vue
@@ -70,8 +70,8 @@
-
-
+
+
@@ -85,28 +85,28 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
@@ -118,8 +118,8 @@
-
-
+
+
是
否
@@ -134,24 +134,24 @@
-
-
+
+
是
否
-
-
+
+
是
否
-
-
+
+
是
否
@@ -462,7 +462,19 @@ const formRules = reactive({
no: [{ required: true, message: '报价单编号不能为空', trigger: 'blur' }],
customerId: [{ required: true, message: '客户id不能为空', trigger: 'change' }],
businessId: [{ required: true, message: '商机编号不能为空', trigger: 'change' }],
- invoiceTemplateId: [{ required: true, message: '票据模板Id不能为空', trigger: 'change' }]
+ invoiceTemplateId: [{ required: true, message: '票据模板Id不能为空', trigger: 'change' }],
+ actualCapital: [{ required: true, message: '实缴资金不能为空', trigger: 'blur' }],
+ socialEmployeeNum: [{ required: true, message: '参保人数不能为空', trigger: 'blur' }],
+ defendantRecord: [{ required: true, message: '被告记录不能为空', trigger: 'blur' }],
+ abnormalService: [{ required: true, message: '经营异常不能为空', trigger: 'blur' }],
+ equityPledge: [{ required: true, message: '股权出质不能为空', trigger: 'blur' }],
+ dishonestyRecord: [{ required: true, message: '失信记录不能为空', trigger: 'blur' }],
+ financeRecord: [{ required: true, message: '融资记录不能为空', trigger: 'blur' }],
+ judgmentRecord: [{ required: true, message: '被执行记录不能为空', trigger: 'blur' }],
+ paymentTerm: [{ required: true, message: '账期不能为空', trigger: 'change' }],
+ partnerCompanyId: [{ required: true, message: '合作主体不能为空', trigger: 'change' }],
+ creditMethod: [{ required: true, message: '授信方式不能为空', trigger: 'change' }],
+ creditCalcCycle: [{ required: true, message: '授信计算周期不能为空', trigger: 'change' }],
})
const formRef = ref() // 表单 Ref
@@ -531,7 +543,7 @@ const onPartnerChange = async (id: string) => {
formData.value.bLegalRepresentative = res.legalRepresentative;
formData.value.bBusinessLicenseNumber = res.businessLicenseNumber;
formData.value.bBusinessLicense = res.businessLicense;
- formData.value.partnerCompanyId = res.partnerCompanyId;
+ // formData.value.partnerCompanyId = res.partnerCompanyId;
} catch (err) {
} finally {
formLoading.value = false;
@@ -539,7 +551,6 @@ const onPartnerChange = async (id: string) => {
}
const changeNum = (val) => {
- console.log('%csrc/views/crm/quotation/QuotationForm.vue:534 val + formData.value.creditAmount || 0', 'color: #007acc;', Number(val) + (formData.value.creditAmount || 0));
formData.value.creditLimit = (Number(val) + (formData.value.creditAmount || 0)).toFixed(2)
}
/** 打开弹窗 */
diff --git a/src/views/crm/quotation/components/QuotationProductForm.vue b/src/views/crm/quotation/components/QuotationProductForm.vue
index cec822971..cd2c94d5d 100644
--- a/src/views/crm/quotation/components/QuotationProductForm.vue
+++ b/src/views/crm/quotation/components/QuotationProductForm.vue
@@ -94,7 +94,7 @@
-
+
@@ -122,7 +122,7 @@
-
+
@@ -169,7 +169,11 @@ const formRules = reactive({
productUnit: [{ required: true, message: '产品单位不能为空', trigger: 'blur' }],
onlinePrice: [{ required: true, message: '线上价格不能为空', trigger: 'blur' }],
offlinePrice: [{ required: true, message: '线下价格不能为空', trigger: 'blur' }],
- totalPrice: [{ required: true, message: '总计价格不能为空', trigger: 'blur' }]
+ totalPrice: [{ required: true, message: '总计价格不能为空', trigger: 'blur' }],
+ productInvoiceItems: [{ required: true, message: '产品开具项目不能为空', trigger: 'blur' }],
+ serviceFeeInvoice: [{ required: true, message: '服务费票据不能为空', trigger: 'blur' }],
+ serviceFeeInvoiceItems: [{ required: true, message: '服务开具项目不能为空', trigger: 'blur' }],
+ productInvoice: [{ required: true, message: '产品票据不能为空', trigger: 'blur' }],
})
const formRef = ref() // 表单 Ref