ci-plus 1.6.1 → 1.6.2
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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ci-plus",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.2",
|
|
4
4
|
"description": "ci组件库",
|
|
5
5
|
"main": "./index.ts",
|
|
6
6
|
"scripts": {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"vue",
|
|
13
13
|
"element-plus",
|
|
14
14
|
"ui组件库二次封装",
|
|
15
|
-
"
|
|
15
|
+
"更新第二版为尚标识卡模板-删除为尚标识卡模板的一些字段"
|
|
16
16
|
],
|
|
17
17
|
"type": "module",
|
|
18
18
|
"author": {
|
|
@@ -25,7 +25,10 @@
|
|
|
25
25
|
:srcdoc="barcodeCon"
|
|
26
26
|
frameborder="0"
|
|
27
27
|
></iframe>
|
|
28
|
-
<div
|
|
28
|
+
<div
|
|
29
|
+
id="barcode"
|
|
30
|
+
style="display: none"
|
|
31
|
+
>
|
|
29
32
|
<!-- 给print-conten 添加 page-break-a;可以使打印的时候在每个print-content元素的下方添加一个分页标记，即可实现一张纸只打印一张标签
|
|
30
33
|
参考：https://blog.csdn.net/qq_35491739/article/details/126279510
|
|
31
34
|
-->
|
|
@@ -1998,7 +2001,7 @@
|
|
|
1998
2001
|
defineOptions({ name: 'ci-identificationCard' })
|
|
1999
2002
|
import { ref, onMounted, nextTick, watch, computed } from 'vue'
|
|
2000
2003
|
import barCode from './barCode.vue'
|
|
2001
|
-
import { ElButton,ElImage } from 'element-plus'
|
|
2004
|
+
import { ElButton,ElIcon,ElPopover,ElImage } from 'element-plus'
|
|
2002
2005
|
import CiQrcode from './qrcode'
|
|
2003
2006
|
// 导入 public/C&U.png 图片
|
|
2004
2007
|
// import C_U from '@/assets/C&U.png'
|
|
@@ -0,0 +1,287 @@
|
|
|
1
|
+
## 使用示例
|
|
2
|
+
|
|
3
|
+
```ts
|
|
4
|
+
const useBackStoreM = defineStore(
|
|
5
|
+
'MaterialWarehouse-MaterialsPreparationNotice-index',
|
|
6
|
+
() => {
|
|
7
|
+
const ifshow = ref(true)
|
|
8
|
+
|
|
9
|
+
type Scoped = Scope<MPNRes>
|
|
10
|
+
const store: ReturnType<
|
|
11
|
+
ReturnType<typeof getOptStore<MPNRes, any, any, any, { ids: number[] }>>
|
|
12
|
+
> = getOptStore<MPNRes, any, any, any, { ids: number[] }>({
|
|
13
|
+
model: 'material_preparation_notice_list', // 请求地址：material_preparation_notice_list_post
|
|
14
|
+
id: 'MaterialWarehouse-MaterialsPreparationNotice-index', // 配置存储的id（约定项目名称-模块名称-页面名称）
|
|
15
|
+
name: '材料库_备料通知',
|
|
16
|
+
storage_type: '', //CHUKU
|
|
17
|
+
params: { limit: 20, storage_type: 'CAILIAO' },
|
|
18
|
+
baseUrl: storageModule,
|
|
19
|
+
setId: true,
|
|
20
|
+
ifInitData: false, // 是否初始请求表格数据
|
|
21
|
+
sortColumn: [
|
|
22
|
+
{ col: { width: 60, label: '序号', type: 'index', fixed: 'left' } },
|
|
23
|
+
{
|
|
24
|
+
col: { width: 130, label: '计划开始时间', prop: 'plan_start_date' },
|
|
25
|
+
// 示例1：日期格式
|
|
26
|
+
header(createVNode: any) {
|
|
27
|
+
return createVNode(HeaderInput, {
|
|
28
|
+
text: '计划开始时间',
|
|
29
|
+
column: 'plan_start_date',
|
|
30
|
+
storePar: store.params.value,
|
|
31
|
+
type: 'date',
|
|
32
|
+
placeholder: '请选择...',
|
|
33
|
+
popperStyle: { width: '450px', height: '300px' },
|
|
34
|
+
onChange(val: any) {
|
|
35
|
+
console.log('val: ', val)
|
|
36
|
+
store.HEADERSEARCH(val)
|
|
37
|
+
console.log('当前的参数: ', store.params.value)
|
|
38
|
+
},
|
|
39
|
+
ordersConfig: { enableOrder: true },
|
|
40
|
+
})
|
|
41
|
+
},
|
|
42
|
+
},
|
|
43
|
+
{
|
|
44
|
+
col: { width: 330, label: '物料编码', prop: 'material_info', },
|
|
45
|
+
// 示例2：输入框(简写)
|
|
46
|
+
header(createVNode: any) {
|
|
47
|
+
return createVNode(HeaderInput, {
|
|
48
|
+
text: '物料编码|物料名称|物料型号',
|
|
49
|
+
column: 'material_info',
|
|
50
|
+
storePar: store.params.value,
|
|
51
|
+
placeholder: '请输入关键字...',
|
|
52
|
+
onChange(val: any) {
|
|
53
|
+
store.HEADERSEARCH(val)
|
|
54
|
+
},
|
|
55
|
+
})
|
|
56
|
+
},
|
|
57
|
+
},
|
|
58
|
+
{
|
|
59
|
+
col: { width: 150, label: '产线', prop: 'line_name' },
|
|
60
|
+
// 示例3：输入框
|
|
61
|
+
header(createVNode: any) {
|
|
62
|
+
return createVNode(HeaderInput, {
|
|
63
|
+
text: '产线',
|
|
64
|
+
column: 'line_name',
|
|
65
|
+
storePar: store.params.value,
|
|
66
|
+
type: 'text',
|
|
67
|
+
disableFilter: false,// 关闭筛选功能true
|
|
68
|
+
selectConfig: {},
|
|
69
|
+
placeholder: '请输入关键字...',
|
|
70
|
+
onChange(val: any) {
|
|
71
|
+
console.log('val: ', val)
|
|
72
|
+
store.HEADERSEARCH(val)
|
|
73
|
+
console.log('当前的参数: ', store.params.value)
|
|
74
|
+
},
|
|
75
|
+
onGetstore(val: any) {
|
|
76
|
+
console.log('val: ', val)
|
|
77
|
+
console.log('当前的参数: ', store.params.value)
|
|
78
|
+
},
|
|
79
|
+
ordersConfig: { enableOrder: false }, // 开启排序功能true
|
|
80
|
+
})
|
|
81
|
+
},
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
col: {
|
|
85
|
+
width: 100,
|
|
86
|
+
label: '通用件库存',
|
|
87
|
+
prop: 'common_parts_inventory_count',
|
|
88
|
+
},
|
|
89
|
+
component(createVNode, { row }: Scoped) {
|
|
90
|
+
return createVNode(
|
|
91
|
+
'div',
|
|
92
|
+
{
|
|
93
|
+
style: {
|
|
94
|
+
color: `${row.common_parts_inventory_count < row.count
|
|
95
|
+
? 'red'
|
|
96
|
+
: 'black'
|
|
97
|
+
}`,
|
|
98
|
+
}, // 行内样式
|
|
99
|
+
class: 'flex-a-c', // 添加一个flex-a-c的class名称
|
|
100
|
+
},
|
|
101
|
+
row.common_parts_inventory_count,
|
|
102
|
+
)
|
|
103
|
+
},
|
|
104
|
+
|
|
105
|
+
},
|
|
106
|
+
{
|
|
107
|
+
col: { width: 100, label: '状态', prop: 'state', fixed: 'right' },
|
|
108
|
+
component(createVNode, { row }: Scoped) {
|
|
109
|
+
let { type, val } = setLibraryName(row.state)
|
|
110
|
+
if (val) {
|
|
111
|
+
return createVNode(ElTag, { type, class: 'ml-2' }, () => val)
|
|
112
|
+
} else {
|
|
113
|
+
return createVNode('div', [val])
|
|
114
|
+
}
|
|
115
|
+
},
|
|
116
|
+
// 示例4：下拉选择框(多选)
|
|
117
|
+
header(createVNode: any) {
|
|
118
|
+
return createVNode(HeaderInput, {
|
|
119
|
+
text: '状态',
|
|
120
|
+
column: 'state',
|
|
121
|
+
storePar: store.params.value,
|
|
122
|
+
type: 'select',
|
|
123
|
+
selectConfig: {
|
|
124
|
+
options: [
|
|
125
|
+
{ value: '0', label: '备货中' },
|
|
126
|
+
{ value: '1', label: '已备货' },
|
|
127
|
+
],
|
|
128
|
+
selectMultiple: true, // 是否多选
|
|
129
|
+
},
|
|
130
|
+
placeholder: '请选择...',
|
|
131
|
+
onChange(val: any) {
|
|
132
|
+
console.log('val: ', val)
|
|
133
|
+
store.HEADERSEARCH(val)
|
|
134
|
+
console.log('当前的参数: ', store.params.value)
|
|
135
|
+
},
|
|
136
|
+
})
|
|
137
|
+
},
|
|
138
|
+
},
|
|
139
|
+
{
|
|
140
|
+
col: {
|
|
141
|
+
width: 100,
|
|
142
|
+
label: '操作',
|
|
143
|
+
prop: 'state',
|
|
144
|
+
fixed: 'right',
|
|
145
|
+
},
|
|
146
|
+
component(createVNode: any, { row }: Scoped) {
|
|
147
|
+
// 单元格内容为一个开关 ElSwitch 组件
|
|
148
|
+
return createVNode(ElSwitch, {
|
|
149
|
+
style: {
|
|
150
|
+
'--el-switch-on-color': '#13ce66',
|
|
151
|
+
'--el-switch-off-color': '#e6a23c',
|
|
152
|
+
},
|
|
153
|
+
modelValue: row.state === 0 ? false : true, //ifshow.value,
|
|
154
|
+
inlinePrompt: true,
|
|
155
|
+
activeText: '备货完成',
|
|
156
|
+
inactiveText: '备货中',
|
|
157
|
+
'onUpdate:modelValue': (newValue: any) => {
|
|
158
|
+
console.log('newValue: ', newValue)
|
|
159
|
+
// ifshow.value = newValue
|
|
160
|
+
row.state = newValue ? 1 : 0
|
|
161
|
+
materialPreparationCompleted(
|
|
162
|
+
[row],
|
|
163
|
+
store.loading,
|
|
164
|
+
store.UPDATEPOST,
|
|
165
|
+
)
|
|
166
|
+
},
|
|
167
|
+
// 点击事件
|
|
168
|
+
onClick: (event: MouseEvent) => {
|
|
169
|
+
event.stopPropagation() // 阻止事件冒泡
|
|
170
|
+
},
|
|
171
|
+
// 禁用状态
|
|
172
|
+
disabled:
|
|
173
|
+
Number(row.material_preparation_count) >= Number(row.count)
|
|
174
|
+
? true
|
|
175
|
+
: false,
|
|
176
|
+
})
|
|
177
|
+
},
|
|
178
|
+
header(createVNode: any) {
|
|
179
|
+
return createVNode(HeaderInput, {
|
|
180
|
+
text: '操作',
|
|
181
|
+
column: 'state',
|
|
182
|
+
storePar: store.params.value,
|
|
183
|
+
type: 'select',
|
|
184
|
+
initValue: '0',
|
|
185
|
+
popperStyle: { width: '300px', height: '150px' },
|
|
186
|
+
selectConfig: {
|
|
187
|
+
options: [
|
|
188
|
+
{ value: '0', label: '备货中' },
|
|
189
|
+
{ value: '1', label: '已备货' },
|
|
190
|
+
],
|
|
191
|
+
selectMultiple: true, // 是否多选
|
|
192
|
+
},
|
|
193
|
+
placeholder: '请选择...',
|
|
194
|
+
onChange(val: any) {
|
|
195
|
+
console.log('val: ', val)
|
|
196
|
+
store.HEADERSEARCH(val)
|
|
197
|
+
console.log('当前的参数: ', store.params.value)
|
|
198
|
+
},
|
|
199
|
+
})
|
|
200
|
+
},
|
|
201
|
+
},
|
|
202
|
+
|
|
203
|
+
{
|
|
204
|
+
col: { label: '操作', prop: '', width: 240 },
|
|
205
|
+
// 单元格中渲染2个普通按钮组件
|
|
206
|
+
component(createVNode, { row }: Scoped) {
|
|
207
|
+
return createVNode('div', [
|
|
208
|
+
createVNode(
|
|
209
|
+
ElButton,
|
|
210
|
+
{
|
|
211
|
+
size: 'small',
|
|
212
|
+
type: 'warning',
|
|
213
|
+
color: '#2193b0',
|
|
214
|
+
onClick(evt) {
|
|
215
|
+
evt.stopPropagation() // 阻止冒泡事件
|
|
216
|
+
console.log('修改', row)
|
|
217
|
+
},
|
|
218
|
+
},
|
|
219
|
+
() => '公司详情记录',
|
|
220
|
+
),
|
|
221
|
+
createVNode(
|
|
222
|
+
ElButton,
|
|
223
|
+
{
|
|
224
|
+
size: 'small',
|
|
225
|
+
color: '#2c56a0',
|
|
226
|
+
onClick(evt) {
|
|
227
|
+
evt.stopPropagation() // 阻止冒泡事件
|
|
228
|
+
console.log('编辑', row)
|
|
229
|
+
},
|
|
230
|
+
},
|
|
231
|
+
() => '条款详情记录',
|
|
232
|
+
),
|
|
233
|
+
])
|
|
234
|
+
},
|
|
235
|
+
},
|
|
236
|
+
|
|
237
|
+
{
|
|
238
|
+
col: { width: 180, label: '操作', prop: '' },
|
|
239
|
+
component(createVNode, { row }: Scoped) {
|
|
240
|
+
// 单元格中渲染3个图标按钮组件
|
|
241
|
+
return createVNode('div', [
|
|
242
|
+
createVNode(ElButton, {
|
|
243
|
+
size: 'small',
|
|
244
|
+
type: 'warning',
|
|
245
|
+
icon: View, // 查看
|
|
246
|
+
color: '#2193b0',
|
|
247
|
+
onClick(evt) {
|
|
248
|
+
evt.stopPropagation() // 阻止冒泡事件
|
|
249
|
+
console.log('查看', row)
|
|
250
|
+
console.log('detailsRef', detailsRef.value)
|
|
251
|
+
// detailsRef.value?.showMydia()
|
|
252
|
+
onSeeDetails(detailsRef.value, row)
|
|
253
|
+
},
|
|
254
|
+
}),
|
|
255
|
+
createVNode(
|
|
256
|
+
ElButton,
|
|
257
|
+
{
|
|
258
|
+
size: 'small',
|
|
259
|
+
icon: EditPen,
|
|
260
|
+
onClick(evt) {
|
|
261
|
+
evt.stopPropagation() // 阻止冒泡事件
|
|
262
|
+
onAdd(true, addRef.value, row)
|
|
263
|
+
},
|
|
264
|
+
}, //, () => '修改'
|
|
265
|
+
),
|
|
266
|
+
createVNode(ElButton, {
|
|
267
|
+
size: 'small',
|
|
268
|
+
type: 'danger',
|
|
269
|
+
icon: Delete,
|
|
270
|
+
onClick(evt) {
|
|
271
|
+
evt.stopPropagation() // 阻止冒泡事件
|
|
272
|
+
console.log('修改', row)
|
|
273
|
+
deleteOpen([row.id], store.UPDATEPOST)
|
|
274
|
+
},
|
|
275
|
+
}),
|
|
276
|
+
])
|
|
277
|
+
},
|
|
278
|
+
},
|
|
279
|
+
|
|
280
|
+
|
|
281
|
+
|
|
282
|
+
],
|
|
283
|
+
})()
|
|
284
|
+
return store
|
|
285
|
+
},
|
|
286
|
+
)
|
|
287
|
+
```
|
package/src/utils/cardPrint.ts
CHANGED
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
* @module cardPrint
|
|
3
3
|
* @author : 卖女孩的小火柴
|
|
4
4
|
* !description : 标识卡打印
|
|
5
|
-
* @version : 1.0.
|
|
5
|
+
* @version : 1.0.3
|
|
6
6
|
* @since : 创建时间 2024-03-15 15:16:12
|
|
7
|
+
* @update : 2024-11-5 13:26:12更新标识卡模板，删除为尚工厂的一些字段
|
|
7
8
|
*/
|
|
8
9
|
// import { scan_card_code_get } from '@/api/InventoryBatch'
|
|
9
10
|
import { ElMessage, MessageParamsWithType } from 'element-plus'
|
|
@@ -125,81 +126,61 @@ export const cardPrint = (
|
|
|
125
126
|
r3c2: item.center_data[0]?.customer_name,
|
|
126
127
|
r4c1: '供应商',
|
|
127
128
|
r4c2: item.center_data[0]?.supplier_name,
|
|
128
|
-
r5c1: '
|
|
129
|
-
r5c2: item.
|
|
129
|
+
r5c1: '材料厂家',
|
|
130
|
+
r5c2: item.center_data[0]?.material_manufacturer,
|
|
130
131
|
r5c4: item.card_code, // 标识卡号
|
|
131
|
-
r6c1: '淬火件编码', // 建
|
|
132
|
-
r6c2: item.quenching_material_code, // 值
|
|
133
|
-
r6c3: '材料炉号', // 建
|
|
134
|
-
r6c4: item.center_data[0]?.material_heat_number, // 值
|
|
135
|
-
r7c1: '产品物料号', // 建
|
|
136
|
-
r7c2: item.material_code, // 值
|
|
137
|
-
r7c3: '库位', // 建
|
|
138
|
-
r7c4: item.location_name, // 值
|
|
139
|
-
r8c1: '产品型号', // 建
|
|
140
|
-
r8c2: item.material_model, // 值-产品型号
|
|
141
|
-
r8c3: '操作工', // 建 2024.08.31 由 收货人员 改为 操作工
|
|
142
|
-
r8c4: item.report_user_name
|
|
143
|
-
? item.report_user_name
|
|
144
|
-
: item.opt_user_name, // 值：item.center_data[0]?.consignee
|
|
145
|
-
r9c1: '本工序',
|
|
146
|
-
r9c2: item.process_name, // 材料厂家
|
|
147
|
-
r9c3: '下工序',
|
|
148
|
-
r9c4: item.next_process_name,
|
|
149
|
-
r10c1: '产线',
|
|
150
|
-
r10c2: item.line_name,
|
|
151
|
-
r10c3: '工单号',
|
|
152
|
-
r10c4: item.wip_order_number,
|
|
153
|
-
r11c1: '材料厂家',
|
|
154
|
-
r11c2: item.center_data[0]?.material_manufacturer,
|
|
155
|
-
r11c3: '收货人员',
|
|
156
|
-
r11c4: item.center_data[0]?.consignee,
|
|
157
|
-
r12c1: '抽检结果',
|
|
158
|
-
r12c2: item.check_result,
|
|
159
|
-
r12c3: '材料牌号',
|
|
160
|
-
r12c4: item.center_data[0]?.material_mark,
|
|
161
|
-
r13c1: '本箱数量',
|
|
162
|
-
r13c2: item.current_inventory,
|
|
163
|
-
r13c3: '本批数量',
|
|
164
|
-
r13c4: item.center_data[0]?.batch_count,
|
|
165
|
-
r14c1: '总箱数',
|
|
166
|
-
r14c2: item.total_row,
|
|
167
|
-
r14c3: '称重总数',
|
|
168
|
-
r14c4: item.center_data[0]?.weighing_count,
|
|
169
|
-
r15c1: '单重',
|
|
170
|
-
r15c2: item.piece_weight,
|
|
171
|
-
r15c3: '净重',
|
|
172
|
-
r15c4: item.net_weight,
|
|
173
|
-
r16c1: '检验日期',
|
|
174
|
-
r16c2: item.center_data[0]?.inspect_time,
|
|
175
|
-
r16c3: '抽检人员',
|
|
176
|
-
r16c4: item.rework_check_user_name,
|
|
177
|
-
r17c1: '炉号/炉数',
|
|
178
|
-
r17c2: item.number_of_furnace,
|
|
179
|
-
r17c3: '生产日期',
|
|
180
|
-
r17c4: item.product_date,
|
|
181
|
-
r18c1: '热处理批号',
|
|
182
|
-
r18c2: item.center_data[0]?.heat_batch_number,
|
|
183
|
-
r18c3: '材料批次',
|
|
184
|
-
r18c4: item.center_data[0]?.material_batch_number,
|
|
185
|
-
r19c1: '包装方式',
|
|
186
|
-
r19c2: item.packaging_specifications_name,
|
|
187
|
-
r19c3: '回火温度',
|
|
188
|
-
r19c4: item.temper_temperature,
|
|
189
|
-
r20c1: '件数规格',
|
|
190
|
-
r20c2: item.center_data[0]?.case_count_str,
|
|
191
|
-
r20c3: '',
|
|
192
|
-
r20c4: '',
|
|
193
132
|
|
|
133
|
+
r6c1: '淬火件型号',
|
|
134
|
+
r6c2: item.quenching_material_model,
|
|
135
|
+
r6c3: '材料炉号',
|
|
136
|
+
r6c4: item.center_data[0]?.material_heat_number,
|
|
137
|
+
r7c1: '淬火件编码',
|
|
138
|
+
r7c2: item.quenching_material_code,
|
|
139
|
+
r7c3: '材料牌号',
|
|
140
|
+
r7c4: item.center_data[0]?.material_mark,
|
|
141
|
+
r8c1: '产品物料号',
|
|
142
|
+
r8c2: item.material_code,
|
|
143
|
+
r8c3: '库位',
|
|
144
|
+
r8c4: item.location_name,
|
|
145
|
+
r9c1: '产品型号',
|
|
146
|
+
r9c2: item.material_model,
|
|
147
|
+
r9c3: '收货人员',
|
|
148
|
+
r9c4: item.center_data[0]?.consignee,
|
|
149
|
+
r10c1: '净重',
|
|
150
|
+
r10c2: item.net_weight,
|
|
151
|
+
r10c3: '单重',
|
|
152
|
+
r10c4: item.piece_weight,
|
|
153
|
+
r11c1: '产线',
|
|
154
|
+
r11c2: item.line_name,
|
|
155
|
+
r11c3: '工单号',
|
|
156
|
+
r11c4: item.wip_order_number,
|
|
157
|
+
r12c1: '本箱数量',
|
|
158
|
+
r12c2: item.current_inventory,
|
|
159
|
+
r12c3: '本批数量',
|
|
160
|
+
r12c4: item.center_data[0]?.batch_count,
|
|
161
|
+
r13c1: '总箱数',
|
|
162
|
+
r13c2: item.total_row,
|
|
163
|
+
r13c3: '生产日期',
|
|
164
|
+
r13c4: item.product_date,
|
|
165
|
+
r14c1: '热处理批号',
|
|
166
|
+
r14c2: item.center_data[0]?.heat_batch_number,
|
|
167
|
+
r14c3: '件数规格',
|
|
168
|
+
r14c4: item.center_data[0]?.case_count_str,
|
|
169
|
+
r15c1: '包装方式',
|
|
170
|
+
r15c2: item.packaging_specifications_name,
|
|
171
|
+
r15c3: '',
|
|
172
|
+
r15c4: '',
|
|
194
173
|
|
|
195
174
|
r40c1: '备注', // 备注
|
|
196
175
|
r40c2: item.remark, // 备注key
|
|
197
176
|
r41c1: item.center_data[0]?.b2b_batch_number || '', //条形码文本666
|
|
198
|
-
|
|
199
177
|
}
|
|
200
178
|
}
|
|
201
179
|
// 成品工厂-尾料标识卡(为尚无尾料标识卡，使用为尚的成品标识卡)
|
|
202
|
-
else if (
|
|
180
|
+
else if (
|
|
181
|
+
item.card_state == 'WEILIAO' &&
|
|
182
|
+
item.is_finished_goods == 2
|
|
183
|
+
) {
|
|
203
184
|
obj = {
|
|
204
185
|
card_state: item.card_state,
|
|
205
186
|
// 工厂类型：1：为尚工厂 | 2：成品工厂
|
|
@@ -383,16 +364,14 @@ export const cardPrint = (
|
|
|
383
364
|
r5c1: '材料厂家',
|
|
384
365
|
r5c2: item.center_data[0]?.material_manufacturer,
|
|
385
366
|
r5c4: item.card_code, // 标识卡号
|
|
386
|
-
|
|
387
367
|
r6c1: '淬火件型号',
|
|
388
368
|
r6c2: item.quenching_material_model,
|
|
389
369
|
r6c3: '材料炉号',
|
|
390
370
|
r6c4: item.center_data[0]?.material_heat_number,
|
|
391
371
|
r7c1: '淬火件编码',
|
|
392
372
|
r7c2: item.quenching_material_code,
|
|
393
|
-
r7c3: '
|
|
394
|
-
r7c4: item.center_data[0]?.
|
|
395
|
-
|
|
373
|
+
r7c3: '材料牌号',
|
|
374
|
+
r7c4: item.center_data[0]?.material_mark,
|
|
396
375
|
r8c1: '产品物料号',
|
|
397
376
|
r8c2: item.material_code,
|
|
398
377
|
r8c3: '库位',
|
|
@@ -403,33 +382,21 @@ export const cardPrint = (
|
|
|
403
382
|
r9c4: item.center_data[0]?.consignee,
|
|
404
383
|
r10c1: '责废总数', // 建
|
|
405
384
|
r10c2: item.storage_scrap_count,
|
|
406
|
-
r10c3: '
|
|
407
|
-
r10c4: item.
|
|
385
|
+
r10c3: '单重',
|
|
386
|
+
r10c4: item.piece_weight,
|
|
408
387
|
r11c1: '工序',
|
|
409
388
|
r11c2: item.process_name,
|
|
410
|
-
r11c3: '
|
|
411
|
-
r11c4: item.
|
|
412
|
-
r12c1: '
|
|
413
|
-
r12c2: item.
|
|
414
|
-
r12c3: '
|
|
415
|
-
r12c4: item.
|
|
416
|
-
r13c1: '
|
|
417
|
-
r13c2: item.
|
|
418
|
-
r13c3: '
|
|
419
|
-
r13c4: item.
|
|
389
|
+
r11c3: '本批数量',
|
|
390
|
+
r11c4: item.center_data[0]?.batch_count,
|
|
391
|
+
r12c1: '热处理批号',
|
|
392
|
+
r12c2: item.center_data[0]?.heat_batch_number,
|
|
393
|
+
r12c3: '生产日期',
|
|
394
|
+
r12c4: item.product_date,
|
|
395
|
+
r13c1: '责任人',
|
|
396
|
+
r13c2: item.duty_user_name,
|
|
397
|
+
r13c3: '提交人',
|
|
398
|
+
r13c4: item.opt_user_name,
|
|
420
399
|
|
|
421
|
-
r14c1: '检验员',
|
|
422
|
-
r14c2: item.center_data[0]?.inspector,
|
|
423
|
-
r14c3: '检验日期',
|
|
424
|
-
r14c4: item.center_data[0]?.inspect_time,
|
|
425
|
-
r15c1: '热处理批号',
|
|
426
|
-
r15c2: item.center_data[0]?.heat_batch_number,
|
|
427
|
-
r15c3: '炉号/炉数',
|
|
428
|
-
r15c4: item.number_of_furnace,
|
|
429
|
-
r16c1: '回火温度',
|
|
430
|
-
r16c2: item.temper_temperature,
|
|
431
|
-
r16c3: '',
|
|
432
|
-
r16c4: '',
|
|
433
400
|
/** ----循环的数据-------------------------------- **/
|
|
434
401
|
r30c1: badList[0]?.label, // 渲染数组第0行的'建'
|
|
435
402
|
r30c2: badList[0]?.value, // 渲染数组第0行的'值'
|
|
@@ -440,11 +407,13 @@ export const cardPrint = (
|
|
|
440
407
|
r40c1: '备注', // 备注
|
|
441
408
|
r40c2: item.remark, //条形码文本
|
|
442
409
|
r41c1: item.center_data[0]?.b2b_batch_number || '', // 条形码文本
|
|
443
|
-
|
|
444
410
|
}
|
|
445
411
|
}
|
|
446
412
|
// 成品工厂-返工标识卡
|
|
447
|
-
else if (
|
|
413
|
+
else if (
|
|
414
|
+
item.card_state == 'FANGONG' &&
|
|
415
|
+
item.is_finished_goods == 2
|
|
416
|
+
) {
|
|
448
417
|
// 如果有不良项目，就循环获取其中值
|
|
449
418
|
let badNum = item.bad_item_list?.length || 0
|
|
450
419
|
let badList: { id: number; label: string; value: string }[] = []
|
|
@@ -524,11 +493,16 @@ export const cardPrint = (
|
|
|
524
493
|
r30c2: badStr, // 渲染数组不良项目的'值'
|
|
525
494
|
r40c1: '备注',
|
|
526
495
|
r40c2: item.remark, // 备注
|
|
527
|
-
r41c1: item.flow_lot_number
|
|
496
|
+
r41c1: item.flow_lot_number
|
|
497
|
+
? item.flow_lot_number
|
|
498
|
+
: item.center_data[0]?.b2b_batch_number || '', //条形码文本:流转批次号存在就用流转批次号，不存在用批次序列号
|
|
528
499
|
}
|
|
529
500
|
}
|
|
530
501
|
// 为尚工厂-返工标识卡
|
|
531
|
-
else if (
|
|
502
|
+
else if (
|
|
503
|
+
item.card_state == 'FANGONG' &&
|
|
504
|
+
item.is_finished_goods == 1
|
|
505
|
+
) {
|
|
532
506
|
// 如果有不良项目，就循环获取其中值
|
|
533
507
|
let badNum = item.bad_item_list?.length || 0
|
|
534
508
|
let badList: { id: number; label: string; value: string }[] = []
|
|
@@ -576,8 +550,8 @@ export const cardPrint = (
|
|
|
576
550
|
r6c4: item.center_data[0]?.material_heat_number,
|
|
577
551
|
r7c1: '淬火件编码',
|
|
578
552
|
r7c2: item.quenching_material_code,
|
|
579
|
-
r7c3: '
|
|
580
|
-
r7c4: item.center_data[0]?.
|
|
553
|
+
r7c3: '材料牌号',
|
|
554
|
+
r7c4: item.center_data[0]?.material_mark,
|
|
581
555
|
r8c1: '产品物料号',
|
|
582
556
|
r8c2: item.material_code,
|
|
583
557
|
r8c3: '热处理批号',
|
|
@@ -592,24 +566,13 @@ export const cardPrint = (
|
|
|
592
566
|
r10c4: item.center_data[0]?.batch_count,
|
|
593
567
|
r11c1: '返工工序',
|
|
594
568
|
r11c2: item.rework_process_names,
|
|
595
|
-
r11c3: '
|
|
596
|
-
r11c4: item.
|
|
597
|
-
r12c1: '
|
|
598
|
-
r12c2: item.
|
|
599
|
-
r12c3: '
|
|
600
|
-
r12c4:
|
|
601
|
-
|
|
602
|
-
r13c2: item.center_data[0]?.inspector,
|
|
603
|
-
r13c3: '检验日期',
|
|
604
|
-
r13c4: item.center_data[0]?.inspect_time,
|
|
605
|
-
r14c1: '热处理批号',
|
|
606
|
-
r14c2: item.center_data[0]?.heat_batch_number,
|
|
607
|
-
r14c3: '炉号/炉数',
|
|
608
|
-
r14c4: item.number_of_furnace,
|
|
609
|
-
r15c1: '回火温度',
|
|
610
|
-
r15c2: item.temper_temperature,
|
|
611
|
-
r15c3: '',
|
|
612
|
-
r15c4: '',
|
|
569
|
+
r11c3: '返工期限',
|
|
570
|
+
r11c4: item.rework_dead_line,
|
|
571
|
+
r12c1: '生产日期',
|
|
572
|
+
r12c2: item.product_date,
|
|
573
|
+
r12c3: '',
|
|
574
|
+
r12c4: '',
|
|
575
|
+
|
|
613
576
|
/** ----循环的数据---------------- **/
|
|
614
577
|
r30c1: '不良项目',
|
|
615
578
|
r30c2: badStr, // 渲染数组不良项目的'值'
|
|
@@ -619,7 +582,10 @@ export const cardPrint = (
|
|
|
619
582
|
}
|
|
620
583
|
}
|
|
621
584
|
// 成品工厂-装配标识卡（为尚工厂无装配标识卡）
|
|
622
|
-
else if (
|
|
585
|
+
else if (
|
|
586
|
+
item.card_state == 'ZHUANGPEI' &&
|
|
587
|
+
item.is_finished_goods == 2
|
|
588
|
+
) {
|
|
623
589
|
// 如果有children ，就循环获取其中值
|
|
624
590
|
let badNum = item.children?.length || 0
|
|
625
591
|
let badList: {
|
|
@@ -723,7 +689,10 @@ export const cardPrint = (
|
|
|
723
689
|
Object.assign(obj, obj1, obj2, obj3)
|
|
724
690
|
}
|
|
725
691
|
// 为尚工厂-装配标识卡（为尚工厂无装配标识卡）
|
|
726
|
-
else if (
|
|
692
|
+
else if (
|
|
693
|
+
item.card_state == 'ZHUANGPEI' &&
|
|
694
|
+
item.is_finished_goods == 1
|
|
695
|
+
) {
|
|
727
696
|
obj = {
|
|
728
697
|
card_state: item.card_state,
|
|
729
698
|
// 工厂类型：1：为尚工厂 | 2：成品工厂
|
|
@@ -731,7 +700,10 @@ export const cardPrint = (
|
|
|
731
700
|
}
|
|
732
701
|
}
|
|
733
702
|
// 成品工厂-料废标识卡
|
|
734
|
-
else if (
|
|
703
|
+
else if (
|
|
704
|
+
item.card_state == 'LIAOFEI' &&
|
|
705
|
+
item.is_finished_goods == 2
|
|
706
|
+
) {
|
|
735
707
|
// 如果有不良项目，就循环获取其中值
|
|
736
708
|
let badNum = item.bad_item_list?.length || 0
|
|
737
709
|
let badList: { id: number; label: string; value: string }[] = []
|
|
@@ -819,7 +791,10 @@ export const cardPrint = (
|
|
|
819
791
|
}
|
|
820
792
|
}
|
|
821
793
|
// 为尚工厂-料废标识卡
|
|
822
|
-
else if (
|
|
794
|
+
else if (
|
|
795
|
+
item.card_state == 'LIAOFEI' &&
|
|
796
|
+
item.is_finished_goods == 1
|
|
797
|
+
) {
|
|
823
798
|
// 如果有不良项目，就循环获取其中值
|
|
824
799
|
let badNum = item.bad_item_list?.length || 0
|
|
825
800
|
let badList: { id: number; label: string; value: string }[] = []
|
|
@@ -867,8 +842,8 @@ export const cardPrint = (
|
|
|
867
842
|
r6c4: item.center_data[0]?.material_heat_number,
|
|
868
843
|
r7c1: '淬火件编码',
|
|
869
844
|
r7c2: item.quenching_material_code,
|
|
870
|
-
r7c3: '
|
|
871
|
-
r7c4: item.center_data[0]?.
|
|
845
|
+
r7c3: '材料牌号',
|
|
846
|
+
r7c4: item.center_data[0]?.material_mark,
|
|
872
847
|
r8c1: '产品物料号',
|
|
873
848
|
r8c2: item.material_code,
|
|
874
849
|
r8c3: '库位',
|
|
@@ -879,24 +854,17 @@ export const cardPrint = (
|
|
|
879
854
|
r9c4: item.center_data[0]?.consignee,
|
|
880
855
|
r10c1: '料废总数',
|
|
881
856
|
r10c2: item.storage_scrap_count,
|
|
882
|
-
r10c3: '
|
|
883
|
-
r10c4: item.
|
|
857
|
+
r10c3: '单重',
|
|
858
|
+
r10c4: item.piece_weight,
|
|
884
859
|
r11c1: '工序',
|
|
885
860
|
r11c2: item.process_name,
|
|
886
|
-
r11c3: '
|
|
887
|
-
r11c4: item.
|
|
861
|
+
r11c3: '本批数量',
|
|
862
|
+
r11c4: item.center_data[0]?.batch_count,
|
|
888
863
|
r12c1: '生产日期',
|
|
889
864
|
r12c2: item.product_date,
|
|
890
|
-
r12c3: '
|
|
891
|
-
r12c4: item.
|
|
892
|
-
|
|
893
|
-
r13c2: item.center_data[0]?.inspector,
|
|
894
|
-
r13c3: '检验日期',
|
|
895
|
-
r13c4: item.center_data[0]?.inspect_time,
|
|
896
|
-
r14c1: '提交人',
|
|
897
|
-
r14c2: item.opt_user_name,
|
|
898
|
-
r14c3: '',
|
|
899
|
-
r14c4: '',
|
|
865
|
+
r12c3: '提交人',
|
|
866
|
+
r12c4: item.opt_user_name,
|
|
867
|
+
|
|
900
868
|
/** ----循环的数据---------------- **/
|
|
901
869
|
r30c1: '不良项目',
|
|
902
870
|
r30c2: badStr, // 渲染数组不良项目的'值'
|
|
@@ -937,7 +905,7 @@ export const cardPrint = (
|
|
|
937
905
|
r7c4: item.center_data[0]?.material_batch_number,
|
|
938
906
|
data: [
|
|
939
907
|
{
|
|
940
|
-
opt_time: item.opt_time, // 日期
|
|
908
|
+
opt_time: setDate(item.opt_time), // 日期
|
|
941
909
|
sr: item.record_type === 1 ? item.inventory : '', // 收入
|
|
942
910
|
fc: item.record_type === 2 ? item.inventory : '', // 发出
|
|
943
911
|
balance_count: item.balance_count, //结存
|
|
@@ -1026,40 +994,32 @@ export const cardPrint = (
|
|
|
1026
994
|
r6c4: item.center_data[0]?.material_heat_number,
|
|
1027
995
|
r7c1: '淬火件编码',
|
|
1028
996
|
r7c2: item.quenching_material_code,
|
|
1029
|
-
r7c3: '
|
|
1030
|
-
r7c4: item.center_data[0]?.
|
|
997
|
+
r7c3: '材料牌号',
|
|
998
|
+
r7c4: item.center_data[0]?.material_mark,
|
|
1031
999
|
r8c1: '产品物料号',
|
|
1032
1000
|
r8c2: item.material_code,
|
|
1033
|
-
r8c3: '
|
|
1034
|
-
r8c4: item.
|
|
1001
|
+
r8c3: '收货人员',
|
|
1002
|
+
r8c4: item.center_data[0]?.consignee,
|
|
1035
1003
|
r9c1: '产品型号',
|
|
1036
1004
|
r9c2: item.material_model,
|
|
1037
|
-
r9c3: '
|
|
1038
|
-
r9c4: item.center_data[0]?.
|
|
1005
|
+
r9c3: '本批数量',
|
|
1006
|
+
r9c4: item.center_data[0]?.batch_count,
|
|
1039
1007
|
r10c1: '本箱数量',
|
|
1040
1008
|
r10c2: item.current_inventory,
|
|
1041
|
-
r10c3: '
|
|
1042
|
-
r10c4: item.
|
|
1009
|
+
r10c3: '单重',
|
|
1010
|
+
r10c4: item.piece_weight,
|
|
1043
1011
|
r11c1: '总箱数',
|
|
1044
1012
|
r11c2: item.total_row,
|
|
1045
|
-
r11c3: '
|
|
1046
|
-
r11c4: item.
|
|
1013
|
+
r11c3: '净重',
|
|
1014
|
+
r11c4: item.net_weight,
|
|
1047
1015
|
r12c1: '包装方式',
|
|
1048
1016
|
r12c2: item.packaging_specifications_name,
|
|
1049
|
-
r12c3: '
|
|
1050
|
-
r12c4: item.
|
|
1017
|
+
r12c3: '生产日期',
|
|
1018
|
+
r12c4: item.product_date,
|
|
1051
1019
|
r13c1: '件数规格',
|
|
1052
1020
|
r13c2: item.center_data[0]?.case_count_str,
|
|
1053
|
-
r13c3: '
|
|
1054
|
-
r13c4:
|
|
1055
|
-
r14c1: '检验员',
|
|
1056
|
-
r14c2: item.center_data[0]?.inspector,
|
|
1057
|
-
r14c3: '检验日期',
|
|
1058
|
-
r14c4: item.center_data[0]?.inspect_time,
|
|
1059
|
-
r15c1: '生产日期',
|
|
1060
|
-
r15c2: item.product_date,
|
|
1061
|
-
r15c3: '',
|
|
1062
|
-
r15c4: '',
|
|
1021
|
+
r13c3: '',
|
|
1022
|
+
r13c4: '',
|
|
1063
1023
|
|
|
1064
1024
|
r40c1: '备注',
|
|
1065
1025
|
r40c2: item.remark, // 备注
|
|
@@ -1067,7 +1027,10 @@ export const cardPrint = (
|
|
|
1067
1027
|
}
|
|
1068
1028
|
}
|
|
1069
1029
|
// 成品工厂-材料标识卡
|
|
1070
|
-
else if (
|
|
1030
|
+
else if (
|
|
1031
|
+
item.card_state == 'CAILIAO' &&
|
|
1032
|
+
item.is_finished_goods == 2
|
|
1033
|
+
) {
|
|
1071
1034
|
obj = {
|
|
1072
1035
|
card_state: item.card_state, // 标识卡类型
|
|
1073
1036
|
// 工厂类型：1：为尚工厂 | 2：成品工厂
|
|
@@ -1113,10 +1076,13 @@ export const cardPrint = (
|
|
|
1113
1076
|
}
|
|
1114
1077
|
}
|
|
1115
1078
|
// 为尚工厂-材料标识卡（为尚工厂无材料标识卡）
|
|
1116
|
-
else if (
|
|
1079
|
+
else if (
|
|
1080
|
+
item.card_state == 'CAILIAO' &&
|
|
1081
|
+
item.is_finished_goods == 1
|
|
1082
|
+
) {
|
|
1117
1083
|
obj = {
|
|
1118
1084
|
card_state: item.card_state,
|
|
1119
|
-
factoryType: item.is_finished_goods
|
|
1085
|
+
factoryType: item.is_finished_goods, // 工厂类型：1：为尚工厂 | 2：成品工厂
|
|
1120
1086
|
}
|
|
1121
1087
|
}
|
|
1122
1088
|
// 为尚工厂无：尾料标识卡、装配标识卡、材料标识卡
|