t20-common-lib 0.14.2 → 0.14.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -30,6 +30,7 @@
|
|
|
30
30
|
</div>
|
|
31
31
|
</div>
|
|
32
32
|
</template>
|
|
33
|
+
<slot name="top" :validateResult="validateResult"></slot>
|
|
33
34
|
<template v-if="validateResult">
|
|
34
35
|
<div class="m-b">
|
|
35
36
|
<span class="m-r">导入统计</span>
|
|
@@ -41,11 +42,11 @@
|
|
|
41
42
|
</span>
|
|
42
43
|
<span>
|
|
43
44
|
无效数据
|
|
44
|
-
<span class="color-danger">{{ validateResult.errorList
|
|
45
|
+
<span class="color-danger">{{ validateResult.errorList?.length }}</span>
|
|
45
46
|
条。
|
|
46
47
|
</span>
|
|
47
48
|
</div>
|
|
48
|
-
<template v-if="validateResult.errorList
|
|
49
|
+
<template v-if="validateResult.errorList?.length">
|
|
49
50
|
<div class="bd-a">
|
|
50
51
|
<div class="flex-box flex-lr flex-v m-t m-b p-l p-r">
|
|
51
52
|
<span>无效数据详情</span>
|
|
@@ -71,7 +72,9 @@
|
|
|
71
72
|
/>
|
|
72
73
|
</div>
|
|
73
74
|
</div>
|
|
74
|
-
<
|
|
75
|
+
<slot name="error" :validateResult="validateResult">
|
|
76
|
+
<div class="color-warning m-t-s">上述数据输入有误，请修改导入文件中相关信息！</div>
|
|
77
|
+
</slot>
|
|
75
78
|
</template>
|
|
76
79
|
</template>
|
|
77
80
|
</div>
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
// 使用 `* as` 可兼容不同打包器的导出形态。
|
|
36
36
|
import * as XLSX from 'xlsx'
|
|
37
37
|
import uploadMsg from './Upload/uploadMsg.vue'
|
|
38
|
-
import writeImportErrorExcel from '
|
|
39
|
-
import { parseDate } from '
|
|
38
|
+
import writeImportErrorExcel from '../../../src/utils/writeImportErrorExcel'
|
|
39
|
+
import { parseDate } from '../../../src/utils/date'
|
|
40
40
|
|
|
41
41
|
export default {
|
|
42
42
|
name: 'FileImport',
|