From eb89c4587a585959ec5511ae8e9bb44e29c2a1cd Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Wed, 20 Mar 2024 16:04:17 +0800 Subject: [PATCH] add --- src/components/biddingDecision/index.vue | 2 +- .../dialogTable/dialogTableConfig.ts | 8 ++-- src/components/project/index.vue | 4 +- src/views/bid_bidding_decision/detail.vue | 45 +++++++++---------- .../consult_new_start_project/detail.vue | 2 +- src/views/consult_new_start_project/edit.vue | 6 +-- src/views/consult_new_start_project/index.vue | 2 +- src/views/consult_project/detail.js | 2 +- src/views/consult_project/edit.vue | 6 +-- src/views/consult_project/index.vue | 2 +- src/views/cost_projects/edit.vue | 10 ++--- src/views/cost_projects/index.vue | 8 ++-- src/views/custom/detail.vue | 2 +- src/views/customer_demand/detail.vue | 2 +- src/views/manage_metered_payment/detail.js | 4 +- src/views/manage_metered_payment/edit.vue | 12 ++--- src/views/manage_metered_payment/index.vue | 8 ++-- src/views/manage_project/detail.js | 2 +- src/views/manage_project/edit.vue | 6 +-- src/views/manage_project/index.vue | 2 +- src/views/project/components/Business.vue | 4 +- src/views/project/components/Overview.vue | 15 ++++--- src/views/project/components/manpower.vue | 2 +- src/views/project/components/tender.vue | 4 +- src/views/project_estimate/detail.vue | 14 +++--- .../project_insurance_management/detail.vue | 2 +- .../project_insurance_management/edit.vue | 4 +- .../project_insurance_management/index.vue | 2 +- .../project_list/components/Overview.vue | 20 +++++---- .../project_list/components/manpower.vue | 5 ++- src/views/project_list/components/tender.vue | 4 +- src/views/project_personnel/detail.vue | 2 +- .../partsettlement/detail.vue | 2 +- .../projectclosure/detail.vue | 2 +- src/views/supervision_project/detail.js | 2 +- src/views/supervision_project/edit.vue | 6 +-- src/views/supervision_project/index.vue | 2 +- .../edit.vue | 24 +++++----- .../index.vue | 8 ++-- 39 files changed, 131 insertions(+), 128 deletions(-) diff --git a/src/components/biddingDecision/index.vue b/src/components/biddingDecision/index.vue index 062b76f..f740781 100644 --- a/src/components/biddingDecision/index.vue +++ b/src/components/biddingDecision/index.vue @@ -16,7 +16,7 @@ <el-table :data="pager.lists" @cell-click="handleCurrentChange"> <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip /> <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip /> - <el-table-column label="项目估算(万元)" prop="project_estimation" show-overflow-tooltip /> + <el-table-column label="项目估算(元)" prop="project_estimation" show-overflow-tooltip /> <el-table-column label="招标项目资金来源" prop="bidding_project_fund_source" show-overflow-tooltip /> <el-table-column label="投标时间" prop="bidding_time" show-overflow-tooltip /> <!-- <el-table-column label="购买标书时间" prop="buy_bid_document_date" show-overflow-tooltip /> --> diff --git a/src/components/dialogTable/dialogTableConfig.ts b/src/components/dialogTable/dialogTableConfig.ts index ff6836f..2e25ec8 100644 --- a/src/components/dialogTable/dialogTableConfig.ts +++ b/src/components/dialogTable/dialogTableConfig.ts @@ -329,10 +329,10 @@ export const cost_project:Iconfig = { { endtime: "计划结束日期" }, { jhgq: "计划工期(天)" }, { person_text: "项目相关人员" }, - { invest: "项目总投资(万元)" }, - { budget: "预算造价(万元)" }, - { cost: "送审造价(万元)" }, - { approval: "审定造价(万元)" }, + { invest: "项目总投资(元)" }, + { budget: "预算造价(元)" }, + { cost: "送审造价(元)" }, + { approval: "审定造价(元)" }, { aunit: "委托单位" }, { acontactnum: "联系电话" }, { date: "登记日期" }, diff --git a/src/components/project/index.vue b/src/components/project/index.vue index cfccc35..cdd03b4 100644 --- a/src/components/project/index.vue +++ b/src/components/project/index.vue @@ -26,7 +26,7 @@ <el-table-column label="招标方式" prop="bidding_method" show-overflow-tooltip /> <el-table-column label="投标时间" property="bidding_time" /> <el-table-column label="预计工期" property="estimated_construction" /> - <el-table-column label="项目估算(万元)" property="project_estimation" /> + <el-table-column label="项目估算(元)" property="project_estimation" /> <!-- <el-table-column label="项目估算(外币)" property="master_phone" /> --> <el-table-column label="联系人" property="contacts" /> <el-table-column label="联系电话" property="telephone" /> @@ -47,7 +47,7 @@ </el-card> </div> </template> - + <script lang="ts" setup> import { usePaging } from "@/hooks/usePaging" import { useDictData } from "@/hooks/useDictOptions" diff --git a/src/views/bid_bidding_decision/detail.vue b/src/views/bid_bidding_decision/detail.vue index 75bb5a6..84df6ec 100644 --- a/src/views/bid_bidding_decision/detail.vue +++ b/src/views/bid_bidding_decision/detail.vue @@ -1,56 +1,55 @@ - - - <template> <div class="detail-popup"> <popup ref="popupRef" title="投标决策详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose"> <el-card> <el-descriptions :column="3" border> <el-descriptions-item label="流程编号" label-align="left" align="left" label-class-name="my-label">{{ - formData.code }}</el-descriptions-item> + formData.code }}</el-descriptions-item> <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ - formData.project_name }}</el-descriptions-item> + formData.project_name }}</el-descriptions-item> <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label">{{ - formData.project_code }}</el-descriptions-item> + formData.project_code }}</el-descriptions-item> <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ - formData.custom_name }}</el-descriptions-item> - <el-descriptions-item label="项目估算(万元)" label-align="left" align="left" label-class-name="my-label">{{ - formData.project_estimation }}</el-descriptions-item> + formData.custom_name }}</el-descriptions-item> + <el-descriptions-item label="项目估算(元)" label-align="left" align="left" label-class-name="my-label">{{ + formData.project_estimation }}</el-descriptions-item> - <el-descriptions-item label="招标项目资金来源" label-align="left" align="left" label-class-name="my-label">{{ - formData.bidding_project_fund_source }}</el-descriptions-item> + <el-descriptions-item label="招标项目资金来源" label-align="left" align="left" + label-class-name="my-label">{{ + formData.bidding_project_fund_source_text }}</el-descriptions-item> <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label">{{ - formData.bidding_time }}</el-descriptions-item> + formData.bidding_time }}</el-descriptions-item> <el-descriptions-item label="招标方式" label-align="left" align="left" label-class-name="my-label">{{ - formData.bid_type }}</el-descriptions-item> + formData.bid_type_text }}</el-descriptions-item> <el-descriptions-item label="竞争对手" label-align="left" align="left" label-class-name="my-label">{{ - formData.competitor }}</el-descriptions-item> + formData.competitor }}</el-descriptions-item> <el-descriptions-item label="是否需要保证金" label-align="left" align="left" label-class-name="my-label">{{ - formData.is_margin }}</el-descriptions-item> - <el-descriptions-item label="保证金金额(元)" label-align="left" align="left" label-class-name="my-label">{{ - formData.margin_amount }}</el-descriptions-item> + formData.is_margin_text }}</el-descriptions-item> + <el-descriptions-item label="保证金金额(元)" label-align="left" align="left" + label-class-name="my-label">{{ + formData.margin_amount }}</el-descriptions-item> <el-descriptions-item label="开标日期" label-align="left" align="left" label-class-name="my-label">{{ - formData.bid_opening_date }}</el-descriptions-item> + formData.bid_opening_date }}</el-descriptions-item> <el-descriptions-item label="保证金退还时间" label-align="left" align="left" label-class-name="my-label">{{ - formData.margin_amount_return_date }}</el-descriptions-item> + formData.margin_amount_return_date }}</el-descriptions-item> <el-descriptions-item label="有无内部资源" label-align="left" align="left" label-class-name="my-label">{{ - formData.is_internal_resources }}</el-descriptions-item> + formData.is_internal_resources_text }}</el-descriptions-item> <el-descriptions-item label="项目把握度" label-align="left" align="left" label-class-name="my-label">{{ - formData.project_assurance }}</el-descriptions-item> + formData.project_assurance_text }}</el-descriptions-item> <el-descriptions-item label="招标项目概况" label-align="left" align="left" label-class-name="my-label">{{ - formData.bid_project_overview }}</el-descriptions-item> + formData.bid_project_overview }}</el-descriptions-item> <el-descriptions-item label="项目简介" label-align="left" align="left" label-class-name="my-label">{{ - formData.project_desc }}</el-descriptions-item> + formData.project_desc }}</el-descriptions-item> <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label"> <div v-if="formDataannex.length > 0"> diff --git a/src/views/consult_new_start_project/detail.vue b/src/views/consult_new_start_project/detail.vue index 1c223af..c6b3685 100644 --- a/src/views/consult_new_start_project/detail.vue +++ b/src/views/consult_new_start_project/detail.vue @@ -15,7 +15,7 @@ <el-descriptions-item label="建筑面积" label-align="left" align="left"> {{ formData.area }} </el-descriptions-item> - <el-descriptions-item label="投资(万元)" label-align="left" align="left"> + <el-descriptions-item label="投资(元)" label-align="left" align="left"> {{ formData.invest }} </el-descriptions-item> <el-descriptions-item label="基础类型" label-align="left" align="left"> diff --git a/src/views/consult_new_start_project/edit.vue b/src/views/consult_new_start_project/edit.vue index 29361ee..ab5188f 100644 --- a/src/views/consult_new_start_project/edit.vue +++ b/src/views/consult_new_start_project/edit.vue @@ -27,8 +27,8 @@ </el-form-item> </el-col> <el-col :span="8"> - <el-form-item label="投资(万元)" prop="invest"> - <el-input v-model="formData.invest" clearable placeholder="请输入投资(万元)" type="number" /> + <el-form-item label="投资(元)" prop="invest"> + <el-input v-model="formData.invest" clearable placeholder="请输入投资(元)" type="number" /> </el-form-item> </el-col> <el-col :span="8"> @@ -292,7 +292,7 @@ const formRules = reactive<any>({ }], invest: [{ required: true, - message: '请输入投资(万元)', + message: '请输入投资(元)', trigger: ['blur'] }], basic_type: [{ diff --git a/src/views/consult_new_start_project/index.vue b/src/views/consult_new_start_project/index.vue index 9b6cced..c494917 100644 --- a/src/views/consult_new_start_project/index.vue +++ b/src/views/consult_new_start_project/index.vue @@ -41,7 +41,7 @@ <el-table-column label="工程地点" prop="address" show-overflow-tooltip /> <el-table-column label="服务范围" prop="service_scope" show-overflow-tooltip /> <el-table-column label="建筑面积" prop="area" show-overflow-tooltip /> - <el-table-column label="投资(万元)" prop="invest" show-overflow-tooltip /> + <el-table-column label="投资(元)" prop="invest" show-overflow-tooltip /> <el-table-column label="基础类型" prop="basic_type" show-overflow-tooltip /> <el-table-column label="工期" prop="duration" show-overflow-tooltip /> <el-table-column label="操作" fixed="right" align="center"> diff --git a/src/views/consult_project/detail.js b/src/views/consult_project/detail.js index 4e706c5..96c3861 100644 --- a/src/views/consult_project/detail.js +++ b/src/views/consult_project/detail.js @@ -29,7 +29,7 @@ const detailConfig = { label: "项目级别", value: "project_level_text" }, { - label: "总投资(万元)", + label: "总投资(元)", value: "total_investment" }, { label: "立项日期", diff --git a/src/views/consult_project/edit.vue b/src/views/consult_project/edit.vue index 40f02bb..732ca13 100644 --- a/src/views/consult_project/edit.vue +++ b/src/views/consult_project/edit.vue @@ -57,8 +57,8 @@ </el-form-item> </el-col> <el-col :span="8"> - <el-form-item label="总投资(万元)" prop="total_investment"> - <el-input v-model="formData.total_investment" clearable placeholder="请输入总投资(万元)" + <el-form-item label="总投资(元)" prop="total_investment"> + <el-input v-model="formData.total_investment" clearable placeholder="请输入总投资(元)" type="number" /> </el-form-item> </el-col> @@ -315,7 +315,7 @@ const formRules = reactive<any>({ }], total_investment: [{ required: true, - message: '请输入总投资(万元)', + message: '请输入总投资(元)', trigger: ['blur'] }], initiation_date: [{ diff --git a/src/views/consult_project/index.vue b/src/views/consult_project/index.vue index 34ad219..0544f9a 100644 --- a/src/views/consult_project/index.vue +++ b/src/views/consult_project/index.vue @@ -37,7 +37,7 @@ <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip /> <el-table-column label="项目编号" prop="project_code" show-overflow-tooltip /> <el-table-column label="委托单位" prop="company" show-overflow-tooltip /> - <el-table-column label="总投资(万元)" prop="total_investment" show-overflow-tooltip /> + <el-table-column label="总投资(元)" prop="total_investment" show-overflow-tooltip /> <el-table-column label="关联合同" prop="contract" show-overflow-tooltip /> <el-table-column label="工程状态" prop="engineering_status_text" show-overflow-tooltip /> <el-table-column label="咨询类型" prop="consult_type_text" show-overflow-tooltip /> diff --git a/src/views/cost_projects/edit.vue b/src/views/cost_projects/edit.vue index 6aaa2bb..9cc43f7 100644 --- a/src/views/cost_projects/edit.vue +++ b/src/views/cost_projects/edit.vue @@ -125,25 +125,25 @@ <el-row> <el-col :span="8"> <el-form-item label="项目总投资" prop="invest"> - <el-input v-model="formData.invest" clearable placeholder="请输入项目总投资(万元)" type="number" + <el-input v-model="formData.invest" clearable placeholder="请输入项目总投资(元)" type="number" disabled /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="预算造价" prop="budget"> - <el-input v-model="formData.budget" clearable placeholder="请输入预算造价(万元)" type="number" /> + <el-input v-model="formData.budget" clearable placeholder="请输入预算造价(元)" type="number" /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="送审造价" prop="cost"> - <el-input v-model="formData.cost" clearable placeholder="请输入送审造价(万元)" type="number" /> + <el-input v-model="formData.cost" clearable placeholder="请输入送审造价(元)" type="number" /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="8"> <el-form-item label="审定造价" prop="approval"> - <el-input v-model="formData.approval" clearable placeholder="请输入审定造价(万元)" type="number" /> + <el-input v-model="formData.approval" clearable placeholder="请输入审定造价(元)" type="number" /> </el-form-item> </el-col> <el-col :span="8"> @@ -377,7 +377,7 @@ const formRules = reactive<any>({ invest: [ { required: true, - message: "请输入项目总投资(万元)", + message: "请输入项目总投资(元)", trigger: ["blur"], }, ], diff --git a/src/views/cost_projects/index.vue b/src/views/cost_projects/index.vue index 7305a16..168bce5 100644 --- a/src/views/cost_projects/index.vue +++ b/src/views/cost_projects/index.vue @@ -59,10 +59,10 @@ <el-table-column label="计划工期(天)" prop="jhgq" show-overflow-tooltip /> <el-table-column label="项目负责人" prop="contract.signing_person" show-overflow-tooltip /> <el-table-column label="项目相关人员" prop="person_text" show-overflow-tooltip /> - <el-table-column label="项目总投资(万元)" prop="invest" show-overflow-tooltip /> - <el-table-column label="预算造价(万元)" prop="budget" show-overflow-tooltip /> - <el-table-column label="送审造价(万元)" prop="cost" show-overflow-tooltip /> - <el-table-column label="审定造价(万元)" prop="approval" show-overflow-tooltip /> + <el-table-column label="项目总投资(元)" prop="invest" show-overflow-tooltip /> + <el-table-column label="预算造价(元)" prop="budget" show-overflow-tooltip /> + <el-table-column label="送审造价(元)" prop="cost" show-overflow-tooltip /> + <el-table-column label="审定造价(元)" prop="approval" show-overflow-tooltip /> <el-table-column label="委托单位" prop="aunit" show-overflow-tooltip /> <el-table-column label="委托方联系人" prop="Acontact" show-overflow-tooltip /> <el-table-column label="联系电话" prop="acontactnum" show-overflow-tooltip /> diff --git a/src/views/custom/detail.vue b/src/views/custom/detail.vue index 6090aa4..90c4a1d 100644 --- a/src/views/custom/detail.vue +++ b/src/views/custom/detail.vue @@ -118,7 +118,7 @@ <el-table :data="tableData1" stripe style="width: 100%"> <el-table-column label="项目编码" prop='project_code' width="180" /> <el-table-column label="项目名称" prop='name' width="180" /> - <el-table-column label="项目估算(万元)" prop='project_estimation' /> + <el-table-column label="项目估算(元)" prop='project_estimation' /> <el-table-column label="项目状态" prop='status' /> <el-table-column label="项目类型" prop='project_type' /> <el-table-column label="立项日期" prop='create_time' /> diff --git a/src/views/customer_demand/detail.vue b/src/views/customer_demand/detail.vue index 1818030..f4720b8 100644 --- a/src/views/customer_demand/detail.vue +++ b/src/views/customer_demand/detail.vue @@ -98,7 +98,7 @@ <el-table-column label="制单人" prop='create_user' width="180" /> <el-table-column label="报价日期" prop='quotation_date' /> <el-table-column label="技术人员" prop='technician_name' width="180" /> - <el-table-column label="概算金额(万元)" prop='estimate_amount' width="180" /> + <el-table-column label="概算金额(元)" prop='estimate_amount' width="180" /> <el-table-column label="要求" prop='ask' /> <el-table-column label="附件" prop="annex" show-overflow-tooltip> <template #default="{ row }"> diff --git a/src/views/manage_metered_payment/detail.js b/src/views/manage_metered_payment/detail.js index 2bb3cdc..fc1642a 100644 --- a/src/views/manage_metered_payment/detail.js +++ b/src/views/manage_metered_payment/detail.js @@ -10,11 +10,11 @@ const detailConfig = { value: "date" }, { - label: "本月完成(万元)", + label: "本月完成(元)", value: "month_amount" }, { - label: "本月支付(万元)", + label: "本月支付(元)", value: "month_pay" }, { diff --git a/src/views/manage_metered_payment/edit.vue b/src/views/manage_metered_payment/edit.vue index 6364115..0cc4dce 100644 --- a/src/views/manage_metered_payment/edit.vue +++ b/src/views/manage_metered_payment/edit.vue @@ -12,11 +12,11 @@ value-format="YYYY-MM" placeholder="请选择日期"> </el-date-picker> </el-form-item> - <el-form-item label="本月完成(万元)" prop="month_amount"> - <el-input v-model="formData.month_amount" clearable placeholder="请输入本月完成(万元)" type="number" /> + <el-form-item label="本月完成(元)" prop="month_amount"> + <el-input v-model="formData.month_amount" clearable placeholder="请输入本月完成(元)" type="number" /> </el-form-item> - <el-form-item label="本月支付(万元)" prop="month_pay"> - <el-input v-model="formData.month_pay" clearable placeholder="请输入本月支付(万元)" type="number" /> + <el-form-item label="本月支付(元)" prop="month_pay"> + <el-input v-model="formData.month_pay" clearable placeholder="请输入本月支付(元)" type="number" /> </el-form-item> <el-form-item label="备注" prop="remark"> <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" /> @@ -99,12 +99,12 @@ const formRules = reactive<any>({ }], month_amount: [{ required: true, - message: '请输入本月完成(万元)', + message: '请输入本月完成(元)', trigger: ['blur'] }], month_pay: [{ required: true, - message: '请输入本月支付(万元)', + message: '请输入本月支付(元)', trigger: ['blur'] }], remark: [{ diff --git a/src/views/manage_metered_payment/index.vue b/src/views/manage_metered_payment/index.vue index ac1c025..c042efe 100644 --- a/src/views/manage_metered_payment/index.vue +++ b/src/views/manage_metered_payment/index.vue @@ -30,10 +30,10 @@ <el-table-column type="selection" width="55" /> <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip /> <el-table-column label="年月" prop="date" show-overflow-tooltip /> - <el-table-column label="本月完成(万元)" prop="month_amount" show-overflow-tooltip /> - <el-table-column label="累计完成(万元)" prop="total_amount" show-overflow-tooltip /> - <el-table-column label="本月支付(万元)" prop="month_pay" show-overflow-tooltip /> - <el-table-column label="累计支付(万元)" prop="total_pay" show-overflow-tooltip /> + <el-table-column label="本月完成(元)" prop="month_amount" show-overflow-tooltip /> + <el-table-column label="累计完成(元)" prop="total_amount" show-overflow-tooltip /> + <el-table-column label="本月支付(元)" prop="month_pay" show-overflow-tooltip /> + <el-table-column label="累计支付(元)" prop="total_pay" show-overflow-tooltip /> <el-table-column label="填报人" prop="create_user" show-overflow-tooltip /> <el-table-column label="操作" align="center" fixed="right"> <template #default="{ row }"> diff --git a/src/views/manage_project/detail.js b/src/views/manage_project/detail.js index 04332cd..3ef4cff 100644 --- a/src/views/manage_project/detail.js +++ b/src/views/manage_project/detail.js @@ -30,7 +30,7 @@ const detailConfig = { value: "project_level_text" }, { - label: "总投资(万元)", + label: "总投资(元)", value: "total_investment" }, { diff --git a/src/views/manage_project/edit.vue b/src/views/manage_project/edit.vue index e814947..5dd1f5f 100644 --- a/src/views/manage_project/edit.vue +++ b/src/views/manage_project/edit.vue @@ -52,8 +52,8 @@ </el-form-item> </el-col> <el-col :span="8"> - <el-form-item label="总投资(万元)" prop="total_investment"> - <el-input v-model="formData.total_investment" clearable placeholder="请输入总投资(万元)" + <el-form-item label="总投资(元)" prop="total_investment"> + <el-input v-model="formData.total_investment" clearable placeholder="请输入总投资(元)" type="number" /> </el-form-item> </el-col> @@ -293,7 +293,7 @@ const formRules = reactive<any>({ }], total_investment: [{ required: true, - message: '请输入总投资(万元)', + message: '请输入总投资(元)', trigger: ['blur'] }], engineering_status: [{ diff --git a/src/views/manage_project/index.vue b/src/views/manage_project/index.vue index 67920c2..908bed5 100644 --- a/src/views/manage_project/index.vue +++ b/src/views/manage_project/index.vue @@ -86,7 +86,7 @@ <el-table-column label="项目进度" prop="progress" show-overflow-tooltip /> <el-table-column label="建设区域" prop="build_area_text" show-overflow-tooltip /> <el-table-column label="项目级别" prop="project_level_text" show-overflow-tooltip /> - <el-table-column label="总投资(万元)" prop="total_investment" show-overflow-tooltip /> + <el-table-column label="总投资(元)" prop="total_investment" show-overflow-tooltip /> <el-table-column label="工程状态" prop="engineering_status_text" show-overflow-tooltip /> <el-table-column label="实施部门" prop="implementation_department" show-overflow-tooltip /> <el-table-column label="监管部门" prop="supervision_department" show-overflow-tooltip /> diff --git a/src/views/project/components/Business.vue b/src/views/project/components/Business.vue index 4f09c00..ec06ace 100644 --- a/src/views/project/components/Business.vue +++ b/src/views/project/components/Business.vue @@ -22,7 +22,7 @@ <el-table-column label="下次回访日期" prop="next_follow_up_date"> <template #default="{ row }"> <span>{{ row.next_follow_up_date ? row.next_follow_up_date : - '' }}</span> + '' }}</span> </template> </el-table-column> </el-table> @@ -95,7 +95,7 @@ <el-table-column label="制单人" prop='create_user' width="180" /> <el-table-column label="报价日期" prop='quotation_date' /> <el-table-column label="技术人员" prop='technician_name' width="180" /> - <el-table-column label="概算金额(万元)" prop='estimate_amount' width="180" /> + <el-table-column label="概算金额(元)" prop='estimate_amount' width="180" /> <el-table-column label="要求" prop='ask' /> <el-table-column label="附件" prop="annex" show-overflow-tooltip> <template #default="{ row }"> diff --git a/src/views/project/components/Overview.vue b/src/views/project/components/Overview.vue index b88742e..c0fbc1f 100644 --- a/src/views/project/components/Overview.vue +++ b/src/views/project/components/Overview.vue @@ -1,7 +1,7 @@ <template> <el-descriptions :column="3" title="基本信息" border> <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.name - }}</el-descriptions-item> + }}</el-descriptions-item> <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item> <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label"> @@ -27,10 +27,11 @@ {{ formData.bidding_time }}</el-descriptions-item> <el-descriptions-item label="预计工期" label-align="left" align="left" label-class-name="my-label"> {{ formData.estimated_construction }}</el-descriptions-item> - <el-descriptions-item label="项目估算(万元)" label-align="left" align="left" label-class-name="my-label"> {{ - formData.project_estimation }}</el-descriptions-item> - <el-descriptions-item label="项目估算(外币)" label-align="left" align="left" label-class-name="my-label"> {{ formData.name - }}</el-descriptions-item> + <el-descriptions-item label="项目估算(元)" label-align="left" align="left" label-class-name="my-label"> {{ + formData.project_estimation }}</el-descriptions-item> + <el-descriptions-item label="项目估算(外币)" label-align="left" align="left" label-class-name="my-label"> {{ + formData.name + }}</el-descriptions-item> <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{ formData.contacts }}</el-descriptions-item> <el-descriptions-item label="联系人部门" label-align="left" align="left" label-class-name="my-label"> @@ -50,8 +51,8 @@ <el-descriptions-item label="竞争对手" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitor }}</el-descriptions-item> <el-descriptions-item label="项目建设资金来源" label-align="left" align="left" label-class-name="my-label"> {{ - formData.construction_funds_sources_text - }}</el-descriptions-item> + formData.construction_funds_sources_text + }}</el-descriptions-item> <el-descriptions-item label="建设单位付款方式" label-align="left" align="left" label-class-name="my-label"> {{ formData.construction_payment_method }}</el-descriptions-item> diff --git a/src/views/project/components/manpower.vue b/src/views/project/components/manpower.vue index bbb72ce..28072ce 100644 --- a/src/views/project/components/manpower.vue +++ b/src/views/project/components/manpower.vue @@ -69,7 +69,7 @@ const baseData1 = reactive({ { label: '到期日期', prop: 'due_date' }, { label: '保险种类', prop: 'type_text' }, { label: '保单号', prop: 'insurance_no' }, - { label: '投保金额(万元)', prop: 'insured_amount' }, + { label: '投保金额(元)', prop: 'insured_amount' }, { label: '保险公司', prop: 'insurance_company' }, ] diff --git a/src/views/project/components/tender.vue b/src/views/project/components/tender.vue index 50899ff..59b44d6 100644 --- a/src/views/project/components/tender.vue +++ b/src/views/project/components/tender.vue @@ -3,7 +3,7 @@ <div> <el-table :data="tableData6" stripe style="width: 100%"> <el-table-column label="流程编号" prop='code' width="180" /> - <el-table-column label="项目估算(万元)" prop='project_estimation' width="180" /> + <el-table-column label="项目估算(元)" prop='project_estimation' width="180" /> <el-table-column label="资金来源" prop='bidding_project_fund_source' /> <el-table-column label="投标时间" prop='bidding_time' /> <el-table-column label="招标方式" prop='bid_type' /> @@ -260,7 +260,7 @@ applyLists() bidResultLists() refundLists() </script> -<style > +<style> .tit { font-size: 1.2em; margin-bottom: 10px; diff --git a/src/views/project_estimate/detail.vue b/src/views/project_estimate/detail.vue index 9557bf1..cdf990b 100644 --- a/src/views/project_estimate/detail.vue +++ b/src/views/project_estimate/detail.vue @@ -37,7 +37,7 @@ }}</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.estimate_amount }}</el-descriptions-item> @@ -55,19 +55,19 @@ }}</el-descriptions-item> <el-descriptions-item label="创建日期" label-align="left" align="left" label-class-name="my-label"> {{ - formData.create_time - }}</el-descriptions-item> + formData.create_time + }}</el-descriptions-item> <el-descriptions-item label="更新人" label-align="left" align="left" label-class-name="my-label"> {{ - formData.update_user_name + formData.update_user_name - }}</el-descriptions-item> + }}</el-descriptions-item> <el-descriptions-item label="更新日期" label-align="left" align="left" label-class-name="my-label"> {{ - formData.update_time + formData.update_time - }}</el-descriptions-item> + }}</el-descriptions-item> <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label"> diff --git a/src/views/project_insurance_management/detail.vue b/src/views/project_insurance_management/detail.vue index b390d24..9dc320a 100644 --- a/src/views/project_insurance_management/detail.vue +++ b/src/views/project_insurance_management/detail.vue @@ -42,7 +42,7 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="投保金额(万元)"> + <el-form-item label="投保金额(元)"> {{ formData.insured_amount }} </el-form-item> </el-col> diff --git a/src/views/project_insurance_management/edit.vue b/src/views/project_insurance_management/edit.vue index e7e160b..49ea527 100644 --- a/src/views/project_insurance_management/edit.vue +++ b/src/views/project_insurance_management/edit.vue @@ -52,9 +52,9 @@ <el-input v-model="formData.insurance" clearable type="number" placeholder="请输入保费(元)" /> </el-form-item> </el-col> <el-col :span="8"> - <el-form-item label="投保金额(万元)" prop="insured_amount"> + <el-form-item label="投保金额(元)" prop="insured_amount"> <el-input v-model="formData.insured_amount" clearable type="number" - placeholder="请输入投保金额(万元)" /> + placeholder="请输入投保金额(元)" /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="保险公司" prop="insurance_company"> diff --git a/src/views/project_insurance_management/index.vue b/src/views/project_insurance_management/index.vue index 7b703cb..b3f3524 100644 --- a/src/views/project_insurance_management/index.vue +++ b/src/views/project_insurance_management/index.vue @@ -49,7 +49,7 @@ <el-table-column label="保险种类" prop="type" show-overflow-tooltip /> <el-table-column label="保单号" prop="insurance_no" show-overflow-tooltip /> <el-table-column label="保费(元)" prop="insurance" show-overflow-tooltip /> - <el-table-column label="投保金额(万元)" prop="insured_amount" show-overflow-tooltip /> + <el-table-column label="投保金额(元)" prop="insured_amount" show-overflow-tooltip /> <el-table-column label="保险公司" prop="insurance_company" show-overflow-tooltip /> <el-table-column label="保单明细" prop="insurance_detail" show-overflow-tooltip /> <el-table-column label="发票编号" prop="invoice_no" show-overflow-tooltip /> diff --git a/src/views/project_list/components/Overview.vue b/src/views/project_list/components/Overview.vue index ad3006a..ce1e66c 100644 --- a/src/views/project_list/components/Overview.vue +++ b/src/views/project_list/components/Overview.vue @@ -1,11 +1,12 @@ <template> <el-descriptions :column="3" title="基本信息" border> - <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name - }}</el-descriptions-item> + <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ + formData.org_name + }}</el-descriptions-item> <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.dept_name }}</el-descriptions-item> <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.name - }}</el-descriptions-item> + }}</el-descriptions-item> <el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{ formData.project_code }}</el-descriptions-item> <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label"> @@ -31,10 +32,11 @@ {{ formData.bidding_time }}</el-descriptions-item> <el-descriptions-item label="预计工期" label-align="left" align="left" label-class-name="my-label"> {{ formData.estimated_construction }}</el-descriptions-item> - <el-descriptions-item label="项目估算(万元)" label-align="left" align="left" label-class-name="my-label"> {{ - formData.project_estimation }}</el-descriptions-item> - <el-descriptions-item label="项目估算(外币)" label-align="left" align="left" label-class-name="my-label"> {{ formData.name - }}</el-descriptions-item> + <el-descriptions-item label="项目估算(元)" label-align="left" align="left" label-class-name="my-label"> {{ + formData.project_estimation }}</el-descriptions-item> + <el-descriptions-item label="项目估算(外币)" label-align="left" align="left" label-class-name="my-label"> {{ + formData.name + }}</el-descriptions-item> <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{ formData.contacts }}</el-descriptions-item> <el-descriptions-item label="联系人部门" label-align="left" align="left" label-class-name="my-label"> @@ -54,8 +56,8 @@ <el-descriptions-item label="竞争对手" label-align="left" align="left" label-class-name="my-label"> {{ formData.competitor }}</el-descriptions-item> <el-descriptions-item label="项目建设资金来源" label-align="left" align="left" label-class-name="my-label"> {{ - formData.construction_funds_sources_text - }}</el-descriptions-item> + formData.construction_funds_sources_text + }}</el-descriptions-item> <el-descriptions-item label="建设单位付款方式" label-align="left" align="left" label-class-name="my-label"> {{ formData.construction_payment_method }}</el-descriptions-item> diff --git a/src/views/project_list/components/manpower.vue b/src/views/project_list/components/manpower.vue index 919e0c9..7524392 100644 --- a/src/views/project_list/components/manpower.vue +++ b/src/views/project_list/components/manpower.vue @@ -6,7 +6,8 @@ </myTable> </el-tab-pane> <el-tab-pane label="劳动合同" name="first-2"> - <myTable :baseData="baseData5" v-if="active == 'first-2'" :project="project" editPath="project_labor_contract"> + <myTable :baseData="baseData5" v-if="active == 'first-2'" :project="project" + editPath="project_labor_contract"> </myTable> </el-tab-pane> <el-tab-pane label="保险记录" name="first-3"> @@ -83,7 +84,7 @@ const baseData1 = reactive({ { label: '保险种类', prop: 'type' }, { label: '保单号', prop: 'insurance_no' }, { label: '保费(元)', prop: 'insurance' }, - { label: '投保金额(万元)', prop: 'insured_amount' }, + { label: '投保金额(元)', prop: 'insured_amount' }, { label: '保险公司', prop: 'insurance_company' }, { label: '保单明细', prop: 'insurance_detail' }, { label: '发票编号', prop: 'invoice_no' }, diff --git a/src/views/project_list/components/tender.vue b/src/views/project_list/components/tender.vue index 2e5439d..66ee0d4 100644 --- a/src/views/project_list/components/tender.vue +++ b/src/views/project_list/components/tender.vue @@ -30,7 +30,7 @@ const baseData = reactive({ queryParams: { project_id: props.project.id }, columnList: [ { label: '流程编号', prop: 'code' }, - { label: '项目估算(万元)', prop: 'project_estimation' }, + { label: '项目估算(元)', prop: 'project_estimation' }, { label: '资金来源', prop: 'bidding_project_fund_source' }, { label: '投标时间', prop: 'bidding_time' }, { label: '招标方式', prop: 'bid_type' }, @@ -113,7 +113,7 @@ const baseData4 = reactive({ </script> -<style > +<style> .tit { font-size: 1.2em; margin-bottom: 10px; diff --git a/src/views/project_personnel/detail.vue b/src/views/project_personnel/detail.vue index 2c4e8d0..5919234 100644 --- a/src/views/project_personnel/detail.vue +++ b/src/views/project_personnel/detail.vue @@ -108,7 +108,7 @@ <el-table-column label="保险种类" prop="type" show-overflow-tooltip /> <el-table-column label="保单号" prop="insurance_no" show-overflow-tooltip /> <el-table-column label="保费(元)" prop="insurance" show-overflow-tooltip /> - <el-table-column label="投保金额(万元)" prop="insured_amount" show-overflow-tooltip /> + <el-table-column label="投保金额(元)" prop="insured_amount" show-overflow-tooltip /> <el-table-column label="保险公司" prop="insurance_company" show-overflow-tooltip /> </el-table> </el-tab-pane> diff --git a/src/views/project_settlement/partsettlement/detail.vue b/src/views/project_settlement/partsettlement/detail.vue index e8f16c0..6f73561 100644 --- a/src/views/project_settlement/partsettlement/detail.vue +++ b/src/views/project_settlement/partsettlement/detail.vue @@ -42,7 +42,7 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="投保金额(万元)"> + <el-form-item label="投保金额(元)"> {{ formData.insured_amount }} </el-form-item> </el-col> diff --git a/src/views/project_settlement/projectclosure/detail.vue b/src/views/project_settlement/projectclosure/detail.vue index e8f16c0..6f73561 100644 --- a/src/views/project_settlement/projectclosure/detail.vue +++ b/src/views/project_settlement/projectclosure/detail.vue @@ -42,7 +42,7 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="投保金额(万元)"> + <el-form-item label="投保金额(元)"> {{ formData.insured_amount }} </el-form-item> </el-col> diff --git a/src/views/supervision_project/detail.js b/src/views/supervision_project/detail.js index bb55952..0b2a0f7 100644 --- a/src/views/supervision_project/detail.js +++ b/src/views/supervision_project/detail.js @@ -30,7 +30,7 @@ const detailConfig = { value: "project_level_text" }, { - label: "总投资(万元)", + label: "总投资(元)", value: "total_investment" }, { diff --git a/src/views/supervision_project/edit.vue b/src/views/supervision_project/edit.vue index 0c7c582..fc884e3 100644 --- a/src/views/supervision_project/edit.vue +++ b/src/views/supervision_project/edit.vue @@ -57,8 +57,8 @@ </el-form-item> </el-col> <el-col :span="8"> - <el-form-item label="总投资(万元)" label-width="120px"> - <el-input v-model="formData.total_investment" clearable placeholder="请输入总投资(万元)" + <el-form-item label="总投资(元)" label-width="120px"> + <el-input v-model="formData.total_investment" clearable placeholder="请输入总投资(元)" type="number" /> </el-form-item> </el-col> @@ -301,7 +301,7 @@ const formRules = reactive<any>({ }], total_investment: [{ required: true, - message: '请输入总投资(万元)', + message: '请输入总投资(元)', trigger: ['blur'] }], initiation_date: [{ diff --git a/src/views/supervision_project/index.vue b/src/views/supervision_project/index.vue index ba84097..c330d73 100644 --- a/src/views/supervision_project/index.vue +++ b/src/views/supervision_project/index.vue @@ -88,7 +88,7 @@ <el-table-column label="建设区域" prop="build_area_text" show-overflow-tooltip /> <el-table-column label="项目地址" prop="address" show-overflow-tooltip /> <el-table-column label="项目等级" prop="project_level_text" show-overflow-tooltip /> - <el-table-column label="总投资(万元)" prop="total_investment" show-overflow-tooltip /> + <el-table-column label="总投资(元)" prop="total_investment" show-overflow-tooltip /> <el-table-column label="立项日期" prop="initiation_date" show-overflow-tooltip /> <el-table-column label="关联合同" prop="contract" show-overflow-tooltip /> <el-table-column label="合同金额" prop="contract_amount" show-overflow-tooltip /> diff --git a/src/views/supervision_project_monthly_report/edit.vue b/src/views/supervision_project_monthly_report/edit.vue index 49154d7..ee7ecf8 100644 --- a/src/views/supervision_project_monthly_report/edit.vue +++ b/src/views/supervision_project_monthly_report/edit.vue @@ -55,26 +55,26 @@ </el-form-item> </el-col> <el-col :span="8"> - <el-form-item label="本月完成(万元)" prop="this_month_amount"> - <el-input v-model="formData.this_month_amount" clearable placeholder="请输入本月完成(万元)" + <el-form-item label="本月完成(元)" prop="this_month_amount"> + <el-input v-model="formData.this_month_amount" clearable placeholder="请输入本月完成(元)" type="number" /> </el-form-item> </el-col> <el-col :span="8"> - <el-form-item label="累计完成(万元)" prop="total_amount"> - <el-input v-model="formData.total_amount" clearable placeholder="请输入累计完成(万元)" + <el-form-item label="累计完成(元)" prop="total_amount"> + <el-input v-model="formData.total_amount" clearable placeholder="请输入累计完成(元)" type="number" /> </el-form-item> </el-col> <el-col :span="8"> - <el-form-item label="本月支付(万元)" prop="this_month_pay"> - <el-input v-model="formData.this_month_pay" clearable placeholder="请输入本月支付(万元)" + <el-form-item label="本月支付(元)" prop="this_month_pay"> + <el-input v-model="formData.this_month_pay" clearable placeholder="请输入本月支付(元)" type="number" /> </el-form-item> </el-col> <el-col :span="8"> - <el-form-item label="累计支付(万元)" prop="total_pay"> - <el-input v-model="formData.total_pay" clearable placeholder="请输入累计支付(万元)" type="number" /> + <el-form-item label="累计支付(元)" prop="total_pay"> + <el-input v-model="formData.total_pay" clearable placeholder="请输入累计支付(元)" type="number" /> </el-form-item> </el-col> <el-col :span="8"> @@ -241,22 +241,22 @@ const formRules = reactive<any>({ }], this_month_amount: [{ required: true, - message: '请输入本月完成(万元)', + message: '请输入本月完成(元)', trigger: ['blur'] }], total_amount: [{ required: true, - message: '请输入累计完成(万元)', + message: '请输入累计完成(元)', trigger: ['blur'] }], this_month_pay: [{ required: true, - message: '请输入本月支付(万元)', + message: '请输入本月支付(元)', trigger: ['blur'] }], total_pay: [{ required: true, - message: '请输入累计支付(万元)', + message: '请输入累计支付(元)', trigger: ['blur'] }], quality_behavior: [{ diff --git a/src/views/supervision_project_monthly_report/index.vue b/src/views/supervision_project_monthly_report/index.vue index 4c84a79..bcbbdd1 100644 --- a/src/views/supervision_project_monthly_report/index.vue +++ b/src/views/supervision_project_monthly_report/index.vue @@ -45,10 +45,10 @@ <el-table-column label="工程状态" prop="engineering_status_text" show-overflow-tooltip /> <el-table-column label="进度描述" prop="progress_description" show-overflow-tooltip /> <el-table-column label="存在的问题及解决措施" prop="problems_and_measure" show-overflow-tooltip /> - <el-table-column label="本月完成(万元)" prop="this_month_amount" show-overflow-tooltip /> - <el-table-column label="累计完成(万元)" prop="total_amount" show-overflow-tooltip /> - <el-table-column label="本月支付(万元)" prop="this_month_pay" show-overflow-tooltip /> - <el-table-column label="累计支付(万元)" prop="total_pay" show-overflow-tooltip /> + <el-table-column label="本月完成(元)" prop="this_month_amount" show-overflow-tooltip /> + <el-table-column label="累计完成(元)" prop="total_amount" show-overflow-tooltip /> + <el-table-column label="本月支付(元)" prop="this_month_pay" show-overflow-tooltip /> + <el-table-column label="累计支付(元)" prop="total_pay" show-overflow-tooltip /> <el-table-column label="建设各方责任主体质量行为" prop="quality_behavior" show-overflow-tooltip /> <el-table-column label="施工现场质量情况" prop="quality_situation" show-overflow-tooltip /> <el-table-column label="质量缺陷或质量隐患的处理情况" prop="quality_hazards" show-overflow-tooltip />