ShipmentDetailModal.vue
12.2 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
:confirmLoading="confirmLoading"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭">
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-row>
<!-- 物料选择框:选择后先查库存,再加载批次 -->
<a-form-model-item label="物料3" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
<j-search-select-tag
placeholder="请选择物料编码"
v-model="model.materialCode"
dict="material,name,code"
@change="handleMaterialChange"
:pageSize="10"
:async="true">
</j-search-select-tag>
</a-form-model-item>
<a-col :span="24">
<a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qty">
<a-input-number v-model="model.qty" placeholder="请输入数量" style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="重量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auxQty">
<a-input-number v-model="model.auxQty" placeholder="请输入重量" style="width: 100%"/>
</a-form-model-item>
</a-col>
<!-- 批次下拉框:带搜索+分页加载 -->
<a-col :span="24">
<a-form-model-item label="批次" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="batch">
<a-select
show-search
placeholder="请选择批次"
option-filter-prop="children"
v-model="model.batch"
:loading="batchLoading"
:not-found-content="batchLoading ? '加载中...' : ''"
@search="handleBatchSearch"
@popupScroll="handleBatchScroll"
@change="handleBatchChange"
>
<a-select-option v-for="item in batchOptions" :key="item.batch" :value="item.batch">
{{ item.batch }}
</a-select-option>
<a-spin v-if="loadingMore" size="small" style="display: block; margin: 10px auto;" />
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="长度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="length">
<a-input v-model="model.length" placeholder="请输入长度"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="宽度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="width">
<a-input v-model="model.width" placeholder="请输入宽度"></a-input>
</a-form-model-item>
</a-col>
<!-- 库存状态选择框:切换后先查库存,再加载批次 -->
<a-col :span="24">
<a-form-model-item label="库存状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryStatus">
<j-dict-select-tag
type="list"
v-model="model.inventoryStatus"
dictCode="inventory_status"
@change="handleInventoryStatusChange"
placeholder="请选择库存状态"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="库存数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventoryQty">
<a-input-number v-model="model.inventoryQty" :disabled="true" style="width: 100%"/>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</a-spin>
</j-modal>
</template>
<script>
import { httpAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
import { getInventoryByShipmentDetail, getMaterialList, searchMaterialByCode, searchMaterialByCodeAndBatch } from '@/api/api'
export default {
name: 'ShipmentDetailModal',
components: {},
props: {
mainId: {
type: String,
required: false,
default: ''
}
},
data() {
return {
title: '操作',
width: 800,
visible: false,
materialList: [],
shipmentDetail: {},
querySource: {},
model: {},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
materialCode: [{ required: true, message: '请输入物料编码!' }],
inventoryStatus: [{ required: true, message: '请输入库存状态!' }],
},
url: {
add: '/shipment/shipmentHeader/addShipmentDetail',
edit: '/shipment/shipmentHeader/editShipmentDetail',
},
// 批次下拉框相关变量
batchOptions: [],
batchLoading: false,
loadingMore: false,
batchSearchKey: '',
batchPage: 1,
batchPageSize: 20,
hasMoreBatch: true
}
},
created() {
this.modelDefault = JSON.parse(JSON.stringify(this.model))
},
methods: {
add() {
let record = { inventoryStatus: 'good' }
this.edit(record)
},
edit(record) {
this.model = Object.assign({}, record)
this.visible = true
// 编辑时:若有物料编码+库存状态,先查库存再加载批次
if (this.model.materialCode && this.model.inventoryStatus) {
this.$nextTick(() => {
this.getInventoryByShipmentDetail().then(() => {
this.queryMaterialBatch()
})
})
}
},
close() {
this.$emit('close')
this.visible = false
this.$refs.form.clearValidate()
this.resetBatchSelector()
},
// ---------------------- 核心修复:统一管控执行顺序 ----------------------
/**
* 物料编码变更:先查库存,再加载批次
*/
handleMaterialChange() {
// 清空批次和库存数量(避免旧数据残留)
this.model.batch = ''
this.model.inventoryQty = 0
// 先查库存,库存查询成功后再加载批次
this.getInventoryByShipmentDetail().then(() => {
this.queryMaterialBatch()
})
},
/**
* 库存状态变更:先查库存,再加载批次
*/
handleInventoryStatusChange() {
// 清空批次和库存数量
this.model.batch = ''
this.model.inventoryQty = 0
// 物料编码为空时不执行(避免无效请求)
if (!this.model.materialCode) return
// 先查库存,库存查询成功后再加载批次
this.getInventoryByShipmentDetail().then(() => {
this.queryMaterialBatch()
})
},
/**
* 批次变更:查询当前批次对应的库存数量
*/
handleBatchChange() {
// 批次为空时清空库存数量
if (!this.model.batch) {
this.model.inventoryQty = 0
return
}
// 查当前批次的库存数量
this.getInventoryByShipmentDetail()
},
// ---------------------- 修复库存查询:改为Promise返回,支持后续回调 ----------------------
getInventoryByShipmentDetail() {
// 返回Promise,让调用者能控制后续逻辑(如加载批次)
return new Promise((resolve, reject) => {
this.model['shipmentId'] = this.mainId
// 必传参数校验(避免无效接口调用)
if (!this.model.materialCode || !this.model.inventoryStatus) {
this.model.inventoryQty = 0
resolve()
return
}
getInventoryByShipmentDetail(this.model).then((res) => {
if (res.success) {
// 只更新需要的字段(避免覆盖物料编码、库存状态等)
this.model.inventoryQty = res.result.inventoryQty || 0
// 若返回重量,同步更新重量字段(根据实际业务调整)
if (res.result.auxQty) {
this.model.auxQty = res.result.auxQty
}
} else {
this.model.inventoryQty = 0
this.$message.warning(res.message || '获取库存数量失败')
}
resolve() // 库存查询完成,通知后续逻辑(如加载批次)
}).catch((err) => {
this.model.inventoryQty = 0
this.$message.error('库存查询接口异常')
reject(err)
})
})
},
// ---------------------- 批次下拉框逻辑(保留,新增库存状态参数) ----------------------
resetBatchSelector() {
this.batchOptions = []
this.batchPage = 1
this.hasMoreBatch = true
this.batchSearchKey = ''
},
handleBatchSearch(keyword) {
this.batchSearchKey = keyword
this.batchPage = 1
this.batchOptions = []
this.hasMoreBatch = true
this.loadBatchData()
},
handleBatchScroll(e) {
const target = e.target
if (target.scrollHeight - target.scrollTop <= target.clientHeight + 100 &&
!this.batchLoading &&
!this.loadingMore &&
this.hasMoreBatch) {
this.loadMoreBatch()
}
},
loadBatchData() {
// 必传参数校验(物料编码+库存状态)
if (!this.model.materialCode || !this.model.inventoryStatus) {
this.batchOptions = []
this.batchLoading = false
return
}
this.batchLoading = true
// 请求参数:新增inventoryStatus(库存状态),后端需支持该参数筛选
const params = {
materialCode: this.model.materialCode,
inventoryStatus: this.model.inventoryStatus,
batchKeyword: this.batchSearchKey,
page: this.batchPage,
pageSize: this.batchPageSize
}
this.searchBatchByMaterial(params).then(res => {
if (res.success) {
const newOptions = res.result.list || []
this.batchOptions = this.batchPage === 1 ? newOptions : [...this.batchOptions, ...newOptions]
this.hasMoreBatch = newOptions.length === this.batchPageSize
} else {
this.batchOptions = []
this.$message.warning(res.message || '获取批次列表失败')
}
}).finally(() => {
this.batchLoading = false
this.loadingMore = false
})
},
loadMoreBatch() {
if (!this.hasMoreBatch) return
this.loadingMore = true
this.batchPage++
this.loadBatchData()
},
queryMaterialBatch() {
this.resetBatchSelector()
this.$nextTick(() => {
this.loadBatchData()
})
},
searchBatchByMaterial(params) {
if (!params.materialCode || !params.inventoryStatus) {
return Promise.resolve({ success: true, result: { list: [] } })
}
return searchMaterialByCodeAndBatch(params);
},
// ---------------------- 原有提交逻辑(保持不变) ----------------------
handleOk() {
const that = this
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true
let httpurl = ''
let method = ''
if (!this.model.id) {
httpurl += this.url.add
method = 'post'
} else {
httpurl += this.url.edit
method = 'put'
}
this.model['shipmentId'] = this.mainId
if (this.model['qty'] === '' || this.model['qty'] === undefined) {
this.model['qty'] = 1
}
httpAction(httpurl, this.model, method).then((res) => {
if (res.success) {
that.$message.success(res.message)
that.$emit('ok')
that.$emit('dataSearch')
} else {
that.$message.warning(res.message)
}
}).finally(() => {
that.confirmLoading = false
that.close()
})
} else {
return false
}
})
},
handleCancel() {
this.close()
},
// 原有物料搜索逻辑(若未使用可保留或删除)
searchMaterial() {
const that = this
that.querySource.code = that.model.materialCode
getMaterialList(that.querySource).then((res) => {
that.materialList = res.result
})
}
}
}
</script>