From 3c488e254f48b66fa2588fdd25eca266820400e9 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, 14 Sep 2022 22:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7=E3=80=81=E4=BC=9A=E5=91=98=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/public/doc/customer_template.xls   | Bin 18944 -> 18944 bytes
 jshERP-web/public/doc/member_template.xls     | Bin 18432 -> 18944 bytes
 jshERP-web/public/doc/vendor_template.xls     | Bin 18944 -> 18944 bytes
 .../tools/ImportFileModal.vue}                |  49 +++++-------------
 jshERP-web/src/mixins/JeecgListMixin.js       |   3 +-
 .../src/views/material/MaterialList.vue       |  11 ++--
 jshERP-web/src/views/system/CustomerList.vue  |  20 +++----
 jshERP-web/src/views/system/MemberList.vue    |  20 +++----
 jshERP-web/src/views/system/VendorList.vue    |  22 ++++----
 .../views/system/modules/CustomerModal.vue    |   4 +-
 .../src/views/system/modules/MemberModal.vue  |   2 +-
 .../src/views/system/modules/VendorModal.vue  |   4 +-
 12 files changed, 61 insertions(+), 74 deletions(-)
 rename jshERP-web/src/{views/material/modules/MaterialImportModal.vue => components/tools/ImportFileModal.vue} (54%)

diff --git a/jshERP-web/public/doc/customer_template.xls b/jshERP-web/public/doc/customer_template.xls
index 0ec0e3682f3ada88fa3609e0440b0ac89f4caad4..b1e67c25268775be64d431b2ec0e0f56ae930aca 100644
GIT binary patch
delta 827
zcmZutJ4_T|5T5yWVR!NF_Hpa&9-QGMYDW$qmvG!2te|262}F#Q54193VJwuy2NX(U
z)HpOG78)B(h(Xs_s)YrG4d#fa#sp%FiLpSV1xAANubejQ=KubgZ@!uNcE=`hY!YWi
zRBd3sc)oYGN@vw8I1w(Z?@>K=XlP4Vt#^?w=ssomeAQCaVl>i_;o=g_X-(9pyVS;&
zs@_OKPthGsr4gfzVunv8J}<d`Q_s*3*4#EMDrq`R>sB~z?5V>B`j$9~8)(qXVT{I2
z594H89?h6OS(Z-=rqBGG<)I~cv?FvPOh(GUGHBE?aU-4KdW`N`UfKeHpR0@&$OhRU
z1@I!f04~T$IrIo^4}D78xpb_id;-AAEU5WNnWkaeOE=c46&Mb(ZGLS|6K&@S8G2w#
z*Kh4}jDwEce$we>eB?-eF=CdT91WNbbtJE=tM@+q3ST7`x3Y(ag|g<O%Ntz!Uihd9
zz*{G79HIG+R&+@z=7m<Ej^cpOk**c*<2%Zini&t4S}!Nyv}u9>6+k3-0?3FTlaDUs
z*UPw~$U8tY;xOXI<OQ(CiFG*HWWs;l3N*+L2qJt2EdYe&O-cX>YA!!-?FQ*Us*t1I
zkq4Q{**ze={LPRvn^wyG1&eD2XSFvDmxR<Om;qSol6vW)2b{HTg=hCblEyn_x3W&R
z@~`_1#NaqDFTpN&4OgL4IPkQde-zbqZQCp$&NGp>aTK3oY)^fPyfe*Dg8I6q9tXZq
kzZ}+2g_-W(LW7Hi&--SpVe{StinarGLLS<~(ft$n2kn)po&W#<

delta 792
zcmZuvOK1~e5T1Xt$?nD^`!u_o2D5@nFD0oo*qTkVwTd3B_&N$&6+~&Fq98&k5n}Z0
z^iuJlw+bTF6|ahT^r8eBsX~f+EBF8p1*OivX}stT%;TGH=KBY>KF{j&Y-viAI_<fy
zXFf0E74asU3fILICVrf5l)`qxVwjh+_)5;+k@I*}vM`WDoRuw{q1cj2cv5ljo}!^I
z$>=K<F3LH)q~tI~_>k=24vL3~-<F54p=jYFWq+J$_&swP`%MGSs@qr+Z>To2QP*r-
zQXS?-S%<PDzSV4&;WbM~=!~YItEp^Dgyrxub^0Qo#0Q$~W&q&lh6d0AFYtmaz)P<K
z7Vu3)<{;B;W}>SX-DHpX41ky(h~<c><D_o8TYKFWOa@-b>FvqmAZ;-4p<bldz1Odi
zKW5nEFB%8QKQTDI8X@aZPPbuT-WDgCvqAXAT-{06KOU({Ix|Vb#2+J{@Wb8#dR4Mg
z7S@Jwta4P?0L027TS4D1kU!-QoJ+&Bs)7I_fWWT=p3%p1S)hxfycOdyU}}W12y5~H
zu!#x(!T3-Hnz-h>agS3`tJ?7Z0!U+j^+jPUQuz%@(gzp^m3+5iRB339PVC80Pob)7
zDVP&DJ54pfw;E@2m2uEFXJf!;4ZIu8#{QX&{heKg6dWO8A9llQXuzmo!1DyHL9e!J
zdxG}Riy=YA*aB$|XTOkI_h_ICF4PwAzS#FPa0Kz4mpUHi_x%#2`gxoG^kLz^iI_A9
L+{)qgL$}x;<T$2P

