ci-plus 1.5.6 → 1.5.8
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 +2 -2
- package/src/identificationCard/debug.log +1 -0
- package/src/identificationCard/identificationCard.vue +1985 -1629
- package/src/selectSuffix/selectSuffix.vue +1 -1
- package/src/sortableTable/headButtons.vue +3 -1
- package/src/utils/Dayjs.ts +19 -15
- package/src/utils/cardPrint.ts +608 -333
|
@@ -25,10 +25,12 @@ defineOptions({ name: 'ci-headbtns' })
|
|
|
25
25
|
padding: 5px 10px;
|
|
26
26
|
}
|
|
27
27
|
.ciheadbtns .ciheadbtns-left{
|
|
28
|
+
text-align: left;
|
|
28
29
|
flex:1;
|
|
29
30
|
}
|
|
30
31
|
.ciheadbtns .ciheadbtns-right{
|
|
31
|
-
|
|
32
|
+
text-align: right;
|
|
33
|
+
max-width: 150px; /**最多显示3个按钮,就换行 */
|
|
32
34
|
display: flex;
|
|
33
35
|
flex-direction: row;
|
|
34
36
|
flex-wrap: wrap;
|
package/src/utils/Dayjs.ts
CHANGED
|
@@ -6,22 +6,26 @@
|
|
|
6
6
|
* @param date 传入日期或者字符串
|
|
7
7
|
* @param geshi? 想要输出的格式
|
|
8
8
|
*/
|
|
9
|
-
import dayjs from 'dayjs'
|
|
9
|
+
// import dayjs from 'dayjs'
|
|
10
10
|
|
|
11
|
-
// 格式化日期
|
|
12
|
-
export const setDate = (date?: string | Date, geshi: string = 'YYYY-MM-DD') => {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
11
|
+
// // 格式化日期
|
|
12
|
+
// export const setDate = (date?: string | Date, geshi: string = 'YYYY-MM-DD') => {
|
|
13
|
+
// if (date == '' || date == null || date == undefined) {
|
|
14
|
+
// return ''
|
|
15
|
+
// } else {
|
|
16
|
+
// return dayjs(date).format(geshi)
|
|
17
|
+
// }
|
|
18
|
+
// }
|
|
19
|
+
// // 格式化日期时间
|
|
20
|
+
// export const setDateTime = (
|
|
21
|
+
// date: string | Date,
|
|
22
|
+
// geshi: string = 'YYYY-MM-DD hh:mm:ss',
|
|
23
|
+
// ): string => {
|
|
24
|
+
// return dayjs(date).format(geshi)
|
|
25
|
+
// }
|
|
26
|
+
let dayjs = 2
|
|
27
|
+
export const setDate = () => { }
|
|
19
28
|
// 格式化日期时间
|
|
20
|
-
export const setDateTime = (
|
|
21
|
-
date: string | Date,
|
|
22
|
-
geshi: string = 'YYYY-MM-DD hh:mm:ss',
|
|
23
|
-
): string => {
|
|
24
|
-
return dayjs(date).format(geshi)
|
|
25
|
-
}
|
|
29
|
+
export const setDateTime = () => { }
|
|
26
30
|
|
|
27
31
|
export default dayjs
|