From c9de5fe849104680f60b7f9016d949fc695f2c3f Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Fri, 3 Apr 2026 11:08:13 +0800
Subject: [PATCH] =?UTF-8?q?1.4.1=E5=89=8D=E7=AB=AF=EF=BC=9A=20=20=20=20fix?=
 =?UTF-8?q?(=E5=B8=82=E5=9C=BA=E9=A2=84=E7=AE=97):=20=20=20=20=E9=A2=84?=
 =?UTF-8?q?=E7=AE=97=E9=87=91=E9=A2=9D=E9=83=BD=E6=94=B9=E4=B8=BA=E5=85=83?=
 =?UTF-8?q?=E3=80=82=20=20=20=20=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E6=A0=BC=E5=BC=8F=EF=BC=9AS-XXX=5F=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=5F=20=E9=A2=84=E7=AE=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82=20=20=20=20=E9=A2=84=E7=AE=97=E4=BA=BA=E5=B7=A5?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=EF=BC=9A=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=89=E6=8B=A9=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E3=80=82=20=20=20=20=E9=A2=84=E7=AE=97=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E8=B4=B9=20=E9=80=89=E6=8B=A9=E6=A0=87=E5=87=86=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E3=80=81=E9=9D=9E=E6=A0=87=E5=87=86=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BC=98=E5=8C=96=E3=80=82=20=20=20=20?=
 =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=9D=90=E6=96=99=E8=B4=B9=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E7=89=A9=E6=96=99=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E3=80=82=20=20=20=20=E9=A2=84=E7=AE=97=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E8=B4=B9=EF=BC=8C=E5=88=86=E4=B8=BA=E6=89=BF=E5=8C=85?=
 =?UTF-8?q?=E3=80=81=E9=9D=9E=E6=89=BF=E5=8C=85=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=89=BF=E5=8C=85=E5=8F=AA=E5=A1=AB=E9=87=91=E9=A2=9D=E3=80=82?=
 =?UTF-8?q?=20=20=20=20=E9=A2=84=E7=AE=97=E5=B7=AE=E6=97=85=E8=B4=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=97=E9=AB=98=E6=B8=A9=E8=A1=A5?=
 =?UTF-8?q?=E8=B4=B4=EF=BC=88=E5=85=83=EF=BC=89=E3=80=81=E8=89=B0=E8=8B=A6?=
 =?UTF-8?q?=E8=A1=A5=E8=B4=B4=EF=BC=88=E5=85=83=EF=BC=89=E3=80=82=20=20=20?=
 =?UTF-8?q?=20=E5=85=B6=E4=BB=96=E8=B4=B9=E7=94=A8=E7=9A=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86=E5=8F=AF?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=BF=90=E8=BE=93?=
 =?UTF-8?q?=E8=B4=B9=E3=80=82=20=20=20=20=E9=A2=84=E7=AE=97=E8=A1=A8?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E5=87=80=E9=A2=9D=E5=8F=AF=E4=BB=A5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa/erp/budgetInfo/edit.vue          |  24 ++--
 src/views/oa/erp/budgetInfo/index.vue         |   8 +-
 .../oa/erp/budgetInfo/market/BudgetTable.vue  |  21 +--
 .../budgetInfo/market/InstallationCost.vue    |  94 +++++++++----
 .../oa/erp/budgetInfo/market/LaborCost.vue    | 124 ++++++++++++++----
 .../oa/erp/budgetInfo/market/MaterialCost.vue |  78 ++++++++---
 .../oa/erp/budgetInfo/market/OtherCost.vue    |  15 ++-
 .../oa/erp/budgetInfo/market/TravelCost.vue   |  59 ++++++---
 8 files changed, 306 insertions(+), 117 deletions(-)

diff --git a/src/views/oa/erp/budgetInfo/edit.vue b/src/views/oa/erp/budgetInfo/edit.vue
index 9c5616c..b72af5b 100644
--- a/src/views/oa/erp/budgetInfo/edit.vue
+++ b/src/views/oa/erp/budgetInfo/edit.vue
@@ -481,11 +481,11 @@ const updateBudgetTable = async () => {
   const otherTotal = otherCostRef.value?.getTotalAmount() || { budgetAmount: 0, reducedAmount: 0 };
 
   // 更新预算表,目前是按单位是万元传值，后续如果根据单位是元，则在此判断更新传的值
-  budgetTableRef.value.updateBudgetDetailData('材料费', materialTotal.budgetAmount / 10000, materialTotal.reducedAmount / 10000);
-  budgetTableRef.value.updateBudgetDetailData('人工费', laborTotal.budgetAmount / 10000, laborTotal.reducedAmount / 10000);
-  budgetTableRef.value.updateBudgetDetailData('安装费', installationTotal.budgetAmount / 10000, installationTotal.reducedAmount / 10000);
-  budgetTableRef.value.updateBudgetDetailData('差旅费', travelTotal.budgetAmount / 10000, travelTotal.reducedAmount / 10000);
-  budgetTableRef.value.updateBudgetDetailData('其他费用', otherTotal.budgetAmount / 10000, otherTotal.reducedAmount / 10000);
+  budgetTableRef.value.updateBudgetDetailData('材料费', materialTotal.budgetAmount, materialTotal.reducedAmount);
+  budgetTableRef.value.updateBudgetDetailData('人工费', laborTotal.budgetAmount, laborTotal.reducedAmount);
+  budgetTableRef.value.updateBudgetDetailData('安装费', installationTotal.budgetAmount, installationTotal.reducedAmount);
+  budgetTableRef.value.updateBudgetDetailData('差旅费', travelTotal.budgetAmount, travelTotal.reducedAmount);
+  budgetTableRef.value.updateBudgetDetailData('其他费用', otherTotal.budgetAmount, otherTotal.reducedAmount);
 };
 
 // 更新研发项目预算预算表数据
