From c36cf03de18cc3cbd8439916fead46ce5d356d68 Mon Sep 17 00:00:00 2001 From: lxz Date: Wed, 17 Jan 2024 14:29:18 +0800 Subject: [PATCH] s" --- src/api/project_cost_budget.ts | 26 +++++ src/api/project_equipment_budget_detail.ts | 26 +++++ src/api/project_labor_budget_detail.ts | 26 +++++ src/views/finance_receipt_record/edit.vue | 55 ++++++++--- src/views/procurement_contract/edit.vue | 33 ++++--- src/views/project/components/budget.vue | 95 ++++++++++++++++++- .../project/components/documentation.vue | 26 ++--- src/views/refund/edit.vue | 29 +++--- .../edit.vue | 9 +- 9 files changed, 267 insertions(+), 58 deletions(-) create mode 100644 src/api/project_cost_budget.ts create mode 100644 src/api/project_equipment_budget_detail.ts create mode 100644 src/api/project_labor_budget_detail.ts diff --git a/src/api/project_cost_budget.ts b/src/api/project_cost_budget.ts new file mode 100644 index 0000000..fa948ae --- /dev/null +++ b/src/api/project_cost_budget.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 费用预算列表 +export function apiProjectCostBudgetLists(params: any) { + return request.get({ url: '/project.project_cost_budget_detail/lists', params }) +} + +// 添加费用预算 +export function apiProjectCostBudgetAdd(params: any) { + return request.post({ url: '/project.project_cost_budget/add', params }) +} + +// 编辑费用预算 +export function apiProjectCostBudgetEdit(params: any) { + return request.post({ url: '/project.project_cost_budget/edit', params }) +} + +// 删除费用预算 +export function apiProjectCostBudgetDelete(params: any) { + return request.post({ url: '/project.project_cost_budget/delete', params }) +} + +// 费用预算详情 +export function apiProjectCostBudgetDetail(params: any) { + return request.get({ url: '/project.project_cost_budget/detail', params }) +} \ No newline at end of file diff --git a/src/api/project_equipment_budget_detail.ts b/src/api/project_equipment_budget_detail.ts new file mode 100644 index 0000000..be14cde --- /dev/null +++ b/src/api/project_equipment_budget_detail.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 机具预算明细列表 +export function apiProjectEquipmentBudgetDetailLists(params: any) { + return request.get({ url: '/project.project_equipment_budget_detail/lists', params }) +} + +// 添加机具预算明细 +export function apiProjectEquipmentBudgetDetailAdd(params: any) { + return request.post({ url: '/project.project_equipment_budget_detail/add', params }) +} + +// 编辑机具预算明细 +export function apiProjectEquipmentBudgetDetailEdit(params: any) { + return request.post({ url: '/project.project_equipment_budget_detail/edit', params }) +} + +// 删除机具预算明细 +export function apiProjectEquipmentBudgetDetailDelete(params: any) { + return request.post({ url: '/project.project_equipment_budget_detail/delete', params }) +} + +// 机具预算明细详情 +export function apiProjectEquipmentBudgetDetailDetail(params: any) { + return request.get({ url: '/project.project_equipment_budget_detail/detail', params }) +} \ No newline at end of file diff --git a/src/api/project_labor_budget_detail.ts b/src/api/project_labor_budget_detail.ts new file mode 100644 index 0000000..ca6e484 --- /dev/null +++ b/src/api/project_labor_budget_detail.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 人工预算明细列表 +export function apiProjectLaborBudgetDetailLists(params: any) { + return request.get({ url: '/project.project_labor_budget_detail/lists', params }) +} + +// 添加人工预算明细 +export function apiProjectLaborBudgetDetailAdd(params: any) { + return request.post({ url: '/project.project_labor_budget_detail/add', params }) +} + +// 编辑人工预算明细 +export function apiProjectLaborBudgetDetailEdit(params: any) { + return request.post({ url: '/project.project_labor_budget_detail/edit', params }) +} + +// 删除人工预算明细 +export function apiProjectLaborBudgetDetailDelete(params: any) { + return request.post({ url: '/project.project_labor_budget_detail/delete', params }) +} + +// 人工预算明细详情 +export function apiProjectLaborBudgetDetailDetail(params: any) { + return request.get({ url: '/project.project_labor_budget_detail/detail', params }) +} \ No newline at end of file diff --git a/src/views/finance_receipt_record/edit.vue b/src/views/finance_receipt_record/edit.vue index 16a9c10..8820b7d 100644 --- a/src/views/finance_receipt_record/edit.vue +++ b/src/views/finance_receipt_record/edit.vue @@ -6,7 +6,8 @@ - + @@ -15,6 +16,17 @@ + + + + + + + + + + + @@ -39,7 +51,8 @@ - + @@ -50,9 +63,11 @@ - + - + {{ item.name }} @@ -64,8 +79,10 @@ - - + + @@ -88,15 +105,18 @@ - + - + - + @@ -110,7 +130,11 @@ - - - + @@ -114,18 +115,11 @@ x - - - -
选择项目MRP缺口 - - -
@@ -182,9 +176,8 @@ - + :label="item.name" :value="item.value" /> @@ -202,6 +195,7 @@ +
付款计划
@@ -297,7 +291,17 @@ const amount_excluding_tax = ref('') const amount_daxie = ref('') const retention_money = ref('') const materialList = reactive([]) -const paymentList = reactive([]) +const paymentList = reactive([ + { + id: "", + period: "", + pay_date: "", + amount: "", + remark: "", + } + + +]) const formDataannex = reactive([]) import feedback from '@/utils/feedback' import configs from "@/config" @@ -372,6 +376,7 @@ const procurementList = (id) => { //获取付款计划 const paymentplanList = (id: any) => { + console.log("获取付款计划") paymentplanLists({ 'page_no': 1, 'page_size': 5000, 'contract_type': 1, 'contract_id': id }).then((res) => { const data = res.lists.map((item: any) => ({ 'period': item.period, @@ -549,7 +554,7 @@ const handleSubmit = async () => { 'material_purchase_request_detail_id': item.material_purchase_request_detail_id, 'num': item.num, 'price': item.price, - 'tax_rate': item.tax_rate.value, + 'tax_rate': item.tax_rate, })) } diff --git a/src/views/project/components/budget.vue b/src/views/project/components/budget.vue index 133f433..37a57c7 100644 --- a/src/views/project/components/budget.vue +++ b/src/views/project/components/budget.vue @@ -1,27 +1,77 @@ \ No newline at end of file diff --git a/src/views/project/components/documentation.vue b/src/views/project/components/documentation.vue index 2766ff7..dfca4be 100644 --- a/src/views/project/components/documentation.vue +++ b/src/views/project/components/documentation.vue @@ -6,28 +6,28 @@ import { ref, reactive, defineProps } from "vue" import myTable from "./myTable.vue" -import { subpackagdetailLists } from '@/api/project_subpackage_budget_detail' +import { apiProjectdocumentLists } from '@/api/project_document_set' const props = defineProps({ project_id: Number }) + + const baseData = reactive({ - fetchFun: subpackagdetailLists, - tit: "竞争对手", + fetchFun: apiProjectdocumentLists, + tit: "文档", queryParams: { project_id: props.project_id }, columnList: [ - { label: '工作类型', prop: 'work_type' }, - { label: '工作内容', prop: 'work_content' }, - { label: '项目特征', prop: 'project_features' }, - { label: '单位', prop: 'unit' }, - { label: '预算工作量', prop: 'num' }, - { label: '单价', prop: 'price' }, - { label: '金额', prop: 'amount' }, - { label: '已分包量', prop: 'has_subcontract_num' }, - { label: '剩余工作量', prop: 'residue_num' }, + { label: '排序号', prop: 'sort' }, + { label: '文档大类', prop: 'large_category' }, + { label: '文档中类', prop: 'middle_category' }, + { label: '文档名称', prop: 'name' }, + { label: '文档描述', prop: 'describe' }, + { label: '必传', prop: 'is_upload' }, + { label: '文档', prop: '' }, ] }) + - \ No newline at end of file diff --git a/src/views/refund/edit.vue b/src/views/refund/edit.vue index 07c38e1..7e13291 100644 --- a/src/views/refund/edit.vue +++ b/src/views/refund/edit.vue @@ -13,7 +13,8 @@ - + @@ -40,8 +41,10 @@ - - + + @@ -64,7 +67,8 @@ - + @@ -83,7 +87,11 @@ -