diff --git a/src/components/dialogTable/dialogTableConfig.ts b/src/components/dialogTable/dialogTableConfig.ts index fea8a3e..ce66dc1 100644 --- a/src/components/dialogTable/dialogTableConfig.ts +++ b/src/components/dialogTable/dialogTableConfig.ts @@ -608,9 +608,7 @@ export const financial_budget_doc: Iconfig = { ], }; - -import { apiFinancialFeeApplicationLists } from '@/api/financial_fee_application' - +import { apiFinancialFeeApplicationLists } from "@/api/financial_fee_application"; export const financial_fee_application: Iconfig = { fetchFn: apiFinancialFeeApplicationLists, @@ -624,9 +622,9 @@ export const financial_fee_application: Iconfig = { value: "code", }, { - label: "申请人", - value: "create_user", - }, + label: "申请人", + value: "create_user", + }, ], tableList: [ { theme: "单据主题" }, @@ -640,11 +638,11 @@ export const financial_fee_application: Iconfig = { ], }; -import { apiFinancialBorrowMoneyLists } from '@/api/financial_borrow_money' +import { apiFinancialBorrowMoneyLists } from "@/api/financial_borrow_money"; export const financial_borrow_money: Iconfig = { fetchFn: apiFinancialBorrowMoneyLists, - dictData:"cost_type,financial_pay_type", + dictData: "cost_type,financial_pay_type", serchList: [ { label: "单据编号", @@ -653,14 +651,13 @@ export const financial_borrow_money: Iconfig = { { label: "费用类别", value: "cost_type", - select:'cost_type' + select: "cost_type", }, { - label: "支付方式", - value: "pay_type", - select:'financial_pay_type' - - }, + label: "支付方式", + value: "pay_type", + select: "financial_pay_type", + }, ], tableList: [ { code: "单据编号" }, @@ -674,11 +671,11 @@ export const financial_borrow_money: Iconfig = { ], }; -import { apiMarketingCustomReturnVisitTemplateLists, } from '@/api/marketing_custom_return_visit_template' +import { apiMarketingCustomReturnVisitTemplateLists } from "@/api/marketing_custom_return_visit_template"; export const marketing_custom_return_visit_template: Iconfig = { fetchFn: apiMarketingCustomReturnVisitTemplateLists, - dictData:"cost_type,financial_pay_type", + dictData: "cost_type,financial_pay_type", serchList: [ { label: "模板名称", @@ -687,25 +684,25 @@ export const marketing_custom_return_visit_template: Iconfig = { { label: "是否启用", value: "is_use", - select:[ + select: [ { - name:'启用', - value:0 - }, - { - name:'不启用', - value:1 - } - ] + name: "启用", + value: 0, + }, + { + name: "不启用", + value: 1, + }, + ], }, { label: "模板名称", value: "name", }, { - label: "创建人", - value: "create_user", - }, + label: "创建人", + value: "create_user", + }, ], tableList: [ { name: "模板名称" }, @@ -715,13 +712,11 @@ export const marketing_custom_return_visit_template: Iconfig = { ], }; - - -import { apiMarketingCustomReturnVisitLists, } from '@/api/marketing_custom_return_visit' +import { apiMarketingCustomReturnVisitLists } from "@/api/marketing_custom_return_visit"; export const marketing_custom_return_visit: Iconfig = { fetchFn: apiMarketingCustomReturnVisitLists, - dictData:'return_visit_type', + dictData: "return_visit_type", serchList: [ { label: "回访编号", @@ -730,13 +725,12 @@ export const marketing_custom_return_visit: Iconfig = { { label: "回访方式", value: "return_visit_type", - select:'return_visit_type', + select: "return_visit_type", }, { label: "回访人", value: "create_user", }, - ], tableList: [ { contract_name: "合同名称" }, @@ -748,4 +742,35 @@ export const marketing_custom_return_visit: Iconfig = { ], }; +import { apiMarketingCustomLists } from "@/api/marketing_custom"; +export const marketing_custom: Iconfig = { + fetchFn: apiMarketingCustomLists, + // dictData: "return_visit_type", + serchList: [ + { + label: "客户名称", + value: "name", + }, + { + label: "客户编号", + value: "code", + }, + { + label: "重要等级", + value: "important_level", + select: "custom_important_level", + }, + ], + tableList: [ + { name: "客户名称" }, + { code: "客户编号" }, + { important_level_text: "重要等级" }, + { dept_name: "负责部门" }, + { category_text: "客户分类" }, + { province_name: "省份" }, + { city_name: "城市" }, + { create_user: "录入人" }, + { create_time: "录入日期" }, + ], +}; diff --git a/src/views/bidbbond/edit.vue b/src/views/bidbbond/edit.vue index b158086..b1fc7ff 100644 --- a/src/views/bidbbond/edit.vue +++ b/src/views/bidbbond/edit.vue @@ -91,7 +91,7 @@ - + @@ -212,6 +212,8 @@ const formData = reactive({ }) + + // 表单验证 const formRules = reactive({ diff --git a/src/views/financial_budget_doc/edit.vue b/src/views/financial_budget_doc/edit.vue index 7610cb6..2d84504 100644 --- a/src/views/financial_budget_doc/edit.vue +++ b/src/views/financial_budget_doc/edit.vue @@ -103,7 +103,7 @@ - + diff --git a/src/views/financial_expense_reimbursement/edit.vue b/src/views/financial_expense_reimbursement/edit.vue index 8663092..3b9ef91 100644 --- a/src/views/financial_expense_reimbursement/edit.vue +++ b/src/views/financial_expense_reimbursement/edit.vue @@ -78,7 +78,7 @@ - + diff --git a/src/views/financial_invoice/edit.vue b/src/views/financial_invoice/edit.vue index b09b60b..ac79756 100644 --- a/src/views/financial_invoice/edit.vue +++ b/src/views/financial_invoice/edit.vue @@ -119,7 +119,7 @@ - + diff --git a/src/views/financial_refund/edit.vue b/src/views/financial_refund/edit.vue index 54d18a7..14af2d4 100644 --- a/src/views/financial_refund/edit.vue +++ b/src/views/financial_refund/edit.vue @@ -46,7 +46,7 @@ - +
diff --git a/src/views/financial_settlement/edit.vue b/src/views/financial_settlement/edit.vue index 8a430db..dc1304f 100644 --- a/src/views/financial_settlement/edit.vue +++ b/src/views/financial_settlement/edit.vue @@ -40,7 +40,7 @@ - + diff --git a/src/views/financial_using_funds/edit.vue b/src/views/financial_using_funds/edit.vue index 0473910..f601d8c 100644 --- a/src/views/financial_using_funds/edit.vue +++ b/src/views/financial_using_funds/edit.vue @@ -103,11 +103,7 @@ - + @@ -125,7 +121,7 @@ - + diff --git a/src/views/marketing_framework_agreement/edit.vue b/src/views/marketing_framework_agreement/edit.vue index 8edda5e..01002eb 100644 --- a/src/views/marketing_framework_agreement/edit.vue +++ b/src/views/marketing_framework_agreement/edit.vue @@ -18,7 +18,8 @@ - + @@ -166,6 +167,10 @@
+ + + + @@ -174,6 +179,10 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apimketingFrameworkAgreementAdd, apimketingFrameworkAgreementEdit } from '@/api/marketing_framework_agreement' +import { marketing_custom } from "@/components/dialogTable/dialogTableConfig"; + + + defineProps({ dictData: { type: Object as PropType>, @@ -187,6 +196,7 @@ const formRef = shallowRef() const popupRef = shallowRef>() const mode = ref('add') const showDialog = ref(false) +const showDialog1 = ref(false) const personnel = ref(null) @@ -200,6 +210,7 @@ const formData = reactive({ "contract_name": "", "agreement_nature": '', "part_a": '', + "part_a_text": '', "part_a_contact": "", "part_a_address": "", "part_b": "", @@ -229,6 +240,13 @@ const formData = reactive({ "create_time": "" }) +const customEvent = (e) => { + formData.part_a = e.id + formData.part_a_text = e.invoice_company + showDialog1.value = false +} + + let value; const userclick = async (val) => { @@ -242,7 +260,7 @@ const userclick = async (val) => { //确认 const submituser = (e: any) => { formData[value + '_name'] = e.name - formData.seal_user = e.id + formData[value] = e.id showDialog.value = false } diff --git a/src/views/marketing_supplementary_agreement/edit.vue b/src/views/marketing_supplementary_agreement/edit.vue index 2c4da40..225826a 100644 --- a/src/views/marketing_supplementary_agreement/edit.vue +++ b/src/views/marketing_supplementary_agreement/edit.vue @@ -1,137 +1,149 @@ @@ -152,6 +164,9 @@ const emit = defineEmits(['success', 'close']) const formRef = shallowRef() const popupRef = shallowRef>() const mode = ref('add') +const showDialog = ref(false) +const personnel = ref(null) + // 弹窗标题 @@ -161,265 +176,53 @@ const popupTitle = computed(() => { // 表单数据 const formData = reactive({ - id: '', - related_contract_id: '', - contract_type: '', - contract_name: '', - contract_code: '', - part_a: '', - part_a_contact: '', - part_a_address: '', - part_b: '', - part_b_signatory: '', - business_nature: '', - industry_nature: '', - fund_sources: '', - const_area: '', - agreement_nature: '', - project_money: '', - project_scale: '', - signed_amount: '', - signed_rate: '', - service_duration: '', - start_date: '', - end_date: '', - performance_money: '', - performance_money_expiration_time: '', - payment_method: '', - content: '', - annex: '', - signed_dept: '', - signed_head: '', - supervise_dept: '', - project_manager: '', - implement_method: '', - seal_name: '', - is_limit: '', - limit_num: '', - file_type: '', - seal_num: '', - seal_user: '', - plance_seal: '', - send_date: '', - mailing_number: '', - review_status: '', - status: '', - create_user: '', + "contract_name": "", + "related_contract_id": '', + "part_a": '', + "part_a_contact": "", + "part_a_address": "", + "part_b": "", + "part_b_signatory": '', + "business_nature": '', + "signed_amount": '', + "payment_method": "", + "content": "", + "annex": [], + "signed_dept": '', + "signed_head": '', + "seal_name": '', + "is_limit": '', + "limit_num": '', + "file_type": '', + "seal_num": '', + "seal_user": '', + "plance_seal": '', + "send_date": "", + "mailing_number": "", + "create_user": "", + "create_time": "" }) +let value; +const userclick = async (val) => { + showDialog.value = true + value = val + await nextTick() + personnel.value.open() + +} + +//确认 +const submituser = (e: any) => { + formData[value + '_name'] = e.name + formData.seal_user = e.id + showDialog.value = false +} + // 表单验证 const formRules = reactive({ - related_contract_id: [{ - required: true, - message: '请输入关联主合同id', - trigger: ['blur'] - }], - contract_type: [{ - required: true, - message: '请输入合同类型 0-主合同 1-框架协议 2-补充协议', - trigger: ['blur'] - }], - contract_name: [{ - required: true, - message: '请输入合同名称', - trigger: ['blur'] - }], - contract_code: [{ - required: true, - message: '请输入合同编号', - trigger: ['blur'] - }], - part_a: [{ - required: true, - message: '请输入甲方签约单位', - trigger: ['blur'] - }], - part_a_contact: [{ - required: true, - message: '请输入联系人', - trigger: ['blur'] - }], - part_a_address: [{ - required: true, - message: '请输入业主地址', - trigger: ['blur'] - }], - part_b: [{ - required: true, - message: '请输入乙方签约单位', - trigger: ['blur'] - }], - part_b_signatory: [{ - required: true, - message: '请输入乙方签约人', - trigger: ['blur'] - }], - business_nature: [{ - required: true, - message: '请输入业务性质', - trigger: ['blur'] - }], - industry_nature: [{ - required: true, - message: '请输入行业性质', - trigger: ['blur'] - }], - fund_sources: [{ - required: true, - message: '请输入资金来源', - trigger: ['blur'] - }], - const_area: [{ - required: true, - message: '请输入建设区域', - trigger: ['blur'] - }], - agreement_nature: [{ - required: true, - message: '请输入协议性质', - trigger: ['blur'] - }], - project_money: [{ - required: true, - message: '请输入工程总投资', - trigger: ['blur'] - }], - project_scale: [{ - required: true, - message: '请输入工程规模及概况', - trigger: ['blur'] - }], - signed_amount: [{ - required: true, - message: '请输入签订金额', - trigger: ['blur'] - }], - signed_rate: [{ - required: true, - message: '请输入合同签订费率', - trigger: ['blur'] - }], - service_duration: [{ - required: true, - message: '请输入合同服务工期', - trigger: ['blur'] - }], - start_date: [{ - required: true, - message: '请输入计划开始日期', - trigger: ['blur'] - }], - end_date: [{ - required: true, - message: '请输入计划结束日期', - trigger: ['blur'] - }], - performance_money: [{ - required: true, - message: '请输入履约金', - trigger: ['blur'] - }], - performance_money_expiration_time: [{ - required: true, - message: '请输入履约金到期时间', - trigger: ['blur'] - }], - payment_method: [{ - required: true, - message: '请输入合同付款方式', - trigger: ['blur'] - }], - content: [{ - required: true, - message: '请输入合同主要内容', - trigger: ['blur'] - }], - signed_dept: [{ - required: true, - message: '请输入签订部门', - trigger: ['blur'] - }], - signed_head: [{ - required: true, - message: '请输入签订负责人', - trigger: ['blur'] - }], - supervise_dept: [{ - required: true, - message: '请输入监管部门', - trigger: ['blur'] - }], - project_manager: [{ - required: true, - message: '请输入项目总监/经理', - trigger: ['blur'] - }], - implement_method: [{ - required: true, - message: '请输入实施方式', - trigger: ['blur'] - }], - seal_name: [{ - required: true, - message: '请输入盖章名称', - trigger: ['blur'] - }], - is_limit: [{ - required: true, - message: '请输入是否限制', - trigger: ['blur'] - }], - limit_num: [{ - required: true, - message: '请输入限制次数', - trigger: ['blur'] - }], - file_type: [{ - required: true, - message: '请输入文件类型', - trigger: ['blur'] - }], - seal_num: [{ - required: true, - message: '请输入盖章份数', - trigger: ['blur'] - }], - seal_user: [{ - required: true, - message: '请输入盖章人', - trigger: ['blur'] - }], - plance_seal: [{ - required: true, - message: '请输入骑缝盖章', - trigger: ['blur'] - }], - send_date: [{ - required: true, - message: '请输入发出日期', - trigger: ['blur'] - }], - mailing_number: [{ - required: true, - message: '请输入邮寄编号', - trigger: ['blur'] - }], - review_status: [{ - required: true, - message: '请输入评审状态 0-待移交 1-已移交', - trigger: ['blur'] - }], - status: [{ - required: true, - message: '请输入立项状态 0-待立项 1-已立项', - trigger: ['blur'] - }], - create_user: [{ - required: true, - message: '请输入录入人', - trigger: ['blur'] - }] + }) diff --git a/src/views/marketing_supplementary_agreement/index.vue b/src/views/marketing_supplementary_agreement/index.vue index d719b58..67feaf0 100644 --- a/src/views/marketing_supplementary_agreement/index.vue +++ b/src/views/marketing_supplementary_agreement/index.vue @@ -40,39 +40,7 @@ - +