@@ -507,13 +507,13 @@ const updateRdBudgetTable = async () => {
   const otherTotal = otherCost.otherTotal || 0;
 
   // 更新预算表,目前是按单位是万元传值，后续如果根据单位是元，则在此判断更新传的值
-  rdBudgetTableRef.value.updateRdBudgetDetailData('材料费', materialTotal / 10000);
-  rdBudgetTableRef.value.updateRdBudgetDetailData('人工费', laborTotal / 10000);
-  rdBudgetTableRef.value.updateRdBudgetDetailData('差旅费', travelTotal / 10000);
-  rdBudgetTableRef.value.updateRdBudgetDetailData('测试化验加工费', testingTotal / 10000);
-  rdBudgetTableRef.value.updateRdBudgetDetailData('专家咨询费用', expertConsultTotal / 10000);
-  rdBudgetTableRef.value.updateRdBudgetDetailData('新产品设计费', techConsultTotal / 10000);
-  rdBudgetTableRef.value.updateRdBudgetDetailData('其他费用', otherTotal / 10000);
+  rdBudgetTableRef.value.updateRdBudgetDetailData('材料费', materialTotal);
+  rdBudgetTableRef.value.updateRdBudgetDetailData('人工费', laborTotal);
+  rdBudgetTableRef.value.updateRdBudgetDetailData('差旅费', travelTotal);
+  rdBudgetTableRef.value.updateRdBudgetDetailData('测试化验加工费', testingTotal);
+  rdBudgetTableRef.value.updateRdBudgetDetailData('专家咨询费用', expertConsultTotal);
+  rdBudgetTableRef.value.updateRdBudgetDetailData('新产品设计费', techConsultTotal);
+  rdBudgetTableRef.value.updateRdBudgetDetailData('其他费用', otherTotal);
 };
 
 // 提取用户查找逻辑
diff --git a/src/views/oa/erp/budgetInfo/index.vue b/src/views/oa/erp/budgetInfo/index.vue
index 5a00d63..8f841d6 100644
--- a/src/views/oa/erp/budgetInfo/index.vue
+++ b/src/views/oa/erp/budgetInfo/index.vue
@@ -86,9 +86,9 @@
         <el-table-column label="版本" align="center" prop="budgetVersion" v-if="columns[34].visible" width="60"/>
         <el-table-column label="项目经理" align="center" prop="managerName" v-if="columns[8].visible" width="100px;"/>
         <el-table-column label="产品经理" align="center" prop="productManagerName" v-if="columns[10].visible" />
-        <el-table-column label="合同额(万元)" align="center" prop="contractAmount" v-if="columns[14].visible" />
-        <el-table-column label="合同净额(万元)" align="center" prop="netContractAmount" v-if="columns[15].visible" />
-        <el-table-column label="预算成本(万元)" align="center" prop="budgetCost" v-if="columns[16].visible" />
+        <el-table-column label="合同额(元)" align="center" prop="contractAmount" v-if="columns[14].visible" />
+        <el-table-column label="合同净额(元)" align="center" prop="netContractAmount" v-if="columns[15].visible" />
+        <el-table-column label="预算成本(元)" align="center" prop="budgetCost" v-if="columns[16].visible" />
         <el-table-column label="预算毛利率" align="center" prop="budgetRate" v-if="columns[17].visible">
           <template #default="scope">
             {{ formatRate(scope.row.budgetRate) }}
@@ -459,7 +459,7 @@ const handleExport = (row?: budgetInfoVO) => {
     {
       budgetId: budgetId
     },
-    fileNamePrefix + projectName + `(` + projectCode + `)` + `.xlsx`
+    projectCode + '_' + projectName + `_预算表.xlsx`
   );
 };
 
