|
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
<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-col :span="24">
<a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
|
|
|
16
|
<a-input v-model="model.materialCode" placeholder="请输入物料编码" style="width: 100%"/>
|
|
|
17
18
19
20
|
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialName">
|
|
|
21
|
<a-input v-model="model.materialName" placeholder="请输入物料名称" style="width: 100%"/>
|
|
|
22
23
24
25
|
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="可出数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qty">
|
|
|
26
|
<a-input-number v-model="model.qty" placeholder="请输入可出数量" style="width: 100%"/>
|
|
|
27
28
29
30
|
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="出库数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskQty">
|
|
|
31
|
<a-input-number v-model="model.taskQty" placeholder="请输入出库数量" style="width: 100%"/>
|
|
|
32
33
34
35
36
|
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</a-spin>
|
|
|
37
38
39
40
41
42
43
44
45
46
47
48
|
<!-- table区域-begin -->
<div>
<a-table
ref="table"
rowKey="id"
size="middle"
:columns="columns"
:dataSource="dataSource"
:pagination="false">
<span slot="action" slot-scope="text, record">
|
|
|
49
|
<a-button @click="combine(record)" type="primary">配盘</a-button>
|
|
|
50
51
52
|
</span>
</a-table>
</div>
|
|
|
53
54
55
56
57
|
</j-modal>
</template>
<script>
|
|
|
58
59
60
61
62
63
64
|
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {httpAction} from '@/api/manage'
import {validateDuplicateValue} from '@/utils/util'
import {searchMaterialByCode, getInventoryFromShipmentDetail} from '@/api/api'
import {listShipmentByShipmentDetailId, combination} from '@/api/api'
import {filterObj} from '@/utils/util';
import {deleteAction, getAction, downFile, getFileAccessHttpUrl} from '@/api/manage'
|
|
|
65
|
|
|
|
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
export default {
name: "ShipmentDetailCombineModal",
components: {
JeecgListMixin,
},
props: {
mainId: {
type: String,
required: false,
default: ''
}
},
data() {
return {
title: "操作",
width: 1000,
/* 分页参数 */
ipagination: {
current: 1,
pageSize: 10,
pageSizeOptions: ['10', '20', '30'],
showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 共" + total + "条"
|
|
|
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
|
showQuickJumper: true,
showSizeChanger: true,
total: 0
},
/* 数据源 */
dataSource: [],
queryParam: {},
combineParam: {},
shipmentParam: {},
visible: false,
materialList: {},
querySource: {},
/* 筛选参数 */
filters: {},
/* table加载状态 */
loading: false,
/* table选中keys*/
selectedRowKeys: [],
/* table选中records*/
selectionRows: [],
/* 查询折叠 */
toggleSearchStatus: false,
/* 高级查询条件生效状态 */
superQueryFlag: false,
/* 高级查询条件 */
superQueryParams: '',
/** 高级查询拼接方式 */
superQueryMatchType: 'and',
model: {},
labelCol: {
xs: {span: 24},
sm: {span: 5},
},
wrapperCol: {
xs: {span: 24},
sm: {span: 16},
},
// 表头
columns: [
{
title: '容器编码',
align: "center",
dataIndex: 'containerCode'
|
|
|
133
|
},
|
|
|
134
135
136
137
|
{
title: '库位编码',
align: "center",
dataIndex: 'locationCode'
|
|
|
138
|
},
|
|
|
139
140
141
142
|
{
title: '物料编码',
align: "center",
dataIndex: 'materialCode'
|
|
|
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
|
{
title: '物料名称',
align: "center",
dataIndex: 'materialName'
},
{
title: '库存数量',
align: "center",
dataIndex: 'qty'
},
{
title: '锁定数量',
align: "center",
dataIndex: 'taskQty'
},
{
title: '库存状态',
align: "center",
dataIndex: 'inventoryStatus_dictText',
},
{
title: '批次',
align: "center",
dataIndex: 'batch'
},
{
title: '创建人',
align: "center",
dataIndex: 'createBy'
|
|
|
173
|
},
|
|
|
174
175
176
177
178
179
180
181
182
183
184
185
|
{
title: '创建日期',
align: "center",
dataIndex: 'createTime'
},
{
title: '操作',
dataIndex: 'action',
align: "center",
fixed: "right",
width: 147,
scopedSlots: {customRender: 'action'},
|
|
|
186
|
}
|
|
|
187
188
189
190
191
192
193
|
],
confirmLoading: false,
validatorRules: {},
url: {
add: "/shipment/shipmentHeader/addShipmentDetail",
edit: "/shipment/shipmentHeader/editShipmentDetail",
list: "/shipment/shipmentCombination/getInventoryFromShipmentDetail"
|
|
|
194
|
}
|
|
|
195
196
197
198
|
}
},
created() {
|
|
|
199
|
//备份model原始值
|
|
|
200
201
202
203
204
205
206
|
this.modelDefault = JSON.parse(JSON.stringify(this.model));
this.searchMaterial();
},
methods: {
add() {
this.edit(this.modelDefault);
this.model.inventoryStatus = "good";
|
|
|
207
|
},
|
|
|
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
|
edit(record) {
// this.model = Object.assign({}, record);
this.shipmentParam = record;
this.searchShipment();
},
close() {
this.$emit('close');
this.visible = false;
this.$refs.form.clearValidate();
},
combine(record) {
const that = this;
that.querySource = record;
this.combineParam.shipmentDetailID = this.model.id;
this.combineParam.inventoryDetailID = record.id;
this.combineParam.shipQty = this.model.taskQty;
combination(this.combineParam).then((res) => {
if (res.success) {
// this.model = res.result;
this.$message.success(res.message);
this.searchShipment();
} else {
this.$message.warning(res.message)
|
|
|
231
|
}
|
|
|
232
233
234
235
236
237
238
239
240
241
242
243
|
});
},
searchShipment() {
const that = this;
that.querySource = this.shipmentParam;
listShipmentByShipmentDetailId(that.querySource).then((res) => {
if (res.success) {
this.model = res.result;
this.visible = true;
this.searchInventory(that.querySource);
} else {
this.$message.warning(res.message)
|
|
|
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
|
});
},
searchInventory(record) {
const that = this;
that.querySource = record;
console.log("searchInventory");
// getInventoryFromShipmentDetail(that.querySource).then((res) => {
// this.dataSource = res.result;
// });
this.searchQuery();
},
searchQuery() {
this.loadData(1);
// 点击查询清空列表选中行
// https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
// this.selectedRowKeys = []
// this.selectionRows = []
},
loadData(arg) {
if (!this.url.list) {
this.$message.error("请设置url.list属性!")
return
}
//加载数据 若传入参数1则加载第一页的内容
if (arg === 1) {
this.ipagination.current = 1;
}
var params = this.getQueryParams();//查询条件
this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
//update-begin---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------
this.dataSource = res.result.records || res.result;
if (res.result.total) {
this.ipagination.total = res.result.total;
} else {
this.ipagination.total = 0;
|
|
|
282
|
}
|
|
|
283
284
285
|
//update-end---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------
} else {
this.$message.warning(res.message)
|
|
|
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
|
}).finally(() => {
this.loading = false
})
},
getQueryField() {
//TODO 字段权限控制
var str = "id,";
this.columns.forEach(function (value) {
str += "," + value.dataIndex;
});
return str;
},
getQueryParams() {
//获取查询条件
let sqp = {}
if (this.superQueryParams) {
sqp['superQueryParams'] = encodeURI(this.superQueryParams)
sqp['superQueryMatchType'] = this.superQueryMatchType
}
this.queryParam.id = this.model.id;
var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
param.field = this.getQueryField();
param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize;
return filterObj(param);
},
handleOk() {
const that = this;
that.close();
// 触发表单验证
// 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
// httpAction(httpurl,this.model,method).then((res)=>{
// if(res.success){
// that.$message.success(res.message);
// that.$emit('ok');
// }else{
// that.$message.warning(res.message);
// }
// }).finally(() => {
// that.confirmLoading = false;
// that.close();
// })
// }else{
// return false
// }
// })
},
handleCancel() {
this.close()
},
searchMaterial() {
const that = this;
that.querySource.materialCode = that.model.materialCode;
console.log("model.materialCode:" + that.model.materialCode);
searchMaterialByCode(that.querySource).then((res) => {
that.materialList = res.result;
})
},
|
|
|
357
358
|
}
|
|
|
359
|
}
|
|
|
360
|
</script>
|
