This commit is contained in:
zmj 2024-04-03 16:23:21 +08:00
parent 453505d090
commit d71edfed3b
37 changed files with 191 additions and 200 deletions

View File

@ -11,7 +11,6 @@
<el-button @click="handleAdd">+</el-button>
<el-button @click="handleDelete(row)">-</el-button>
</div>
</el-form-item>
</template>
</el-table-column>
@ -28,7 +27,10 @@
</el-form-item>
<!-- 时间框 -->
<el-form-item v-else-if="item.date" :prop="item.check ? item.value : ''" label-width="0">
<el-form-item v-else-if="item.date" :prop="`${item.check[0]}[${$index}].${item.value}`" :rules="item?.check ? {
validator: item.check[1],
trigger: ['blur'],
} : ''" label-width="0">
<el-date-picker class="flex-1 !flex" v-model="row[item.value]" clearable value-format="YYYY-MM-DD"
placeholder="请选择日期">
</el-date-picker>

View File

@ -1,27 +1,15 @@
<template>
<div class="icon-select">
<el-popover
trigger="contextmenu"
v-model:visible="state.popoverVisible"
:width="state.popoverWidth"
>
<div
@mouseover.stop="state.mouseoverSelect = true"
@mouseout.stop="state.mouseoverSelect = false"
>
<el-popover trigger="contextmenu" v-model:visible="state.popoverVisible" :width="state.popoverWidth">
<div @mouseover.stop="state.mouseoverSelect = true" @mouseout.stop="state.mouseoverSelect = false">
<div>
<div class="flex justify-between">
<div class="mb-3">请选择图标</div>
<div>
<span
v-for="(item, index) in iconTabsMap"
:key="index"
class="cursor-pointer text-sm ml-2"
<span v-for="(item, index) in iconTabsMap" :key="index" class="cursor-pointer text-sm ml-2"
:class="{
'text-primary': index == tabIndex
}"
@click="tabIndex = index"
>
}" @click="tabIndex = index">
{{ item.name }}
</span>
</div>
@ -41,25 +29,12 @@
</div>
</div>
<template #reference>
<el-input
ref="inputRef"
v-model.trim="state.inputValue"
placeholder="搜索图标"
:autofocus="false"
:disabled="disabled"
@focus="handleFocus"
@blur="handleBlur"
clearable
>
<el-input ref="inputRef" v-model.trim="state.inputValue" placeholder="搜索图标" :autofocus="false"
:disabled="disabled" @focus="handleFocus" @blur="handleBlur" clearable>
<template #prepend>
<div class="flex items-center" v-if="modelValue">
<el-tooltip class="flex-1 w-20" :content="modelValue" placement="top">
<icon
class="mr-1"
:key="modelValue"
:name="modelValue"
:size="16"
/>
<icon class="mr-1" :key="modelValue" :name="modelValue" :size="16" />
</el-tooltip>
</div>

View File

@ -43,7 +43,7 @@
</template>
</el-table-column>
<el-table-column label="不含税金额" prop="amount_excluding_tax" show-overflow-tooltip />
<el-table-column label="质保金比例" prop="retention_money" show-overflow-tooltip />
<el-table-column label="质保金比例%" prop="retention_money" show-overflow-tooltip />
<el-table-column label="质保金" prop="retention_money_rate" show-overflow-tooltip />
</el-table>

View File

@ -1,18 +1,15 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<div
style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
<div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
<el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
<el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
</el-select>
<el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织"
@change="deptrmt">
<el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
<el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
</el-select>
</div>
@ -77,8 +74,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="本次支付比例(%" prop="payment_rate">
<el-input v-model="formData.payment_rate" clearable placeholder="请输入本次支付比例(%" />
<el-form-item label="本次支付比例(%%" prop="payment_rate">
<el-input v-model="formData.payment_rate" clearable placeholder="请输入本次支付比例(%%" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -116,8 +113,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>

View File

@ -46,7 +46,7 @@
<el-table-column label="申请人" prop="applier" show-overflow-tooltip />
<el-table-column label="本次支付金额" prop="payment_amount" show-overflow-tooltip />
<el-table-column label="合计已付款" prop="invoice_amount" show-overflow-tooltip />
<el-table-column label="本次支付比例" prop="amount_excluding_tax" show-overflow-tooltip />
<el-table-column label="本次支付比例%" prop="amount_excluding_tax" show-overflow-tooltip />
<el-table-column label="本次支付金额" prop="tax" show-overflow-tooltip />
<el-table-column label="付款方式" prop="invoice_type">

View File

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<el-form-item label="项目名称" prop="project_id"
@ -33,7 +32,7 @@
<el-input v-model="formData.buyer_name" clearable placeholder="请输入购买人员" />
</el-form-item>
<el-form-item label="购买标书金额" prop="amount">
<el-input v-model="formData.amount" clearable placeholder="请输入购买标书金额" />
<el-input v-model="formData.amount" clearable placeholder="请输入购买标书金额" type="number" />
</el-form-item>
<el-form-item label="购买标书时间" prop="buy_date">
<el-date-picker class="flex-1 !flex" v-model="formData.buy_date" clearable value-format="YYYY-MM-DD"

