From 7b334754418623dd2908ad259325c7ca6c0d7205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 24 Aug 2023 00:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=B4=A2=E5=8A=A1=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/mixins/BillListMixin.js    |  4 ++--
 .../src/views/financial/AdvanceInList.vue     |  4 ++++
 jshERP-web/src/views/financial/GiroList.vue   |  4 ++++
 jshERP-web/src/views/financial/ItemInList.vue |  4 ++++
 .../src/views/financial/ItemOutList.vue       |  4 ++++
 .../src/views/financial/MoneyInList.vue       |  4 ++++
 .../src/views/financial/MoneyOutList.vue      |  4 ++++
 .../financial/mixins/FinancialListMixin.js    | 19 ++++++++++++++++++-
 8 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js
index de459b55..884f9792 100644
--- a/jshERP-web/src/views/bill/mixins/BillListMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js
@@ -40,6 +40,7 @@ export const BillListMixin = {
   },
   created() {
     this.initColumnsSetting()
+    this.isShowExcel = Vue.ls.get('isShowExcel');
   },
   methods: {
     myHandleAdd() {
@@ -116,7 +117,6 @@ export const BillListMixin = {
       console.log(value);
     },
     initSystemConfig() {
-      this.isShowExcel = Vue.ls.get('isShowExcel');
       getCurrentSystemConfig().then((res) => {
         if(res.code === 200 && res.data){
           let multiBillType = res.data.multiBillType
@@ -208,7 +208,7 @@ export const BillListMixin = {
     //导出单据
     handleExport() {
       let search = this.getQueryParams().search
-      this.$refs.billExcelIframe.show(this.model, this.billExcelUrl + '?search=' + search, 150)
+      this.$refs.billExcelIframe.show(this.model, this.billExcelUrl + '?search=' + search + '&type=1', 150)
       this.$refs.billExcelIframe.title = "确认导出"
     }
   }
diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue
index a206b377..73dbd838 100644
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -83,6 +83,7 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+          <a-button v-if="isShowExcel" type="primary" icon="download" @click="handleExport">导出</a-button>
           <a-dropdown>
             <a-menu slot="overlay">
               <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -132,6 +133,7 @@
         <!-- 表单区域 -->
         <advance-in-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></advance-in-modal>
         <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
+        <bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
       </a-card>
     </a-col>
   </a-row>
@@ -139,6 +141,7 @@
 <script>
   import AdvanceInModal from './modules/AdvanceInModal'
   import FinancialDetail from './dialog/FinancialDetail'
+  import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { FinancialListMixin } from './mixins/FinancialListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -149,6 +152,7 @@
     components: {
       AdvanceInModal,
       FinancialDetail,
+      BillExcelIframe,
       JDate
     },
     data () {
diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue
index 7de34486..c1b13725 100644
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -83,6 +83,7 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+          <a-button v-if="isShowExcel" type="primary" icon="download" @click="handleExport">导出</a-button>
           <a-dropdown>
             <a-menu slot="overlay">
               <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -132,6 +133,7 @@
         <!-- 表单区域 -->
         <giro-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></giro-modal>
         <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
+        <bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
       </a-card>
     </a-col>
   </a-row>
@@ -139,6 +141,7 @@
 <script>
   import GiroModal from './modules/GiroModal'
   import FinancialDetail from './dialog/FinancialDetail'
+  import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { FinancialListMixin } from './mixins/FinancialListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -149,6 +152,7 @@
     components: {
       GiroModal,
       FinancialDetail,
+      BillExcelIframe,
       JDate
     },
     data () {
diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue
index e0e0ba5d..b191111f 100644
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -92,6 +92,7 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+          <a-button v-if="isShowExcel" type="primary" icon="download" @click="handleExport">导出</a-button>
           <a-dropdown>
             <a-menu slot="overlay">
               <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1"@click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -141,6 +142,7 @@
         <!-- 表单区域 -->
         <item-in-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></item-in-modal>
         <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
+        <bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
       </a-card>
     </a-col>
   </a-row>
@@ -148,6 +150,7 @@
 <script>
   import ItemInModal from './modules/ItemInModal'
   import FinancialDetail from './dialog/FinancialDetail'
+  import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { FinancialListMixin } from './mixins/FinancialListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -158,6 +161,7 @@
     components: {
       ItemInModal,
       FinancialDetail,
+      BillExcelIframe,
       JDate
     },
     data () {
diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue
index 0fc0fc3d..b5b0a412 100644
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -92,6 +92,7 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+          <a-button v-if="isShowExcel" type="primary" icon="download" @click="handleExport">导出</a-button>
           <a-dropdown>
             <a-menu slot="overlay">
               <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -141,6 +142,7 @@
         <!-- 表单区域 -->
         <item-out-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></item-out-modal>
         <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
+        <bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
       </a-card>
     </a-col>
   </a-row>
@@ -148,6 +150,7 @@
 <script>
   import ItemOutModal from './modules/ItemOutModal'
   import FinancialDetail from './dialog/FinancialDetail'
+  import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { FinancialListMixin } from './mixins/FinancialListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -158,6 +161,7 @@
     components: {
       ItemOutModal,
       FinancialDetail,
+      BillExcelIframe,
       JDate
     },
     data () {
diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue
index 4bb61d9f..17dffc8c 100644
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -97,6 +97,7 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+          <a-button v-if="isShowExcel" type="primary" icon="download" @click="handleExport">导出</a-button>
           <a-dropdown>
             <a-menu slot="overlay">
               <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -147,6 +148,7 @@
         <!-- 表单区域 -->
         <money-in-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></money-in-modal>
         <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
+        <bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
       </a-card>
     </a-col>
   </a-row>
@@ -154,6 +156,7 @@
 <script>
   import MoneyInModal from './modules/MoneyInModal'
   import FinancialDetail from './dialog/FinancialDetail'
+  import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { FinancialListMixin } from './mixins/FinancialListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -164,6 +167,7 @@
     components: {
       MoneyInModal,
       FinancialDetail,
+      BillExcelIframe,
       JDate
     },
     data () {
diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue
index e056964f..ace27451 100644
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -97,6 +97,7 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+          <a-button v-if="isShowExcel" type="primary" icon="download" @click="handleExport">导出</a-button>
           <a-dropdown>
             <a-menu slot="overlay">
               <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -147,6 +148,7 @@
         <!-- 表单区域 -->
         <money-out-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></money-out-modal>
         <financial-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></financial-detail>
+        <bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
       </a-card>
     </a-col>
   </a-row>
@@ -154,6 +156,7 @@
 <script>
   import MoneyOutModal from './modules/MoneyOutModal'
   import FinancialDetail from './dialog/FinancialDetail'
+  import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { FinancialListMixin } from './mixins/FinancialListMixin'
   import JDate from '@/components/jeecg/JDate'
@@ -164,6 +167,7 @@
     components: {
       MoneyOutModal,
       FinancialDetail,
+      BillExcelIframe,
       JDate
     },
     data () {
diff --git a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
index 5b2b5717..c5480714 100644
--- a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
+++ b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
@@ -1,5 +1,5 @@
 import {findFinancialDetailByNumber, findBySelectSup, findBySelectCus, findBySelectOrgan, findBySelectRetail,
-  getUserList, getPersonByType, getAccount, getCurrentSystemConfig} from '@/api/api'
+  getUserList, getPersonByType, getAccount, getCurrentSystemConfig, getPlatformConfigByKey} from '@/api/api'
 import { getCheckFlag } from "@/utils/util"
 import Vue from 'vue'
 
@@ -8,6 +8,9 @@ export const FinancialListMixin = {
     return {
       /* 原始审核是否开启 */
       checkFlag: true,
+      /* 单据Excel是否开启 */
+      isShowExcel: false,
+      billExcelUrl: '',
       prefixNo: '',
       supList: [],
       cusList: [],
@@ -33,6 +36,7 @@ export const FinancialListMixin = {
     }
   },
   created() {
+    this.isShowExcel = Vue.ls.get('isShowExcel');
   },
   methods: {
     myHandleAdd() {
@@ -92,6 +96,13 @@ export const FinancialListMixin = {
           this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo)
         }
       })
+      getPlatformConfigByKey({ "platformKey": "bill_excel_url" }).then((res) => {
+        if (res && res.code === 200) {
+          if(res.data.platformValue) {
+            this.billExcelUrl = res.data.platformValue
+          }
+        }
+      })
     },
     initSupplier() {
       let that = this;
@@ -154,6 +165,12 @@ export const FinancialListMixin = {
     },
     onDateOk(value) {
       console.log(value);
+    },
+    //导出单据
+    handleExport() {
+      let search = this.getQueryParams().search
+      this.$refs.billExcelIframe.show(this.model, this.billExcelUrl + '?search=' + search + '&type=2', 150)
+      this.$refs.billExcelIframe.title = "确认导出"
     }
   }
 }
\ No newline at end of file