diff --git a/src/api/flowSet.ts b/src/api/flowSet.ts index 0dbbba9..9928f4c 100644 --- a/src/api/flowSet.ts +++ b/src/api/flowSet.ts @@ -404,3 +404,18 @@ export function apimarketing_supplementary_agreementApprove(params: any) { params, }); } + +// 合同列表 +export function apimarketing_business_opportunitytFlows() { + return request.get({ + url: "/marketing.marketing_business_opportunity/flows", + }); +} + +// 框架协议-提交审批 +export function apimarketing_supplementary_agreementtApprove(params: any) { + return request.post({ + url: "/marketing.marketing_business_opportunity/approve", + params, + }); +} diff --git a/src/components/detailPage/index.vue b/src/components/detailPage/index.vue index f50f188..3e170f3 100644 --- a/src/components/detailPage/index.vue +++ b/src/components/detailPage/index.vue @@ -1,7 +1,6 @@ diff --git a/src/views/bidbbond/index.vue b/src/views/bidbbond/index.vue index fafda69..bcd1218 100644 --- a/src/views/bidbbond/index.vue +++ b/src/views/bidbbond/index.vue @@ -36,15 +36,20 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/views/build_plan/index.vue b/src/views/build_plan/index.vue index 1c25acd..3f21e33 100644 --- a/src/views/build_plan/index.vue +++ b/src/views/build_plan/index.vue @@ -35,26 +35,38 @@
- + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/src/views/build_report/index.vue b/src/views/build_report/index.vue index 661897c..86e00fc 100644 --- a/src/views/build_report/index.vue +++ b/src/views/build_report/index.vue @@ -36,15 +36,22 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/views/build_report_detail/index.vue b/src/views/build_report_detail/index.vue index 9c5bcca..3624bfa 100644 --- a/src/views/build_report_detail/index.vue +++ b/src/views/build_report_detail/index.vue @@ -5,17 +5,23 @@
- - - - - - - - - - - + + + + + + + + + + + diff --git a/src/views/contract_ticket_difference/index.vue b/src/views/contract_ticket_difference/index.vue index ba351c8..7bc65db 100644 --- a/src/views/contract_ticket_difference/index.vue +++ b/src/views/contract_ticket_difference/index.vue @@ -20,8 +20,10 @@ - - + + - + - - - - - - - - - + + + + + + + + + diff --git a/src/views/marketing_bid_evaluation/detail.vue b/src/views/marketing_bid_evaluation/detail.vue new file mode 100644 index 0000000..b136342 --- /dev/null +++ b/src/views/marketing_bid_evaluation/detail.vue @@ -0,0 +1,243 @@ + + + + + diff --git a/src/views/marketing_bid_evaluation/edit.vue b/src/views/marketing_bid_evaluation/edit.vue index af5676d..47a7d7b 100644 --- a/src/views/marketing_bid_evaluation/edit.vue +++ b/src/views/marketing_bid_evaluation/edit.vue @@ -1,90 +1,223 @@ @@ -94,17 +227,25 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiMarketingBidEvaluationAdd, apiMarketingBidEvaluationEdit, apiMarketingBidEvaluationDetail } from '@/api/marketing_bid_evaluation' import type { PropType } from 'vue' -defineProps({ +import { marketing_business_opportunity } from "@/components/dialogTable/dialogTableConfig"; +import { apiMarketingBusinessOpportunityDetail } from '@/api/marketing_business_opportunity' + + +let prop = defineProps({ dictData: { type: Object as PropType>, default: () => ({}) - } + }, + marketing_business_opportunity_id: Number, + deptList: Array }) const emit = defineEmits(['success', 'close']) const formRef = shallowRef() const popupRef = shallowRef>() const mode = ref('add') - +const showDialog = ref(false) +const showDialog1 = ref(false) +const personnel = ref(null) // 弹窗标题 const popupTitle = computed(() => { @@ -115,6 +256,7 @@ const popupTitle = computed(() => { const formData = reactive({ id: '', business_opportunity_id: '', + business_opportunity_name: '', bid_type: '', bid__nature: '', bid_code: '', @@ -129,15 +271,41 @@ const formData = reactive({ bid_agency_address: '', bid_agency_contacts: '', bid_agency_telephone: '', - annex: '', + annex: [], }) +const customEvent = (e) => { + formData.business_opportunity_id = e.id + formData.business_opportunity_name = e.project_name + const { head_name, dept_name, leader_name, project_name, contacts, project_code, construct_company_name, management_company, industry_nature_text, business_nature_text, const_area_text, project_address, info_sources_text, fund_sources_text, total_investment, jianan_investment, project_overview } = e + Object.assign(formData, { head_name, dept_name, leader_name, project_name, contacts, project_name, project_code, construct_company_name, management_company, industry_nature_text, business_nature_text, const_area_text, project_address, info_sources_text, fund_sources_text, total_investment, jianan_investment, project_overview }) + showDialog.value = false +} + +let val: string; +const userclick = async (value: string) => { + val = value + showDialog1.value = true + await nextTick() + personnel.value.open() + +} + +//确认 +const submituser = (e: any) => { + formData[val] = e.id; + formData[val + '_name'] = e.name; + console.log(formData, val) + showDialog1.value = false +} + + // 表单验证 const formRules = reactive({ - business_opportunity_id: [{ + business_opportunity_name: [{ required: true, - message: '请输入业务机会id', + message: '选择业务机会', trigger: ['blur'] }], bid_type: [{ @@ -245,9 +413,13 @@ const handleSubmit = async () => { } //打开弹窗 -const open = (type = 'add') => { +const open = async (type = 'add') => { mode.value = type popupRef.value?.open() + if (prop.marketing_business_opportunity_id) { + let res = await apiMarketingBusinessOpportunityDetail({ id: prop.marketing_business_opportunity_id }) + customEvent(res) + } } // 关闭回调 diff --git a/src/views/marketing_bid_evaluation/index.vue b/src/views/marketing_bid_evaluation/index.vue index edbc279..6ccf59c 100644 --- a/src/views/marketing_bid_evaluation/index.vue +++ b/src/views/marketing_bid_evaluation/index.vue @@ -2,15 +2,17 @@
- - - - + + + - + + + @@ -35,23 +37,16 @@
- - - - - - - - + + + + - - - - - - - - + + + + + @@ -69,30 +69,36 @@
- + + +
diff --git a/src/views/marketing_business_opportunity/detail.vue b/src/views/marketing_business_opportunity/detail.vue new file mode 100644 index 0000000..08c137c --- /dev/null +++ b/src/views/marketing_business_opportunity/detail.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/marketing_business_opportunity/edit.vue b/src/views/marketing_business_opportunity/edit.vue index 562a0e7..701c65e 100644 --- a/src/views/marketing_business_opportunity/edit.vue +++ b/src/views/marketing_business_opportunity/edit.vue @@ -2,126 +2,146 @@
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -140,7 +160,6 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiMarketingBusinessOpportunityAdd, apiMarketingBusinessOpportunityEdit, apiMarketingBusinessOpportunityDetail } from '@/api/marketing_business_opportunity' -import { timeFormat } from '@/utils/util' import { marketing_custom } from "@/components/dialogTable/dialogTableConfig"; import type { PropType } from 'vue' defineProps({ @@ -186,6 +205,7 @@ const formData = reactive({ head_name: "", dept: '', leader: '', + leader_name: '', contacts: '', annex: [], }) @@ -196,8 +216,9 @@ const customEvent = (e) => { showDialog.value = false } - -const userclick = async () => { +let val: string; +const userclick = async (value: string) => { + val = value showDialog1.value = true await nextTick() personnel.value.open() @@ -206,8 +227,9 @@ const userclick = async () => { //确认 const submituser = (e: any) => { - formData.head_name = e.name - formData.head = e.id + formData[val] = e.id; + formData[val + '_name'] = e.name; + console.log(formData, val) showDialog1.value = false } diff --git a/src/views/marketing_business_opportunity/index.vue b/src/views/marketing_business_opportunity/index.vue index ceaaf3f..f63aa8f 100644 --- a/src/views/marketing_business_opportunity/index.vue +++ b/src/views/marketing_business_opportunity/index.vue @@ -13,39 +13,46 @@ - - - - - + - + + + - + + + - + + + + - + + + - - - - - - + + + @@ -71,29 +78,25 @@ 删除
- + - - - - - - - - - - - + + + + + + + - - - - - - - - - + + + + @@ -113,21 +126,24 @@ + +