|
|
@@ -58,15 +58,16 @@ export default {
|
|
|
// '导出模板中的每一项都需填写，请检查您的数据！'
|
|
|
// )
|
|
|
// }
|
|
|
- // const dateRegex = /^(\d{4})[-/](\d{2})(?:[-/](\d{2}))?$/
|
|
|
- // const isDateError = list.some((item) => {
|
|
|
- // return !dateRegex.test(item.qian_dao_shi_jian)
|
|
|
- // })
|
|
|
- // if (isDateError) {
|
|
|
- // return this.$message.warning(
|
|
|
- // '有效期格式支持【2026-01】、【2026/01】、【2026-01-01】、【2026/01/01】，请检查您的数据！'
|
|
|
- // )
|
|
|
- // }
|
|
|
+ const dateRegex = /^(\d{4})[-/](\d{2})[-/](\d{2})\s+(\d{2}):(\d{2}):(\d{2})$/
|
|
|
+ const isDateError = list.some((item) => {
|
|
|
+ console.log('item.qian_dao_shi_jian', item.qian_dao_shi_jian)
|
|
|
+ return !dateRegex.test(item.qian_dao_shi_jian)
|
|
|
+ })
|
|
|
+ if (isDateError) {
|
|
|
+ return this.$message.warning(
|
|
|
+ '有效期格式支持【2024-03-14 09:39:30】、【2024/03/14 09:39:30】请检查您的数据！'
|
|
|
+ )
|
|
|
+ }
|
|
|
|
|
|
const userMap = new Map();
|
|
|
this.userList.forEach(user => {
|
|
|
@@ -75,7 +76,10 @@ export default {
|
|
|
});
|
|
|
|
|
|
list.forEach(item => {
|
|
|
+ console.log('item.qian_dao_shi_jian', item.qian_dao_shi_jian)
|
|
|
item.qian_dao_shi_jian = item.qian_dao_shi_jian.replace(/\//g, '-')
|
|
|
+ console.log('item.qian_dao_shi_jian222222222', item.qian_dao_shi_jian)
|
|
|
+
|
|
|
item.guan_lian_id_ = this.params.guan_lian_id_
|
|
|
item.qian_dao_lei_xing = '导入'
|
|
|
item.ye_wu_biao_ming_ = 't_lhrypxjlb'
|
tianxinyu