ci-plus 1.5.5 → 1.5.7
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 -11
- package/src/identificationCard/identificationCard.vue +6 -6
- package/src/identificationCard/identificationCard1.5.4.vue +43 -9
- package/src/sortableTable/headButtons.vue +12 -2
- package/src/sortableTable/headerSelectV2.vue +1 -1
- package/src/utils/Dayjs.ts +19 -15
- package/src/utils/cardPrint.ts +7 -8
- package/src/utils/cardPrint1.5.4.ts +6 -8
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ci-plus",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.7",
|
|
4
4
|
"description": "ci组件库",
|
|
5
5
|
"main": "./index.ts",
|
|
6
6
|
"scripts": {
|
|
@@ -21,16 +21,7 @@
|
|
|
21
21
|
},
|
|
22
22
|
"license": "ISC",
|
|
23
23
|
"dependencies": {},
|
|
24
|
-
"devDependencies": {
|
|
25
|
-
"lodash-es": "^4.17.21",
|
|
26
|
-
"sortablejs": "^1.15.1",
|
|
27
|
-
"jsbarcode": "^3.11.4",
|
|
28
|
-
"@types/jsbarcode": "^3.11.4",
|
|
29
|
-
"vue-draggable-plus": "^0.4.0",
|
|
30
|
-
"vue3-print-nb": "^0.1.4",
|
|
31
|
-
"qrcode": "^1.5.3",
|
|
32
|
-
"@vueuse/core": "^9.13.0"
|
|
33
|
-
},
|
|
24
|
+
"devDependencies": {},
|
|
34
25
|
"peerDependencies": {},
|
|
35
26
|
"peerDependenciesMeta": {}
|
|
36
27
|
}
|
|
@@ -52,13 +52,13 @@
|
|
|
52
52
|
<td style="width: 100px">
|
|
53
53
|
<el-image
|
|
54
54
|
style="height: 20px; margin-top: 5px"
|
|
55
|
-
src="
|
|
55
|
+
:src="C_U"
|
|
56
56
|
/>
|
|
57
57
|
</td>
|
|
58
58
|
<td style="font-size: 23px">{{ item.r1c2 }}</td>
|
|
59
59
|
<!-- 文件编号 -->
|
|
60
|
-
<td>{{ item.
|
|
61
|
-
<td>{{ item.
|
|
60
|
+
<td>{{ item.r7c1 }}</td>
|
|
61
|
+
<td>{{ item.r7c2 }}</td>
|
|
62
62
|
</tr>
|
|
63
63
|
<tr>
|
|
64
64
|
<td>{{ item.r2c1 }}</td>
|
|
@@ -106,14 +106,14 @@
|
|
|
106
106
|
{{ item.r6c4 }}
|
|
107
107
|
</td>
|
|
108
108
|
</tr>
|
|
109
|
-
<tr>
|
|
109
|
+
<!-- <tr>
|
|
110
110
|
<td>{{ item.r7c1 }}</td>
|
|
111
111
|
<td>{{ item.r7c2 }}</td>
|
|
112
|
-
<td>{{ item.r7c3 }}</td>
|
|
112
|
+
<td> {{ item.r7c3 }} </td>
|
|
113
113
|
<td class="content">
|
|
114
114
|
{{ item.r7c4 }}
|
|
115
115
|
</td>
|
|
116
|
-
</tr>
|
|
116
|
+
</tr> -->
|
|
117
117
|
<tr style="border-bottom: none; border-top: none">
|
|
118
118
|
<td colspan="4">
|
|
119
119
|
<table
|
|
@@ -31,7 +31,11 @@
|
|
|
31
31
|
<div>第{{ index + 1 }}张标签</div> -->
|
|
32
32
|
</div>
|
|
33
33
|
<!-- 帐物卡 -->
|
|
34
|
-
<div
|
|
34
|
+
<div
|
|
35
|
+
class="id-code"
|
|
36
|
+
:style="`width: ${myWidth}; `"
|
|
37
|
+
v-if="item.card_state == 'ZHANGWU'"
|
|
38
|
+
>
|
|
35
39
|
<table
|
|
36
40
|
border="1"
|
|
37
41
|
cellpadding="0"
|
|
@@ -46,18 +50,30 @@
|
|
|
46
50
|
<tbody>
|
|
47
51
|
<tr>
|
|
48
52
|
<td style="width: 100px">
|
|
49
|
-
<el-image
|
|
53
|
+
<el-image
|
|
54
|
+
style="height: 20px; margin-top: 5px"
|
|
55
|
+
:src="C_U"
|
|
56
|
+
/>
|
|
50
57
|
</td>
|
|
51
58
|
<td style="font-size: 23px">{{ item.r1c2 }}</td>
|
|
52
59
|
<!-- 文件编号 -->
|
|
53
|
-
<td>{{ item.
|
|
54
|
-
<td>{{ item.
|
|
60
|
+
<td>{{ item.r7c1 }}</td>
|
|
61
|
+
<td>{{ item.r7c2 }}</td>
|
|
55
62
|
</tr>
|
|
56
63
|
<tr>
|
|
57
64
|
<td>{{ item.r2c1 }}</td>
|
|
58
65
|
<td colspan="2">{{ item.r2c2 }}</td>
|
|
59
|
-
<td
|
|
60
|
-
|
|
66
|
+
<td
|
|
67
|
+
rowspan="3"
|
|
68
|
+
colspan="2"
|
|
69
|
+
class="content"
|
|
70
|
+
>
|
|
71
|
+
<img
|
|
72
|
+
alt="二维码"
|
|
73
|
+
:src="item.r2c4"
|
|
74
|
+
:width="80"
|
|
75
|
+
style="margin: 1px"
|
|
76
|
+
/>
|
|
61
77
|
<!-- <CiQrcode :codeValue="item.r5c4" :width="80" /> -->
|
|
62
78
|
</td>
|
|
63
79
|
</tr>
|
|
@@ -74,7 +90,10 @@
|
|
|
74
90
|
<tr>
|
|
75
91
|
<td>{{ item.r5c1 }}</td>
|
|
76
92
|
<td colspan="2">{{ item.r5c2 }}</td>
|
|
77
|
-
<td
|
|
93
|
+
<td
|
|
94
|
+
colspan="2"
|
|
95
|
+
class="content"
|
|
96
|
+
>
|
|
78
97
|
{{ item.r5c4 }}
|
|
79
98
|
</td>
|
|
80
99
|
</tr>
|
|
@@ -87,6 +106,14 @@
|
|
|
87
106
|
{{ item.r6c4 }}
|
|
88
107
|
</td>
|
|
89
108
|
</tr>
|
|
109
|
+
<!-- <tr>
|
|
110
|
+
<td>{{ item.r7c1 }}</td>
|
|
111
|
+
<td>{{ item.r7c2 }}</td>
|
|
112
|
+
<td> {{ item.r7c3 }} </td>
|
|
113
|
+
<td class="content">
|
|
114
|
+
{{ item.r7c4 }}
|
|
115
|
+
</td>
|
|
116
|
+
</tr> -->
|
|
90
117
|
<tr style="border-bottom: none; border-top: none">
|
|
91
118
|
<td colspan="4">
|
|
92
119
|
<table
|
|
@@ -117,7 +144,11 @@
|
|
|
117
144
|
<td>{{ item.data[0]?.balance_count }}</td>
|
|
118
145
|
<td>{{ item.data[0]?.remark }}</td>
|
|
119
146
|
</tr>
|
|
120
|
-
<tr
|
|
147
|
+
<tr
|
|
148
|
+
v-for="(item, index) in 5"
|
|
149
|
+
:key="index"
|
|
150
|
+
style="border-left: none"
|
|
151
|
+
>
|
|
121
152
|
<td>{{ index + 2 }}</td>
|
|
122
153
|
<td></td>
|
|
123
154
|
<td></td>
|
|
@@ -132,7 +163,10 @@
|
|
|
132
163
|
|
|
133
164
|
<tr>
|
|
134
165
|
<td colspan="4">
|
|
135
|
-
<div
|
|
166
|
+
<div
|
|
167
|
+
class="b2bcode"
|
|
168
|
+
style="margin: 1px"
|
|
169
|
+
>
|
|
136
170
|
<!-- 将条码文本传递到组件生成对应条形码 -->
|
|
137
171
|
<bar-code
|
|
138
172
|
:key="item + new Date()"
|
|
@@ -7,10 +7,10 @@
|
|
|
7
7
|
*/ -->
|
|
8
8
|
<template>
|
|
9
9
|
<div class="ciheadbtns">
|
|
10
|
-
<div>
|
|
10
|
+
<div class="ciheadbtns-left">
|
|
11
11
|
<slot name="left"></slot>
|
|
12
12
|
</div>
|
|
13
|
-
<div>
|
|
13
|
+
<div class="ciheadbtns-right">
|
|
14
14
|
<slot name="right"></slot>
|
|
15
15
|
</div>
|
|
16
16
|
</div>
|
|
@@ -24,4 +24,14 @@ defineOptions({ name: 'ci-headbtns' })
|
|
|
24
24
|
justify-content: space-between;
|
|
25
25
|
padding: 5px 10px;
|
|
26
26
|
}
|
|
27
|
+
.ciheadbtns .ciheadbtns-left{
|
|
28
|
+
flex:1;
|
|
29
|
+
}
|
|
30
|
+
.ciheadbtns .ciheadbtns-right{
|
|
31
|
+
max-width: 120px; /**最多显示3个按钮，就换行 */
|
|
32
|
+
display: flex;
|
|
33
|
+
flex-direction: row;
|
|
34
|
+
flex-wrap: wrap;
|
|
35
|
+
justify-content: end;
|
|
36
|
+
}
|
|
27
37
|
</style>
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
</div>
|
|
42
42
|
</template>
|
|
43
43
|
<script setup lang="ts">
|
|
44
|
-
import SvgIcon from '
|
|
44
|
+
import SvgIcon from '../svgIcon/index'
|
|
45
45
|
import { computed, ref } from 'vue'
|
|
46
46
|
import headerPopover from './utils/headerPopover.vue'
|
|
47
47
|
import { TooltipTriggerType, ElSelectV2 } from 'element-plus'
|
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
|
package/src/utils/cardPrint.ts
CHANGED
|
@@ -7,8 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
// import { scan_card_code_get } from '@/api/InventoryBatch'
|
|
9
9
|
import { ElMessage, MessageParamsWithType } from 'element-plus'
|
|
10
|
-
import
|
|
11
|
-
import apis from '@/utils/baseApi'
|
|
10
|
+
import apis from './baseApi'
|
|
12
11
|
import axios from 'axios'
|
|
13
12
|
import { ref } from 'vue'
|
|
14
13
|
const { storageModule } = apis
|
|
@@ -237,7 +236,7 @@ export const cardPrint = (
|
|
|
237
236
|
r5c2: item.storage_scrap_count, // 责废总数
|
|
238
237
|
r5c4: item.card_code, // 标识卡号
|
|
239
238
|
r6c2: item.process_name, // 工序
|
|
240
|
-
r6c4:
|
|
239
|
+
r6c4: item.product_date, // 生产日期
|
|
241
240
|
r7c2: item.value, // 规值
|
|
242
241
|
r7c4: item.specification, // 规格
|
|
243
242
|
r8c2: item.opt_user_name, // 提交人
|
|
@@ -581,7 +580,7 @@ export const cardPrint = (
|
|
|
581
580
|
// r10c3: '质检员',
|
|
582
581
|
// r10c4: '',
|
|
583
582
|
// r11c1: '生产日期',
|
|
584
|
-
// r11c2:
|
|
583
|
+
// r11c2: item.product_date,
|
|
585
584
|
// r11c3: '质检日期',
|
|
586
585
|
// r11c4: '',
|
|
587
586
|
/** ----循环的数据-------------------------------- **/
|
|
@@ -694,7 +693,7 @@ export const cardPrint = (
|
|
|
694
693
|
r5c4: item.card_code, // 标识卡号
|
|
695
694
|
r6c2: item.storage_scrap_count, // 料废总数
|
|
696
695
|
r6c4: item.process_name, // 工序
|
|
697
|
-
r7c2:
|
|
696
|
+
r7c2: item.product_date, // 生产日期
|
|
698
697
|
r7c4: item.value, // 规值
|
|
699
698
|
r8c2: item.specification, // 规格
|
|
700
699
|
r8c4: item.opt_user_name, // 提交人
|
|
@@ -784,7 +783,7 @@ export const cardPrint = (
|
|
|
784
783
|
r11c3: '本批数量',
|
|
785
784
|
r11c4: item.center_data[0]?.batch_count,
|
|
786
785
|
r12c1: '生产日期',
|
|
787
|
-
r12c2:
|
|
786
|
+
r12c2: item.product_date,
|
|
788
787
|
r12c3: '工序',
|
|
789
788
|
r12c4: item.process_name,
|
|
790
789
|
r13c1: '提交人',
|
|
@@ -818,7 +817,7 @@ export const cardPrint = (
|
|
|
818
817
|
r2c4: baseUrls + item.qr_code_path, // 二维码地址
|
|
819
818
|
r3c1: '产品型号',
|
|
820
819
|
r3c2: item.material_model,
|
|
821
|
-
r4c1: '
|
|
820
|
+
r4c1: '物料编码',
|
|
822
821
|
r4c2: item.material_code,
|
|
823
822
|
r5c1: '批号',
|
|
824
823
|
r5c2: item.flow_lot_number
|
|
@@ -833,7 +832,7 @@ export const cardPrint = (
|
|
|
833
832
|
r7c2: item.location_name, // 值
|
|
834
833
|
data: [
|
|
835
834
|
{
|
|
836
|
-
opt_time:
|
|
835
|
+
opt_time: item.opt_time, // 日期
|
|
837
836
|
sr: item.record_type === 1 ? item.inventory : '', // 收入
|
|
838
837
|
fc: item.record_type === 2 ? item.inventory : '', // 发出
|
|
839
838
|
balance_count: item.balance_count, //结存
|
|
@@ -7,10 +7,8 @@
|
|
|
7
7
|
*/
|
|
8
8
|
// import { scan_card_code_get } from '@/api/InventoryBatch'
|
|
9
9
|
import { ElMessage, MessageParamsWithType } from 'element-plus'
|
|
10
|
-
import
|
|
11
|
-
import apis from '@/utils/baseApi'
|
|
10
|
+
import apis from './baseApi'
|
|
12
11
|
import axios from 'axios'
|
|
13
|
-
import { ref } from 'vue'
|
|
14
12
|
const { storageModule } = apis
|
|
15
13
|
const UserData = JSON.parse(localStorage.getItem('UserData') as string)
|
|
16
14
|
let users = {
|
|
@@ -225,7 +223,7 @@ export const cardPrint = (
|
|
|
225
223
|
r5c2: item.storage_scrap_count, // 责废总数
|
|
226
224
|
r5c4: item.card_code, // 标识卡号
|
|
227
225
|
r6c2: item.process_name, // 工序
|
|
228
|
-
r6c4:
|
|
226
|
+
r6c4: item.product_date, // 生产日期
|
|
229
227
|
r7c2: item.value, // 规值
|
|
230
228
|
r7c4: item.specification, // 规格
|
|
231
229
|
r8c2: '', // 提交人
|
|
@@ -569,7 +567,7 @@ export const cardPrint = (
|
|
|
569
567
|
// r10c3: '质检员',
|
|
570
568
|
// r10c4: '',
|
|
571
569
|
// r11c1: '生产日期',
|
|
572
|
-
// r11c2:
|
|
570
|
+
// r11c2: item.product_date,
|
|
573
571
|
// r11c3: '质检日期',
|
|
574
572
|
// r11c4: '',
|
|
575
573
|
/** ----循环的数据-------------------------------- **/
|
|
@@ -682,7 +680,7 @@ export const cardPrint = (
|
|
|
682
680
|
r5c4: item.card_code, // 标识卡号
|
|
683
681
|
r6c2: item.storage_scrap_count, // 料废总数
|
|
684
682
|
r6c4: item.process_name, // 工序
|
|
685
|
-
r7c2:
|
|
683
|
+
r7c2: item.product_date, // 生产日期
|
|
686
684
|
r7c4: item.value, // 规值
|
|
687
685
|
r8c2: item.specification, // 规格
|
|
688
686
|
r8c4: item.opt_user_name, // 提交人
|
|
@@ -772,7 +770,7 @@ export const cardPrint = (
|
|
|
772
770
|
r11c3: '本批数量',
|
|
773
771
|
r11c4: item.center_data[0]?.batch_count,
|
|
774
772
|
r12c1: '生产日期',
|
|
775
|
-
r12c2:
|
|
773
|
+
r12c2: item.product_date,
|
|
776
774
|
r12c3: '工序',
|
|
777
775
|
r12c4: item.process_name,
|
|
778
776
|
r13c1: '提交人',
|
|
@@ -819,7 +817,7 @@ export const cardPrint = (
|
|
|
819
817
|
r6c4: item.center_data[0]?.supplier_name,
|
|
820
818
|
data: [
|
|
821
819
|
{
|
|
822
|
-
opt_time:
|
|
820
|
+
opt_time: item.opt_time, // 日期
|
|
823
821
|
sr: item.record_type === 1 ? item.inventory : '', // 收入
|
|
824
822
|
fc: item.record_type === 2 ? item.inventory : '', // 发出
|
|
825
823
|
balance_count: item.balance_count, //结存
|