ci-plus 1.3.1 → 1.3.3
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 +14 -5
package/package.json
CHANGED
package/src/utils/cardPrint.ts
CHANGED
|
@@ -12,6 +12,14 @@ import apis from '@/utils/baseApi'
|
|
|
12
12
|
import axios from 'axios'
|
|
13
13
|
import { ref } from 'vue'
|
|
14
14
|
const { storageModule } = apis
|
|
15
|
+
const UserData = JSON.parse(localStorage.getItem('UserData') as string)
|
|
16
|
+
let users = {
|
|
17
|
+
org_id: UserData.orgId || '',
|
|
18
|
+
user_code: UserData.loginName || '',
|
|
19
|
+
user_name: UserData.name || '',
|
|
20
|
+
deptId: UserData.deptId || '',
|
|
21
|
+
}
|
|
22
|
+
let user = JSON.parse(JSON.stringify(users))
|
|
15
23
|
|
|
16
24
|
let baseUrls = storageModule //new URL(storageModule).origin + '/' // 图片的地址前缀
|
|
17
25
|
let apiurl = storageModule + 'scan_card_code_get/'
|
|
@@ -28,6 +36,7 @@ export const cardPrint = (
|
|
|
28
36
|
params: {
|
|
29
37
|
page: 1,
|
|
30
38
|
...cParams,
|
|
39
|
+
...user,
|
|
31
40
|
},
|
|
32
41
|
})
|
|
33
42
|
.then((_res: { data: { code: number; data: any[]; msg: MessageParamsWithType } }) => {
|
|
@@ -64,7 +73,7 @@ export const cardPrint = (
|
|
|
64
73
|
r8c2: item.center_data[0]?.inspector, // 检验员
|
|
65
74
|
r8c4: setDate(item.product_date), // 生产日期
|
|
66
75
|
r9c2: item.value, // 规值
|
|
67
|
-
r9c4: item.
|
|
76
|
+
r9c4: item.specification, // 规格
|
|
68
77
|
r10c1: '批次号',
|
|
69
78
|
r10c2: item.flow_lot_number
|
|
70
79
|
? item.flow_lot_number
|
|
@@ -154,7 +163,7 @@ export const cardPrint = (
|
|
|
154
163
|
r9c2: item.center_data[0]?.inspector, // 检验员
|
|
155
164
|
r9c4: setDate(item.product_date), // 生产日期
|
|
156
165
|
r10c2: setDate(item.center_data[0]?.inspect_time), // 检查日期
|
|
157
|
-
r10c4: item.
|
|
166
|
+
r10c4: item.specification, // 规格
|
|
158
167
|
r11c2: '', // 游隙/尺寸
|
|
159
168
|
r11c4: item.value, // 规值
|
|
160
169
|
r12c1: '批次号', // 批次号
|
|
@@ -208,7 +217,7 @@ export const cardPrint = (
|
|
|
208
217
|
r6c2: item.process_name, // 工序
|
|
209
218
|
r6c4: setDate(item.product_date), // 生产日期
|
|
210
219
|
r7c2: item.value, // 规值
|
|
211
|
-
r7c4: item.
|
|
220
|
+
r7c4: item.specification, // 规格
|
|
212
221
|
r8c2: '', // 提交人
|
|
213
222
|
r8c4: item.opt_user_name, // 责任人
|
|
214
223
|
/** ----循环的数据-------------------------------- **/
|
|
@@ -633,7 +642,7 @@ export const cardPrint = (
|
|
|
633
642
|
r6c4: item.process_name, // 工序
|
|
634
643
|
r7c2: setDate(item.product_date), // 生产日期
|
|
635
644
|
r7c4: item.value, // 规值
|
|
636
|
-
r8c2: item.
|
|
645
|
+
r8c2: item.specification, // 规格
|
|
637
646
|
r8c4: item.opt_user_name, // 提交人
|
|
638
647
|
r9c2: '', // 检验员
|
|
639
648
|
/** ----循环的数据-------------------------------- **/
|
|
@@ -761,7 +770,7 @@ export const cardPrint = (
|
|
|
761
770
|
opt_time: setDate(item.opt_time), // 日期
|
|
762
771
|
sr: item.record_type === 1 ? item.inventory : '', // 收入
|
|
763
772
|
fc: item.record_type === 2 ? item.inventory : '', // 发出
|
|
764
|
-
balance_count: item.balance_count,
|
|
773
|
+
balance_count: item.balance_count, //结存
|
|
765
774
|
remark: item.remark, // 签字/备注
|
|
766
775
|
},
|
|
767
776
|
],
|