diff --git a/src/api/bid_document_examination_detail.ts b/src/api/bid_document_examination_detail.ts index 248ac5a..db1aeb0 100644 --- a/src/api/bid_document_examination_detail.ts +++ b/src/api/bid_document_examination_detail.ts @@ -23,4 +23,13 @@ export function apiBidDocumentExaminationDetailDelete(params: any) { // 标书审查-报价明细详情 export function apiBidDocumentExaminationDetailDetail(params: any) { return request.get({ url: '/bid.bid_document_examination_detail/detail', params }) -} \ No newline at end of file +} + +// 标书审查-提交审批 +export function apibidDocumentExaminationApprove(params: any) { + return request.post({ url: '/bid.bid_document_examination/approve', params }) +} +// 标书审查-审批详情 +export function apibidDocumentExaminationFlows() { + return request.get({ url: '/bid.bid_document_examination/flows' }) +} diff --git a/src/api/flowSet.ts b/src/api/flowSet.ts new file mode 100644 index 0000000..0f26b48 --- /dev/null +++ b/src/api/flowSet.ts @@ -0,0 +1,299 @@ +import request from '@/utils/request' + +// 标书审查-提交审批 +export function apibidDocumentExaminationApprove(params: any) { + return request.post({ url: '/bid.bid_document_examination/approve', params }) +} +// 标书审查-审批详情 +export function apibidDocumentExaminationFlows() { + return request.get({ url: '/bid.bid_document_examination/flows' }) +} + +// 投标决策-提交审批 +export function apibid_bidding_decisionApprove(params: any) { + return request.post({ url: '/bid.bid_bidding_decision/approve', params }) +} +// 投标决策-审批详情 +export function apibid_bidding_decisionFlows() { + return request.get({ url: '/bid.bid_bidding_decision/flows' }) +} + +// 购买标书-提交审批 +export function apibid_buy_bidding_documentApprove(params: any) { + return request.post({ url: '/bid.bid_buy_bidding_document/approve', params }) +} +// 购买标书-审批详情 +export function apibid_buy_bidding_documentFlows() { + return request.get({ url: '/bid.bid_buy_bidding_document/flows' }) +} +// 项目合同-提交审批 +export function apicontractApprove(params: any) { + return request.post({ url: '/contract.contract/approve', params }) +} +// 项目合同-审批详情 +export function apicontractFlows() { + return request.get({ url: '/contract.contract/flows' }) +} + +// 合同洽商-提交审批 +export function apicontract_negotiationApprove(params: any) { + return request.post({ url: '/contract.contract_negotiation/approve', params }) +} +// 合同洽商-审批详情 +export function apicontract_negotiationFlows() { + return request.get({ url: '/contract.contract_negotiation/flows' }) +} + +// 采购合同-提交审批 +export function apiprocurement_contractApprove(params: any) { + return request.post({ url: '/contract.procurement_contract/approve', params }) +} +// 采购合同-审批详情 +export function apiprocurement_contractFlows() { + return request.get({ url: '/contract.procurement_contract/flows' }) +} + + +// 分包合同-提交审批 +export function apisubcontracting_contractApprove(params: any) { + return request.post({ url: '/contract.subcontracting_contract/approve', params }) +} +// 分包合同-审批详情 +export function apisubcontracting_contractFlows() { + return request.get({ url: '/contract.subcontracting_contract/flows' }) +} + +// 分包洽商-提交审批 +export function apisubcontracting_contract_negotiationApprove(params: any) { + return request.post({ url: '/contract.subcontracting_contract_negotiation/approve', params }) +} +// 分包洽商-审批详情 +export function apisubcontracting_contract_negotiationFlows() { + return request.get({ url: '/contract.subcontracting_contract_negotiation/flows' }) +} + +// 开票申请-提交审批 +export function apiInvoicingRequestsApprove(params: any) { + return request.post({ url: '/finance.finance_invoice_apply/approve', params }) +} +// 开票申请-审批详情 +export function apiInvoicingRequestsFlows() { + return request.get({ url: '/finance.finance_invoice_apply/flows' }) +} + +// 回款计划-提交审批 +export function apifinance_returned_moneyApprove(params: any) { + return request.post({ url: '/finance.finance_returned_money/approve', params }) +} +// 回款计划-审批详情 +export function apifinance_returned_moneyFlows() { + return request.get({ url: '/finance.finance_returned_money/flows' }) +} + +// 回款记录-提交审批 +export function apifinance_returned_recordApprove(params: any) { + return request.post({ url: '/finance.finance_returned_record/approve', params }) +} +// 回款记录-审批详情 +export function apifinance_returned_recordFlows() { + return request.get({ url: '/finance.finance_returned_record/flows' }) +} +// 退款申请-提交审批 +export function apifinance_refund_applyApprove(params: any) { + return request.post({ url: '/finance.finance_refund_apply/approve', params }) +} +// 退款申请-审批详情 +export function apifinance_refund_applydFlows() { + return request.get({ url: '/finance.finance_refund_apply/flows' }) +} + +// 收票记录-提交审批 +export function apifinance_receipt_recordApprove(params: any) { + return request.post({ url: '/finance.finance_receipt_record/approve', params }) +} +// 收票记录-审批详情 +export function apifinance_receipt_recordFlows() { + return request.get({ url: '/finance.finance_receipt_record/flows' }) +} +// 付款计划-提交审批 +export function apifinance_payment_planApprove(params: any) { + return request.post({ url: '/finance.finance_payment_plan/approve', params }) +} +// 付款计划-审批详情 +export function apifinance_payment_planFlows() { + return request.get({ url: '/finance.finance_payment_plan/flows' }) +} + +// 付款申请-提交审批 +export function apifinance_payment_applyApprove(params: any) { + return request.post({ url: '/finance.finance_payment_apply/approve', params }) +} +// 付款申请-审批详情 +export function apifinance_payment_applyFlows() { + return request.get({ url: '/finance.finance_payment_apply/flows' }) +} + +// 退款记录-提交审批 +export function apifinance_refund_recordApprove(params: any) { + return request.post({ url: '/finance.finance_refund_record/approve', params }) +} +// 退款记录-审批详情 +export function apifinance_refund_recordFlows() { + return request.get({ url: '/finance.finance_refund_record/flows' }) +} +// 保证金-提交审批 +export function apibid_security_applyApprove(params: any) { + return request.post({ url: '/bid.bid_security_apply/approve', params }) +} +// 保证金-审批详情 +export function apibid_security_applyFlows() { + return request.get({ url: '/bid.bid_security_apply/flows' }) +} +// 推投标保证金-提交审批 +export function apibid_security_refundApprove(params: any) { + return request.post({ url: '/bid.bid_security_refund/approve', params }) +} +// 推投标保证金-审批详情 +export function apbid_security_refundFlows() { + return request.get({ url: '/bid.bid_security_refund/flows' }) +} +// 项目结算-提交审批 +export function apiproject_settlementApprove(params: any) { + return request.post({ url: '/project.project_settlement/approve', params }) +} +// 项目结算-审批详情 +export function apiproject_settlementFlows() { + return request.get({ url: '/project.project_settlement/flows' }) +} + +// 分包结算-提交审批 +export function apiproject_subcontract_settlementApprove(params: any) { + return request.post({ url: '/project.project_subcontract_settlement/approve', params }) +} +// 分包结算-审批详情 +export function apiproject_subcontract_settlementFlows() { + return request.get({ url: '/project.project_subcontract_settlement/flows' }) +} + + +// 总预算-提交审批 +export function apiproject_total_budgetApprove(params: any) { + return request.post({ url: '/project.project_total_budget/approve', params }) +} +// 总预算-审批详情 +export function apiproject_total_budgetFlows() { + return request.get({ url: '/project.project_total_budget/flows' }) +} + +// 材料预算-提交审批 +export function apiproject_material_budgetApprove(params: any) { + return request.post({ url: '/project.project_material_budget/approve', params }) +} +// 材料预算-审批详情 +export function apiproject_material_budgetFlows() { + return request.get({ url: '/project.project_material_budget/flows' }) +} + +// 材料预算明细-提交审批 +export function apiproject_material_budget_detailApprove(params: any) { + return request.post({ url: '/project.project_material_budget_detail/approve', params }) +} +// 材料预算明细-审批详情 +export function apiproject_material_budget_detailFlows() { + return request.get({ url: '/project.project_material_budget_detail/flows' }) +} + +// 分包预算-提交审批 +export function apiproject_subpackage_budgetApprove(params: any) { + return request.post({ url: '/project.project_subpackage_budget/approve', params }) +} +// 分包预算-审批详情 +export function apiproject_subpackage_budgetFlows() { + return request.get({ url: '/project.project_subpackage_budget/flows' }) +} + +// 分包预算明细-提交审批 +export function apiproject_subpackage_budget_detailApprove(params: any) { + return request.post({ url: '/project.project_subpackage_budget_detail/approve', params }) +} +// 分包预算明细-审批详情 +export function approject_subpackage_budget_detailFlows() { + return request.get({ url: '/project.project_subpackage_budget_detail/flows' }) +} + +// 人工预算-提交审批 +export function apiproject_labor_budgetApprove(params: any) { + return request.post({ url: '/project.project_labor_budget/approve', params }) +} +// 人工预算-审批详情 +export function apiproject_labor_budgetFlows() { + return request.get({ url: '/project.project_labor_budget/flows' }) +} +// 机具预算-提交审批 +export function apiproject_equipment_budgetApprove(params: any) { + return request.post({ url: '/project.project_equipment_budget/approve', params }) +} +// 机具预算-审批详情 +export function apiproject_equipment_budgetFlows() { + return request.get({ url: '/project.project_equipment_budget/flows' }) +} +// 费用预算-提交审批 +export function apiproject_cost_budgetApprove(params: any) { + return request.post({ url: '/project.project_cost_budget/approve', params }) +} +// 费用预算-审批详情 +export function apiproject_cost_budgetFlows() { + return request.get({ url: '/project.project_cost_budget/flows' }) +} + +// 出差申请-提交审批 +export function apiproject_trip_applyApprove(params: any) { + return request.post({ url: '/project.project_trip_apply/approve', params }) +} +// 出差申请-审批详情 +export function apiproject_trip_applyFlows() { + return request.get({ url: '/project.project_trip_apply/flows' }) +} + +// 借款申请-提交审批 +export function apiproject_loan_applyApprove(params: any) { + return request.post({ url: '/project.project_loan_apply/approve', params }) +} +// 借款申请-审批详情 +export function apiproject_loan_applyFlows() { + return request.get({ url: '/project.project_loan_apply/flows' }) +} +// 成本调整-提交审批 +export function apiproject_cost_adjustmentApprove(params: any) { + return request.post({ url: '/project.project_cost_adjustment/approve', params }) +} +// 成本调整-审批详情 +export function apiproject_cost_adjustmentFlows() { + return request.get({ url: '/project.project_cost_adjustment/flows' }) +} + +// 差旅报销-提交审批 +export function apiproject_travel_reimbursementApprove(params: any) { + return request.post({ url: '/project.project_travel_reimbursement/approve', params }) +} +// 差旅报销-审批详情 +export function apiproject_travel_reimbursementFlows() { + return request.get({ url: '/project.project_travel_reimbursement/flows' }) +} +// 差旅报销-提交审批 +export function apiproject_expense_reimbursementApprove(params: any) { + return request.post({ url: '/project.project_expense_reimbursement/approve', params }) +} +// 差旅报销-审批详情 +export function apiproject_expense_reimbursementFlows() { + return request.get({ url: '/project.project_expense_reimbursement/flows' }) +} + +// 采购申请-提交审批 +export function apimaterial_purchase_requestApprove(params: any) { + return request.post({ url: '/material.material_purchase_request/approve', params }) +} +// 采购申请-审批详情 +export function apimaterial_purchase_requestFlows() { + return request.get({ url: '/material.material_purchase_request/flows' }) +} \ No newline at end of file diff --git a/src/components/flowDetail/index.vue b/src/components/flowDetail/index.vue index 194b94b..0240154 100644 --- a/src/components/flowDetail/index.vue +++ b/src/components/flowDetail/index.vue @@ -1,7 +1,7 @@ - + {{ formData.title }} @@ -29,14 +29,17 @@ - - - + + + + + - + + @@ -48,18 +51,13 @@ 拒绝 + + 撤销 + - - - - - - 撤销 - - @@ -74,10 +72,11 @@ const userStore = useUserStore() const userInfo = computed(() => userStore.userInfo) const props = defineProps({ - approve_id: Number + approve_id: Number, }) let activeStep = ref(0) const remark = ref('') +const remark2 = ref('') const emit = defineEmits(['off']) const popupRef = shallowRef>() @@ -156,6 +155,7 @@ const checkFn = async (i: Number) => { } const getStep = (item: Object, index: Number) => { + if (index == 0) { return formData.create_user_name + '创建' } else { return item?.flow_step_text } } @@ -165,7 +165,6 @@ flowapproveDetail({ id: props.approve_id }).then(res => { setFormData(res) }) - defineExpose({ open, setFormData, @@ -177,4 +176,9 @@ defineExpose({ .el-step.is-simple .el-step__icon { margin-top: 15px; } + +.steps-cls { + max-height: 200px; + overflow-y: auto; +} \ No newline at end of file diff --git a/src/components/flowProcess/index.vue b/src/components/flowProcess/index.vue index 5fdef3f..a41632d 100644 --- a/src/components/flowProcess/index.vue +++ b/src/components/flowProcess/index.vue @@ -10,9 +10,9 @@ - - @@ -37,7 +37,7 @@ - + 提交 @@ -52,45 +52,48 @@ import { useRoute } from "vue-router" const route = useRoute() const props = defineProps({ - id: Number + id: Number, + flows: Object, + submitApi: Object, }) const emit = defineEmits(['off']) const formData = reactive({ - flow_path: "", - path: route.path + flow_id: "", + path: route.path, + id: props.id }) -// 审批流程 -const flowTypeList = ref([{ - "id": 1, - "name": "fgfdgd", - "flow_cate": "1212", - "check_type": "固定审批流", - "remark": "vcggfhfghfg", - "status": "启用", - "flow_type": "财务", - "org_name": "海之农", - "dept_name": "技术部,张伟自己的部门" -}]) +// // 审批流程 +// const flowTypeList = ref([{ +// "id": 1, +// "name": "fgfdgd", +// "flow_cate": "1212", +// "check_type": "固定审批流", +// "remark": "vcggfhfghfg", +// "status": "启用", +// "flow_type": "财务", +// "org_name": "海之农", +// "dept_name": "技术部,张伟自己的部门" +// }]) -const getFlowTypeList = async () => { +// const getFlowTypeList = async () => { - // let res = await apiFlowLists({ id: 1 }) - // flowTypeList.value = res +// // let res = await apiFlowLists({ id: 1 }) +// // flowTypeList.value = res -} +// } // 获取流程详情 const flowDetail = ref({}) const getDetail = async () => { - let res = await apiFlowDetail({ id: formData.flow_path }) + let res = await apiFlowDetail({ id: formData.flow_id }) flowDetail.value = res } @@ -99,10 +102,12 @@ const getDescr = (item) => { return item.flow_step == 1 ? "当前部门负责人 // 提交审批 const submit = async () => { - // await apiFlowLists({ - // id: props.id, - // as: { ...formData } - // }) + await props.submitApi({ + ...formData + // id: props.id, + // flow_id: + // as: { ...formData } + }) emit('off') @@ -113,5 +118,5 @@ const numberToChinese = (num) => { let chineseNum = ["零", "一", "二", "三", "四", "五", "六", "七", "八", "九", "十"]; return chineseNum[num]; } -getFlowTypeList() +// getFlowTypeList() \ No newline at end of file diff --git a/src/views/InvoicingRequests/detail.vue b/src/views/InvoicingRequests/detail.vue index a77377e..8dca7d8 100644 --- a/src/views/InvoicingRequests/detail.vue +++ b/src/views/InvoicingRequests/detail.vue @@ -92,7 +92,18 @@ - + + + + @@ -104,7 +115,7 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiCustomDetail } from '@/api/custom' -import { timeFormat } from '@/utils/util' +import { apiInvoicingRequestsApprove, apiInvoicingRequestsFlows } from '@/api/flowSet.ts' import type { PropType } from 'vue' defineProps({ dictData: { @@ -116,11 +127,7 @@ const emit = defineEmits(['success', 'close']) const formRef = shallowRef() const popupRef = shallowRef>() const formDataannex = reactive([]) -const datas = reactive({ - provinceOptions: [], - cityOptions: [], - areaOptions: [], -}); + // 表单数据 @@ -134,7 +141,6 @@ const formData = reactive({ // 获取详情 const setFormData = async (data: Record) => { if (data.annex && data.annex.length > 0) { - const arry1 = data.annex.map((item: any, index: any) => { return { name: `文件${index + 1}`, @@ -142,22 +148,9 @@ const setFormData = async (data: Record) => { }; }); Object.assign(formDataannex, arry1) - } - - // for (const key in formData) { - // if (data[key] != null && data[key] != undefined) { - // //@ts-ignore - // formData[key] = data[key] - - // } - - // } - Object.assign(formData, data) - - - + getbidDocumentExaminationFlows() } @@ -187,7 +180,13 @@ const handleClose = () => { } - +// 获取审批流程 +const flows = ref([]) +const getbidDocumentExaminationFlows = async () => { + if (formData?.approve_id) return + let res = await apiInvoicingRequestsFlows() + flows.value = res +} diff --git a/src/views/bid_bidding_decision/detail.vue b/src/views/bid_bidding_decision/detail.vue index ba03f7c..75bb5a6 100644 --- a/src/views/bid_bidding_decision/detail.vue +++ b/src/views/bid_bidding_decision/detail.vue @@ -4,59 +4,86 @@ - - {{ formData.code }} - {{ formData.project_name }} - {{ formData.project_code }} - {{ formData.custom_name }} - {{ formData.project_estimation }} + + + {{ + formData.code }} + {{ + formData.project_name }} + {{ + formData.project_code }} + {{ + formData.custom_name }} + {{ + formData.project_estimation }} - {{ formData.bidding_project_fund_source }} + {{ + formData.bidding_project_fund_source }} - {{ formData.bidding_time }} + {{ + formData.bidding_time }} - {{ formData.bid_type }} + {{ + formData.bid_type }} - {{ formData.competitor }} + {{ + formData.competitor }} - {{ formData.is_margin }} - {{ formData.margin_amount }} + {{ + formData.is_margin }} + {{ + formData.margin_amount }} - {{ formData.bid_opening_date }} - {{ formData.margin_amount_return_date }} + {{ + formData.bid_opening_date }} + {{ + formData.margin_amount_return_date }} - {{ formData.is_internal_resources }} + {{ + formData.is_internal_resources }} - {{ formData.project_assurance }} - {{ formData.bid_project_overview }} + {{ + formData.project_assurance }} + {{ + formData.bid_project_overview }} - {{ formData.project_desc }} + {{ + formData.project_desc }} - - - - {{ item.name }} + + + + {{ item.name }} + - - 暂无附件 - + 暂无附件 + + + - - + + + +} + diff --git a/src/views/procurement_contract/detail.vue b/src/views/procurement_contract/detail.vue index 38f2f14..1f22aec 100644 --- a/src/views/procurement_contract/detail.vue +++ b/src/views/procurement_contract/detail.vue @@ -173,6 +173,19 @@ + + + + + @@ -189,7 +202,7 @@ import { apifinancereceiptLists } from '@/api/receiptrecord' import { paymentplanLists } from '@/api/paymentplan' import { paymentapplyLists } from '@/api/paymentrequest' import { apiFinancerefundLists } from '@/api/refundrecord' -import { timeFormat } from '@/utils/util' +import { apiprocurement_contractApprove, apiprocurement_contractFlows } from '@/api/flowSet' import type { TabsPaneContext } from 'element-plus' const activeName = ref('demo-tabs-1') @@ -387,6 +400,7 @@ const setFormData = async (data: Record) => { financereceiptLists() payapplyLists() financerefundLists() + getbidDocumentExaminationFlows() } const getDetail = async (row: Record) => { @@ -415,7 +429,13 @@ const handleClose = () => { } - +// 获取审批流程 +const flows = ref([]) +const getbidDocumentExaminationFlows = async () => { + if (formData?.approve_id) return + let res = await apiprocurement_contractFlows() + flows.value = res +} diff --git a/src/views/procurement_contract_detail/index.vue b/src/views/procurement_contract_detail/index.vue index 91496b1..a35bf2f 100644 --- a/src/views/procurement_contract_detail/index.vue +++ b/src/views/procurement_contract_detail/index.vue @@ -1,6 +1,6 @@ - + - +} + diff --git a/src/views/project_settlement/detail.vue b/src/views/project_settlement/detail.vue index dc918c4..ecdbd79 100644 --- a/src/views/project_settlement/detail.vue +++ b/src/views/project_settlement/detail.vue @@ -78,6 +78,19 @@ + + + + + @@ -87,7 +100,7 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiCustomDetail } from '@/api/custom' -import { timeFormat } from '@/utils/util' +import { apiproject_settlementApprove, apiproject_settlementFlows } from '@/api/flowSet' import type { PropType } from 'vue' defineProps({ dictData: { @@ -119,7 +132,6 @@ const formData = reactive({ const setFormData = async (data: Record) => { Object.assign(formData, data) if (data.annex && data.annex.length > 0) { - const arry1 = data.annex.map((item: any, index: any) => { return { name: `文件${index + 1}`, @@ -127,10 +139,8 @@ const setFormData = async (data: Record) => { }; }); Object.assign(formDataannex, arry1) - - } - + getbidDocumentExaminationFlows() } @@ -161,7 +171,13 @@ const handleClose = () => { - +// 获取审批流程 +const flows = ref([]) +const getbidDocumentExaminationFlows = async () => { + if (formData?.approve_id) return + let res = await apiproject_settlementFlows() + flows.value = res +} diff --git a/src/views/project_subcontract_settlement/detail.vue b/src/views/project_subcontract_settlement/detail.vue index 34e1917..b61f0fc 100644 --- a/src/views/project_subcontract_settlement/detail.vue +++ b/src/views/project_subcontract_settlement/detail.vue @@ -77,7 +77,20 @@ + + + + + @@ -87,7 +100,7 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiCustomDetail } from '@/api/custom' -import { timeFormat } from '@/utils/util' +import { apiproject_subcontract_settlementApprove, apiproject_subcontract_settlementFlows } from '@/api/flowSet' import type { PropType } from 'vue' defineProps({ dictData: { @@ -119,7 +132,6 @@ const formData = reactive({ const setFormData = async (data: Record) => { Object.assign(formData, data) if (data.annex && data.annex.length > 0) { - const arry1 = data.annex.map((item: any, index: any) => { return { name: `文件${index + 1}`, @@ -127,10 +139,8 @@ const setFormData = async (data: Record) => { }; }); Object.assign(formDataannex, arry1) - - } - + getbidDocumentExaminationFlows() } @@ -159,7 +169,13 @@ const handleClose = () => { emit('close') } - +// 获取审批流程 +const flows = ref([]) +const getbidDocumentExaminationFlows = async () => { + if (formData?.approve_id) return + let res = await apiproject_subcontract_settlementFlows() + flows.value = res +} diff --git a/src/views/project_subpackage_budget/detail.vue b/src/views/project_subpackage_budget/detail.vue index a5f49a5..b188450 100644 --- a/src/views/project_subpackage_budget/detail.vue +++ b/src/views/project_subpackage_budget/detail.vue @@ -4,17 +4,22 @@ - {{ formData.project_name }} - {{ formData.project_code }} - {{ formData.subpackage_budget_code }} - {{ formData.remark + {{ + formData.project_name }} + {{ + formData.project_code }} + {{ + formData.subpackage_budget_code }} + {{ + formData.remark }} - 文件{{ index + 1 }}查看 + 文件{{ index + 1 }}查看 @@ -36,8 +41,23 @@ - + + + + + + @@ -47,7 +67,7 @@ import { subpackagdetailLists } from '@/api/project_subpackage_budget_detail' import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiCustomDetail } from '@/api/custom' -import { timeFormat } from '@/utils/util' +import { apiproject_subpackage_budgetApprove, apiproject_subpackage_budgetFlows } from '@/api/flowSet' import type { PropType } from 'vue' defineProps({ dictData: { @@ -113,11 +133,8 @@ const setFormData = async (data: Record) => { }; }); Object.assign(formDataannex, arry1) - - } - - + getbidDocumentExaminationFlows() } const getDetail = async (row: Record) => { @@ -146,7 +163,13 @@ const handleClose = () => { } - +// 获取审批流程 +const flows = ref([]) +const getbidDocumentExaminationFlows = async () => { + if (formData?.approve_id) return + let res = await apiproject_subpackage_budgetFlows() + flows.value = res +} diff --git a/src/views/project_subpackage_budget_detail/detail.vue b/src/views/project_subpackage_budget_detail/detail.vue index b7fe697..6d300ec 100644 --- a/src/views/project_subpackage_budget_detail/detail.vue +++ b/src/views/project_subpackage_budget_detail/detail.vue @@ -52,7 +52,18 @@ - + + + + @@ -62,7 +73,7 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiCustomDetail } from '@/api/custom' -import { timeFormat } from '@/utils/util' +import { apiproject_subpackage_budget_detailApprove, approject_subpackage_budget_detailFlows } from '@/api/flowSet' import type { PropType } from 'vue' defineProps({ dictData: { @@ -96,7 +107,7 @@ const formData = reactive({ // 获取详情 const setFormData = async (data: Record) => { Object.assign(formData, data) - + getbidDocumentExaminationFlows() } @@ -127,7 +138,13 @@ const handleClose = () => { } - +// 获取审批流程 +const flows = ref([]) +const getbidDocumentExaminationFlows = async () => { + if (formData?.approve_id) return + let res = await approject_subpackage_budget_detailFlows() + flows.value = res +} diff --git a/src/views/project_total_budget/detail.vue b/src/views/project_total_budget/detail.vue index 09c11af..155272d 100644 --- a/src/views/project_total_budget/detail.vue +++ b/src/views/project_total_budget/detail.vue @@ -4,20 +4,30 @@ - {{ formData.dept_name }} - {{ formData.project_name }} - {{ formData.project_code }} - {{ formData.profit }} - {{ formData.profit_rate }} - {{ formData.contract_amount }} + {{ + formData.dept_name }} + {{ + formData.project_name }} + {{ + formData.project_code }} + {{ + formData.profit }} + {{ + formData.profit_rate }} + {{ + formData.contract_amount }} - {{ formData.remark }} - {{ formData.project_manager }} - {{ formData.budget_date }} + {{ + formData.remark }} + {{ + formData.project_manager }} + {{ + formData.budget_date }} - 文件{{ index + 1 }} 查看 + 文件{{ index + 1 }} 查看 @@ -34,24 +44,29 @@ {{ row.text }} - - - - - + + + +