From 3a1815b0fbc08d26401f326885c39b74be15a8b0 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Sun, 28 Jan 2024 18:00:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/contract/edit.vue | 9 +- src/views/project/components/manpower.vue | 187 ---- src/views/project/detail.vue | 115 ++- src/views/project_follow_up/edit.vue | 9 +- .../project_list/components/Business.vue | 309 ++----- .../project_list/components/Collection.vue | 4 +- .../project_list/components/Statistics.vue | 3 + src/views/project_list/components/a.vue | 36 - src/views/project_list/components/budget.vue | 4 - .../project_list/components/construction.vue | 0 .../project_list/components/contract.vue | 121 +-- .../project_list/components/expenses.vue | 102 --- .../project_list/components/manpower.vue | 72 +- src/views/project_list/components/myTable.vue | 59 +- .../project_list/components/operateMenu.vue | 25 + src/views/project_list/components/tender.vue | 311 ++----- src/views/project_list/detail.vue | 822 +----------------- 17 files changed, 415 insertions(+), 1773 deletions(-) delete mode 100644 src/views/project/components/manpower.vue create mode 100644 src/views/project_list/components/Statistics.vue delete mode 100644 src/views/project_list/components/a.vue delete mode 100644 src/views/project_list/components/construction.vue delete mode 100644 src/views/project_list/components/expenses.vue create mode 100644 src/views/project_list/components/operateMenu.vue diff --git a/src/views/contract/edit.vue b/src/views/contract/edit.vue index a4c13a5..6f275a2 100644 --- a/src/views/contract/edit.vue +++ b/src/views/contract/edit.vue @@ -24,8 +24,7 @@ - + @@ -369,10 +368,10 @@ const customEvent1 = (e: any) => { }; const customEvent2 = (e: any) => { project_id.value = e.id; - formData.project_id = e.id + formData.project_id = e.id; project_name.value = e.name; - project_code.value = e.project_code - bidding_code.value = '' + project_code.value = e.project_code; + bidding_code.value = ''; showDialog2.value = false; }; diff --git a/src/views/project/components/manpower.vue b/src/views/project/components/manpower.vue deleted file mode 100644 index 5d0f649..0000000 --- a/src/views/project/components/manpower.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/project/detail.vue b/src/views/project/detail.vue index b79724e..db79f9f 100644 --- a/src/views/project/detail.vue +++ b/src/views/project/detail.vue @@ -9,7 +9,7 @@ - + @@ -59,8 +59,11 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiCustomDetail } from '@/api/custom' +import { timeFormat } from '@/utils/util' import type { PropType } from 'vue' import type { TabsPaneContext } from 'element-plus' +import { apiCustomServiceLists } from '@/api/custom_service' +import { subpackagdetailLists } from '@/api/project_subpackage_budget_detail' import Overview from "./components/Overview.vue" import Business from "./components/Business.vue" import tender from "./components/tender.vue" @@ -74,6 +77,8 @@ import payment from "./components/payment.vue" import documentation from "./components/documentation.vue" + + const activeName = ref('demo-1') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -89,6 +94,114 @@ const formRef = shallowRef() const popupRef = shallowRef>() + +const pager12 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager13 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager14 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) + +const pager15 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager16 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) + +const pager17 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager18 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) + + + +const pager21 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) + + +const pager22 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) + + +const pager23 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) + + +const pager24 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager25 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager26 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager27 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager28 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager29 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager30 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager31 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) +const pager32 = reactive({ + page_size: 10, + page_no: 1, + project_id: "" +}) + // 表单数据 const formData = reactive({ diff --git a/src/views/project_follow_up/edit.vue b/src/views/project_follow_up/edit.vue index 975e722..a934516 100644 --- a/src/views/project_follow_up/edit.vue +++ b/src/views/project_follow_up/edit.vue @@ -109,7 +109,7 @@ import type { FormInstance } from 'element-plus' import projectTable from "@/components/project/index.vue" import Popup from '@/components/popup/index.vue' import { apiProjectFollowUpAdd, apiProjectFollowUpEdit, apiProjectFollowUpDetail } from '@/api/project_follow_up' -import type { PropType } from 'vue' +import { useDictData } from '@/hooks/useDictOptions' // 上传文件 import annexUpload from "@/components/annexUpload/index.vue" @@ -121,12 +121,9 @@ const handleAvatarSuccess_four = (response: any) => { const delFileFn = (index: number) => { formData.annex.splice(index, 1) } const props = defineProps({ - dictData: { - type: Object as PropType>, - default: () => ({}) - }, project: Object }) +const { dictData } = useDictData('project_assurance,follow_status,follow_type,follow_stage') const emit = defineEmits(['success', 'close']) const formRef = shallowRef() const popupRef = shallowRef>() @@ -138,8 +135,6 @@ const formDataannex = reactive([]) // dialog const showDialog = ref(false) - - // 弹窗标题 const popupTitle = computed(() => { return mode.value == 'edit' ? '编辑项目跟进记录' : '新增项目跟进记录' diff --git a/src/views/project_list/components/Business.vue b/src/views/project_list/components/Business.vue index a39abc8..9ab2ab3 100644 --- a/src/views/project_list/components/Business.vue +++ b/src/views/project_list/components/Business.vue @@ -1,139 +1,11 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/project_list/components/expenses.vue b/src/views/project_list/components/expenses.vue deleted file mode 100644 index 9e7fec5..0000000 --- a/src/views/project_list/components/expenses.vue +++ /dev/null @@ -1,102 +0,0 @@ - - \ No newline at end of file diff --git a/src/views/project_list/components/manpower.vue b/src/views/project_list/components/manpower.vue index 5d0f649..bbb72ce 100644 --- a/src/views/project_list/components/manpower.vue +++ b/src/views/project_list/components/manpower.vue @@ -5,33 +5,7 @@ - - - - - - - - - - - - - - - - - - + @@ -40,24 +14,14 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/views/project_list/components/myTable.vue b/src/views/project_list/components/myTable.vue index 7c819f5..b9fcd2b 100644 --- a/src/views/project_list/components/myTable.vue +++ b/src/views/project_list/components/myTable.vue @@ -1,26 +1,65 @@ + \ No newline at end of file diff --git a/src/views/project_list/components/tender.vue b/src/views/project_list/components/tender.vue index 50899ff..3a5c8b4 100644 --- a/src/views/project_list/components/tender.vue +++ b/src/views/project_list/components/tender.vue @@ -1,115 +1,11 @@ - -