From 11362d1f0be2e54c2d9adb71ebf6b4ec9a4fc648 Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Fri, 13 Sep 2024 14:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=A9=B3=E5=9B=9E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue | 7 +++++--
 sgzb-ui/src/views/cost/csotSettlement/costList.vue      | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
index a4b7f935..e05c49e1 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
@@ -140,6 +140,7 @@
                     <span v-if="scope.row.sltStatus == '1'">未结算</span>
                     <span v-if="scope.row.sltStatus == '2'">已结算</span>
                     <span v-if="scope.row.sltStatus == '3'">已审核</span>
+                  <span v-if="scope.row.sltStatus == '4'">已驳回</span>
                 </template>
             </el-table-column>
             <el-table-column
@@ -164,12 +165,12 @@
                         type="primary"
                         icon="el-icon-edit"
                         @click="handleApply(scope.row)"
-                        v-if="scope.row.sltStatus == '1'"
+                        v-if="scope.row.sltStatus == '1' || (scope.row.sltStatus == '4' && scope.row.isCommit == 0 )"
                         >结算申请</el-button
                     >
                     <!-- <el-button
             size="mini"
-            type="danger" 
+            type="danger"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >撤销申请</el-button> -->
@@ -220,6 +221,7 @@ export default {
                 { id: '1', name: '未结算' },
                 { id: '2', name: '已结算' },
                 { id: '3', name: '已审核' },
+                { id: '4', name: '已驳回' },
             ], //集合
             // 表格数据
             agreementList: [],
@@ -235,6 +237,7 @@ export default {
                 pageSize: 10,
                 keyWord: undefined,
                 sltStatus: '',
+                isCommit:'',
                 unitId: '',
                 projectId: '',
             },
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costList.vue b/sgzb-ui/src/views/cost/csotSettlement/costList.vue
index 56bec74c..e5e18b76 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costList.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costList.vue
@@ -152,7 +152,7 @@
                     >
                     <!-- <el-button
             size="mini"
-            type="danger" 
+            type="danger"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >撤销申请</el-button> -->
@@ -218,6 +218,7 @@ export default {
                 pageSize: 10,
                 keyWord: undefined,
                 sltStatus: '',
+                isCommit: '',
                 unitId: '',
                 projectId: '',
             },