From 44e8630301453ba742f7ae3ef8c14042fb09a554 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 21 Aug 2024 08:04:39 +0800
Subject: [PATCH] md

---
 src/api/emis/emisSettleSubBill.js                         | 8 ++++++++
 .../emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue | 4 ++--
 .../emisSettleInvoiceRecordForm.vue                       | 6 +++---
 .../emis/emisSettlePayRecord/panel/PayRecordList.vue      | 6 +++---
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/api/emis/emisSettleSubBill.js b/src/api/emis/emisSettleSubBill.js
index deb7a5dd..399c0a21 100644
--- a/src/api/emis/emisSettleSubBill.js
+++ b/src/api/emis/emisSettleSubBill.js
@@ -9,6 +9,14 @@ export function listEmisSettleSubBill(query) {
   })
 }
 
+export function listEmisCanInvoiceSettleSubBill(query) {
+  return request({
+    url: '/emis/emisSettleSubBill/listCanInvoice',
+    method: 'get',
+    params: query
+  })
+}
+
 export function getQueryStatInfoMap(query) {
   return request({
     url: '/emis/emisSettleSubBill/getQueryStatInfoMap',
diff --git a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
index 27156fb1..1e567b61 100644
--- a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
+++ b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
@@ -72,14 +72,14 @@
 
     </div>
 
-    <div style="margin-bottom:20px">
+    <!-- <div style="margin-bottom:20px">
       <div style="font-weight:500;margin-bottom:20px">
             子账单列表:
       </div>
       <div>
         <SubBillList :settleBillNo="settleBillNo"> </SubBillList>
       </div>
-    </div>
+    </div> -->
  </div>
 </template>
 
diff --git a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
index 07f5ba45..c18fb492 100644
--- a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
@@ -198,7 +198,7 @@
 </template>
 
 <script>
-import {listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill";
+import {listEmisSettleSubBill,listEmisCanInvoiceSettleSubBill} from "@/api/emis/emisSettleSubBill";
 import { addEmisSettleInvoiceRecord } from "@/api/emis/emisSettleInvoiceRecord";
 import CustomerInvoiceInfoPicker from '@/views/emis/EmisBaseTools/CustomerInvoiceInfoPicker.vue';
 import { parseTime,genJsSeqNo } from "@/utils/custom";
@@ -315,7 +315,7 @@ export default {
                 }
 
                 // 查询子账单
-                let res=await listEmisSettleSubBill(qParam);
+                let res=await listEmisCanInvoiceSettleSubBill(qParam);
                 console.log("===>=res==>",res)
                 if(res.code==200){
                   res.rows.forEach(itemSubBill=>{
@@ -352,7 +352,7 @@ export default {
       }
 
       // 查询子账单
-      let res=await listEmisSettleSubBill(qParam);
+      let res=await listEmisCanInvoiceSettleSubBill(qParam);
       console.log("===>=res==>",res)
       if(res.code==200){
         res.rows.forEach(itemSubBill=>{
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
index 1e3bef10..cb577b56 100644
--- a/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
+++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
@@ -31,9 +31,9 @@
               <el-tag type="success" v-if="scope.row.settleType == '1'">现金收款</el-tag>
               <el-tag type="success" v-if="scope.row.settleType == '2'">月结收款</el-tag>
             </span>
-            <span v-if="scope.row.recType == '1'">
-              <el-tag type="success" v-if="scope.row.settleType == '1'">现金退款</el-tag>
-              <el-tag type="success" v-if="scope.row.settleType == '2'">月结退款</el-tag>
+            <span v-if="scope.row.recType == '2'">
+              <el-tag type="danger" v-if="scope.row.settleType == '1'">现金退款</el-tag>
+              <el-tag type="danger" v-if="scope.row.settleType == '2'">月结退款</el-tag>
             </span>
         </template>
       </el-table-column>