费用推送租赁

src/api/costPush/costPush.js

@@ -36,6 +36,14 @@ export function getLeaseList(query) {
   })
 }
 
+export function getLeaseListApi(query) {
+  return request({
+    url: '/material/iws_cost_push/getLeaseCostsByAgreementIdAndMonth',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询费用推送审核维修列表
 export function getRepairList(query) {
   return request({

src/views/material/costPush/pushReview/index.vue

@@ -237,22 +237,23 @@
           <el-table-column label="序号" align="center" width="80" type="index" />
           <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="mtUnitName" :show-overflow-tooltip="true"/>
+          <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
           <el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true"/>
-          <el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true"/>
+          <el-table-column label="租赁数量" align="center" prop="leaseNum" :show-overflow-tooltip="true"/>
-          <el-table-column label="计算开始时间" align="center" prop="calcStartTime"  width="120px"/>
+          <el-table-column label="计算开始时间" align="center" prop="leaseDate"  width="120px">
-          <el-table-column label="计算结束时间" align="center" prop="calcEndTime"  width="120px"/>
-          <el-table-column label="实际开始时间" align="center" prop="startTime"  width="120px"/>
-          <el-table-column label="实际结束时间" align="center" prop="endTime"  width="120px">
             <template slot-scope="scope">
-              <span v-if="scope.row.endTime">{{ scope.row.endTime }}</span>
+                {{ formatDate(scope.row.leaseDate) }}
-              <span v-else style="color: #909399;">未归还</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="计算结束时间" align="center" prop="backDate"  width="120px">
+              <template slot-scope="scope">
+                {{ formatDate(scope.row.backDate) }}
             </template>
           </el-table-column>
           <el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true"/>
-          <el-table-column label="租赁费用" align="center" width="126px" prop="leaseCost" :show-overflow-tooltip="true">
+          <el-table-column label="租赁费用" align="center" width="126px" prop="leaseMoney" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-                {{ scope.row.leaseCost.toFixed(2) }}
+                {{ scope.row.leaseMoney.toFixed(2) }}
             </template>
           </el-table-column>
         </el-table>
@@ -451,7 +452,7 @@ import {
     getUnitList,
     getAgreementInfoById,
 } from '@/api/back/index.js'
-import {getPushReviewList,getLeaseList,getRepairList,getLoseList,getScrapList,submitPushCosts } from "@/api/costPush/costPush";
+import {getPushReviewList,getLeaseListApi,getRepairList,getLoseList,getScrapList,submitPushCosts } from "@/api/costPush/costPush";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
@@ -529,6 +530,8 @@ export default {
         modelName: undefined,
       },
       dialogRepairTotal: 0,
+      repairAllMoney: 0,     
+      currentRepairRow: null, // 当前维修费用行数据
 
       //报废费用弹窗
       showScrap: false,
@@ -538,6 +541,8 @@ export default {
         modelName: undefined,
       },
       dialogScrapTotal: 0,
+      scrapAllMoney: 0,
+      currentScrapRow: null, // 当前报废费用行数据
 
       //丢失费用弹窗
       showLose: false,
@@ -547,6 +552,8 @@ export default {
         modelName: undefined,
       },
       dialogLoseTotal: 0,
+      loseAllMoney: 0,
+      currentLoseRow: null, // 当前丢失费用行数据
 
       originalMonth: null, // 用于存储原始的月份值，防止键盘按键删除
       originalMonthTrue: null,
@@ -574,6 +581,16 @@ export default {
         this.originalMonthTrue = dayDate.toString();
       },
 
+      formatDate(dateStr) {
+          if (!dateStr) return '';
+          // 处理日期格式，只保留年月日部分
+          const date = new Date(dateStr);
+          const year = date.getFullYear();
+          const month = String(date.getMonth() + 1).padStart(2, '0');
+          const day = String(date.getDate()).padStart(2, '0');
+          return `${year}-${month}-${day}`;
+        },
+
       //键盘按键删除触发返回效果
       handleMonthInput() {
       // 当用户输入时，检查是否为空
@@ -767,12 +784,14 @@ export default {
           agreementId: row.agreementId,
           typeName: this.dialogLease.typeName,
           modelName: this.dialogLease.modelName,
+          settlementType: 1,
         }
-        getLeaseList(params).then((response) => {
+        getLeaseListApi(params).then((response) => {
           this.dialogLeaseList = response.rows;
+          console.log("xxxxxxxxxxxxxx",this.dialogLeaseList)
           this.leaseAllMoney = 0;
           this.dialogLeaseList.forEach(item => {
-            this.leaseAllMoney += Number(item.leaseCost);
+            this.leaseAllMoney += Number(item.leaseMoney);
           })
           this.dialogLeaseTotal = response.total;
           this.loading = false;