From 34f65fcbf33cb4355c8b0f020fcc188af6873454 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 12 Oct 2024 00:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/dialog/BillDetail.vue   |  3 +--
 .../views/financial/dialog/FinancialDetail.vue    | 15 +++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 9295d8c6..2c97131e 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -4,7 +4,6 @@
     :width="width"
     :visible="visible"
     :maskClosable="false"
-    :keyboard="false"
     :forceRender="true"
     :style="modalStyle"
     fullscreen
@@ -13,6 +12,7 @@
     wrapClassName="ant-modal-cust-warp">
     <template slot="footer">
       <!--打印-->
+      <a-button key="back" @click="handleCancel">取消(ESC)</a-button>
       <template v-if="isShowPrintBtn">
         <a-button v-if="billPrintFlag" @click="handlePrint">三联打印预览</a-button>
         <!--此处为解决缓存问题-->
@@ -44,7 +44,6 @@
       <a-button v-if="billType === '盘点复盘'" @click="stockCheckReplayExportExcel()">导出</a-button>
       <!--反审核-->
       <a-button v-if="checkFlag && isCanBackCheck && model.status==='1'" @click="handleBackCheck()">反审核</a-button>
-      <a-button key="back" @click="handleCancel">取消</a-button>
     </template>
     <a-form :form="form">
       <!--零售出库-->
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index 9403fb65..12bbd75a 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -4,7 +4,6 @@
     :width="width"
     :visible="visible"
     :maskClosable="false"
-    :keyboard="false"
     :forceRender="true"
     :style="modalStyle"
     fullscreen
@@ -12,16 +11,16 @@
     @cancel="handleCancel"
     wrapClassName="ant-modal-cust-warp">
     <template slot="footer">
+      <a-button key="back" @click="handleCancel">取消(ESC)</a-button>
       <!--此处为解决缓存问题-->
-      <a-button v-if="financialType === '收预付款'" v-print="'#advanceInPrint'" ghost type="primary">打印</a-button>
-      <a-button v-if="financialType === '转账'" v-print="'#giroPrint'" ghost type="primary">打印</a-button>
-      <a-button v-if="financialType === '收入'" v-print="'#itemInPrint'" ghost type="primary">打印</a-button>
-      <a-button v-if="financialType === '支出'" v-print="'#itemOutPrint'" ghost type="primary">打印</a-button>
-      <a-button v-if="financialType === '收款'" v-print="'#moneyInPrint'" ghost type="primary">打印</a-button>
-      <a-button v-if="financialType === '付款'" v-print="'#moneyOutPrint'" ghost type="primary">打印</a-button>
+      <a-button v-if="financialType === '收预付款'" v-print="'#advanceInPrint'">打印</a-button>
+      <a-button v-if="financialType === '转账'" v-print="'#giroPrint'">打印</a-button>
+      <a-button v-if="financialType === '收入'" v-print="'#itemInPrint'">打印</a-button>
+      <a-button v-if="financialType === '支出'" v-print="'#itemOutPrint'">打印</a-button>
+      <a-button v-if="financialType === '收款'" v-print="'#moneyInPrint'">打印</a-button>
+      <a-button v-if="financialType === '付款'" v-print="'#moneyOutPrint'">打印</a-button>
       <!--反审核-->
       <a-button v-if="checkFlag && isCanBackCheck && model.status==='1'" @click="handleBackCheck()">反审核</a-button>
-      <a-button key="back" @click="handleCancel">取消</a-button>
     </template>
     <a-form :form="form">
       <!--收预付款-->