This commit is contained in:
lxz 2024-01-17 14:29:18 +08:00
parent d6d8a64b45
commit c36cf03de1
9 changed files with 267 additions and 58 deletions

View File

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

View File

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

View File

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

View File

@ -6,7 +6,8 @@
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="供应商名称" prop="supplier_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" @click="showDialog = true">
<el-form-item label="供应商名称" prop="supplier_id"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" @click="showDialog = true">
<el-input v-model="supplier_name" readonly clearable placeholder="请选择供应商" />
</el-form-item>
</el-col>
@ -15,6 +16,17 @@
<el-input v-model="supplier_code" clearable disabled placeholder="系统自动填写" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同类型" prop="contract_cate">
<el-select v-model="formData.contract_cate" placeholder="请选择">
<el-option label="采购合同" :value="1"></el-option>
<el-option label="分包合同" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="项目名称" prop="contract_id" @click="showDialog1 = true">
@ -39,7 +51,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="开票日期" prop="invoicing_date">
<el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开票日期">
<el-date-picker class="flex-1 !flex" v-model="formData.invoicing_date" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择开票日期">
</el-date-picker>
</el-form-item>
</el-col>
@ -50,9 +63,11 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="发票类型" prop="invoice_type" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-form-item label="发票类型" prop="invoice_type"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-radio-group v-model="formData.invoice_type" placeholder="请选择发票类型">
<el-radio v-for="(item, index) in dictData.invoice_type" :key="index" :label="parseInt(item.value)">
<el-radio v-for="(item, index) in dictData.invoice_type" :key="index"
:label="parseInt(item.value)">
{{ item.name }}
</el-radio>
</el-radio-group>
@ -64,8 +79,10 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发票金额" prop="invoice_amount" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.invoice_amount" clearable placeholder="请输入发票金额" @input="amountinput" />
<el-form-item label="发票金额" prop="invoice_amount"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.invoice_amount" clearable placeholder="请输入发票金额"
@input="amountinput" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -88,15 +105,18 @@
</el-col>
<el-col :span="8">
<el-form-item label="不含税金额" prop="amount_excluding_tax" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-form-item label="不含税金额" prop="amount_excluding_tax"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="formData.amount_excluding_tax" clearable placeholder="请输入不含税金额" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收票日期" prop="receipt_date" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-form-item label="收票日期" prop="receipt_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<!-- <el-input v-model="formData.receipt_date" clearable placeholder="请输入收票日期" /> -->
<el-date-picker class="flex-1 !flex" v-model="formData.receipt_date" clearable type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择收票日期">
<el-date-picker class="flex-1 !flex" v-model="formData.receipt_date" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择收票日期">
</el-date-picker>
</el-form-item>
</el-col>
@ -110,7 +130,11 @@
<el-col :span="24">
<el-form-item label="附件" prop="field87">
<el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
<el-upload
accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
class="upload-demo" :show-file-list="false" aria-hidden="true"
:headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
:on-success="handleAvatarSuccess_four" ref="upload">
<el-button type="primary">
上传
</el-button>
@ -118,7 +142,8 @@
<div>
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
@ -276,7 +301,8 @@ const formData = reactive({
amount_excluding_tax: "",
receipt_date: "",
remark: "",
annex: ""
annex: "",
contract_cate: 1
})
@ -333,11 +359,14 @@ const handleSubmit = async () => {
if (formDataannex.length > 0) {
formData.return_desc = formDataannex.map((item: any) => item.uri).toString()
}
console.log(formRef.value?.validate(), '22222222')
await formRef.value?.validate()
const data = { ...formData }
console.log(data, "data")
return
mode.value == 'edit'
? await apifinancereceiptEdit(data)
: await apifinancereceiptAdd(data)

View File

@ -51,10 +51,11 @@
</el-radio>
</el-radio-group>
</el-form-item> </el-col> <el-col :span="8">
<el-form-item label="签订日期" prop="signing_date"
<el-form-item label="签约日期" prop="signing_date"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-date-picker class="flex-1 !flex" v-model="formData.signing_date" clearable type="date"
value-format="YYYY-MM-DD" placeholder="选择签日期">
<el-date-picker class="flex-1 !flex" v-model="formData.signing_date" clearable type="datetime"
value-format="YYYY-MM-DD " placeholder="选择签日期">
</el-date-picker>
</el-form-item>
</el-col> <el-col :span="24">
@ -114,18 +115,11 @@
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
<div style=" display: flex;justify-content: flex-end;margin-bottom: 30px;">
<el-button @click="showDialog2 = true" type="primary" plain>选择项目MRP缺口</el-button>
</div>
<el-row>
<el-col :span="24">
@ -182,9 +176,8 @@
<el-select v-model="row.tax_rate" clearable placeholder="请选择税率" value-key="name"
@change="materialji2(row, $index, $event)">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in dictData.tax_rate" :key="index"
:label="item.name" :value="item" />
:label="item.name" :value="item.value" />
</el-select>
</template>
</el-table-column>
@ -202,6 +195,7 @@
</el-table>
</div>
<div style="margin-bottom: 30px;">付款计划</div>
<div style="margin-bottom: 30px;">
<el-table :data="paymentList">
@ -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,
}))
}