View File

@ -63,7 +63,7 @@
formData.tax_rate }}</el-descriptions-item>
<el-descriptions-item label="付款方式" label-align="left" align="left" label-class-name="my-label">{{
formData.pay_type }}</el-descriptions-item>
<el-descriptions-item label="付款比例" label-align="left" align="left" label-class-name="my-label">{{
<el-descriptions-item label="付款比例%" label-align="left" align="left" label-class-name="my-label">{{
formData.pay_rate }}</el-descriptions-item>
<el-descriptions-item label="商务合同偏差" label-align="left" align="left" label-class-name="my-label">{{
formData.business_contract_deviation }}</el-descriptions-item>

View File

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="150px" :rules="formRules">
<el-card>
<template #header>
@ -34,8 +33,7 @@
<el-col :span="8">
<el-form-item label="招标公司名称" prop="buy_bidding_document_id">
<el-input v-model="invite_tenders_company_name" clearable disabled
placeholder="系统自动填写" />
<el-input v-model="invite_tenders_company_name" clearable disabled placeholder="系统自动填写" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -51,8 +49,7 @@
<el-col :span="8">
<el-form-item label="招标项目资金来源" prop="buy_bidding_document_id">
<el-input v-model="bidding_project_fund_source" clearable disabled
placeholder="系统自动填写" />
<el-input v-model="bidding_project_fund_source" clearable disabled placeholder="系统自动填写" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -116,22 +113,22 @@
<el-col :span="8">
<el-form-item label="税率" prop="tax_rate">
<el-select class="flex-1 " v-model="formData.tax_rate" clearable placeholder="请选择税率">
<el-option v-for="(item, index) in dictData.tax_rate" :key="index"
:label="item.name" :value="parseInt(item.value)" />
<el-option v-for="(item, index) in dictData.tax_rate" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="付款方式" prop="pay_type">
<el-select class="flex-1" v-model="formData.pay_type" clearable placeholder="请选择付款方式">
<el-option v-for="(item, index) in dictData.pay_type" :key="index"
:label="item.name" :value="parseInt(item.value)" />
<el-option v-for="(item, index) in dictData.pay_type" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="付款比例" prop="pay_rate">
<el-input v-model="formData.pay_rate" clearable placeholder="请输入付款比例" />
<el-form-item label="付款比例%" prop="pay_rate">
<el-input v-model="formData.pay_rate" clearable placeholder="请输入付款比例%" />
</el-form-item>
</el-col>
<el-col :span="8">

View File

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-row>
@ -46,23 +45,23 @@
<el-col :span="8">
<el-form-item label="产品数量" prop="num">
<el-input v-model="formData.num" clearable placeholder="请输入产品数量" />
<el-input v-model="formData.num" clearable placeholder="请输入产品数量" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="成本单价" prop="cost_price">
<el-input v-model="formData.cost_price" clearable placeholder="请输入成本单价" />
<el-input v-model="formData.cost_price" clearable placeholder="请输入成本单价" type="number" />
</el-form-item></el-col>
<el-col :span="8">
<el-form-item label="点数" prop="points">
<el-input v-model="formData.points" clearable placeholder="请输入点数" />
<el-input v-model="formData.points" clearable placeholder="请输入点数" type="number" />
</el-form-item></el-col>
<el-col :span="8">
<el-form-item label="报价单价" prop="usale_price">
<el-input v-model="formData.sale_price" clearable placeholder="请输入报价单价" />
<el-input v-model="formData.sale_price" clearable placeholder="请输入报价单价" type="number" />
</el-form-item></el-col>

View File

@ -29,7 +29,7 @@
<el-input v-model="formData.bidder_company" clearable placeholder="请输入中标单位" />
</el-form-item>
<el-form-item label="中标金额" prop="bidder_amount">
<el-input v-model="formData.bidder_amount" clearable placeholder="请输入中标金额" />
<el-input v-model="formData.bidder_amount" clearable placeholder="请输入中标金额" type="number" />
</el-form-item>
<el-form-item label="投标总结" prop="bid_summary">

View File

@ -79,8 +79,7 @@
<el-form-item label="乙方主要负责人" prop="party_b_diretor">
<el-input v-model="formData.party_b_diretor" clearable placeholder="请输入乙方主要负责人" />
</el-form-item></el-col><el-col :span="8">
<el-form-item label="乙方电话" prop="party_b_phone"
:rules="[{ validator: checkPhone, trigger: 'blur' }]">
<el-form-item label="乙方电话">
<el-input v-model="formData.party_b_phone" clearable placeholder="请输入乙方电话" type="number" />
</el-form-item></el-col><el-col :span="8">
<el-form-item label="乙方手机" prop="party_b_mobile">
@ -121,8 +120,10 @@
value-format="YYYY-MM-DD" placeholder="选择合同有效期">
</el-date-picker>
</el-form-item></el-col><el-col :span="8">
<el-form-item label="签约日期" prop="contract_date"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-form-item label="签约日期" prop="contract_date" :rules="[{ required: true, message: '不可为空', trigger: 'change' }, {
validator: chekcDate,
trigger: ['blur']
}]">
<el-date-picker class="flex-1 !flex" v-model="formData.contract_date" clearable type="date"
value-format="YYYY-MM-DD" placeholder="选择签约日期">
</el-date-picker>
@ -219,6 +220,27 @@ const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined)
const { dictData } = useDictData('contract_type,contract_pricing_method,contract_status,pay_period')
const chekcDate = (rule: any, value: any, callback: any) => {
if (new Date(formData.contract_date) > new Date(formData.expire)) {
callback(new Error('签约日期不能超过合同有效期'))
} else {
callback()
}
}
const chekcDate1 = (rule: any, value: any, callback: any) => {
if (new Date(value) < new Date(formData.contract_date)) {
callback(new Error('签约日期不能早于签约日期'))
}
else if (new Date(value) > new Date(formData.expire)) {
callback(new Error('计划回款日期不能超过合同有效期'))
} else {
callback()
}
}
//
const formData = reactive({
id: '',
@ -267,7 +289,8 @@ const tableConfig = reactive(
{
label: "计划回款日期",
value: 'return_date',
date: true
date: true,
check: ['returned_money', chekcDate1],
},
{
@ -358,6 +381,7 @@ const popupTitle = computed(() => {
//
const formRules = reactive<any>({

View File

@ -91,7 +91,7 @@
<el-descriptions-item label="签证报价表" label-align="left" align="left" label-class-name="my-label">
<div v-if="formData.negotiation_quotation.length > 0">
<!-- <div v-if="formData.negotiation_quotation.length > 0">
<div v-for="(item, index) in formData.negotiation_quotation"
style="margin-left: 5px;display: block;">
<el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
@ -101,10 +101,11 @@
</div>
<div v-else>
暂无附件
</div>
</div> -->
<AnnexLink :annex="formData.negotiation_quotation"></AnnexLink>
</el-descriptions-item>
<el-descriptions-item label="洽商依据" label-align="left" align="left" label-class-name="my-label">
<div v-if="formData.negotiation_basis.length > 0">
<!-- <div v-if="formData.negotiation_basis.length > 0">
<div v-for="(item, index) in formData.negotiation_basis"
style="margin-left: 5px;display: block;">
<el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
@ -114,7 +115,9 @@
</div>
<div v-else>
暂无附件
</div>
</div> -->
<AnnexLink :annex="formData.negotiation_basis"></AnnexLink>
</el-descriptions-item>
</el-descriptions>
</el-card>

View File

@ -54,7 +54,7 @@
<el-table-column label="业务负责人" prop="business_director" :render-header="pager.calcWidth" />
<el-table-column label="利润" prop="profit" show-overflow-tooltip />
<el-table-column label="利润率" prop="profit_rate" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="操作" width="170" fixed="right">
<template #default="{ row }">
<el-button v-perms="['contract.contract_negotiation/edit']" type="primary" link
@click="handleEdit(row)">

View File

@ -80,7 +80,7 @@
<div class="mt-4">
<el-table border :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="合同编号" prop="contract_num" show-overflow-tooltip />
<el-table-column label="合同编号" prop="contract_num" show-overflow-tooltip width="200" />
<el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
<el-table-column label="甲方签约单位" prop="part_a" show-overflow-tooltip />
<el-table-column label="乙方签约单位" prop="part_b" show-overflow-tooltip />

View File

@ -1,7 +1,7 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form ref="formRef" :model="formData" label-width="130px" :rules="formRules">
<el-form-item label="项目名称" prop="project_id" @click="showDialog = true"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-input v-model="project_name" clearable placeholder="请选择项目" :disabled="project" />

View File

@ -65,7 +65,7 @@
</el-table>
</template>
</el-table-column>
<el-table-column label="提成比例" prop="tc_rate" show-overflow-tooltip>
<el-table-column label="提成比例%" prop="tc_rate" show-overflow-tooltip>
<template #default="{ row }">
<el-table :data="row.children" :show-header="false">
<el-table-column prop="tc_rate" show-overflow-tooltip />

View File

@ -42,7 +42,7 @@
<el-descriptions-item label="不含税金额" label-align="left" align="left" label-class-name="my-label">
{{ formData.amount_excluding_tax }}
</el-descriptions-item>
<el-descriptions-item label="质保金比例()" label-align="left" align="left"
<el-descriptions-item label="质保金比例%()" label-align="left" align="left"
label-class-name="my-label">
{{ formData.retention_money_rate }}
</el-descriptions-item>

View File

@ -75,8 +75,8 @@
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
<el-input v-model="amount_daxie" clearable disabled placeholder="请输入金额大写" />
</el-form-item> </el-col> <el-col :span="8">
<el-form-item label="质保金比例" prop="retention_money_rate">
<el-input v-model="formData.retention_money_rate" clearable placeholder="请输入质保金比例" />
<el-form-item label="质保金比例%" prop="retention_money_rate">
<el-input v-model="formData.retention_money_rate" clearable placeholder="请输入质保金比例%" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="质保金" prop="project_id"
@ -174,7 +174,7 @@
<el-table-column label="含税金额" prop="amount_including_tax">
<template #default="{ row }">
<el-input v-model="row.amount_including_tax" prop="num" disabled />
<el-input v-model="row.amount_including_tax" prop="num" disabled type="number" />
</template>
</el-table-column>

View File

@ -34,7 +34,7 @@
<div class="mt-4">
<el-table border :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" show-overflow-tooltip />
<el-table-column label="序号" type="index" width="155" show-overflow-tooltip />
<el-table-column label="供应商名称" prop="supplier_name" :render-header="pager.calcWidth" />
<el-table-column label="项目名称" prop="project_name" :render-header="pager.calcWidth" />
<el-table-column label="合同名称" prop="contract_name" :render-header="pager.calcWidth" />

View File

@ -10,19 +10,19 @@ const detailConfig = {
value: "project_code"
},
{
label: "材料预算花费比例",
label: "材料预算花费比例%",
value: "material_budget_expenditure_ratio"
},
{
label: "人工预算花费比例",
label: "人工预算花费比例%",
value: "labour_budget_expenditure_ratio"
},
{
label: "费用预算花费比例",
label: "费用预算花费比例%",
value: "cost_budget_expenditure_ratio"
},
{
label: "分包预算花费比例",
label: "分包预算花费比例%",
value: "subcontract_budget_expenditure_ratio"
},

View File

@ -4,7 +4,8 @@
<el-form ref="formRef" :model="formData" label-width="160px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="项目" prop="project_id" @click="showDialog = true" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-form-item label="项目" prop="project_id" @click="showDialog = true"
:rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
<el-input v-model="project_name" readonly clearable placeholder="请选择项目" />
</el-form-item> </el-col>
<el-col :span="8">
@ -12,22 +13,26 @@
<el-input v-model="project_code" readonly clearable placeholder="请选择项目" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="材料预算花费比例" prop="material_budget_expenditure_ratio">
<el-input v-model="formData.material_budget_expenditure_ratio" clearable placeholder="请输入材料预算花费比例" />
<el-form-item label="材料预算花费比例(%" prop="material_budget_expenditure_ratio">
<el-input v-model="formData.material_budget_expenditure_ratio" clearable
placeholder="请输入材料预算花费比例(%" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="人工预算花费比例" prop="labour_budget_expenditure_ratio">
<el-input v-model="formData.labour_budget_expenditure_ratio" clearable placeholder="请输入人工预算花费比例" />
<el-form-item label="人工预算花费比例(%" prop="labour_budget_expenditure_ratio">
<el-input v-model="formData.labour_budget_expenditure_ratio" clearable
placeholder="请输入人工预算花费比例(%" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="费用预算花费比例" prop="cost_budget_expenditure_ratio">
<el-input v-model="formData.cost_budget_expenditure_ratio" clearable placeholder="请输入费用预算花费比例" />
<el-form-item label="费用预算花费比例(%" prop="cost_budget_expenditure_ratio">
<el-input v-model="formData.cost_budget_expenditure_ratio" clearable
placeholder="请输入费用预算花费比例(%" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="分包预算花费比例" prop="subcontract_budget_expenditure_ratio">
<el-input v-model="formData.subcontract_budget_expenditure_ratio" clearable placeholder="请输入分包预算花费比例" />
<el-form-item label="分包预算花费比例(%" prop="subcontract_budget_expenditure_ratio">
<el-input v-model="formData.subcontract_budget_expenditure_ratio" clearable
placeholder="请输入分包预算花费比例(%" />
</el-form-item> </el-col>
</el-row>

View File

@ -34,12 +34,13 @@
<el-table-column label="项目编码" prop="project_code" show-overflow-tooltip />
<el-table-column label="材料预算花费比例()" prop="material_budget_expenditure_ratio" show-overflow-tooltip />
<el-table-column label="材料预算花费比例(%()" prop="material_budget_expenditure_ratio"
show-overflow-tooltip />
<el-table-column label="人工预算花费比例()" prop="labour_budget_expenditure_ratio" show-overflow-tooltip />
<el-table-column label="人工预算花费比例%()" prop="labour_budget_expenditure_ratio" show-overflow-tooltip />
<el-table-column label="费用预算花费比例()" prop="cost_budget_expenditure_ratio" show-overflow-tooltip />
<el-table-column label="分包预算花费比例()" prop="subcontract_budget_expenditure_ratio"
<el-table-column label="费用预算花费比例%()" prop="cost_budget_expenditure_ratio" show-overflow-tooltip />
<el-table-column label="分包预算花费比例%()" prop="subcontract_budget_expenditure_ratio"
show-overflow-tooltip />
<el-table-column label="操作" width="170" fixed="right">

View File

@ -31,7 +31,7 @@ const detailConfig = {
},
{
label: "提成比例",
label: "提成比例%",
value: "rate"
},
{
@ -91,7 +91,7 @@ const detailConfig = {
value: 'other_fee',
},
{
label: "提成比例",
label: "提成比例%",
value: 'tc_rate',
},
{

View File

@ -48,8 +48,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="提成比例(%" prop="rate">
<el-input v-model="formData.rate" clearable placeholder="请输入提成比例(%" />
<el-form-item label="提成比例(%%" prop="rate">
<el-input v-model="formData.rate" clearable placeholder="请输入提成比例(%%" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -160,7 +160,7 @@
<el-input v-model="scope.row.other_fee" type="number" @blur="calcMoney" />
</template>
</el-table-column>
<el-table-column label="提成比例(%)" prop="tc_rate" width="200px">
<el-table-column label="提成比例%(%)" prop="tc_rate" width="200px">
<template #default="scope">
<el-input v-model="scope.row.tc_rate" type="number" @blur="calcMoney" />

View File

@ -53,7 +53,7 @@
</el-table-column>
<el-table-column label="造价金额" prop="zj_amount" show-overflow-tooltip />
<el-table-column label="收款金额" prop="sk_amount" show-overflow-tooltip />
<el-table-column label="提成比例(%" prop="tc_rate" show-overflow-tooltip />
<el-table-column label="提成比例(%%" prop="tc_rate" show-overflow-tooltip />
<el-table-column label="应提成金额" prop="tc_amount" show-overflow-tooltip />
<el-table-column label="本次支付金额" prop="pay_amount" show-overflow-tooltip />
</el-table>
@ -68,7 +68,7 @@
<el-table-column label="关联合同" prop="contract_name" show-overflow-tooltip />
<el-table-column label="行业" prop="industry_nature" show-overflow-tooltip />
<el-table-column label="项目回款总额" prop="total_refund_amount" show-overflow-tooltip />
<el-table-column label="提成比例(%" prop="rate" show-overflow-tooltip />
<el-table-column label="提成比例(%%" prop="rate" show-overflow-tooltip />
<el-table-column label="应提成总金额" prop="total_commission_amount" show-overflow-tooltip />
<el-table-column label="已支付总额" prop="total_pay_amount" show-overflow-tooltip />
<el-table-column label="本次支付总额" prop="bczfze" show-overflow-tooltip />

View File

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form-item label="工程师" prop="engineer">
<el-input v-model="formData.engineer" clearable placeholder="请输入工程师" @click="userclick" />
@ -28,8 +27,8 @@
<el-form-item label="收款金额" prop="sk_amount">
<el-input v-model="formData.sk_amount" clearable placeholder="请输入收款金额" type="number" />
</el-form-item>
<el-form-item label="提成比例(%" prop="tc_rate">
<el-input v-model="formData.tc_rate" clearable placeholder="请输入提成比例(%" type="number" />
<el-form-item label="提成比例(%%" prop="tc_rate">
<el-input v-model="formData.tc_rate" clearable placeholder="请输入提成比例(%%" type="number" />
</el-form-item>
<el-form-item label="应提成金额" prop="tc_amount">
<el-input v-model="formData.tc_amount" clearable placeholder="请输入应提成金额" type="number" />

View File

@ -43,7 +43,7 @@
</el-table-column>
<el-table-column label="造价金额" prop="zj_amount" show-overflow-tooltip />
<el-table-column label="收款金额" prop="sk_amount" show-overflow-tooltip />
<el-table-column label="提成比例(%" prop="tc_rate" show-overflow-tooltip />
<el-table-column label="提成比例(%%" prop="tc_rate" show-overflow-tooltip />
<el-table-column label="应提成金额" prop="tc_amount" show-overflow-tooltip />
<el-table-column label="本次支付金额" prop="pay_amount" show-overflow-tooltip />

View File

@ -95,7 +95,7 @@ const contractList = reactive([
{ name: '已开票', value: 0 },
{ name: '已回款', value: 0 },
{ name: '未回款', value: 0 },
{ name: '回款比例', value: 0 },
{ name: '回款比例%', value: 0 },
],
[
{ name: '分包合同金额', value: 0 },
@ -104,14 +104,14 @@ const contractList = reactive([
{ name: '已收票', value: 0 },
{ name: '已付款', value: 0 },
{ name: '未付款', value: 0 },
{ name: '付款比例', value: 0 },
{ name: '付款比例%', value: 0 },
],
[
{ name: '材料合同金额', value: 0 },
{ name: '已收票', value: 0 },
{ name: '已付款', value: 0 },
{ name: '未付款', value: 0 },
{ name: '付款比例', value: 0 },
{ name: '付款比例%', value: 0 },
],
])

View File

@ -58,7 +58,7 @@ const detailConfig = {
},
{
label: "合同付款比例",
label: "合同付款比例%",
value: 'dcntract_payment_rate',
},
{
@ -110,7 +110,7 @@ const detailConfig = {
value: 'deduction_amount',
},
{
label: "完成产值比例(%)",
label: "完成产值比例%(%)",
value: 'completed_rate',
},
{
@ -122,7 +122,7 @@ const detailConfig = {
value: 'current_payable_funds',
},
{
label: "付款比例",
label: "付款比例%",
value: 'payment_rate',
},
{

View File

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -90,7 +89,7 @@
<el-input v-model="row.contract_total_amount" type="number" />
</template>
</el-table-column>
<el-table-column label="合同付款比例(%)" prop="dcntract_payment_rate" width="200px">
<el-table-column label="合同付款比例%(%)" prop="dcntract_payment_rate" width="200px">
<template #default="{ row }">
<el-input v-model="row.dcntract_payment_rate" type="number" />
@ -164,7 +163,7 @@
<el-input v-model="row.deduction_amount" type="number" placeholder="系统自动计算" disabled />
</template>
</el-table-column>
<el-table-column label="完成产值比例(%)" prop="completed_rate" width="200px">
<el-table-column label="完成产值比例%(%)" prop="completed_rate" width="200px">
<template #default="{ row }">
<el-input v-model="row.completed_rate" type="number" />
@ -183,7 +182,7 @@
</template>
</el-table-column>
<el-table-column label="付款比例(%)" prop="payment_rate" width="200px">
<el-table-column label="付款比例%(%)" prop="payment_rate" width="200px">
<template #default="{ row }">
<el-input v-model="row.payment_rate" type="number" placeholder="系统自动计算" disabled />

View File

@ -5,8 +5,8 @@
<el-form-item label="所属项目" prop="cost_project_id">
<el-select v-model="queryParams.project_id" remote filterable :remote-method="queryCostProject"
:loading="loading" class="flex-1">
<el-option v-for="(item, index) in optionsData.projectList" :key="index"
:label="item.projectinfo" :value="item.id" />
<el-option v-for="(item, index) in optionsData.projectList" :key="index" :label="item.projectinfo"
:value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="单据编号" prop="num">
@ -48,22 +48,20 @@
<el-table-column label="形象进度" prop="image_progress" show-overflow-tooltip />
<el-table-column label="申报造价(土建)" prop="declared_cost_tj" show-overflow-tooltip />
<el-table-column label="申报造价(安装)" prop="declared_cost_az" show-overflow-tooltip />
<el-table-column label="申报造价(其他)" prop="declared_cost_other"
show-overflow-tooltip />
<el-table-column label="申报造价(其他)" prop="declared_cost_other" show-overflow-tooltip />
<el-table-column label="进度申报造价小计" prop="jdsbzj_xiaoji" show-overflow-tooltip />
<el-table-column label="审核造价(土建)" prop="audit_cost_tj" show-overflow-tooltip />
<el-table-column label="审核造价(安装)" prop="audit_cost_az" show-overflow-tooltip />
<el-table-column label="审核造价(其他)" prop="audit_cost_other" show-overflow-tooltip />
<el-table-column label="进度审核造价小计" prop="jdshzj_xiaoji" show-overflow-tooltip />
<el-table-column label="审减额(元)" prop="deduction_amount" show-overflow-tooltip />
<el-table-column label="完成产值比例(%)" prop="completed_rate" show-overflow-tooltip />
<el-table-column label="合同工程款总额" prop="contract_total_amount"
show-overflow-tooltip />
<el-table-column label="完成产值比例(%(%)" prop="completed_rate" show-overflow-tooltip />
<el-table-column label="合同工程款总额" prop="contract_total_amount" show-overflow-tooltip />
<el-table-column label="累计完成工程款" prop="ljwc_funds" show-overflow-tooltip />
<el-table-column label="当期应付工程款(元)" prop="current_payable_funds"
show-overflow-tooltip />
<el-table-column label="付款比例(%)" prop="payment_rate" show-overflow-tooltip />
<el-table-column label="合同付款比例(%)" prop="dcntract_payment_rate"
<el-table-column label="付款比例%(%)" prop="payment_rate" show-overflow-tooltip />
<el-table-column label="合同付款比例%(%)" prop="dcntract_payment_rate"
show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
</el-table>
@ -79,8 +77,8 @@
<el-table-column label="累计应付工程款合计" prop="ljhj" show-overflow-tooltip />
<el-table-column label="操作" fixed="right" align='center'>
<template #default="{ row }">
<el-button v-perms="['project_process_management.project_progress_payment/edit']"
type="primary" link @click="handleEdit(row)">
<el-button v-perms="['project_process_management.project_progress_payment/edit']" type="primary"
link @click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['project_process_management.project_progress_payment/delete']"

View File

@ -1,7 +1,6 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
@close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="140px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -35,8 +34,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同付款比例(%)" prop="dcntract_payment_rate">
<el-input v-model="formData.dcntract_payment_rate" clearable placeholder="请输入合同付款比例(%)"
<el-form-item label="合同付款比例%(%)" prop="dcntract_payment_rate">
<el-input v-model="formData.dcntract_payment_rate" clearable placeholder="请输入合同付款比例%(%)"
type="number" />
</el-form-item>
</el-col>
@ -66,14 +65,12 @@
<el-row>
<el-col :span="8">
<el-form-item label="审核造价(土建)" prop="audit_cost_tj">
<el-input v-model="formData.audit_cost_tj" clearable placeholder="请输入审核造价(土建)"
type="number" />
<el-input v-model="formData.audit_cost_tj" clearable placeholder="请输入审核造价(土建)" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审核造价(安装)" prop="audit_cost_az">
<el-input v-model="formData.audit_cost_az" clearable placeholder="请输入审核造价(安装)"
type="number" />
<el-input v-model="formData.audit_cost_az" clearable placeholder="请输入审核造价(安装)" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -87,8 +84,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="进度审核造价小计" prop="jdshzj_xiaoji">
<el-input v-model="formData.jdshzj_xiaoji" clearable placeholder="请输入进度审核造价小计"
type="number" />
<el-input v-model="formData.jdshzj_xiaoji" clearable placeholder="请输入进度审核造价小计" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -98,8 +94,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="完成产值比例(%)" prop="completed_rate">
<el-input v-model="formData.completed_rate" clearable placeholder="请输入完成产值比例(%)"
<el-form-item label="完成产值比例%(%)" prop="completed_rate">
<el-input v-model="formData.completed_rate" clearable placeholder="请输入完成产值比例%(%)"
type="number" />
</el-form-item>
</el-col>
@ -114,13 +110,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="累计完成工程款" prop="ljwc_funds">
<el-input v-model="formData.ljwc_funds" clearable placeholder="系统自动计算" disabled
type="number" />
<el-input v-model="formData.ljwc_funds" clearable placeholder="系统自动计算" disabled type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="付款比例(%)" prop="payment_rate">
<el-form-item label="付款比例%(%)" prop="payment_rate">
<el-input v-model="formData.payment_rate" clearable placeholder="系统自动计算" disabled
type="number" />
</el-form-item>

View File

@ -43,12 +43,12 @@
<el-table-column label="审核造价(其他)" prop="audit_cost_other" show-overflow-tooltip />
<el-table-column label="进度审核造价小计" prop="jdshzj_xiaoji" show-overflow-tooltip />
<el-table-column label="审减额(元)" prop="deduction_amount" show-overflow-tooltip />
<el-table-column label="完成产值比例(%)" prop="completed_rate" show-overflow-tooltip />
<el-table-column label="完成产值比例%(%)" prop="completed_rate" show-overflow-tooltip />
<el-table-column label="合同工程款总额" prop="contract_total_amount" show-overflow-tooltip />
<el-table-column label="累计完成工程款" prop="ljwc_funds" show-overflow-tooltip />
<el-table-column label="当期应付工程款(元)" prop="current_payable_funds" show-overflow-tooltip />
<el-table-column label="付款比例(%)" prop="payment_rate" show-overflow-tooltip />
<el-table-column label="合同付款比例(%)" prop="dcntract_payment_rate" show-overflow-tooltip />
<el-table-column label="付款比例%(%)" prop="payment_rate" show-overflow-tooltip />
<el-table-column label="合同付款比例%(%)" prop="dcntract_payment_rate" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">

View File

@ -43,7 +43,7 @@
<el-descriptions-item label="不含税金额" label-align="left" align="left" label-class-name="my-label">
{{ formData.amount_excluding_tax }}
</el-descriptions-item>
<el-descriptions-item label="质保金比例()" label-align="left" align="left"
<el-descriptions-item label="质保金比例%()" label-align="left" align="left"
label-class-name="my-label">
{{ formData.retention_money_rate }}
</el-descriptions-item>

View File

@ -100,8 +100,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="质保金比例" prop="retention_money_rate">
<el-input v-model="formData.retention_money_rate" clearable placeholder="请输入质保金比例" />
<el-form-item label="质保金比例%" prop="retention_money_rate">
<el-input v-model="formData.retention_money_rate" clearable placeholder="请输入质保金比例%" />
</el-form-item>
</el-col>
<el-col :span="8">

View File

@ -1,67 +1,66 @@
<template>
<div>
<el-card>
<div>
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px"
label-position="left">
<el-row :gutter="10">
<el-card>
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px" label-position="left">
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="项目名称" prop="field101">
<el-input v-model="formData.field101" placeholder="点击选择项目" :disabled='true' clearable
:style="{width: '100%'}"></el-input>
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目编码" prop="field102">
<el-input v-model="formData.field102" placeholder="系统自动填写" :disabled='true' clearable
:style="{width: '100%'}"></el-input>
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同编号" prop="field103">
<el-input v-model="formData.field103" placeholder="系统自动编号" :disabled='true' clearable
:style="{width: '100%'}"></el-input>
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同名称" prop="field104">
<el-input v-model="formData.field104" placeholder="请输入合同名称" clearable :style="{width: '100%'}">
<el-input v-model="formData.field104" placeholder="请输入合同名称" clearable :style="{ width: '100%' }">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商名称" prop="field105">
<el-input v-model="formData.field105" placeholder="点击选择目项供应商" :disabled='true' clearable
:style="{width: '100%'}"></el-input>
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商编码" prop="field106">
<el-input v-model="formData.field106" placeholder="系统自动填写" :disabled='true' clearable
:style="{width: '100%'}"></el-input>
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同类型" prop="field107">
<el-radio-group v-model="formData.field107" size="medium">
<el-radio v-for="(item, index) in field107Options" :key="index" :label="item.value"
:disabled="item.disabled">{{item.label}}</el-radio>
:disabled="item.disabled">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="签订日期" prop="field108">
<el-date-picker v-model="formData.field108" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:style="{width: '100%'}" placeholder="请选择签订日期" clearable></el-date-picker>
:style="{ width: '100%' }" placeholder="请选择签订日期" clearable></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="付款方式" prop="field109">
<el-radio-group v-model="formData.field109" size="medium">
<el-radio v-for="(item, index) in field109Options" :key="index" :label="item.value"
:disabled="item.disabled">{{item.label}}</el-radio>
:disabled="item.disabled">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -69,52 +68,52 @@
<el-form-item label="账期" prop="field110">
<el-radio-group v-model="formData.field110" size="medium">
<el-radio v-for="(item, index) in field110Options" :key="index" :label="item.value"
:disabled="item.disabled">{{item.label}}</el-radio>
:disabled="item.disabled">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同金额" prop="field111">
<el-input v-model="formData.field111" placeholder="系统自动计算" :disabled='true' clearable
:style="{width: '100%'}"></el-input>
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="金额大写" prop="field112">
<el-input v-model="formData.field112" placeholder="系统自动填写" :disabled='true' clearable
:style="{width: '100%'}"></el-input>
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="税率" prop="field113">
<el-select v-model="formData.field113" placeholder="请选择税率" clearable :style="{width: '100%'}">
<el-option v-for="(item, index) in field113Options" :key="index" :label="item.label"
:value="item.value" :disabled="item.disabled"></el-option>
<el-select v-model="formData.field113" placeholder="请选择税率" clearable :style="{ width: '100%' }">
<el-option v-for="(item, index) in field113Options" :key="index" :label="item.label" :value="item.value"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="不含税金额" prop="field114">
<el-input v-model="formData.field114" placeholder="系统自动计算不" :disabled='true' clearable
:style="{width: '100%'}"></el-input>
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="质保金比例(%)" prop="field116">
<el-input v-model="formData.field116" placeholder="请输入质保金比例(%)" clearable
:style="{width: '100%'}"></el-input>
<el-form-item label="质保金比例%(%)" prop="field116">
<el-input v-model="formData.field116" placeholder="请输入质保金比例%(%)" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="质保金" prop="field117">
<el-input v-model="formData.field117" placeholder="系统自动计算" :disabled='true' clearable
:style="{width: '100%'}"></el-input>
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="field118">
<el-input v-model="formData.field118" type="textarea" placeholder="请输入备注"
:autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>
:autosize="{ minRows: 4, maxRows: 4 }" :style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
@ -131,17 +130,17 @@
<el-button @click="resetForm">重置</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-row>
</el-form>
</el-card>
</div>
</template>
<script>
</div>
</template>
<script>
export default {
components: {},
props: [],
@ -228,7 +227,7 @@
field114: [],
field116: [{
required: true,
message: '请输入质保金比例(%)',
message: '请输入质保金比例%(%)',
trigger: 'blur'
}],
field117: [{
@ -303,10 +302,9 @@
}
</script>
<style>
.el-upload__tip {
line-height: 1.2;
}
</style>
<style>
.el-upload__tip {
line-height: 1.2;
}
</style>

View File

@ -19,7 +19,7 @@ export default defineConfig({
base: "/admin/",
server: {
host: "0.0.0.0",
port: 8888,
port: 9000,
open: true,
},
plugins: [