From 4deb815d278b1f3693c3ede6468f3c9556d8391d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 12 May 2023 00:49:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=98=8E=E7=BB=86Excel=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/public/doc/bill_item_template.xls  | Bin 0 -> 18432 bytes
 .../src/views/bill/dialog/ImportItemModal.vue | 115 ++++++++++++++++++
 .../src/views/bill/mixins/BillModalMixin.js   |  13 ++
 .../views/bill/modules/PurchaseOrderModal.vue |   9 +-
 .../src/views/bill/modules/SaleOrderModal.vue |   6 +
 5 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 jshERP-web/public/doc/bill_item_template.xls
 create mode 100644 jshERP-web/src/views/bill/dialog/ImportItemModal.vue

diff --git a/jshERP-web/public/doc/bill_item_template.xls b/jshERP-web/public/doc/bill_item_template.xls
new file mode 100644
index 0000000000000000000000000000000000000000..7db9c5c02db0f841088d40eb75e474dbea0f9e07
GIT binary patch
literal 18432
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

literal 0
HcmV?d00001

diff --git a/jshERP-web/src/views/bill/dialog/ImportItemModal.vue b/jshERP-web/src/views/bill/dialog/ImportItemModal.vue
new file mode 100644
index 00000000..4a321b51
--- /dev/null
+++ b/jshERP-web/src/views/bill/dialog/ImportItemModal.vue
@@ -0,0 +1,115 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="500"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :maskStyle="{'top':'93px','left':'154px'}"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:20%;height: 55%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="模板">
+          <span><a href="/doc/bill_item_template.xls" target="_blank"><b>明细Excel模板[下载]</b></a></span>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="文件">
+          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+                    :data="setFileData" :action="importExcelUrl" @change="handleImportExcel">
+            <a-button type="primary" icon="import">导入</a-button>
+          </a-upload>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import Vue from 'vue'
+
+  export default {
+    name: "ImportItemModal",
+    components: {
+    },
+    data () {
+      return {
+        title:"明细导入",
+        visible: false,
+        prefixNo: '',
+        model: {},
+        tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        url: {
+          importExcelUrl: "/depotItem/importItemExcel",
+        }
+      }
+    },
+    created () {
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {
+      add (prefixNo) {
+        this.prefixNo = prefixNo
+        this.form.resetFields()
+        this.model = Object.assign({}, {})
+        this.visible = true
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      },
+      //导入
+      handleImportExcel(info){
+        if (info.file.status !== 'uploading') {
+          console.log(info.file, info.fileList);
+        }
+        if (info.file.status === 'done') {
+          if (info.file.response) {
+            if (info.file.response.code === 200) {
+              this.$message.success('文件导入成功')
+              this.$emit('ok', info.file.response.data.rows);
+              this.close()
+            } else if (info.file.response.code === 500) {
+              this.$message.warn(info.file.response.data.message)
+            }
+          } else {
+            this.$message.error(`${info.file.name} ${info.file.response.data}.`);
+          }
+        } else if (info.file.status === 'error') {
+          this.$message.error(`文件导入失败: ${info.file.msg} `);
+        }
+      },
+      setFileData() {
+        return {
+          'prefixNo': this.prefixNo
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index ccf0caa7..f1860e66 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -807,6 +807,19 @@ export const BillModalMixin = {
       this.scanStatus = true
       this.scanBarCode = ''
     },
+    onImport(prefixNo) {
+      this.$refs.importItemModalForm.add(prefixNo);
+    },
+    importItemModalFormOk(data) {
+      this.materialTable.dataSource = data
+      this.$nextTick(() => {
+        let discountLastMoney = 0
+        for (let i = 0; i < data.length; i++) {
+          discountLastMoney += data[i].taxLastMoney
+        }
+        this.form.setFieldsValue({'discountLastMoney':discountLastMoney})
+      });
+    },
     //保存并审核
     handleOkAndCheck() {
       this.billStatus = '1'
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index bfe8690c..2471817c 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -89,6 +89,9 @@
                 <a-button style="margin-left: 8px" @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button>
               </a-col>
             </a-row>
+            <a-row :gutter="24" style="float:left;padding-bottom: 5px;padding-left:20px;">
+              <a-button icon="import" @click="onImport(prefixNo)">导入明细</a-button>
+            </a-row>
           </template>
         </j-editable-table>
         <a-row class="form-row" :gutter="24">
@@ -161,6 +164,7 @@
       </a-form>
     </a-spin>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
+    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
     <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
     <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
@@ -171,6 +175,7 @@
 <script>
   import pick from 'lodash.pick'
   import ManyAccountModal from '../dialog/ManyAccountModal'
+  import ImportItemModal from '../dialog/ImportItemModal'
   import LinkBillList from '../dialog/LinkBillList'
   import VendorModal from '../../system/modules/VendorModal'
   import AccountModal from '../../system/modules/AccountModal'
@@ -189,6 +194,7 @@
     mixins: [JEditableTableMixin,BillModalMixin],
     components: {
       ManyAccountModal,
+      ImportItemModal,
       LinkBillList,
       VendorModal,
       AccountModal,
@@ -273,7 +279,8 @@
         url: {
           add: '/depotHead/addDepotHeadAndDetail',
           edit: '/depotHead/updateDepotHeadAndDetail',
-          detailList: '/depotItem/getDetailList'
+          detailList: '/depotItem/getDetailList',
+          importExcelUrl: "/depotItem/importItemExcel",
         }
       }
     },
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 1246a01c..227c4065 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -89,6 +89,9 @@
                 <a-button style="margin-left: 8px" @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button>
               </a-col>
             </a-row>
+            <a-row :gutter="24" style="float:left;padding-bottom: 5px;padding-left:20px;">
+              <a-button icon="import" @click="onImport(prefixNo)">导入明细</a-button>
+            </a-row>
           </template>
         </j-editable-table>
         <a-row class="form-row" :gutter="24">
@@ -161,6 +164,7 @@
       </a-form>
     </a-spin>
     <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
+    <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
     <customer-modal ref="customerModalForm" @ok="customerModalFormOk"></customer-modal>
     <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
     <history-bill-list ref="historyBillListModalForm"></history-bill-list>
@@ -170,6 +174,7 @@
 <script>
   import pick from 'lodash.pick'
   import ManyAccountModal from '../dialog/ManyAccountModal'
+  import ImportItemModal from '../dialog/ImportItemModal'
   import CustomerModal from '../../system/modules/CustomerModal'
   import AccountModal from '../../system/modules/AccountModal'
   import HistoryBillList from '../dialog/HistoryBillList'
@@ -187,6 +192,7 @@
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
       ManyAccountModal,
+      ImportItemModal,
       CustomerModal,
       AccountModal,
       HistoryBillList,