优化供应商、客户、会员导入的界面展示方式

jshERP-web/src/views/material/MaterialList.vue

@@ -154,7 +154,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <material-modal ref="modalForm" @ok="modalFormOk"></material-modal>
-        <material-import-modal ref="modalImportForm" @ok="modalFormOk"></material-import-modal>
+        <import-file-modal ref="modalImportForm" @ok="modalFormOk"></import-file-modal>
         <batch-set-info-modal ref="batchSetInfoModalForm" @ok="modalFormOk"></batch-set-info-modal>
       </a-card>
     </a-col>
@@ -162,7 +162,7 @@
 </template>
 <script>
   import MaterialModal from './modules/MaterialModal'
-  import MaterialImportModal from './modules/MaterialImportModal'
+  import ImportFileModal from '@/components/tools/ImportFileModal'
   import BatchSetInfoModal from './modules/BatchSetInfoModal'
   import { queryMaterialCategoryTreeList } from '@/api/api'
   import { postAction } from '@/api/manage'
@@ -177,7 +177,7 @@
     mixins:[JeecgListMixin],
     components: {
       MaterialModal,
-      MaterialImportModal,
+      ImportFileModal,
       BatchSetInfoModal,
       JEllipsis,
       JDate
@@ -371,7 +371,10 @@
         }
       },
       handleImportXls() {
-        this.$refs.modalImportForm.init();
+        let importExcelUrl = this.url.importExcelUrl
+        let templateUrl = '/doc/goods_template.xls'
+        let templateName = '商品Excel模板[下载]'
+        this.$refs.modalImportForm.initModal(importExcelUrl, templateUrl, templateName);
         this.$refs.modalImportForm.title = "商品导入";
       },
       searchReset() {

jshERP-web/src/views/material/modules/MaterialImportModal.vue

@@ -1,112 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="400"
-    :visible="visible"
-    :confirm-loading="confirmLoading"
-    @cancel="handleCancel"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:25%;height: 45%;overflow-y: hidden">
-    <template slot="footer">
-      <a-button key="back" @click="handleCancel">取消</a-button>
-    </template>
-    <a-spin :spinning="confirmLoading">
-      <a-row class="form-row" :gutter="24">
-        <a-col :md="24" :sm="24">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="第一步：">
-            <a target="_blank" href="/doc/goods_template.xls"><b>商品Excel模板[下载]</b></a>
-            <p>注意：模板中的第一行请勿删除</p>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row class="form-row" :gutter="24">
-        <a-col :md="24" :sm="24">
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="第二步：">
-            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleMaterialImportExcel">
-              <a-button type="primary" icon="import">导入</a-button>
-            </a-upload>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import { ACCESS_TOKEN } from "@/store/mutation-types"
-  import Vue from 'vue'
-  export default {
-    name: 'MaterialImportModal',
-    data () {
-      return {
-        title:"",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 18 },
-        },
-        confirmLoading: false,
-        disableMixinCreated: true,
-        tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
-        url: {
-          importExcelUrl: "/material/importExcel",
-        }
-      }
-    },
-    created () {
-    },
-    computed: {
-      importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}${this.url.importExcelUrl}`;
-      }
-    },
-    methods: {
-      init () {
-        this.model = Object.assign({}, '')
-        this.visible = true
-      },
-      /* 导入 */
-      handleMaterialImportExcel(info){
-        this.loading = true
-        if (info.file.status !== 'uploading') {
-          console.log(info.file, info.fileList);
-        }
-        if (info.file.status === 'done') {
-          if (info.file.response) {
-            // this.$message.success(`${info.file.name} 文件上传成功`);
-            if (info.file.response.code === 200) {
-              this.$message.success(info.file.response.data || `${info.file.name} 文件上传成功`)
-            } else {
-              this.$message.warning(info.file.response.data)
-            }
-            this.$emit('ok')
-            this.visible = false;
-            this.loading = false
-          } else {
-            this.$message.error(`${info.file.name} ${info.file.response.data}.`);
-            this.loading = false
-          }
-        } else if (info.file.status === 'error') {
-          this.$message.error(`文件上传失败: ${info.file.msg} `)
-          this.loading = false
-        }
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>