From e220aa8f39e89c8a783ac4037c60302f36e0d135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 16 Aug 2023 00:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E5=9F=8B=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tools/BillExcelIframe.vue  | 83 +++++++++++++++++++
 jshERP-web/src/views/bill/PurchaseInList.vue  |  4 +
 .../src/views/bill/mixins/BillListMixin.js    | 18 +++-
 .../views/material/modules/MaterialModal.vue  |  4 +-
 4 files changed, 106 insertions(+), 3 deletions(-)
 create mode 100644 jshERP-web/src/components/tools/BillExcelIframe.vue

diff --git a/jshERP-web/src/components/tools/BillExcelIframe.vue b/jshERP-web/src/components/tools/BillExcelIframe.vue
new file mode 100644
index 00000000..efe8ffa2
--- /dev/null
+++ b/jshERP-web/src/components/tools/BillExcelIframe.vue
@@ -0,0 +1,83 @@
+<template>
+  <div ref="container">
+    <a-modal
+      :title="title"
+      :width="width"
+      :visible="visible"
+      :getContainer="() => $refs.container"
+      :maskStyle="{'top':'93px','left':'154px'}"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
+      :maskClosable="false"
+      :style="modalStyle"
+      @cancel="handleCancel"
+      cancelText="关闭">
+      <template slot="footer">
+        <a-button key="back" @click="handleCancel">取消</a-button>
+      </template>
+      <a-form :form="form">
+        <template>
+          <iframe :src="billExcelUrl" width="100%" :height="height" frameborder="0" scrolling="no"></iframe>
+        </template>
+        <template>
+          <a-row>
+            <a-col>
+              <a-form-item>
+                <a-input v-decorator="['id']" hidden/>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </template>
+      </a-form>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import {mixinDevice} from '@/utils/mixin'
+  export default {
+    name: 'BillExcelIframe',
+    mixins: [mixinDevice],
+    data () {
+      return {
+        title: "单据导出",
+        width: '500px',
+        visible: false,
+        modalStyle: '',
+        billExcelUrl: '',
+        height: "",
+        model: {},
+        form: this.$form.createForm(this),
+        loading: false
+      }
+    },
+    created () {
+    },
+    methods: {
+      show(record, billExcelUrl, height) {
+        this.height = height
+        this.billExcelUrl = billExcelUrl
+        this.visible = true
+        this.modalStyle = 'top:20%; height: 400px;'
+        this.model = Object.assign({}, record)
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'id'))
+        });
+      },
+      handleCancel() {
+        this.close()
+      },
+      close() {
+        this.billExcelUrl = ''
+        this.$emit('close')
+        this.visible = false
+        this.modalStyle = ''
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index 778bef1c..70d60360 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -109,6 +109,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>
@@ -194,6 +195,7 @@
         <!-- 表单区域 -->
         <purchase-in-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></purchase-in-modal>
         <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
+        <bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
       </a-card>
     </a-col>
   </a-row>
@@ -202,6 +204,7 @@
 <script>
   import PurchaseInModal from './modules/PurchaseInModal'
   import BillDetail from './dialog/BillDetail'
+  import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -213,6 +216,7 @@
     components: {
       PurchaseInModal,
       BillDetail,
+      BillExcelIframe,
       JEllipsis,
       JDate
     },
diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js
index 8df1f920..4a4c9c63 100644
--- a/jshERP-web/src/views/bill/mixins/BillListMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import {getAction } from '@/api/manage'
 import { FormTypes } from '@/utils/JEditableTableUtil'
 import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount,
-  getCurrentSystemConfig} from '@/api/api'
+  getCurrentSystemConfig, getPlatformConfigByKey} from '@/api/api'
 import { getCheckFlag } from "@/utils/util"
 
 export const BillListMixin = {
@@ -10,6 +10,9 @@ export const BillListMixin = {
     return {
       /* 原始审核是否开启 */
       checkFlag: true,
+      /* 单据Excel是否开启 */
+      isShowExcel: false,
+      billExcelUrl: '',
       supList: [],
       cusList: [],
       retailList: [],
@@ -120,6 +123,14 @@ export const BillListMixin = {
           this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo)
         }
       })
+      getPlatformConfigByKey({ "platformKey": "bill_excel_url" }).then((res) => {
+        if (res && res.code === 200) {
+          if(res.data.platformValue) {
+            this.isShowExcel = true
+            this.billExcelUrl = res.data.platformValue + '?no='
+          }
+        }
+      })
     },
     initSupplier() {
       let that = this;
@@ -193,6 +204,11 @@ export const BillListMixin = {
     handleRestDefault() {
       Vue.ls.remove(this.prefixNo)
       this.initColumnsSetting()
+    },
+    //导出单据
+    handleExport() {
+      this.$refs.billExcelIframe.show(this.model, this.billExcelUrl, 150)
+      this.$refs.billExcelIframe.title = "确认导出"
     }
   }
 }
\ No newline at end of file
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index b6d488f1..3894f4d6 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -929,12 +929,12 @@
           getMaxBarCode({}).then((res)=> {
             if (res && res.code === 200) {
               this.maxBarCodeInfo = res.data.barCode - 0
-              this.maxBarCodeInfo = this.maxBarCodeInfo + 1
+              this.maxBarCodeInfo = this.maxBarCodeInfo
               target.setValues([{rowKey: row.id, values: {barCode: this.maxBarCodeInfo, commodityUnit: unit?unit:''}}])
             }
           })
         } else {
-          this.maxBarCodeInfo = this.maxBarCodeInfo + 1
+          this.maxBarCodeInfo = this.maxBarCodeInfo
           target.setValues([{rowKey: row.id, values: {barCode: this.maxBarCodeInfo, commodityUnit: unit?unit:''}}])
         }
       },