diff --git a/src/components/Materialprocurement_details/index.vue b/src/components/Materialprocurement_details/index.vue new file mode 100644 index 0000000..f8e1cd3 --- /dev/null +++ b/src/components/Materialprocurement_details/index.vue @@ -0,0 +1,69 @@ + + + \ No newline at end of file diff --git a/src/components/contract/index.vue b/src/components/contract/index.vue new file mode 100644 index 0000000..09fadbc --- /dev/null +++ b/src/components/contract/index.vue @@ -0,0 +1,117 @@ + + + \ No newline at end of file diff --git a/src/components/project/index.vue b/src/components/project/index.vue index cea6cd1..b2c24dd 100644 --- a/src/components/project/index.vue +++ b/src/components/project/index.vue @@ -24,21 +24,20 @@ - - - - - - - - - - - + + + + + + + + + + - - + + diff --git a/src/components/project_contract/index.vue b/src/components/project_contract/index.vue index aa013a1..23fa27a 100644 --- a/src/components/project_contract/index.vue +++ b/src/components/project_contract/index.vue @@ -18,8 +18,7 @@ - - + diff --git a/src/components/supplier/index.vue b/src/components/supplier/index.vue index 14dcb27..6401832 100644 --- a/src/components/supplier/index.vue +++ b/src/components/supplier/index.vue @@ -16,34 +16,17 @@
- + - - - - - - - - - - + + + - - - - + + diff --git a/src/views/contract/detail.vue b/src/views/contract/detail.vue index 26ee3a3..ffa2f7d 100644 --- a/src/views/contract/detail.vue +++ b/src/views/contract/detail.vue @@ -3,240 +3,122 @@
- - - - {{ formData.custom_name }} - {{ formData.bid_document_no }} - {{ formData.project_name }} - {{ formData.project_code }} - {{ formData.contract_code }} - {{ formData.custom_name }} - - {{ formData.contract_type_text }} - - {{ formData.contract_pricing_method_text - }} - {{ formData.party_a - }} + - {{ formData.party_b }} + {{ formData.custom_name }} + {{ formData.bid_document_no }} + {{ formData.project_name }} + {{ formData.project_code }} + {{ formData.contract_code }} + {{ formData.custom_name }} + + {{ formData.contract_type_text }} + + {{ formData.contract_pricing_method_text + }} + {{ formData.party_a - {{ formData.party_a_contact_address + }} - }} - {{ formData.party_b_contact_address + {{ formData.party_b }} - }} + {{ formData.party_a_contact_address - {{ formData.party_a_diretor + }} + {{ formData.party_b_contact_address - }} + }} - {{ formData.party_b_diretor + {{ formData.party_a_diretor - }} + }} + + {{ formData.party_b_diretor + + }} - {{ formData.party_a_phone + {{ formData.party_a_phone - }} - {{ formData.party_b_phone + }} + {{ formData.party_b_phone - }} - {{ formData.party_a_mobile + }} + {{ formData.party_a_mobile - }} - {{ formData.party_b_mobile + }} + {{ formData.party_b_mobile - }} - {{ formData.party_a_email + }} + {{ formData.party_a_email - }} - {{ formData.party_b_email + }} + {{ formData.party_b_email - }} - {{ formData.amount + }} + {{ formData.amount - }} - - {{ formData.business_director_name + {{ formData.business_director_name - }} - {{ formData.contract_status_text + }} + {{ formData.contract_status_text - }} + }} - {{ formData.expire + {{ formData.expire - }} - {{ formData.contract_date + }} + {{ formData.contract_date - }} - {{ formData.main_content + }} + {{ formData.main_content - }} - {{ formData.remark + }} + {{ formData.remark - }} + }} - -
-
- 文件{{ index + 1 }}查看 + +
+
+ 文件{{ index + 1 }}查看 -
-
-
- 暂无附件 -
- - - - -
- - - - - - - - - +
-
- +
+ 暂无附件
- - -
- - - - - - - - - - - -
-
- -
- - -
- - - - - - - - - - - - -
-
- -
- - -
- - - - - - - - - - - - -
-
- -
- - -
- - - - - - - - - - - - -
-
- -
- - + + + +
+ 回款计划 +
+
+ + + + + + + + +
+
+ +
+ + +
@@ -253,7 +135,6 @@ import { apiCompetitorLists } from '@/api/competitor' import { timeFormat } from '@/utils/util' import type { TabsPaneContext } from 'element-plus' -const activeName = ref('demo-tabs-1') import type { PropType } from 'vue' defineProps({ @@ -268,20 +149,9 @@ const pager1 = reactive({ page_no: 1, customer_demand_id: "" }) -const pager2 = reactive({ - page_size: 10, - page_no: 1, - customer_demand_id: "" -}) -const pager3 = reactive({ - page_size: 10, - page_no: 1, - customer_demand_id: "" -}) const total = ref(0) -const total1 = ref(0) -const total2 = ref(0) + const emit = defineEmits(['success', 'close']) const formRef = shallowRef() const popupRef = shallowRef>() @@ -292,8 +162,7 @@ const datas = reactive({ areaOptions: [], }); const tableData = ref([]) -const tableData1 = ref([]) -const tableData2 = ref([]) + const handleClick = (tab: TabsPaneContext, event: Event) => { console.log(tab, event) } @@ -309,32 +178,14 @@ const handleSizeChange1 = (val: number) => { pager1.page_size = val solutionLists() } -const handleSizeChange2 = (val: number) => { - pager2.page_size = val - estimateLists() -} -const handleSizeChange3 = (val: number) => { - - pager3.page_size = val - competitorLists() -} //分页 const handleCurrentChange1 = (val: number) => { console.log(`current page: ${val}`) pager1.page_no = val solutionLists() } -const handleCurrentChange2 = (val: number) => { - console.log(`current page: ${val}`) - pager2.page_no = val - estimateLists() -} -const handleCurrentChange3 = (val: number) => { - pager3.page_no = val - console.log(`current page: ${val}`) - competitorLists() -} + // 解决方案列表 const solutionLists = () => { apiCustomerDemandSolutionLists(pager1).then((res) => { @@ -345,31 +196,13 @@ const solutionLists = () => { }) } -// 获取项目概算列表 -const estimateLists = () => { - apiProjectEstimateLists(pager2).then((res) => { - tableData1.value = res.lists - total1.value = res.count - }) -} - -// 获取竞争对手列表 -const competitorLists = () => { - apiCompetitorLists(pager3).then((res) => { - tableData2.value = res.lists - total2.value = res.count - }) -} - - // 获取详情 const setFormData = async (data: Record) => { Object.assign(formData, data) pager1.customer_demand_id = data.id - pager2.customer_demand_id = data.id - pager3.customer_demand_id = data.id + if (data.annex && data.annex.length > 0) { const arry1 = data.annex.map((item: any, index: any) => { return { @@ -380,8 +213,7 @@ const setFormData = async (data: Record) => { Object.assign(formDataannex, arry1) } competitorLists() - solutionLists() - estimateLists() + } const getDetail = async (row: Record) => { diff --git a/src/views/contract_negotiation/detail.vue b/src/views/contract_negotiation/detail.vue index 6cbeb33..bfb9a4c 100644 --- a/src/views/contract_negotiation/detail.vue +++ b/src/views/contract_negotiation/detail.vue @@ -1,86 +1,97 @@