View File

@ -1,27 +1,77 @@
<template>
<myTable :baseData="baseData"></myTable>
<myTable :baseData="baseData1"></myTable>
<myTable :baseData="baseData2"></myTable>
<myTable :baseData="baseData3"></myTable>
<myTable :baseData="baseData4"></myTable>
</template>
<script setup>
import { ref, reactive, defineProps } from "vue"
import myTable from "./myTable.vue"
import { subpackagdetailLists } from '@/api/project_subpackage_budget_detail'
import { apiProjectCostBudgetLists } from '@/api/project_cost_budget'
import { MaterialbudgetDetailLists } from '@/api/project_material_budget_detail.ts'
import { subpackagdetailLists } from '@/api/project_subpackage_budget_detail.ts'
import { apiProjectEquipmentBudgetDetailLists } from '@/api/project_equipment_budget_detail.ts'
import { apiProjectLaborBudgetDetailLists } from '@/api/project_labor_budget_detail.ts'
const props = defineProps({
project_id: Number
})
const baseData = reactive({
fetchFun: apiProjectCostBudgetLists,
tit: "费用预算",
queryParams: { project_id: props.project_id },
columnList: [
{ label: '一级科目', prop: 'first_level_subject' },
{ label: '差?科目', prop: 'second_level_subject' },
{ label: '单位', prop: 'unit' },
{ label: '首次预算', prop: 'unit' },
{ label: '预算调整', prop: 'num' },
{ label: '预算金额', prop: 'amount' },
{ label: '已支出', prop: 'amount' },
{ label: '剩余预算', prop: 'has_subcontract_num' },
{ label: '编制标准', prop: 'standard' },
{ label: '备注', prop: 'remark' },
]
})
const baseData1 = reactive({
fetchFun: MaterialbudgetDetailLists,
tit: "材料预算",
queryParams: { project_id: props.project_id },
columnList: [
{ label: '材料名称', prop: 'material_name' },
{ label: '材料编码', prop: 'material_code' },
{ label: '规格单号', prop: 'material_budget_code' },
{ label: '品牌', prop: 'material_brand' },
{ label: '参数说明', prop: 'material_parameter_description' },
{ label: '单位', prop: 'material_unit' },
{ label: '预算数量', prop: 'num' },
{ label: '单价', prop: 'price' },
{ label: '金额', prop: 'amount' },
{ label: '已申购量', prop: 'apply_num' },
{ label: '剩余数量', prop: 'residual_num' },
]
})
const baseData2 = reactive({
fetchFun: subpackagdetailLists,
tit: "竞争SDSD对手",
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: 'num' },
{ label: '预算调正量', prop: 'price' },
{ label: '预算工作量', prop: 'amount' },
{ label: '单价', prop: 'price' },
{ label: '金额', prop: 'amount' },
{ label: '已分包量', prop: 'has_subcontract_num' },
@ -29,4 +79,43 @@ const baseData = reactive({
]
})
const baseData3 = reactive({
fetchFun: apiProjectEquipmentBudgetDetailLists,
tit: "机具预算",
queryParams: { project_id: props.project_id },
columnList: [
{ label: '机具类别', prop: 'type' },
{ label: '机具名称', prop: 'name' },
{ label: '规格型号', prop: 'spec' },
{ label: '单位', prop: 'unit' },
{ label: '首次预算量', prop: '' },
{ label: '预算调整量', prop: '' },
{ label: '预算总量', prop: '' },
{ label: '单价', prop: 'price' },
{ label: '金额', prop: 'amount' },
{ label: '备注', prop: 'remark' },
]
})
const baseData4 = reactive({
fetchFun: apiProjectLaborBudgetDetailLists,
tit: "人工预算",
queryParams: { project_id: props.project_id },
columnList: [
{ label: '工种名称', prop: 'job_type_name' },
{ label: '人工说明', prop: 'desc' },
{ label: '单位', prop: 'unit' },
{ label: '首次预算量', prop: '' },
{ label: '预算调整量', prop: '' },
{ label: '预算总量', prop: '' },
{ label: '单价', prop: 'price' },
{ label: '金额', prop: 'amount' },
{ label: '备注', prop: 'remark' },
]
})
</script>

