给财务单据的列表页面进行优化

2023-08-24 00:42:14 +08:00 · 2023-08-24 00:42:14 +08:00 · 7b33475441
commit 7b33475441
parent 5befe0e0f0
8 changed files with 44 additions and 3 deletions
--- 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 = "确认导出"
    }
  }
--- 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 () {
--- 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 () {
--- 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 () {
--- 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 () {
--- 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 () {
--- 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 () {
--- 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 = "确认导出"
    }
  }
 }