From dfd4abfdafc6967259fba0213b9ce469400266b5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 6 Aug 2024 17:15:01 +0800
Subject: [PATCH] md

---
 src/plugins/modal.js                          |  8 +++----
 .../emisSettleBill/SiteInvoiceRecordApply.vue |  6 +++---
 .../emisSettleInvoiceChRecordForm.vue         | 14 +------------
 .../panel/InvoiceRecordApplyListPanel.vue     | 21 ++++++++++---------
 4 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/plugins/modal.js b/src/plugins/modal.js
index 73bb3ae3..7660d40e 100644
--- a/src/plugins/modal.js
+++ b/src/plugins/modal.js
@@ -5,19 +5,19 @@ let loadingInstance;
 export default {
   // 消息提示
   msg(content) {
-    Message.info({message: content,duration: 2000,offset: 120})
+    Message.info({message: content,duration: 1000,offset: 120})
   },
   // 错误消息
   msgError(content) {
-    Message.error({message: content,duration: 2000,offset: 120})
+    Message.error({message: content,duration: 1000,offset: 120})
   },
   // 成功消息
   msgSuccess(content) {
-    Message.success({message: content,duration: 2000,offset: 120})
+    Message.success({message: content,duration: 1000,offset: 120})
   },
   // 警告消息
   msgWarning(content) {
-    Message.warning({message: content,duration: 2000,offset: 120})
+    Message.warning({message: content,duration: 1000,offset: 120})
   },
   // 弹出提示
   alert(content) {
diff --git a/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue b/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
index 17a29ca0..0463f1ff 100644
--- a/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
+++ b/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
@@ -4,7 +4,7 @@
       <div class="tab-container">
         <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick"  @tab-remove="removeTab">
           <el-tab-pane label="可开票账单" name="waitOpenBillList" >
-            <SiteConfimPanel confirmStatus="1"> </SiteConfimPanel>
+            <SiteWaitOpenBillPanel confirmStatus="1"> </SiteWaitOpenBillPanel>
           </el-tab-pane>
           <el-tab-pane label="开票申请记录" name="billList" >
             <InvoiceRecordApplyListPanel @onSelect="onSelectApply"> </InvoiceRecordApplyListPanel>
@@ -23,7 +23,7 @@
 <script>
 import InvoiceRecordApplyListPanel from '@/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue';
 import InvoiceDetailPanel from '@/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue';
-import SiteConfimPanel from '@/views/emis/emisSettleBill/panel/SiteConfimPanel.vue';
+import SiteWaitOpenBillPanel from '@/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue';
 
 
 export default {
@@ -31,7 +31,7 @@ export default {
   components: {
     InvoiceRecordApplyListPanel,
     InvoiceDetailPanel,
-    SiteConfimPanel
+    SiteWaitOpenBillPanel
  },
   dicts: [
   ],
diff --git a/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue b/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
index 37c95025..453479a6 100644
--- a/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/emisSettleInvoiceChRecordForm.vue
@@ -2,19 +2,7 @@
   <div >
        <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-          <!-- <el-col :span="24">
-            <div>客户开票主体</div>
-            <div style="padding: 10px;
-                color: #6f6f6f;
-                font-size: 14px;
-                font-weight: 600;
-                border: 1px solid #eff0f4;
-                border-radius: 5px;">
-                  <div> <span style="color: blue">抬头:</span>{{ form.companyTaxNo }} {{ form.companyName }}</div>
-                  <div> <span style="color: blue">地址:</span>{{ form.companyAddress }} {{ form.companyTel }} </div>
-                  <div> <span style="color: blue">银行:</span>{{ form.bankName }} {{ form.bankAccNo }}</div>
-            </div>
-          </el-col> -->
+
           <el-col :span="24">
             <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
               <el-col :span="8">
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
index 1a7a609f..4c505484 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
@@ -357,6 +357,17 @@
                   v-hasPermi="['emis:emisSettleInvoiceRecord:edit']"
                 >修改</el-button>
               </el-col> -->
+
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleDownPDF"
+                >下载发票PDF</el-button>
+              </el-col>
               <el-col :span="1.5">
                 <el-button
                   type="danger"
@@ -368,16 +379,6 @@
                   v-hasPermi="['emis:emisSettleInvoiceRecord:remove']"
                 >删除</el-button>
               </el-col>
-              <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  plain
-                  icon="el-icon-download"
-                  size="mini"
-                  :disabled="single"
-                  @click="handleDownPDF"
-                >下载发票PDF</el-button>
-              </el-col>
               <!-- <el-col :span="1.5">
                 <el-button
                   type="warning"