diff --git a/src/views/oa/erp/budgetInfo/market/BudgetTable.vue b/src/views/oa/erp/budgetInfo/market/BudgetTable.vue
index ddd3528..73f7660 100644
--- a/src/views/oa/erp/budgetInfo/market/BudgetTable.vue
+++ b/src/views/oa/erp/budgetInfo/market/BudgetTable.vue
@@ -36,14 +36,12 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="合同额">
-            <el-input-number v-model="budgetForm.contractAmount" :min="0" :precision="2" @change="computedAmountAndRate" style="width:100%;text-align: left"/>
+            <el-input-number v-model="budgetForm.contractAmount" :min="0" :precision="2" @change="contractAmountChange" style="width:100%;text-align: left"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="合同净额">
-            <div class="custom-display">
-              {{ budgetForm.netContractAmount || '0.00' }}
-            </div>
+              <el-input-number v-model="budgetForm.netContractAmount" :min="0" :precision="2" @change="computedAmountAndRate" style="width:100%;text-align: left"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -153,7 +151,7 @@ const budgetForm = reactive({
   reduceBudgetRate: undefined,
   duringOperation: undefined,
   unitId: undefined,
-  unitName: '万元',
+  unitName: '元',
   exportFlag: undefined,
   budgetStatus: undefined,
   flowStatus: undefined,
@@ -229,7 +227,7 @@ const budgetDetailData = ref([
   }
 ]);
 
-// 格式化数字,元转换为万元
+// 格式化数字
 const formatNumber = (value: number) => {
   if (!value) return '0.00';
   return parseFloat(value).toFixed(2);
@@ -318,9 +316,6 @@ watch(
 );
 
 const computedAmountAndRate = async () => {
-  if (budgetForm.contractAmount) {
-    budgetForm.netContractAmount = (budgetForm.contractAmount / 1.13).toFixed(2);
-  }
   if (budgetForm.netContractAmount && budgetForm.budgetCost && budgetForm.netContractAmount > 0 && budgetForm.budgetCost > 0) {
     budgetForm.budgetRate = (((budgetForm.netContractAmount - budgetForm.budgetCost) * 100) / budgetForm.netContractAmount).toFixed(2);
   }
@@ -329,6 +324,14 @@ const computedAmountAndRate = async () => {
   }
 };
 
+const contractAmountChange = async () => {
+  if (budgetForm.contractAmount) {
+    budgetForm.netContractAmount = (budgetForm.contractAmount / 1.13).toFixed(2);
+  }
+};
+
+
+
 // 暴露方法给父组件
 defineExpose({
   updateBudgetDetailData,
diff --git a/src/views/oa/erp/budgetInfo/market/InstallationCost.vue b/src/views/oa/erp/budgetInfo/market/InstallationCost.vue
index 3cd2168..d48b094 100644
--- a/src/views/oa/erp/budgetInfo/market/InstallationCost.vue
+++ b/src/views/oa/erp/budgetInfo/market/InstallationCost.vue
@@ -34,6 +34,13 @@
       <!-- 预算成本 -->
       <el-table-column label="预算成本" align="center">
         <el-table-column prop="sortOrder" label="序号" width="60" align="center" />
+        <el-table-column prop="type" label="类型" width="120">
+          <template #default="scope">
+            <el-select v-model="scope.row.installType" placeholder="请选择类型" clearable @change="handleTypeChange(scope.row)">
+              <el-option v-for="dict in install_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </template>
+        </el-table-column>
         <el-table-column prop="personnelCategory" label="人员类别" width="150">
           <template #default="scope">
             <el-input v-model="scope.row.personnelCategory" placeholder="请输入人员类别" />
@@ -41,27 +48,32 @@
         </el-table-column>
         <el-table-column prop="peopleNumber" label="人数" width="120">
           <template #default="scope">
-            <el-input-number v-model="scope.row.peopleNumber" :min="0" :precision="0" size="small" @change="calculateBudgetAmount(scope.row)" style="width:106px;"/>
+            <el-input-number v-if="scope.row.installType === INSTALL_TYPE.NON_CONTRACT" v-model="scope.row.peopleNumber" :min="0" :precision="0" size="small" @change="calculateBudgetAmount(scope.row)" style="width:106px;"/>
+            <span v-else></span>
           </template>
         </el-table-column>
         <el-table-column prop="cumulativeTime" label="累计时间(月)" width="120">
           <template #default="scope">
-            <el-input-number v-model="scope.row.cumulativeTime" :min="0" :precision="2" size="small" @change="calculateBudgetAmount(scope.row)" style="width:106px;"/>
+            <el-input-number v-if="scope.row.installType === INSTALL_TYPE.NON_CONTRACT" v-model="scope.row.cumulativeTime" :min="0" :precision="2" size="small" @change="calculateBudgetAmount(scope.row)" style="width:106px;"/>
+            <span v-else></span>
           </template>
         </el-table-column>
         <el-table-column prop="monthRate" label="月平均投入比例(%)" width="150">
           <template #default="scope">
-            <el-input-number v-model="scope.row.monthRate" :min="0" :max="100" :precision="2" size="small" @change="calculateBudgetAmount(scope.row)" style="width:136px;"/>
+            <el-input-number v-if="scope.row.installType === INSTALL_TYPE.NON_CONTRACT" v-model="scope.row.monthRate" :min="0" :max="100" :precision="2" size="small" @change="calculateBudgetAmount(scope.row)" style="width:136px;"/>
+            <span v-else></span>
           </template>
         </el-table-column>
         <el-table-column prop="artificialStandard" label="人工标准(元/人月)" width="150">
           <template #default="scope">
-            <el-input-number v-model="scope.row.artificialStandard" :min="0" :precision="2" :step="10" size="small" @change="calculateBudgetAmount(scope.row)" style="width:136px;"/>
+            <el-input-number v-if="scope.row.installType === INSTALL_TYPE.NON_CONTRACT" v-model="scope.row.artificialStandard" :min="0" :precision="2" :step="10" size="small" @change="calculateBudgetAmount(scope.row)" style="width:136px;"/>
+            <span v-else></span>
           </template>
         </el-table-column>
-        <el-table-column prop="price" label="金额(万元)" width="100">
+        <el-table-column prop="price" label="金额(元)" width="150">
           <template #default="scope">
-            {{ format2TenThousandNumber(scope.row.price) }}
+            <el-input-number v-if="scope.row.installType === INSTALL_TYPE.CONTRACT" v-model="scope.row.price" :min="0" :precision="2" size="small" style="width:136px;"/>
+            <span v-else>{{ formatNumber(scope.row.price) }}</span>
           </template>
         </el-table-column>
       </el-table-column>
@@ -75,27 +87,32 @@
         </el-table-column>
         <el-table-column prop="reducePeopleNumber" label="人数" width="120">
           <template #default="scope">
-            <el-input-number v-model="scope.row.reducePeopleNumber" :min="0" :precision="0" size="small" @change="calculateReducedAmount(scope.row)" style="width:106px;"/>
+            <el-input-number v-if="scope.row.installType === INSTALL_TYPE.NON_CONTRACT" v-model="scope.row.reducePeopleNumber" :min="0" :precision="0" size="small" @change="calculateReducedAmount(scope.row)" style="width:106px;"/>
+            <span v-else></span>
           </template>
         </el-table-column>
         <el-table-column prop="reduceCumulativeTime" label="累计时间(月)" width="120">
           <template #default="scope">
-            <el-input-number v-model="scope.row.reduceCumulativeTime" :min="0" :precision="2" size="small" @change="calculateReducedAmount(scope.row)" style="width:106px;"/>
+            <el-input-number v-if="scope.row.installType === INSTALL_TYPE.NON_CONTRACT" v-model="scope.row.reduceCumulativeTime" :min="0" :precision="2" size="small" @change="calculateReducedAmount(scope.row)" style="width:106px;"/>
+            <span v-else></span>
           </template>
         </el-table-column>
         <el-table-column prop="reduceMonthRate" label="月平均投入比例(%)" width="150">
           <template #default="scope">
-            <el-input-number v-model="scope.row.reduceMonthRate" :min="0" :max="100" :precision="2" size="small" @change="calculateReducedAmount(scope.row)" style="width:136px;"/>
+            <el-input-number v-if="scope.row.installType === INSTALL_TYPE.NON_CONTRACT" v-model="scope.row.reduceMonthRate" :min="0" :max="100" :precision="2" size="small" @change="calculateReducedAmount(scope.row)" style="width:136px;"/>
+            <span v-else></span>
           </template>
         </el-table-column>
         <el-table-column prop="reduceArtificialStandard" label="人工标准(元/人月)" width="150">
           <template #default="scope">
-            <el-input-number v-model="scope.row.reduceArtificialStandard" :min="0" :precision="2" :step="10" size="small" @change="calculateReducedAmount(scope.row)" style="width:136px;"/>
+            <el-input-number v-if="scope.row.installType === INSTALL_TYPE.NON_CONTRACT" v-model="scope.row.reduceArtificialStandard" :min="0" :precision="2" :step="10" size="small" @change="calculateReducedAmount(scope.row)" style="width:136px;"/>
+            <span v-else></span>
           </template>
         </el-table-column>
-        <el-table-column prop="reducePrice" label="金额(万元)" width="100">
+        <el-table-column prop="reducePrice" label="金额(元)" width="150">
           <template #default="scope">
-            {{ format2TenThousandNumber(scope.row.reducePrice) }}
+            <el-input-number v-if="scope.row.installType === INSTALL_TYPE.CONTRACT" v-model="scope.row.reducePrice" :min="0" :precision="2" size="small" style="width:136px;"/>
+            <span v-else>{{ formatNumber(scope.row.reducePrice) }}</span>
           </template>
         </el-table-column>
       </el-table-column>
@@ -135,9 +152,16 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { budgetInstallCostVO } from '@/api/oa/erp/budgetInfo/market/budgetInstallCost/types';
-import { budgetMaterialCostVO } from '@/api/oa/erp/budgetInfo/market/budgetMaterialCost/types';
 
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { install_type } = toRefs<any>(
+  proxy?.useDict('install_type')
+);
 
+const INSTALL_TYPE = {
+  NON_CONTRACT: '1', //非承包
+  CONTRACT: '2' //承包
+}
 // 安装费数据
 const installCostList = ref<budgetInstallCostVO[]>([]);
 const toDeletedInstallCostIdList = ref([]);
@@ -163,7 +187,7 @@ const personnelCategories = ref([
   { label: '其他', value: '其他' }
 ])
 
-// 格式化数字,元转换为万元
+// 格式化数字
 const formatNumber = (value: number) => {
   if (!value) return '0.00';
   return parseFloat(value).toFixed(2);
@@ -175,24 +199,37 @@ const format2TenThousandNumber = (value: number) => {
   return (parseFloat(value) / 10000).toFixed(2);
 };
 
+// 处理类型变更
+const handleTypeChange = (row: any) => {
+  if (row.installType === INSTALL_TYPE.NON_CONTRACT) {
+    // 非承包类型，重新计算金额
+    calculateBudgetAmount(row)
+  }
+}
+
 // 计算预算金额
 const calculateBudgetAmount = (row: any) => {
-  const peopleNumber = parseFloat(row.peopleNumber) || 0
-  const cumulativeTime = parseFloat(row.cumulativeTime) || 0
-  const monthRate = parseFloat(row.monthRate) || 0
-  const artificialStandard = parseFloat(row.artificialStandard) || 0
+  // 只有非承包类型才需要计算金额
+  if (row.installType === INSTALL_TYPE.NON_CONTRACT) {
+    const peopleNumber = parseFloat(row.peopleNumber) || 0
+    const cumulativeTime = parseFloat(row.cumulativeTime) || 0
+    const monthRate = parseFloat(row.monthRate) || 0
+    const artificialStandard = parseFloat(row.artificialStandard) || 0
 
-  row.price = peopleNumber * cumulativeTime * (monthRate / 100) * artificialStandard
+    row.price = peopleNumber * cumulativeTime * (monthRate / 100) * artificialStandard
+  }
 }
 
 // 计算降成本后金额
 const calculateReducedAmount = (row: any) => {
-  const peopleNumber = parseFloat(row.reducePeopleNumber) || 0
-  const cumulativeTime = parseFloat(row.reduceCumulativeTime) || 0
-  const monthRate = parseFloat(row.reduceMonthRate) || 0
-  const artificialStandard = parseFloat(row.reduceArtificialStandard) || 0
+  if (row.installType === INSTALL_TYPE.NON_CONTRACT) {
+    const peopleNumber = parseFloat(row.reducePeopleNumber) || 0
+    const cumulativeTime = parseFloat(row.reduceCumulativeTime) || 0
+    const monthRate = parseFloat(row.reduceMonthRate) || 0
+    const artificialStandard = parseFloat(row.reduceArtificialStandard) || 0
 
-  row.reducePrice = peopleNumber * cumulativeTime * (monthRate / 100) * artificialStandard
+    row.reducePrice = peopleNumber * cumulativeTime * (monthRate / 100) * artificialStandard
+  }
 }
 
 // 选择变化
@@ -209,6 +246,7 @@ const handleAddRows = () => {
   for (let i = 0; i < addRowCount.value; i++) {
     installCostList.value.push({
       sortOrder: currentSortOrder + i + 1,
+      installType: INSTALL_TYPE.NON_CONTRACT,
       personnelCategory: '',
       peopleNumber: 0,
       cumulativeTime: 0,
@@ -267,7 +305,7 @@ const getSummaries = (param: any) => {
   const sums: any[] = []
   columns.forEach((column: any, index: number) => {
     if (index === 2) {
-      sums[index] = '合计(万元)'
+      sums[index] = '合计(元)'
       return
     }
     if (column.property === 'price' || column.property === 'reducePrice') {
@@ -281,7 +319,7 @@ const getSummaries = (param: any) => {
             return prev
           }
         }, 0)
-        sums[index] = format2TenThousandNumber(sums[index])
+        sums[index] = formatNumber(sums[index])
       } else {
         sums[index] = ''
       }
@@ -294,8 +332,8 @@ const getSummaries = (param: any) => {
 
 // 获取总金额（供父组件调用）
 const getTotalAmount = () => {
-  const totalBudgetAmount = installCostList.value.reduce((sum, item) => sum + Number(item.price), 0)
-  const totalReducedAmount = installCostList.value.reduce((sum, item) => sum + Number(item.reducePrice), 0)
+  const totalBudgetAmount = installCostList.value.reduce((sum, item) => sum + Number(item.price), 0);
+  const totalReducedAmount = installCostList.value.reduce((sum, item) => sum + Number(item.reducePrice), 0);
   return {
     budgetAmount: totalBudgetAmount,
     reducedAmount: totalReducedAmount
diff --git a/src/views/oa/erp/budgetInfo/market/LaborCost.vue b/src/views/oa/erp/budgetInfo/market/LaborCost.vue
index 5206d2a..d83d2d5 100644
--- a/src/views/oa/erp/budgetInfo/market/LaborCost.vue
+++ b/src/views/oa/erp/budgetInfo/market/LaborCost.vue
@@ -78,20 +78,25 @@
         </el-table-column>
         <el-table-column prop="artificialStandard" label="人工标准(元/人月)" width="150">
           <template #default="scope">
-            <el-input-number
-              v-model="scope.row.artificialStandard"
-              :min="0"
-              :precision="2"
-              :step="10"
-              size="small"
-              @change="calculateBudgetAmount(scope.row)"
-              style="width: 136px"
-            />
+            <el-tooltip
+              :content="getArtificialStandardTooltipContent(scope.row)"
+              placement="top"
+              raw-content
+              :show-after="500"
+            >
+            <el-select v-model="scope.row.artificialStandard" placeholder="请选择或输入后回车" clearable
+                       filterable
+                       allow-create style="flex: 1" default-first-option
+                       @change="handleChangeArtificialStandard(scope.row)"
+                       @blur="handleBlurArtificialStandard(scope.row)">
+              <el-option v-for="dict in artificial_standard" :key="dict.value" :label="dict.value" :value="dict.value"/>
+            </el-select>
+            </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop="price" label="金额(万元)" width="100">
+        <el-table-column prop="price" label="金额(元)" width="100">
           <template #default="scope">
-            {{ format2TenThousandNumber(scope.row.price) }}
+            {{ formatNumber(scope.row.price) }}
           </template>
         </el-table-column>
       </el-table-column>
@@ -142,20 +147,25 @@
         </el-table-column>
         <el-table-column prop="reduceArtificialStandard" label="人工标准(元/人月)" width="150">
           <template #default="scope">
-            <el-input-number
-              v-model="scope.row.reduceArtificialStandard"
-              :min="0"
-              :precision="2"
-              :step="10"
-              size="small"
-              @change="calculateReducedAmount(scope.row)"
-              style="width: 136px"
-            />
+            <el-tooltip
+              :content="getArtificialStandardTooltipContent(scope.row)"
+              placement="top"
+              raw-content
+              :show-after="500"
+            >
+              <el-select v-model="scope.row.reduceArtificialStandard" placeholder="请选择或输入后回车" clearable
+                         filterable
+                         allow-create style="flex: 1" default-first-option
+                         @change="handleChangeReduceArtificialStandard(scope.row)"
+                         @blur="handleBlurReduceArtificialStandard(scope.row)">
+                <el-option v-for="dict in artificial_standard" :key="dict.value" :label="dict.value" :value="dict.value"/>
+              </el-select>
+            </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop="reducePrice" label="金额(万元)" width="100">
+        <el-table-column prop="reducePrice" label="金额(元)" width="100">
           <template #default="scope">
-            {{ format2TenThousandNumber(scope.row.reducePrice) }}
+            {{ formatNumber(scope.row.reducePrice) }}
           </template>
         </el-table-column>
       </el-table-column>
@@ -192,6 +202,11 @@
 import { ref } from 'vue';
 import { budgetLaborCostVO } from '@/api/oa/erp/budgetInfo/market/budgetLaborCost/types';
 
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { artificial_standard } = toRefs<any>(
+  proxy?.useDict('artificial_standard')
+);
+
 // 人工费数据
 const budgetLaborCostList = ref<budgetLaborCostVO[]>([]);
 const toDeletedLaborCostIdList = ref([]);
@@ -203,6 +218,8 @@ const selectedRows = ref([]);
 const showAddDialog = ref(false);
 const addRowCount = ref(1);
 
+
+
 // 人员类别选项
 const personnelCategories = ref([
   { label: '项目经理', value: '项目经理' },
@@ -217,7 +234,7 @@ const personnelCategories = ref([
   { label: '其他', value: '其他' }
 ]);
 
-// 格式化数字,元转换为万元
+// 格式化数字
 const formatNumber = (value: number) => {
   if (!value) return '0.00';
   return parseFloat(value).toFixed(2);
@@ -229,6 +246,42 @@ const format2TenThousandNumber = (value: number) => {
   return (parseFloat(value) / 10000).toFixed(2);
 };
 
+const getArtificialStandardTooltipContent = (row: any) => {
+  if (!artificial_standard.value || artificial_standard.value.length === 0) {
+    return '暂无可用选项'
+  }
+
+  // 格式：value（label）
+  const optionsHtml = artificial_standard.value
+    .map(dict => `<div style="padding: 2px 0;">${dict.value}（${dict.label}）</div>`)
+    .join('')
+
+  return `<div style="max-height: 200px; overflow-y: auto;">${optionsHtml}</div>`
+};
+
+// 验证是否为数字
+const isValidNumber = (value) => {
+  if (value === null || value === undefined || value === '') return true
+  return /^\d+$/.test(String(value))
+}
+
+const handleChangeArtificialStandard = (row) => {
+  if (!isValidNumber(row.artificialStandard) && row.artificialStandard !== '') {
+    ElMessage.warning('只能输入数字')
+    row.artificialStandard = null
+  } else {
+    calculateBudgetAmount(row)
+  }
+}
+
+const handleBlurArtificialStandard = (row) => {
+  // 可选：自动转换字符串数字为数字类型
+  if (row.artificialStandard && !isNaN(row.artificialStandard)) {
+    row.artificialStandard = Number(row.artificialStandard)
+  }
+}
+
+
 // 计算预算金额
 const calculateBudgetAmount = (row: any) => {
   const peopleNumber = parseFloat(row.peopleNumber) || 0;
@@ -239,6 +292,23 @@ const calculateBudgetAmount = (row: any) => {
   row.price = peopleNumber * cumulativeTime * (monthRate / 100) * artificialStandard; //yuan
 };
 
+const handleChangeReduceArtificialStandard = (row) => {
+  if (!isValidNumber(row.reduceArtificialStandard) && row.reduceArtificialStandard !== '') {
+    ElMessage.warning('只能输入数字')
+    row.reduceArtificialStandard = null
+  } else {
+    calculateReducedAmount(row)
+  }
+}
+
+const handleBlurReduceArtificialStandard = (row) => {
+  // 可选：自动转换字符串数字为数字类型
+  if (row.reduceArtificialStandard && !isNaN(row.reduceArtificialStandard)) {
+    row.reduceArtificialStandard = Number(row.reduceArtificialStandard)
+  }
+}
+
+
 // 计算降成本后金额
 const calculateReducedAmount = (row: any) => {
   const peopleNumber = parseFloat(row.reducePeopleNumber) || 0;
@@ -265,13 +335,13 @@ const handleAddRows = () => {
       peopleNumber: 0,
       cumulativeTime: 0,
       monthRate: 0,
-      artificialStandard: 0,
+      artificialStandard: undefined,
       price: 0,
       reducePersonnelCategory: '',
       reducePeopleNumber: 0,
       reduceCumulativeTime: 0,
       reduceMonthRate: 0,
-      reduceArtificialStandard: 0,
+      reduceArtificialStandard: undefined,
       reducePrice: 0,
       reduceProposal: ''
     });
@@ -318,7 +388,7 @@ const getSummaries = (param: any) => {
   const sums: any[] = [];
   columns.forEach((column: any, index: number) => {
     if (index === 2) {
-      sums[index] = '合计(万元)';
+      sums[index] = '合计(元)';
       return;
     }
 
@@ -333,7 +403,7 @@ const getSummaries = (param: any) => {
             return prev;
           }
         }, 0);
-        sums[index] = format2TenThousandNumber(sums[index]);
+        sums[index] = formatNumber(sums[index]);
       } else {
         sums[index] = '';
       }
diff --git a/src/views/oa/erp/budgetInfo/market/MaterialCost.vue b/src/views/oa/erp/budgetInfo/market/MaterialCost.vue
index f9fc132..427a323 100644
--- a/src/views/oa/erp/budgetInfo/market/MaterialCost.vue
+++ b/src/views/oa/erp/budgetInfo/market/MaterialCost.vue
@@ -4,23 +4,56 @@
       <div class="card-header">
         <span class="title">材料费预算明细表</span>
         <div class="flex items-center gap-2">
-          <span style="white-space: nowrap">行数:</span>
-          <el-input-number v-model="addRowCount" :min="1" :max="10" size="small" style="width: 80px" />
-          <el-button type="primary" size="small" @click="handleAddRows">
-            <el-icon>
-              <Plus />
-            </el-icon>
-            添加</el-button>
-          <el-button type="primary" size="small" @click="handleShowMaterial">
-            <el-icon>
-              <Search />
-            </el-icon>
-            选择物料</el-button>
+<!--          <span style="white-space: nowrap">行数:</span>-->
+<!--          <el-input-number v-model="addRowCount" :min="1" :max="10" size="small" style="width: 80px" />-->
+<!--          <el-button type="primary" size="small" @click="handleAddRows">-->
+<!--            <el-icon>-->
+<!--              <Plus />-->
+<!--            </el-icon>-->
+<!--            添加-->
+<!--          </el-button>-->
+<!--          <el-button type="primary" size="small" @click="handleShowMaterial">        <el-icon>-->
+<!--            <Search />-->
+<!--          </el-icon>-->
+<!--            选择物料-->
+<!--          </el-button>-->
+
+          <!-- 新增的下拉按钮 -->
+          <el-dropdown trigger="click" @command="handleDropdownCommand">
+            <el-button type="primary" size="small">
+              添加物料 <el-icon><ArrowDown /></el-icon>
+            </el-button>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item divided>
+                  <div class="custom-dropdown-item" @click.stop="handleAddRows">
+                    <span>添加非标准物料：</span>
+                    <el-input-number
+                      v-model="addRowCount"
+                      :min="1"
+                      :max="1000"
+                      size="small"
+                      controls-position="right"
+                      style="width: 80px"
+                      @click.stop
+                    />
+                    <span style="margin-left: 4px">个</span>
+
+                  </div>
+                </el-dropdown-item>
+                <el-dropdown-item command="standard">
+                  选择标准物料
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+
           <el-button type="danger" size="small" @click="handleBatchDelete" :disabled="selectedRows.length === 0">
             <el-icon>
               <Delete />
             </el-icon>
-            删除 </el-button>
+            删除
+          </el-button>
         </div>
       </div>
     </template>
@@ -45,7 +78,7 @@
             <span>{{ scope.row.materialCode }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="materialName" label="材料名称" width="200">
+        <el-table-column prop="materialName" label="物料名称" width="200">
           <template #default="scope">
             <el-input v-model="scope.row.materialName" type="textarea" :rows="1" :disabled="scope.row.materialId !== null" />
           </template>
@@ -311,6 +344,17 @@ const getMaterialList = async () => {
   materialLoading.value = false;
 };
 
+const handleDropdownCommand = (command) => {
+  if (command === 'notStandard') {
+    // 处理添加非标准物料
+    handleAddRows();
+  } else if (command === 'standard') {
+    // 处理其他文字选项
+    handleShowMaterial();
+    // 其他逻辑
+  }
+};
+
 // 添加行
 const handleAddRows = () => {
   const currentSortOrder =
@@ -489,7 +533,7 @@ const confirmMaterialSelection = () => {
   materialSearchKeyword.value = '';
 };
 
-// 格式化数字,元转换为万元
+// 格式化数字
 const formatNumber = (value: number) => {
   if (!value) return '0.00';
   return parseFloat(value).toFixed(2);
@@ -536,7 +580,7 @@ const getSummaries = (param: any) => {
       return;
     }
     if (column.property === 'materialName') {
-      sums[index] = '合计(万元)';
+      sums[index] = '合计(元)';
       return;
     }
 
@@ -551,7 +595,7 @@ const getSummaries = (param: any) => {
         }
       }, 0);
       if (column.property === 'price' || column.property === 'reducePrice') {
-        sums[index] = format2TenThousandNumber(sums[index]);
+        sums[index] = formatNumber(sums[index]);
       } else {
         sums[index] = formatNumber(sums[index]);
       }
diff --git a/src/views/oa/erp/budgetInfo/market/OtherCost.vue b/src/views/oa/erp/budgetInfo/market/OtherCost.vue
index ac26e83..7ee3736 100644
--- a/src/views/oa/erp/budgetInfo/market/OtherCost.vue
+++ b/src/views/oa/erp/budgetInfo/market/OtherCost.vue
@@ -29,7 +29,9 @@
         <el-table-column prop="sortOrder" label="序号" width="80" align="center" />
         <el-table-column prop="itemDesc" label="项目" width="200">
           <template #default="scope">
-            <el-input v-model="scope.row.itemDesc" />
+            <el-select v-model="scope.row.itemDesc" placeholder="请选择项目" clearable filterable allow-create>
+              <el-option v-for="dict in budget_other_item" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
           </template>
         </el-table-column>
         <el-table-column prop="price" label="金额(元)" width="160">
@@ -43,7 +45,9 @@
       <el-table-column label="降成本后预算成本" align="center">
         <el-table-column prop="reduceItemDesc" label="项目" width="200">
           <template #default="scope">
-            <el-input v-model="scope.row.reduceItemDesc" />
+            <el-select v-model="scope.row.reduceItemDesc" placeholder="请选择项目" clearable filterable allow-create>
+              <el-option v-for="dict in budget_other_item" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
           </template>
         </el-table-column>
         <el-table-column prop="reducePrice" label="金额(元)" width="160">
@@ -83,9 +87,10 @@
 
 <script setup lang="ts">
 import { ref } from 'vue';
-import { budgetTravelCostVO } from '@/api/oa/erp/budgetInfo/market/budgetTravelCost/types';
 import { budgetOtherCostVO } from '@/api/oa/erp/budgetInfo/market/budgetOtherCost/types';
-import { budgetMaterialCostVO } from '@/api/oa/erp/budgetInfo/market/budgetMaterialCost/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { budget_other_item } = toRefs<any>(proxy?.useDict('budget_other_item'));
 
 const loaded = ref(false);
 
@@ -100,7 +105,7 @@ const selectedRows = ref([]);
 const showAddDialog = ref(false);
 const addRowCount = ref(1);
 
-// 格式化数字,元转换为万元
+// 格式化数字
 const formatNumber = (value: number) => {
   if (!value) return '0.00';
   return parseFloat(value).toFixed(2);
diff --git a/src/views/oa/erp/budgetInfo/market/TravelCost.vue b/src/views/oa/erp/budgetInfo/market/TravelCost.vue
index 69b41da..91277b0 100644
--- a/src/views/oa/erp/budgetInfo/market/TravelCost.vue
+++ b/src/views/oa/erp/budgetInfo/market/TravelCost.vue
@@ -47,19 +47,19 @@
             <el-input-number v-model="scope.row.peopleNumber" :min="0" :precision="0" size="small" @change="calculateBudgetSubtotal(scope.row)" style="width: 106px" />
           </template>
         </el-table-column>
-        <el-table-column prop="days" label="天数" width="130">
+        <el-table-column prop="days" label="天数" width="120">
           <template #default="scope">
-            <el-input-number v-model="scope.row.days" :min="0" :precision="0" size="small" @change="calculateBudgetSubtotal(scope.row)" style="width: 116px" />
+            <el-input-number v-model="scope.row.days" :min="0" :precision="0" size="small" @change="calculateBudgetSubtotal(scope.row)" style="width: 106px" />
           </template>
         </el-table-column>
-        <el-table-column prop="stayStandard" label="住宿标准(元)" width="140">
+        <el-table-column prop="stayStandard" label="住宿标准(元)" width="130">
           <template #default="scope">
-            <el-input-number v-model="scope.row.stayStandard" :min="0" :precision="2" size="small" :step="10" @change="calculateBudgetSubtotal(scope.row)" style="width: 126px" />
+            <el-input-number v-model="scope.row.stayStandard" :min="0" :precision="2" size="small" :step="10" @change="calculateBudgetSubtotal(scope.row)" style="width: 116px"/>
           </template>
         </el-table-column>
-        <el-table-column prop="travelExpenses" label="往返路费(元)" width="140">
+        <el-table-column prop="travelExpenses" label="往返路费(元)" width="130">
           <template #default="scope">
-            <el-input-number v-model="scope.row.travelExpenses" :min="0" :precision="2" size="small" :step="10" @change="calculateBudgetSubtotal(scope.row)" style="width: 126px" />
+            <el-input-number v-model="scope.row.travelExpenses" :min="0" :precision="2" size="small" :step="10" @change="calculateBudgetSubtotal(scope.row)" style="width: 116px" />
           </template>
         </el-table-column>
         <el-table-column prop="stayCosts" label="住宿费(元)" width="100">
@@ -72,6 +72,16 @@
             {{ formatNumber(scope.row.subsidyCosts) }}
           </template>
         </el-table-column>
+        <el-table-column prop="highTempSubsidy" label="高温补贴(元)" width="120">
+          <template #default="scope">
+            <el-input-number v-model="scope.row.highTempSubsidy" :min="0" :precision="0" size="small" @change="calculateBudgetSubtotal(scope.row)" style="width: 106px" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="hardshipSubsidy" label="艰苦补贴(元)" width="120">
+          <template #default="scope">
+            <el-input-number v-model="scope.row.hardshipSubsidy" :min="0" :precision="0" size="small" @change="calculateBudgetSubtotal(scope.row)" style="width: 106px" />
+          </template>
+        </el-table-column>
         <el-table-column prop="subtotalCosts" label="小计(元)" width="100">
           <template #default="scope">
             {{ formatNumber(scope.row.subtotalCosts) }}
@@ -127,6 +137,17 @@
             {{ formatNumber(scope.row.reduceSubsidyCosts) }}
           </template>
         </el-table-column>
+        <el-table-column prop="reduceHighTempSubsidy" label="高温补贴(元)" width="120">
+          <template #default="scope">
+            <el-input-number v-model="scope.row.reduceHighTempSubsidy" :min="0" :precision="0" size="small" @change="calculateReducedSubtotal(scope.row)" style="width: 106px" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="reduceHardshipSubsidy" label="艰苦补贴(元)" width="120">
+          <template #default="scope">
+            <el-input-number v-model="scope.row.reduceHardshipSubsidy" :min="0" :precision="0" size="small" @change="calculateReducedSubtotal(scope.row)" style="width: 106px" />
+          </template>
+        </el-table-column>
+
         <el-table-column prop="reduceSubtotalCosts" label="小计(元)" width="100">
           <template #default="scope">
             {{ formatNumber(scope.row.reduceSubtotalCosts) }}
@@ -178,7 +199,7 @@ const selectedRows = ref([]);
 const showAddDialog = ref(false);
 const addRowCount = ref(1);
 
-// 格式化数字,元转换为万元
+// 格式化数字
 const formatNumber = (value: number) => {
   if (!value) return '0.00';
   return parseFloat(value).toFixed(2);
@@ -201,11 +222,11 @@ const calculateBudgetSubtotal = (row: any) => {
   // 住宿费 = 人数 × 天数 × 住宿标准
   row.stayCosts = peopleNumber * days * stayStandard;
 
-  // 补贴 = 50 × 人数 × 天数
-  row.subsidyCosts = 50 * peopleNumber * days;
+  // 补贴 = 90 × 人数 × 天数
+  row.subsidyCosts = 90 * peopleNumber * days;
 
   // 小计 = (往返路费 + 住宿费 + 补贴)
-  row.subtotalCosts = travelExpenses + row.stayCosts + row.subsidyCosts;
+  row.subtotalCosts = travelExpenses + row.stayCosts + row.subsidyCosts + row.highTempSubsidy + row.hardshipSubsidy;
 };
 
 // 计算降成本后小计
@@ -219,11 +240,11 @@ const calculateReducedSubtotal = (row: any) => {
   // 住宿费 = 人数 × 天数 × 住宿标准
   row.reduceStayCosts = peopleNumber * days * stayStandard;
 
-  // 补贴 = 50 × 人数 × 天数
-  row.reduceSubsidyCosts = 50 * peopleNumber * days;
+  // 补贴 = 90 × 人数 × 天数
+  row.reduceSubsidyCosts = 90 * peopleNumber * days;
 
   // 小计 = (往返路费 + 住宿费 + 补贴)
-  row.reduceSubtotalCosts = travelExpenses + row.reduceStayCosts + row.reduceSubsidyCosts;
+  row.reduceSubtotalCosts = travelExpenses + row.reduceStayCosts + row.reduceSubsidyCosts + row.reduceHighTempSubsidy + row.reduceHardshipSubsidy;
 };
 
 // 选择变化
@@ -246,10 +267,12 @@ const handleAddRows = () => {
       frequency: 0,
       peopleNumber: 0,
       days: 0,
-      stayStandard: 0,
+      stayStandard: 180,
       travelExpenses: 0,
       stayCosts: 0,
       subsidyCosts: 0,
+      highTempSubsidy: 0,
+      hardshipSubsidy: 0,
       subtotalCosts: 0,
       reduceSortOrder: currentSortOrder + i + 1,
       reduceTripLocation: '',
@@ -257,10 +280,12 @@ const handleAddRows = () => {
       reduceFrequency: 0,
       reducePeopleNumber: 0,
       reduceDayNumber: 0,
-      reduceStayStandard: 0,
+      reduceStayStandard: 180,
       reduceTravelExpenses: 0,
       reduceStayCosts: 0,
       reduceSubsidyCosts: 0,
+      reduceHighTempSubsidy: 0 ,
+      reduceHardshipSubsidy: 0,
       reduceSubtotalCosts: 0,
       reduceProposal: ''
     });
@@ -316,10 +341,14 @@ const getSummaries = (param: any) => {
       column.property === 'travelExpenses' ||
       column.property === 'stayCosts' ||
       column.property === 'subsidyCosts' ||
+      column.property === 'highTempSubsidy' ||
+      column.property === 'hardshipSubsidy' ||
       column.property === 'subtotalCosts' ||
       column.property === 'reduceTravelExpenses' ||
       column.property === 'reduceStayCosts' ||
       column.property === 'reduceSubsidyCosts' ||
+      column.property === 'reduceHighTempSubsidy' ||
+      column.property === 'reduceHardshipSubsidy' ||
       column.property === 'reduceSubtotalCosts'
     ) {
       const values = data.map((item: any) => Number(item[column.property]));