diff --git a/jshERP-web/public/doc/member_template.xls b/jshERP-web/public/doc/member_template.xls
index 4732da224917b5907cd693093b4547847e8a9287..bfb36617d4e6c39aa44e756f5d212a22069e53f6 100644
GIT binary patch
delta 1077
zcmZ`%O=uHQ5T5t4&F&_#yJ>57(+0Eg?_$N&QtVHnYpc<Nh*iN;wMEFGDk>;w)izbA
z;z2{F7k_SoR4CHA9y~~^pxA?;Lcv-rv<DB0NEGx?sBzvV5h?XO-n^OlX1<yClgYBo
z5X&Z5bS(LbvDH|{PX<>3!0&uMFIJ57HBLXjzy_t`sy#oO-ZeSREIcb+;l4&^L7HJw
z=b?jZaoW3I0?7B_H#x)$n=jv&Wt0yCfN8lK<4Od-%C&=vgnJYdKPpw2r9G#_v6J?<
zay9lSA+%HzO$tq@yYa57<3-iN7le-}x-+8ImN6ASlpi74uNk;ci?e{x*a{5l299bb
zW;7MUx{04Pjj(sR!E_g!)J#?(G*;=#Dm+d4N|F{n(6z8mt^UlDoC3?X>=3{+YYwWw
z<v?9m^`T&JB03QTNp%4OS<ncZrL>`Rx`1wRQ5EY54V2Kw07Pnm)Zn6F>>{+fgib-1
zZN-VIP_o9&jg-*8xf_bi&zEJ67t!xQgRX~SNX9CJ6qgXd_KM~DsV`<xWLW)A#Q=`E
zJc2WT^ULxy6?w#CxKDz1<uxgPZ+5|XT{*vw-NuJaN%;==sfHhaG@X+<u)(7@4`X+8
z4fEqba|64MPn+Ah!cc1&W;6JtCE7QmYrsK*OAr7L$Z$d{*ucw)2nZ2F5sQl#6#6h1
zyUjG$C;p%U8TTtf(I*0y`aDZ~i{JyW$Z6987^klQz{vV{%6KNxv9XmJ0}u&}wC!#?
zz1#<)OdIqh?sI|BdC5{SmoSWSvOHuJrWXp)GDecoom3V)bUY8m>>wRRZ{+-~;~+ds
zbHtUjQAlpvd%B>@bjSp(hf}Z@dz0}P1219BonG%P;%f|ja=R3?05ZNw);V)2i{V`A
o<)f`8m%el;$DD}0$i17aU#ZDyC)#$vBX5R!Xn;oNeCjIu10h@Ky#N3J

delta 1038
zcma)5T}TvB6h3!m+?m<jnOS#rX4<74`+-1%U23&;XKB(39|SXdizs`L2+f54ge;@5
zAWG@@kZ<<ZLxi?Hr_n<%y##`l1{(I#4{6X#P}{k)yAom0T;|?$&v(A>oOAEY&=?yU
zWuq?JG?jb7SS?lvebv7Tg#v#a0N6~gzn|*3!0t*t>csi>1HH?0EP>~wYr@yY{153Z
zliu}SPvYyqA=iPzl~G0{7?uTg>quvN3Zk$8|KrDQ`4l^et4a(%%k{XT#Bo-(Fs@j5
zR*vEft)47ln-ax)Y7{T24(=lRxRS&P@-L9h@k+H7dsGV#t498zT3^9J_(nTM^Htr%
zgL;x_++tA-8zxTb7H&5zR*g&K)9{typl#^5sH=Qssvl)ggo*tWKVhgiKz<GH8>U@D
zeSR+(0JGqDjz`-WXOa5lI;L%v(XnuNIx(F9N%c`1S=h8UuA$xCMYPdJLzp5|E2B>U
zNZA1??W1w*A~aS;XQ9h;l9Z^JH{x@v%IF%muB7~IUFBp6T@9ObN)$tLZ55xX3+l9^
zYQ1`PmRJ;NhyIaK!zo{fYihW(u1=<;!|%ku8T2AIr4cr=oPQZv+QtwcWpeTu1Sv-l
zzhy3Be^ZPF@pe<1_2KiT4xs>8lYPMEaXOpO=M5bMkYErhL4*K)$(kXVsER<>M30PN
zH&Q3Vu>X+)(|ttX$X`CO=)-o`j_@O8;QcWIIOrY~_mbWxH?~6|Tog3QEWkdp!Fb=G
zG(V*p1gfIN9~E#}2+}@)>0F{kEiuG0WAe_*2A?7R#h@;T53sUlj`U7b-7ai}6VQg^
zxnwP`lGnyr0OO>#yXFHOR<S*xY#(!}$DSofne3Uae7yOm5NO!Kf8l&$f2Sy?fRA*3
Ip!Ej(4X&*39smFU

diff --git a/jshERP-web/public/doc/vendor_template.xls b/jshERP-web/public/doc/vendor_template.xls
index d0901d5d12a5b6ad32ae5db6c68e59d741ce8a3e..1c5dd335ad5bbf53b31924d8338e6ad2c2f1f672 100644
GIT binary patch
delta 816
zcmZuwO=#3m5T41Vo22gMCA+anbYXX^7B97}wa|8VyRlj-RKdlT-n7+A3q4poh@i59
zKS#kS;t!%CLWLfx5wG2YNRKK7>(9ZW-V_w{P*8MU+V#{t^3BXQ^Ucf)q&kDu8JwR|
zwc7QTlY@)PbV|L155iUTJ*s1)!`s8<xPzqX4z=qU`l@+!mi?Np(i~flxr1y2O{Ik4
z-~^59J~bP=XpA#Ib&o#qJ8XD#(b!2vO{XdLpX*jQXY6mlM*3kM!%b8XZJ3}7!llE)
zAm0)+FFdj=4+X6VmvgTy7cH_amjcV9Md4vuM(EHq<K_qxbl-A)3jluoWn6+>kPDgs
zYPpZ#K-9zMa4kDy+Y8x+ET~45bqQ@3J@V}~KT)rF3cww5pms$yK8@S1zonjCg7F~N
z?$!Hmr4H_pp+~m7%Uk<2V<jbbpG*xhK2Aw~C1O@1U*0!J-&03!-8RF|>6IPWNiTXz
zS_U1S;ZS4mCrtsocH-($`qtaQcg+^Ma2t&jDvFLYTbRXnR4HZ|r;Dv<(%qsvBv`5|
z@*@BUsKulWP(&O?TvZx?bxzrUlOh3C!jj+6EK4b0@~OR~@{B@hp|u}OX8%AVAbWec
zb}f><_JN!&bG$l7Hu-&rdMu6%j_M}~=M`CDG6V3vEbHae0Z6T@W05*dcOrFc19j}b
z`VA!DI1ewv9(WCxp-)M{vp9f4`EpAhA;~>4I?3csp4#2?CEA^7eoUGupL-H`irO-I
hV=~P2|5mi>!<TXX8N%$qk(jm{I-v`?!!rl2;6HU@teOA-

delta 841
zcmZ`&O=uHQ5dPj~?e4}Tn@!T}ZX3*cuy|0KiuI>So7J``1%;vq4}$Gcu%IZYP_=6P
zxlayytG5b*)h)ega}dF!P^eM_i}mKAq8<vCI`5^?gPI}VoB3wGnfC^Eq9!J4V&<G~
zjL`VEk(EWdsNWIyqcwd==pV)=OVPWQoS=f~(HA2}=M9|}43Bh<$ITqAng!a+=d{^I
zLuQ^HSUD<K0VOPtE^&R`EK$gs3dfWDKWXiZo>&80#8&#6IwO)aY<G${-Lzdwr#+gn
zJ&_?N?TQ2~+b(C`vY%2+p0QK7%J=93^R~h`JxaTN3c!zzG_Zgm48lB64?ZFX)xmFV
zW^0Z!Uz{&Ow^TMq!f}O9zSHT)n>DilcL<<&tD1HibzHyD%r0Ow3`$<Je;ajihb%pI
z<U8Iwml=mM^5$nVM;M=FB)_bfHRa2<hS@2-zCQaVTFEZ&5WDF0!Cs?PWO+uG;ys_}
zdruel>?n5&lTMe1wGGhI^0Zi@Q<Wm)mCEiLNsQSxH0XdP9}nsAPx_|Di%@<&CeKjV
ziW7>vD-U3k)BeFpQ3`+R)*+X}eH6Y#0BnQc@PC%1f!_JzA$1ukmP7hsGd3c@QJPA9
z$M&Z<XK~c91g>kcI>|AxT9wuEGJ|k7wK1OCj||NzZR{^??6-Ci2^{Ca73{$)OrlTA
zV6KJRP^H?j-DHP%0Fw=P$TJV*Kl8N4Zh$1+u3n=lz5RLUY5G2Y=tWdG{8KY<t6zR4
SQE~7@%;<u&?&#{#d*T<LovWDu

diff --git a/jshERP-web/src/views/material/modules/MaterialImportModal.vue b/jshERP-web/src/components/tools/ImportFileModal.vue
similarity index 54%
rename from jshERP-web/src/views/material/modules/MaterialImportModal.vue
rename to jshERP-web/src/components/tools/ImportFileModal.vue
index 8788b2ca..6d13cd51 100644
--- a/jshERP-web/src/views/material/modules/MaterialImportModal.vue
+++ b/jshERP-web/src/components/tools/ImportFileModal.vue
@@ -14,15 +14,15 @@
       <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 target="_blank" :href="templateUrl"><b>{{templateName}}</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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
               <a-button type="primary" icon="import">导入</a-button>
             </a-upload>
           </a-form-item>
@@ -33,10 +33,10 @@
 </template>
 
 <script>
-  import { ACCESS_TOKEN } from "@/store/mutation-types"
-  import Vue from 'vue'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   export default {
-    name: 'MaterialImportModal',
+    name: 'ImportFileModal',
+    mixins:[JeecgListMixin],
     data () {
       return {
         title:"",
@@ -52,9 +52,10 @@
         },
         confirmLoading: false,
         disableMixinCreated: true,
-        tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
+        templateUrl: '',
+        templateName: '',
         url: {
-          importExcelUrl: "/material/importExcel",
+          importExcelUrl: '',
         }
       }
     },
@@ -66,36 +67,12 @@
       }
     },
     methods: {
-      init () {
-        this.model = Object.assign({}, '')
+      initModal(apiUrl, templateUrl, templateName) {
+        this.url.importExcelUrl = apiUrl
+        this.templateUrl = templateUrl
+        this.templateName = templateName
         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;
diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index 960fa005..4ff84278 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -323,8 +323,9 @@ export const JeecgListMixin = {
           } else {
             this.$message.warning(info.file.response.data)
           }
-          this.loadData()
           this.loading = false
+          this.visible = false
+          this.$emit('ok')
         } else {
           this.$message.error(`${info.file.name} ${info.file.response.data}.`);
           this.loading = false
diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index 6f610337..f09cb853 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/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() {
diff --git a/jshERP-web/src/views/system/CustomerList.vue b/jshERP-web/src/views/system/CustomerList.vue
index dd195e90..6b76812f 100644
--- a/jshERP-web/src/views/system/CustomerList.vue
+++ b/jshERP-web/src/views/system/CustomerList.vue
@@ -35,14 +35,7 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-          <a-upload v-if="btnEnableList.indexOf(1)>-1" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-            <a-popover title="导入注意点">
-              <template slot="content">
-                <p><a target="_blank" href="/doc/customer_template.xls"><b>客户Excel模板下载</b></a></p>
-              </template>
-              <a-button type="primary" icon="import">导入</a-button>
-            </a-popover>
-          </a-upload>
+          <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleImportXls()" type="primary" icon="import">导入</a-button>
           <a-button type="primary" icon="download" @click="handleExportXls('客户信息')">导出</a-button>
           <a-dropdown>
             <a-menu slot="overlay">
@@ -86,6 +79,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <customer-modal ref="modalForm" @ok="modalFormOk"></customer-modal>
+        <import-file-modal ref="modalImportForm" @ok="modalFormOk"></import-file-modal>
       </a-card>
     </a-col>
   </a-row>
@@ -93,14 +87,15 @@
 <!-- BY cao_yu_li -->
 <script>
   import CustomerModal from './modules/CustomerModal'
+  import ImportFileModal from '@/components/tools/ImportFileModal'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { openDownloadDialog, sheet2blob} from "@/utils/util"
   import JDate from '@/components/jeecg/JDate'
   export default {
     name: "CustomerList",
     mixins:[JeecgListMixin],
     components: {
       CustomerModal,
+      ImportFileModal,
       JDate
     },
     data () {
@@ -176,6 +171,13 @@
         }
         this.loadData(1);
       },
+      handleImportXls() {
+        let importExcelUrl = this.url.importExcelUrl
+        let templateUrl = '/doc/customer_template.xls'
+        let templateName = '客户Excel模板[下载]'
+        this.$refs.modalImportForm.initModal(importExcelUrl, templateUrl, templateName);
+        this.$refs.modalImportForm.title = "客户导入";
+      },
       handleEdit: function (record) {
         this.$refs.modalForm.edit(record);
         this.$refs.modalForm.title = "编辑";
diff --git a/jshERP-web/src/views/system/MemberList.vue b/jshERP-web/src/views/system/MemberList.vue
index 25868c6f..81e0abef 100644
--- a/jshERP-web/src/views/system/MemberList.vue
+++ b/jshERP-web/src/views/system/MemberList.vue
@@ -34,14 +34,7 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-          <a-upload v-if="btnEnableList.indexOf(1)>-1" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-            <a-popover title="导入注意点">
-              <template slot="content">
-                <p><a target="_blank" href="/doc/member_template.xls"><b>会员Excel模板下载</b></a></p>
-              </template>
-              <a-button type="primary" icon="import">导入</a-button>
-            </a-popover>
-          </a-upload>
+          <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleImportXls()" type="primary" icon="import">导入</a-button>
           <a-button type="primary" icon="download" @click="handleExportXls('会员信息')">导出</a-button>
           <a-dropdown>
             <a-menu slot="overlay">
@@ -85,6 +78,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <member-modal ref="modalForm" @ok="modalFormOk"></member-modal>
+        <import-file-modal ref="modalImportForm" @ok="modalFormOk"></import-file-modal>
       </a-card>
     </a-col>
   </a-row>
@@ -92,14 +86,15 @@
 <!-- f r o m 7 5  2 7 1  8 9 2 0 -->
 <script>
   import MemberModal from './modules/MemberModal'
+  import ImportFileModal from '@/components/tools/ImportFileModal'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { openDownloadDialog, sheet2blob} from "@/utils/util"
   import JDate from '@/components/jeecg/JDate'
   export default {
     name: "MemberList",
     mixins:[JeecgListMixin],
     components: {
       MemberModal,
+      ImportFileModal,
       JDate
     },
     data () {
@@ -173,6 +168,13 @@
         }
         this.loadData(1);
       },
+      handleImportXls() {
+        let importExcelUrl = this.url.importExcelUrl
+        let templateUrl = '/doc/member_template.xls'
+        let templateName = '会员Excel模板[下载]'
+        this.$refs.modalImportForm.initModal(importExcelUrl, templateUrl, templateName);
+        this.$refs.modalImportForm.title = "会员导入";
+      },
       handleEdit: function (record) {
         this.$refs.modalForm.edit(record);
         this.$refs.modalForm.title = "编辑";
diff --git a/jshERP-web/src/views/system/VendorList.vue b/jshERP-web/src/views/system/VendorList.vue
index ad643c97..dd161879 100644
--- a/jshERP-web/src/views/system/VendorList.vue
+++ b/jshERP-web/src/views/system/VendorList.vue
@@ -33,15 +33,8 @@
         </div>
         <!-- 操作按钮区域 -->
         <div class="table-operator"  style="margin-top: 5px">
-          <a-button v-if="btnEnableList.indexOf(1)>-1" type="primary" icon="plus" @click="handleAdd">新增</a-button>
-          <a-upload v-if="btnEnableList.indexOf(1)>-1" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-            <a-popover title="导入注意点">
-              <template slot="content">
-                <p><a target="_blank" href="/doc/vendor_template.xls"><b>供应商Excel模板下载</b></a></p>
-              </template>
-              <a-button type="primary" icon="import">导入</a-button>
-            </a-popover>
-          </a-upload>
+          <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
+          <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleImportXls()" type="primary" icon="import">导入</a-button>
           <a-button type="primary" icon="download" @click="handleExportXls('供应商信息')">导出</a-button>
           <a-dropdown>
             <a-menu slot="overlay">
@@ -85,6 +78,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <vendor-modal ref="modalForm" @ok="modalFormOk"></vendor-modal>
+        <import-file-modal ref="modalImportForm" @ok="modalFormOk"></import-file-modal>
       </a-card>
     </a-col>
   </a-row>
@@ -92,14 +86,15 @@
 <!-- b y 7 5 2 7  1 8 9 2 0 -->
 <script>
   import VendorModal from './modules/VendorModal'
+  import ImportFileModal from '@/components/tools/ImportFileModal'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { openDownloadDialog, sheet2blob} from "@/utils/util"
   import JDate from '@/components/jeecg/JDate'
   export default {
     name: "VendorList",
     mixins:[JeecgListMixin],
     components: {
       VendorModal,
+      ImportFileModal,
       JDate
     },
     data () {
@@ -175,6 +170,13 @@
         }
         this.loadData(1);
       },
+      handleImportXls() {
+        let importExcelUrl = this.url.importExcelUrl
+        let templateUrl = '/doc/vendor_template.xls'
+        let templateName = '供应商Excel模板[下载]'
+        this.$refs.modalImportForm.initModal(importExcelUrl, templateUrl, templateName);
+        this.$refs.modalImportForm.title = "供应商导入";
+      },
       handleEdit: function (record) {
         this.$refs.modalForm.edit(record);
         this.$refs.modalForm.title = "编辑";
diff --git a/jshERP-web/src/views/system/modules/CustomerModal.vue b/jshERP-web/src/views/system/modules/CustomerModal.vue
index 4689f580..357a6b78 100644
--- a/jshERP-web/src/views/system/modules/CustomerModal.vue
+++ b/jshERP-web/src/views/system/modules/CustomerModal.vue
@@ -139,8 +139,8 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone',
-            'phoneNum', 'fax', 'beginNeedGet', 'beginNeedPay', 'allNeedGet', 'allNeedPay', 'taxNum', 'taxRate',
+          this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email',
+            'phoneNum', 'fax', 'beginNeedGet', 'allNeedGet', 'taxNum', 'taxRate',
             'bankName', 'accountNumber', 'address', 'sort', 'description'))
           autoJumpNextInput('customerModal')
         });
diff --git a/jshERP-web/src/views/system/modules/MemberModal.vue b/jshERP-web/src/views/system/modules/MemberModal.vue
index 3f3f2062..3cf36001 100644
--- a/jshERP-web/src/views/system/modules/MemberModal.vue
+++ b/jshERP-web/src/views/system/modules/MemberModal.vue
@@ -99,7 +99,7 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone',
+          this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email',
             'phoneNum', 'sort', 'description'))
           autoJumpNextInput('memberModal')
         });
diff --git a/jshERP-web/src/views/system/modules/VendorModal.vue b/jshERP-web/src/views/system/modules/VendorModal.vue
index 4efe79b0..2770524b 100644
--- a/jshERP-web/src/views/system/modules/VendorModal.vue
+++ b/jshERP-web/src/views/system/modules/VendorModal.vue
@@ -139,8 +139,8 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email', 'telephone',
-            'phoneNum', 'fax', 'beginNeedGet', 'beginNeedPay', 'allNeedGet', 'allNeedPay', 'taxNum', 'taxRate',
+          this.form.setFieldsValue(pick(this.model,'supplier', 'contacts', 'telephone', 'email',
+            'phoneNum', 'fax', 'beginNeedPay', 'allNeedPay', 'taxNum', 'taxRate',
             'bankName', 'accountNumber', 'address', 'sort', 'description'))
           autoJumpNextInput('vendorModal')
         });