From 347527221c45b645ae521cda08790665560264e2 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 25 Sep 2025 12:01:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E8=BD=AC=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/costPush/costPush.js                  |  9 +++++-
 .../business-details.vue                      |  3 +-
 .../material/costPush/pushReview/index.vue    | 30 +++++++++++--------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/api/costPush/costPush.js b/src/api/costPush/costPush.js
index 9b139b3d..029f82cf 100644
--- a/src/api/costPush/costPush.js
+++ b/src/api/costPush/costPush.js
@@ -173,5 +173,12 @@ export function getCostPushLeaseListApi(query) {
     })
 }
 
-
+// 费用推送审核提交
+export function submitPushCosts(params){
+  return request({
+    url: '/material/iws_cost_push/materialCostPush',
+    method: 'post',
+    data: params
+  })
+}
 
diff --git a/src/views/business-examine/direct-rotation-apply/business-details.vue b/src/views/business-examine/direct-rotation-apply/business-details.vue
index 3c994289..864d71e0 100644
--- a/src/views/business-examine/direct-rotation-apply/business-details.vue
+++ b/src/views/business-examine/direct-rotation-apply/business-details.vue
@@ -250,8 +250,9 @@ export default {
                 { label: '直转数量', prop: 'directNum' },
                 { label: '类型名称', prop: 'typeName' },
                 { label: '规格型号', prop: 'typeModelName' },
+                { label: '机具编号', prop: 'maCode' },
                 { label: '计量单位', prop: 'unitName' },
-                { label: '领料数量', prop: 'useNum' },
+                { label: '在用数量', prop: 'useNum' },
                 { label: '领料人', prop: 'leasePerson' },
                 { label: '领料日期', prop: 'startTime' }
             ],
diff --git a/src/views/material/costPush/pushReview/index.vue b/src/views/material/costPush/pushReview/index.vue
index ef66040e..35e5ae01 100644
--- a/src/views/material/costPush/pushReview/index.vue
+++ b/src/views/material/costPush/pushReview/index.vue
@@ -44,17 +44,17 @@
 <!--            </el-form-item>-->
             <el-form-item label="是否结算" prop="isSettlement">
                 <el-select v-model="queryParams.isSettlement" placeholder="请选择" clearable>
-                    <el-option label="已结算" value="0"></el-option>
-                    <el-option label="未结算" value="1"></el-option>
+                    <el-option label="已结算" value="1"></el-option>
+                    <el-option label="未结算" value="0"></el-option>
                 </el-select>
             </el-form-item>
 
-          <el-form-item label="费用归属" prop="settlementType">
+          <!-- <el-form-item label="费用归属" prop="settlementType">
             <el-select v-model="queryParams.settlementType" placeholder="请选择" clearable>
               <el-option label="工器具" value="1"></el-option>
               <el-option label="安全用品" value="2"></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
 
 <!--            <el-form-item label="是否审核" prop="isReview">-->
 <!--                <el-select v-model="queryParams.isReview" placeholder="请选择" clearable>-->
@@ -451,7 +451,7 @@ import {
     getUnitList,
     getAgreementInfoById,
 } from '@/api/back/index.js'
-import {getPushReviewList,getLeaseList,getRepairList,getLoseList,getScrapList } from "@/api/costPush/costPush";
+import {getPushReviewList,getLeaseList,getRepairList,getLoseList,getScrapList,submitPushCosts } from "@/api/costPush/costPush";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
@@ -501,7 +501,7 @@ export default {
         month: null,
         isReview: null,
         isSettlement: null,
-        settlementType: null,
+        settlementType: 1,
         isFilter: null,
       },
 
@@ -582,7 +582,7 @@ export default {
 
       //多选框选中数据
       handleSelectionChange(val) {
-        this.ids = val.map(item => item.id);
+        this.ids = val.map(item => item.agreementId);
       },
 
       /** 转换菜单数据结构 */
@@ -708,6 +708,7 @@ export default {
           agreementId: '',
           agreementCode: '',
           month: this.originalMonth,
+          settlementType: 1,
         }
         this.resetForm('queryForm')
         this.handleQuery()
@@ -720,7 +721,7 @@ export default {
 
       // 多选框选中数据
       handleSelectionChange(selection) {
-        this.ids = selection.map((item) => item.id)
+        this.ids = selection.map((item) => item.agreementId)
         this.single = selection.length != 1
         this.multiple = !selection.length
       },
@@ -905,15 +906,20 @@ export default {
               .confirm('是否确认提交？')
           .then(() => {
                   // let params = {
-                  //     'agreementId': this.rowData.agreementId, 'agreementCode': this.rowData.agreementCode,'totalCostAll': this.costAll,
-                  //     'leaseList': this.leaseList, 'repairList': this.repairList, 'scrapList': this.scrapList,'loseList': this.loseList,
+                  //   agreementIds:this.ids
                   // }
-
-                  // submitCosts(params).then((response) => {
+                  // console.log("xxxxxxxxxxxx",params)
+                  // submitPushCosts(params).then((response) => {
                   //     this.$message({
                   //         type: 'success',
                   //         message: '提交成功',
                   //     })
+                  //     // 清空勾选框选择状态
+                  //     if (this.$refs.multipleTable) {
+                  //       this.$refs.multipleTable.clearSelection()
+                  //     }
+                  //     // 清空ids数组
+                  //     this.ids = []
                   //     this.getList()
                   // })
               })