ci-plus 1.7.2 → 1.7.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 +1 -1
- package/src/utils/cardPrint.ts +27 -22
package/package.json
CHANGED
package/src/utils/cardPrint.ts
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* ?description : 11月22日开会重新更新成品工厂标识卡
|
|
5
5
|
* !@version : 1.6.1
|
|
6
6
|
* TODO:@since : 创建时间 2024-11-23 09:40:30
|
|
7
|
-
* !update : 2025-
|
|
7
|
+
* !update : 2025-03-13 调整生产日期字段取值
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
10
|
import { ElMessage, MessageParamsWithType } from 'element-plus'
|
|
@@ -104,7 +104,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
104
104
|
r8c1: '本批数量',
|
|
105
105
|
r8c2: item.center_data[0]?.batch_count,
|
|
106
106
|
r8c3: '生产日期',
|
|
107
|
-
r8c4: item.product_date,
|
|
107
|
+
r8c4: item.product_date ? item.product_date : item.center_data?.[0]?.product_date,
|
|
108
108
|
r9c1: '规值',
|
|
109
109
|
r9c2: item.value,
|
|
110
110
|
r9c3: '材料厂商',
|
|
@@ -185,7 +185,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
185
185
|
r13c1: '总箱数',
|
|
186
186
|
r13c2: item.total_row,
|
|
187
187
|
r13c3: '生产日期',
|
|
188
|
-
r13c4: item.product_date,
|
|
188
|
+
r13c4: item.product_date ? item.product_date : item.center_data?.[0]?.product_date,
|
|
189
189
|
r14c1: '热处理批号',
|
|
190
190
|
r14c2: item.center_data[0]?.heat_batch_number,
|
|
191
191
|
r14c3: '件数规格',
|
|
@@ -230,7 +230,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
230
230
|
r8c1: '本箱数量',
|
|
231
231
|
r8c2: item.current_inventory, // 本箱数量
|
|
232
232
|
r8c3: '生产日期',
|
|
233
|
-
r8c4: item.product_date, // 生产日期
|
|
233
|
+
r8c4: item.product_date ? item.product_date : item.center_data?.[0]?.product_date, // 生产日期
|
|
234
234
|
r9c1: '本批数量',
|
|
235
235
|
r9c2: item.center_data[0]?.batch_count,
|
|
236
236
|
r9c3: '材料厂商',
|
|
@@ -302,7 +302,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
302
302
|
r6c1: '工序', // 工序
|
|
303
303
|
r6c2: item.process_name, // 工序
|
|
304
304
|
r6c3: '生产日期', // 生产日期
|
|
305
|
-
r6c4: item.product_date, // 生产日期
|
|
305
|
+
r6c4: item.product_date ? item.product_date : item.center_data?.[0]?.product_date, // 生产日期
|
|
306
306
|
r7c1: '规值', // 规值
|
|
307
307
|
r7c2: item.value, // 规值
|
|
308
308
|
r7c3: '规格', // 规格
|
|
@@ -414,7 +414,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
414
414
|
r12c1: '热处理批号',
|
|
415
415
|
r12c2: item.center_data[0]?.heat_batch_number,
|
|
416
416
|
r12c3: '生产日期',
|
|
417
|
-
r12c4: item.product_date,
|
|
417
|
+
r12c4: item.product_date ? item.product_date : item.center_data?.[0]?.product_date,
|
|
418
418
|
r13c1: '责任人',
|
|
419
419
|
r13c2: item.duty_user_name,
|
|
420
420
|
r13c3: '提交人',
|
|
@@ -481,7 +481,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
481
481
|
r7c1: '操作员',
|
|
482
482
|
r7c2: item.report_user_name,
|
|
483
483
|
r7c3: '生产日期',
|
|
484
|
-
r7c4: item.product_date,
|
|
484
|
+
r7c4: item.product_date ? item.product_date : item.center_data?.[0]?.product_date,
|
|
485
485
|
r8c1: '检验员',
|
|
486
486
|
r8c2: item.inspector ? item.inspector : item.center_data[0]?.inspector,
|
|
487
487
|
r8c3: '检验日期',
|
|
@@ -580,7 +580,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
580
580
|
r11c3: '返工期限',
|
|
581
581
|
r11c4: item.rework_dead_line,
|
|
582
582
|
r12c1: '生产日期',
|
|
583
|
-
r12c2: item.product_date,
|
|
583
|
+
r12c2: item.product_date ? item.product_date : item.center_data?.[0]?.product_date,
|
|
584
584
|
r12c3: '',
|
|
585
585
|
r12c4: '',
|
|
586
586
|
|
|
@@ -698,19 +698,24 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
698
698
|
// 通过循环 tqList 数组，将数组中的每一项合并到obj中
|
|
699
699
|
console.log('%c Line:699 🍰 套圈数组', 'color:#ed9ec7', tqList)
|
|
700
700
|
let obj4: any = {}
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
701
|
+
if (tqList.length > 0) {
|
|
702
|
+
for (let i = 0; i < tqList.length; i++) {
|
|
703
|
+
const item = tqList[i]
|
|
704
|
+
console.log('%c Line:703 🌰 item', 'color:#ffdd4d', item)
|
|
705
|
+
const rowIndex = Math.floor(i / 2) + (row + 1) // 从r8c1开始这里就是8
|
|
706
|
+
const columnIndex = (i % 2) * 2 + 1
|
|
707
|
+
obj4[`r${rowIndex}c${columnIndex}`] = item.label
|
|
708
|
+
obj4[`r${rowIndex}c${columnIndex + 1}`] = item.value
|
|
709
|
+
}
|
|
708
710
|
}
|
|
709
711
|
console.log('%c Line:709 🌭 obj4', 'color:#42b983', obj4)
|
|
710
712
|
//-------
|
|
711
713
|
|
|
712
714
|
// 获取obj4最后一条属性
|
|
713
|
-
let lastKey4 =
|
|
715
|
+
let lastKey4 = lastKey
|
|
716
|
+
if (Object.keys(obj4).length > 0) {
|
|
717
|
+
lastKey4 = Object.keys(obj4)[Object.keys(obj4).length - 1]
|
|
718
|
+
}
|
|
714
719
|
console.log('%c Line:714 🍻 lastKey4', 'color:#6ec1c2', lastKey4)
|
|
715
720
|
// 获取行号
|
|
716
721
|
let row4 = Number(parseInt(lastKey4.split('r')[1].split('c')[0]))
|
|
@@ -738,7 +743,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
738
743
|
r52c1: '操作员',
|
|
739
744
|
r52c2: item.report_user_name,
|
|
740
745
|
r52c3: '生产日期',
|
|
741
|
-
r52c4: item.product_date,
|
|
746
|
+
r52c4: item.product_date ? item.product_date : item.center_data?.[0]?.product_date,
|
|
742
747
|
r53c1: '检验员',
|
|
743
748
|
r53c2: item.inspector ? item.inspector : item.center_data[0]?.inspector,
|
|
744
749
|
r53c3: '检验日期',
|
|
@@ -810,7 +815,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
810
815
|
r7c1: '规值',
|
|
811
816
|
r7c2: item.value,
|
|
812
817
|
r7c3: '生产日期',
|
|
813
|
-
r7c4: item.product_date,
|
|
818
|
+
r7c4: item.product_date ? item.product_date : item.center_data?.[0]?.product_date,
|
|
814
819
|
r8c1: '料废总数',
|
|
815
820
|
r8c2: item.storage_scrap_count,
|
|
816
821
|
r8c3: '材料厂商',
|
|
@@ -910,7 +915,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
910
915
|
r11c3: '本批数量',
|
|
911
916
|
r11c4: item.center_data[0]?.batch_count,
|
|
912
917
|
r12c1: '生产日期',
|
|
913
|
-
r12c2: item.product_date,
|
|
918
|
+
r12c2: item.product_date ? item.product_date : item.center_data?.[0]?.product_date,
|
|
914
919
|
r12c3: '提交人',
|
|
915
920
|
r12c4: item.opt_user_name,
|
|
916
921
|
|
|
@@ -1074,7 +1079,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
1074
1079
|
r13c1: '总箱数',
|
|
1075
1080
|
r13c2: item.total_row,
|
|
1076
1081
|
r13c3: '生产日期',
|
|
1077
|
-
r13c4: item.product_date,
|
|
1082
|
+
r13c4: item.product_date ? item.product_date : item.center_data?.[0]?.product_date,
|
|
1078
1083
|
r14c1: '热处理批号',
|
|
1079
1084
|
r14c2: item.center_data[0]?.heat_batch_number,
|
|
1080
1085
|
r14c3: '件数规格',
|
|
@@ -1136,7 +1141,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
1136
1141
|
r12c1: '包装方式',
|
|
1137
1142
|
r12c2: item.packaging_specifications_name,
|
|
1138
1143
|
r12c3: '生产日期',
|
|
1139
|
-
r12c4: item.product_date,
|
|
1144
|
+
r12c4: item.product_date ? item.product_date : item.center_data?.[0]?.product_date,
|
|
1140
1145
|
r13c1: '件数规格',
|
|
1141
1146
|
r13c2: item.center_data[0]?.case_count_str,
|
|
1142
1147
|
r13c3: '',
|
|
@@ -1169,7 +1174,7 @@ export const cardPrint = (cParams: any, callback: (data: any) => void, baseUrl?:
|
|
|
1169
1174
|
r6c1: '规值',
|
|
1170
1175
|
r6c2: item.value,
|
|
1171
1176
|
r6c3: '生产日期',
|
|
1172
|
-
r6c4: item.product_date,
|
|
1177
|
+
r6c4: item.product_date ? item.product_date : item.center_data?.[0]?.product_date,
|
|
1173
1178
|
r7c1: '本箱数量',
|
|
1174
1179
|
r7c2: item.current_inventory,
|
|
1175
1180
|
r7c3: '件数规格',
|