diff --git a/jshERP-web/public/doc/goods_template.xls b/jshERP-web/public/doc/goods_template.xls index c49c4d19..6f493b68 100644 Binary files a/jshERP-web/public/doc/goods_template.xls and b/jshERP-web/public/doc/goods_template.xls differ 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模板[下载]'