View File

@ -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: '' },
]
})
</script>
</script>

View File

@ -13,7 +13,8 @@
<el-col :span="8">
<el-form-item label="项目名称" prop="contract_id" @click="showDialog1 = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-form-item label="项目名称" prop="contract_id" @click="showDialog1 = true"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-input v-model="project_name" clearable placeholder="请选择项目" />
</el-form-item>
</el-col>
@ -40,8 +41,10 @@
</el-col>
<el-col :span="8">
<el-form-item label="退款日期" prop="refund_date" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-date-picker class="flex-1 !flex" v-model="formData.refund_date" clearable type="date" value-format="YYYY-MM-DD" placeholder="选择日期">
<el-form-item label="退款日期" prop="refund_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-date-picker class="flex-1 !flex" v-model="formData.refund_date" clearable type="date"
value-format="YYYY-MM-DD" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
@ -64,7 +67,8 @@
<el-col :span="8">
<el-form-item label="退款方式" prop="contacts">
<el-select class="flex-1" v-model="formData.refund_type" clearable placeholder="请选择退款方式">
<el-option v-for="(item, index) in dictData.refund_type" :key="index" :label="item.name" :value="parseInt(item.value)" />
<el-option v-for="(item, index) in dictData.refund_type" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
@ -83,7 +87,11 @@
<el-col :span="24">
<el-form-item label="附件" prop="field127">
<el-upload accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv" class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
<el-upload
accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
class="upload-demo" :show-file-list="false" aria-hidden="true"
:headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
:on-success="handleAvatarSuccess_four" ref="upload">
<el-button type="primary">
上传
</el-button>
@ -91,7 +99,8 @@
<div>
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{ item.name }}</a>
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
@ -203,9 +212,9 @@ const showDialog1 = ref(false)
const customEvent = (e: any) => {
formData.bank_account_id = e.id;
bank_account_no.value = e.account;
showDialog.value = false;
};
const customEvent1 = (e: any) => {
formData.contract_id = e.id;
@ -299,13 +308,11 @@ const getDetail = async (row: Record<string, any>) => {
//
const handleSubmit = async () => {
console.log(formDataannex)
if (formDataannex.length > 0) {
formData.annex = formDataannex.map((item: any) => item.uri).toString()
formData.annex = formDataannex
}
console.log(formRef.value?.validate(), '22222222')
await formRef.value?.validate()
const data = { ...formData }
mode.value == 'edit'
? await apirefundapplyEdit(data)

View File

@ -47,9 +47,9 @@
<el-col :span="8">
<el-form-item label="签订日期" prop="signing_date">
<el-date-picker class="flex-1 !flex" v-model="formData.signing_date" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择签订日期">
<el-form-item label="签订日期" prop="sign_date">
<el-date-picker class="flex-1 !flex" v-model="formData.sign_date" clearable type="datetime"
value-format="YYYY-MM-DD" placeholder="选择签订日期">
</el-date-picker>
</el-form-item>
</el-col>
@ -76,7 +76,7 @@
<el-col :span="8">
<el-form-item label="洽商质保到期时间" prop="Warranty_expire_date">
<el-date-picker class="flex-1 !flex" v-model="formData.Warranty_expire_date" clearable
type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择洽商质保到期时间">
type="datetime" value-format="YYYY-MM-DD" placeholder="选择洽商质保到期时间">
</el-date-picker>
</el-form-item> </el-col>
@ -265,6 +265,7 @@ const formData = reactive({
negotiation_content: '',
negotiation_quotation: [],
negotiation_basis: [],
"sign_date": "string",
})
const customEvent = (e: any) => {