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 @@