From 7407734832ca9214c9ba81e5add6789b6799a172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 21 May 2023 23:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/public/doc/goods_template.xls      | Bin 20992 -> 20992 bytes
 jshERP-web/src/utils/util.js                  |   5 +++--
 .../src/views/material/MaterialList.vue       |   1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/public/doc/goods_template.xls b/jshERP-web/public/doc/goods_template.xls
index c49c4d19528c09228d471e89ce273bc66372080f..6f493b685b51a2e7b030a652d8f6c4b81caf101f 100644
GIT binary patch
delta 1404
zcmZ{kZD><h7{~wT-k7HKCTUHYG`BWQOlxafMl`LpGi`6u*Jyg<tX4(IgrP0yh7&sG
zroC}5u3PQa?#$OOB8U_}$Yx;QCi^fMY`6)7$ru~m*kJVIEE5YMJ~v5kg1CFRC(rMH
z&Ux<toIK~IZm`r1_W5y>`9a_nd1Z#5G@WDr@h2vYy_G(-W}LBK(tnsct)4Of3^l;%
zs!GMD_<*l{i*TZxUw629(7DkZ!^%fz9;FXCU$?R${)0crhSOR9qZ;9O7hir+Su2^^
zC`SuDA>O<FJuNe5RWqsk^VS1W_Kl=d)h^sj>dO1G-+t1LAS%!f7L*Sp4>cWLp0OR3
zv)1u@(=0f1sXO`h>G-s)I@IP#DXaJIRF^L_PrBzGkA8L$FH6~D`>(ttzB`kUv)QSW
z@3bLK**YlOuVe1rkJa!5<tw9v`Y@i^zJ+b&!EkG+lSZuUQ{KEk|Kt4mJ-;QIXY0r5
zttu{^{ZJpecXT8nWtT=Xsbl+39NBlU0^9ghcqi-P--R1l2md$RC2mHLw{`o40ON^n
z&78N-zwhqtFoFG~jwG69zZ@6Aw(j=L4eljv>Fm{mF?BPHa7!@^fmigj^H+Ob6I(FG
zfA0wi6AE|quCSlEP0`pb{;^W8#n##((4;evV5R%hiXz)!!$Jw$VaGywvA+_PShN<o
z3RMVMio6c%Fj+F+0SBhbiv3PFHT+qUpc>V<RWiXvHFH8LPVm5ki4p@cyjUtQ1RGTc
zXes(tPme{YEW|-c4-{t4X^i4}oYQ~cM?n-y#8pkyHGV!)%c6WC(kl+Y%m0ad!3O!&
zXs10&s|7Mt9E_p}UyN?jqO^cjtr}6d3~~{<4RRCFaVX5LA@UgHA(9P}F@#!!YKhhx
zw4SKWpgIhV(SEEZ^-`z43%WslaeeR^#EAR`2}BzV5{Uu^nTQ(rgT6qhku)ZlDVK$`
zDM8O#P7(UADR-%O1bR<j?w0Tsoj?Ir-q7EwIdGTCK%mo}@6ER!8q+|kjA6>#p!{F!
z&H2~=h(2sAxS|6<)MSwEzu6$&|0aV>`33ydA7G8#GEi47L43xjNJh5}v?lUK#pfCo
z3r5>>MxWPu@sKtlN!1s|9^7Fj{>?y--$I)H>9f!+NmppWA=lrziXoXUZ#pp8!tM;a
wgfdl#-G1nfrR#P?1pY$Y!jo~Cr{b5*SaQ?1HSHZ46W4@jW4qF)c74E}0&Hv!YybcN

delta 1163
zcmbW0ZAepL6vxkV?>232Zo0YocD4CZtwGIvnJ;(mI#=2f0}TR2$`>$7#Vm>1KA1re
zQK!NPqR7fGL3N3~Bm@zD@LSOf^rb!&<QJiWFj{u*Ht!7jQupCL&-tD6+{6Dl&$+Q#
z7Mo@F52-ZHQyRB!498T{EQl+rC>xU|)q{-vl0Il$dUTpSnlQW?T(V2!=21Nh;U}Au
zwMy2quld~Pdek-fvTpJY0I<`m#_p!6#;FN$$k6+|_ry$N<iPNF|46@Xb)v@{iC(_b
zqmRU6r_U{%uYzjOLJctIyDn?z_lP*8Tirf@ec}#Qi<d+PtHY;ao_=X>JT|;<q`!N=
z7F_s6Y-9E4aaZzH;KYOO2G)Q#+&1nT;4^m=+dLvZ@ziYNfxV1iPaUKT*P2nkW;B2*
zxkt{k>^Z{Q!GnF?YVMI2uXum3w|K!9WpkM0FO6Q*8i1qyCqV~#8guJ78?s?;Lpp8%
z1H9L#*$76c%}jF+<iOE&-{(RuoXtqbO<;ndb@|L7;IiMkvxI7!$r)(|D1i>Gy!x0S
z;bRHkw7dYMeB57ryzIk0fg<L^;eeM3crWmP1+X{hGWbasK%8!bkrlw(L3=a=d5SL&
zLSRwILS$9QN|diqK2d=}1w@4k6%rLGR76y)P%)99kN}}D9W*IPK1>iw6=Fmi72=3&
z3h_i`3aN<7@m6y=tH6b3!K9^&)RHd<SuhVyA|0+YJEFP3I1Q1BBJ&U+%M7iQrNZ}r
zvydpIT<{=Nrqoa`5^YjQ*1b7N7HUgb_!cFY6n?iw7QWab3+Mk3&Xe$Xi=!_ooL7YN
zDd9B<;r~7h@P@klunItgPMBq8JQniU80DwdN(__fDwU_!@-fjX<fccEUWc|aG`30)
z!xk<h#9hCpJ|32YU49M++6(b#C=+AtGn&}q;}@%=QpxTvUhSm+zfPL$IKzGe?9tXc

diff --git a/jshERP-web/src/utils/util.js b/jshERP-web/src/utils/util.js
index 465e02ea..9edacc97 100644
--- a/jshERP-web/src/utils/util.js
+++ b/jshERP-web/src/utils/util.js
@@ -502,10 +502,11 @@ export function getNowFormatDateTime() {
 }
 
 /**
- * js获取当前时间， 格式“MMddHHMMSS”
+ * js获取当前时间， 格式“yyyyMMddHHMMSS”
  */
 export function getNowFormatStr() {
   let date = new Date();
+  let year = date.getFullYear();
   let month = date.getMonth() + 1;
   let strDate = date.getDate();
   let strHours = date.getHours();
@@ -526,7 +527,7 @@ export function getNowFormatStr() {
   if (strSeconds >= 0 && strSeconds <= 9) {
     strSeconds = "0" + strSeconds;
   }
-  return month +''+ strDate +''+ strHours +''+ strMinutes +''+ strSeconds;
+  return year +''+ month +''+ strDate +''+ strHours +''+ strMinutes +''+ strSeconds;
 }
 
 /**
diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index 44c57b4a..cb3d7bbb 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -392,6 +392,7 @@
         }
       },
       handleImportXls() {
+        this.$message.warning('最近增加了多属性、仓位货架、制造商、自定义列，请下载最新的模板！');
         let importExcelUrl = this.url.importExcelUrl
         let templateUrl = '/doc/goods_template.xls'
         let templateName = '商品Excel模板[下载]'