From 38dd85de64e0fefdfaf04a03908ca7c94aed47e6 Mon Sep 17 00:00:00 2001 From: ljx <15723110242@139.com> Date: Fri, 22 Aug 2025 22:57:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/contract/limitPrice/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue index 090e53a..604b920 100644 --- a/src/views/contract/limitPrice/index.vue +++ b/src/views/contract/limitPrice/index.vue @@ -286,6 +286,7 @@ const clickApprovalSheet = () => { }; onUnmounted(() => { listeningProject(); + console.log(11111111); }); onMounted(() => { getVersionNums(); From 31c21c7bb5c666df7bebf593968b0ab27494ca0a Mon Sep 17 00:00:00 2001 From: ljx <15723110242@139.com> Date: Sat, 23 Aug 2025 03:30:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/out/outDesignTable/index.vue | 103 ++++++++------ src/views/out/outDesignTableVS/index.vue | 165 +++++++++++------------ 2 files changed, 139 insertions(+), 129 deletions(-) diff --git a/src/views/out/outDesignTable/index.vue b/src/views/out/outDesignTable/index.vue index dff39c3..ae8a4f0 100644 --- a/src/views/out/outDesignTable/index.vue +++ b/src/views/out/outDesignTable/index.vue @@ -1,44 +1,54 @@ @@ -66,8 +76,23 @@ const data = reactive({ month: undefined } }); - +const activeTab = ref('1'); const { queryParams } = toRefs(data); +const tabList = [ + { + value: '1', + label: '对甲采购设计报表' + }, + { + value: '2', + label: '对乙采购设计报表' + } +]; +const handleTabChange = (tab) => { + activeTab.value = tab; + data.queryParams.valueType = '1'; + data.queryParams.month = ''; +}; /** 查询项目总产值分配列表 */ const getList = async () => { diff --git a/src/views/out/outDesignTableVS/index.vue b/src/views/out/outDesignTableVS/index.vue index eb4b502..13b6b18 100644 --- a/src/views/out/outDesignTableVS/index.vue +++ b/src/views/out/outDesignTableVS/index.vue @@ -1,7 +1,7 @@ - + + From 73772f036f1830ff317e184a2109fdbc0fd16148 Mon Sep 17 00:00:00 2001 From: ljx <15723110242@139.com> Date: Sat, 23 Aug 2025 06:28:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=95=E6=A0=87=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E6=A0=B8=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/out/outDesignTableVS/index.ts | 16 + .../biddingLimit/indexEdit.vue | 35 +- src/views/contract/bidCost/index.vue | 301 +++++++++++++++ src/views/contract/bidCost/indexEdit.vue | 343 ++++++++++++++++++ src/views/contract/limitPrice/index.vue | 2 + src/views/out/outDesignTable/index.vue | 2 +- src/views/out/outDesignTableVS/index.vue | 84 ++++- src/views/out/outTable/index.vue | 22 +- 8 files changed, 773 insertions(+), 32 deletions(-) create mode 100644 src/views/contract/bidCost/index.vue create mode 100644 src/views/contract/bidCost/indexEdit.vue diff --git a/src/api/out/outDesignTableVS/index.ts b/src/api/out/outDesignTableVS/index.ts index 788d797..9385a1d 100644 --- a/src/api/out/outDesignTableVS/index.ts +++ b/src/api/out/outDesignTableVS/index.ts @@ -7,3 +7,19 @@ export function listOutTable(query: any) { params: query }); } +// 对甲产值和对乙产值 +export function comparisonOfOutputValue(query: any) { + return request({ + url: '/out/table/outCompare', + method: 'get', + params: query + }); +} +// 对甲结算和对乙结算 +export function comparisonOfSettlementValue(query: any) { + return request({ + url: '/out/table/comparisonOfOwnerAndSub', + method: 'get', + params: query + }); +} diff --git a/src/views/biddingManagemen/biddingLimit/indexEdit.vue b/src/views/biddingManagemen/biddingLimit/indexEdit.vue index 450d058..fee3dd1 100644 --- a/src/views/biddingManagemen/biddingLimit/indexEdit.vue +++ b/src/views/biddingManagemen/biddingLimit/indexEdit.vue @@ -70,7 +70,7 @@ import ApprovalButton from '@/components/Process/approvalButton.vue'; import { StartProcessBo } from '@/api/workflow/workflowCommon/types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; import { useUserStoreHook } from '@/store/modules/user'; -import { getVersionDetail } from '@/api/bidding/biddingLimit'; +import { getVersionDetail, sheetList } from '@/api/bidding/biddingLimit'; // 获取用户 store const userStore = useUserStoreHook(); @@ -82,8 +82,8 @@ const loading = ref(true); const routeParams = ref>({}); const flowCodeOptions = [ { - value: currentProject.value?.id + '_costAccounting', - label: '成本核算清单审批' + value: currentProject.value?.id + '_biddingLimitList', + label: '投标一览审核' } ]; @@ -151,11 +151,25 @@ const getInfo = () => { nextTick(async () => { const res = await getVersionDetail(routeParams.value.id); Object.assign(form.value, res.data); + getSheetName(res.data.versions); loading.value = false; buttonLoading.value = false; }); }; - +//获取表名 +const getSheetName = async (versions) => { + const params = { + projectId: currentProject.value?.id, + versions + }; + const res = await sheetList(params); + if (res.code == 200) { + sheets.value = res.data; + if (res.data.length > 0) { + sheets.value = res.data; + } + } +}; /** 提交按钮 */ const submitForm = (status1: string) => { status.value = status1; @@ -171,7 +185,7 @@ const submitFlow = async () => { const handleStartWorkFlow = async (data: LeaveForm) => { try { submitFormData.value.flowCode = flowCode.value; - submitFormData.value.businessId = data.id; + submitFormData.value.businessId = data.versions + '_abc'; //流程变量 taskVariables.value = { // leave4/5 使用的流程变量 @@ -189,7 +203,7 @@ const handleStartWorkFlow = async (data: LeaveForm) => { }; //审批记录 const handleApprovalRecord = () => { - approvalRecordRef.value.init(form.value.id); + approvalRecordRef.value.init(form.value.versions + '_abc'); }; //提交回调 const submitCallback = async () => { @@ -227,13 +241,10 @@ onMounted(() => { nextTick(async () => { reset(); routeParams.value = proxy.$route.query; - sheets.value = routeParams.value.sheets; - versions.value = routeParams.value.versions; - Object.assign(form.value, versions.value); loading.value = false; - if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') { - getInfo(); - } + // if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') { + getInfo(); + // } }); }); diff --git a/src/views/contract/bidCost/index.vue b/src/views/contract/bidCost/index.vue new file mode 100644 index 0000000..8a6297b --- /dev/null +++ b/src/views/contract/bidCost/index.vue @@ -0,0 +1,301 @@ + + + + + diff --git a/src/views/contract/bidCost/indexEdit.vue b/src/views/contract/bidCost/indexEdit.vue new file mode 100644 index 0000000..f97c080 --- /dev/null +++ b/src/views/contract/bidCost/indexEdit.vue @@ -0,0 +1,343 @@ + + + + diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue index f64b797..55230b6 100644 --- a/src/views/contract/limitPrice/index.vue +++ b/src/views/contract/limitPrice/index.vue @@ -53,6 +53,7 @@