|
|
@@ -187,7 +187,7 @@ export default {
|
|
|
this.data = res.data
|
|
|
this.total_num = this.total_num + element.this_delivery_qty
|
|
|
this.transport_total = this.transport_total + element.out_qty
|
|
|
- this.key_tableData[element.bus_item_id] = element;
|
|
|
+ this.key_tableData[this.deelUniqueProductKey(element)] = element;
|
|
|
if (element.box_orders_show) {
|
|
|
this.is_box_data.push(this.deelUniqueKey(element));
|
|
|
}
|
|
|
@@ -204,7 +204,7 @@ export default {
|
|
|
v = v.replace(/\"/g, '')
|
|
|
text.push(this.func.hexToString(v))
|
|
|
})
|
|
|
- // console.log(text)
|
|
|
+ // // console.log(text)
|
|
|
}
|
|
|
const dataBox = {
|
|
|
url: 'http://121.36.142.167:7774/jbl/api/module-data/box_orders/box_orders/diy/defective_order_no_list',
|
|
|
@@ -224,11 +224,12 @@ export default {
|
|
|
if (res.code == 200) {
|
|
|
this.$Message.success('请求成功！')
|
|
|
res.data.data.forEach((element, index) => {
|
|
|
+ element.product_code = element.product_no
|
|
|
let object = {
|
|
|
"order_item_id": element.order_item_id,
|
|
|
"order_no": element.order_no,
|
|
|
"box_num": element.box_num,
|
|
|
- "product_no": element.product_no,
|
|
|
+ "product_code": element.product_code,
|
|
|
"box_no": element.box_orders.defective_order_no,
|
|
|
"box_id": element.box_orders.id
|
|
|
}
|
|
|
@@ -242,18 +243,24 @@ export default {
|
|
|
let key = element.box_orders_show
|
|
|
return key;
|
|
|
},
|
|
|
+ deelUniqueProductKey(element) {
|
|
|
+ let key = element.order_no+'_'+element.product_code
|
|
|
+ return key;
|
|
|
+ },
|
|
|
// 将原始数据处理拼接成提交的数据
|
|
|
deelTableData() {
|
|
|
let new_table_data = [];
|
|
|
+ console.log(this.scan_data);
|
|
|
this.scan_data.forEach((element, index) => {
|
|
|
- if (this.is_box_data.indexOf(element.box_no) === -1 && Object.keys(this.key_tableData).indexOf(element.order_item_id) !== -1 && (this.key_tableData[element.order_item_id].this_delivery_qty - element.box_num) > 0) {
|
|
|
- let table_data_detail = JSON.parse(JSON.stringify(this.key_tableData[element.order_item_id]))
|
|
|
+ if (this.is_box_data.indexOf(element.box_no) === -1 && Object.keys(this.key_tableData).indexOf(this.deelUniqueProductKey(element)) !== -1 && (this.key_tableData[this.deelUniqueProductKey(element)].this_delivery_qty - element.box_num) >= 0) {
|
|
|
+ let table_data_detail = JSON.parse(JSON.stringify(this.key_tableData[this.deelUniqueProductKey(element)]))
|
|
|
table_data_detail.box_orders = element.box_id;
|
|
|
table_data_detail.box_orders_show = element.box_no;
|
|
|
- table_data_detail.out_qty = element.box_num;
|
|
|
- table_data_detail.this_delivery_qty = element.box_num;
|
|
|
+ table_data_detail.out_qty += element.box_num;
|
|
|
+ this.key_tableData[this.deelUniqueProductKey(element)].this_delivery_qty -= element.box_num*1;
|
|
|
+ // table_data_detail.this_delivery_qty = this.key_tableData[this.deelUniqueProductKey(element)].this_delivery_qty;
|
|
|
table_data_detail.id = null;
|
|
|
- this.key_tableData[element.order_item_id].this_delivery_qty -= element.box_num*1;
|
|
|
+
|
|
|
new_table_data.push(table_data_detail)
|
|
|
}
|
|
|
})
|
