From b6cf74026dbaa98a2c0c02e9a5be3070f922a1e4 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Thu, 15 Jan 2026 14:00:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8F=8A=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E5=87=8F=E5=85=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../costRecord/component/applyDetail.vue      |  2 +-
 src/views/business/discountApply/index.vue    | 20 +++++++++----------
 .../material/cost/component/applyDetail.vue   |  7 ++++---
 .../material/cost/component/unreportHome.vue  |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/views/business/costRecord/component/applyDetail.vue b/src/views/business/costRecord/component/applyDetail.vue
index 4317359a..2d3ec81d 100644
--- a/src/views/business/costRecord/component/applyDetail.vue
+++ b/src/views/business/costRecord/component/applyDetail.vue
@@ -227,7 +227,7 @@
             <div class="tabelAllBottom">
                 <div class="columnAllNum">费用小计：</div>
                 <div class="columnAll">
-                {{ reducCost }}
+                {{ reducCost.toFixed(2) }}
                 </div>
             </div>
             <div class="tabelAllBottom">
diff --git a/src/views/business/discountApply/index.vue b/src/views/business/discountApply/index.vue
index ed33f25e..53307936 100644
--- a/src/views/business/discountApply/index.vue
+++ b/src/views/business/discountApply/index.vue
@@ -196,9 +196,9 @@
                     <span v-else>{{ scope.$index + 1 }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="设备名称" align="center" prop="maName" show-overflow-tooltip />
-            <el-table-column label="规格型号" align="center" prop="maModel" show-overflow-tooltip />
-            <el-table-column label="单位" align="center" prop="maUnit" show-overflow-tooltip />
+            <el-table-column label="设备名称" align="center" prop="typeName" show-overflow-tooltip />
+            <el-table-column label="规格型号" align="center" prop="modelName" show-overflow-tooltip />
+            <el-table-column label="单位" align="center" prop="mtUnitName" show-overflow-tooltip />
             <el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true">
                 <!-- <template slot-scope="scope" v-if="scope.row.num">
             {{ scope.row.leasePrice.toFixed(2) }}
@@ -212,12 +212,12 @@
             <el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true" />
             <!-- <el-table-column label="归还数量" align="center" prop="backNum" :show-overflow-tooltip="true" /> -->
             <el-table-column label="归还日期 " align="center" prop="endTime" :show-overflow-tooltip="true" />
-            <el-table-column label="租赁天数" align="center" prop="days" :show-overflow-tooltip="true">
+            <el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true">
                 <!-- <template slot-scope="scope" v-if="scope.row.num">
               {{ Number(scope.row.leaseDays).toFixed(2) }}
           </template> -->
             </el-table-column>
-            <el-table-column label="租赁费用（元）" align="center" prop="leaseMoney" :show-overflow-tooltip="true">
+            <el-table-column label="租赁费用（元）" align="center" prop="leaseCost" :show-overflow-tooltip="true">
                 <!-- <template slot-scope="scope" v-if="scope.row.costs">
               {{ scope.row.costs.toFixed(2) }}
           </template> -->
@@ -384,8 +384,8 @@
                 border
                 :row-class-name="getRowClassName"
             >
-                <el-table-column label="机具名称" align="center" prop="maName" :show-overflow-tooltip="true" />
-                <el-table-column label="规格型号" align="center" prop="maModel" :show-overflow-tooltip="true" />
+                <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+                <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
                 <el-table-column label="领料数量" align="center" prop="num" :show-overflow-tooltip="true" />
                 <el-table-column label="减免数量" align="center" prop="reduceNum" width="120px">
                     <template v-slot="scope">
@@ -663,7 +663,7 @@ export default {
         if (!value) return
         try {
           let edit =true;
-          const res = await getUnitProDepList({ projectId: value, enableFilter: edit })
+          const res = await getListUnite({ projectId: value, enableFilter: edit })
           this.uniteList = res.data || []
 
           // 自动选中唯一叶子节点
@@ -817,11 +817,11 @@ export default {
                 console.log('22222222', this.pushReviewList)
                 this.leaseAll = this.pushReviewList.reduce((total, item) => {
                     // return total + Number(item.leaseMoney);
-                     return new Decimal(total).add(new Decimal(item.leaseMoney || 0)).toString()
+                     return new Decimal(total).add(new Decimal(item.leaseCost || 0)).toString()
                 }, 0)
                 let obj = {
                     id: null,
-                    leaseMoney: this.leaseAll
+                    leaseCost: this.leaseAll
                 }
                 this.pushReviewList.push(obj)
             })
diff --git a/src/views/material/cost/component/applyDetail.vue b/src/views/material/cost/component/applyDetail.vue
index 4224c2b4..e6127498 100644
--- a/src/views/material/cost/component/applyDetail.vue
+++ b/src/views/material/cost/component/applyDetail.vue
@@ -417,8 +417,7 @@
                                 <td>{{ item.typeName }}</td>
                                 <td>{{ item.modeName }}</td>
                                 <td>{{ item.unitName }}</td>
-                                <td v-if="item.leasePrice">{{ item.leasePrice }}</td>
-                                <td v-else></td>
+                                <td>{{ item.leasePrice }}</td>
                                 <td v-if="item.reduceNum">{{ item.reduceNum }}</td>
                                 <td v-else></td>
                                 <td>{{ item.startTime }}</td>
@@ -426,7 +425,7 @@
                                 <td>{{ item.days }}</td>
                                 <td>{{ item.remark }}</td>
                                 <td v-if="item.leaseMoney">{{ item.leaseMoney.toFixed(3) }}</td>
-                                <td v-else></td>
+                                <td v-else>{{ 0 }}</td>
                                 <td>{{ item.unitName }}</td>
                             </tr>
                         </table>
@@ -651,6 +650,8 @@ export default {
                         Number(this.reducCost)
                     this.costAll = costSum
 
+                    console.log(this.leaseCost + "," + this.repairCost + "," + this.scrapCost + "," + this.loseCost + "," + this.reducCost)
+
                     this.subCostFlag = costSum
                 })
                 .catch(error => {
diff --git a/src/views/material/cost/component/unreportHome.vue b/src/views/material/cost/component/unreportHome.vue
index 08acb15b..0dcc11f0 100644
--- a/src/views/material/cost/component/unreportHome.vue
+++ b/src/views/material/cost/component/unreportHome.vue
@@ -186,7 +186,7 @@
                     <el-tag type="warning" v-if="scope.row.isFinish == 0" effect="plain">未竣工</el-tag>
                 </template>
             </el-table-column>
-          <el-table-column label="竣工日期" align="center" prop="actualEndDate" :show-overflow-tooltip="true"/>
+          <el-table-column label="竣工日期" align="center" prop="actualEndDate"/>
         </el-table>
 
        <pagination