fix: 本单匹数数量改取整单合计并升至1.1.16
This commit is contained in:
@@ -272,6 +272,7 @@ export function buildScanDetailFromScanResponse(res) {
|
|||||||
: '',
|
: '',
|
||||||
product_code: res.product_code || '',
|
product_code: res.product_code || '',
|
||||||
product_color_code: res.product_color_code || '',
|
product_color_code: res.product_color_code || '',
|
||||||
|
// 本单匹数/数量:整单合计(扫码后会再以详情 total_* 覆盖)
|
||||||
order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
|
order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
|
||||||
item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
|
item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
|
||||||
order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
|
order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
|
||||||
|
|||||||
@@ -237,6 +237,7 @@ export function buildScanDetailFromScanResponse(res) {
|
|||||||
: '',
|
: '',
|
||||||
product_code: res.product_code || '',
|
product_code: res.product_code || '',
|
||||||
product_color_code: res.product_color_code || '',
|
product_color_code: res.product_color_code || '',
|
||||||
|
// 本单匹数/数量:整单合计(扫码后会再以详情 total_* 覆盖)
|
||||||
order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
|
order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
|
||||||
item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
|
item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
|
||||||
order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
|
order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
|
||||||
|
|||||||
@@ -233,6 +233,7 @@ export function buildScanDetailFromScanResponse(res) {
|
|||||||
: '',
|
: '',
|
||||||
product_code: res.product_code || '',
|
product_code: res.product_code || '',
|
||||||
product_color_code: res.product_color_code || '',
|
product_color_code: res.product_color_code || '',
|
||||||
|
// 本单匹数/数量:整单合计(扫码后会再以详情 total_* 覆盖)
|
||||||
order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
|
order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
|
||||||
item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
|
item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
|
||||||
order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
|
order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
|
||||||
|
|||||||
@@ -288,6 +288,7 @@ export function buildScanDetailFromScanResponse(res) {
|
|||||||
: '',
|
: '',
|
||||||
product_code: res.product_code || '',
|
product_code: res.product_code || '',
|
||||||
product_color_code: res.product_color_code || '',
|
product_color_code: res.product_color_code || '',
|
||||||
|
// 本单匹数/数量:整单合计(扫码后会再以详情 total_* 覆盖)
|
||||||
order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
|
order_roll: formatRoll(res.order_roll != null ? res.order_roll : res.total_roll),
|
||||||
item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
|
item_roll: formatRoll(res.item_roll != null ? res.item_roll : res.roll),
|
||||||
order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
|
order_weight: formatWeightKg(res.order_weight != null ? res.order_weight : res.total_weight),
|
||||||
|
|||||||
+2
-2
@@ -2,8 +2,8 @@
|
|||||||
"name" : "浩拓ERP",
|
"name" : "浩拓ERP",
|
||||||
"appid" : "__UNI__F79F300",
|
"appid" : "__UNI__F79F300",
|
||||||
"description" : "浩拓ERP",
|
"description" : "浩拓ERP",
|
||||||
"versionName" : "1.1.15",
|
"versionName" : "1.1.16",
|
||||||
"versionCode" : 115,
|
"versionCode" : 116,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"optimization" : {
|
"optimization" : {
|
||||||
|
|||||||
@@ -610,6 +610,12 @@ export default {
|
|||||||
if (order) {
|
if (order) {
|
||||||
this.form.item_data = order.item_data;
|
this.form.item_data = order.item_data;
|
||||||
this.auditStatus = order.audit_status;
|
this.auditStatus = order.audit_status;
|
||||||
|
// 本单匹数/本单数量:取这张单的总匹数、总数量
|
||||||
|
this.scanDetail = {
|
||||||
|
...this.scanDetail,
|
||||||
|
order_roll: order.total_roll,
|
||||||
|
order_weight: order.total_weight,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(() => null);
|
.catch(() => null);
|
||||||
|
|||||||
@@ -453,6 +453,12 @@ export default {
|
|||||||
if (order) {
|
if (order) {
|
||||||
this.form.item_data = order.item_data;
|
this.form.item_data = order.item_data;
|
||||||
this.auditStatus = order.audit_status;
|
this.auditStatus = order.audit_status;
|
||||||
|
// 本单匹数/本单数量:取这张单的总匹数、总数量
|
||||||
|
this.scanDetail = {
|
||||||
|
...this.scanDetail,
|
||||||
|
order_roll: order.total_roll,
|
||||||
|
order_weight: order.total_weight,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(() => null);
|
.catch(() => null);
|
||||||
|
|||||||
@@ -510,6 +510,12 @@ export default {
|
|||||||
if (order) {
|
if (order) {
|
||||||
this.form.item_data = order.item_data;
|
this.form.item_data = order.item_data;
|
||||||
this.auditStatus = order.audit_status;
|
this.auditStatus = order.audit_status;
|
||||||
|
// 本单匹数/本单数量:取这张单的总匹数、总数量
|
||||||
|
this.scanDetail = {
|
||||||
|
...this.scanDetail,
|
||||||
|
order_roll: order.total_roll,
|
||||||
|
order_weight: order.total_weight,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(() => null);
|
.catch(() => null);
|
||||||
|
|||||||
@@ -615,6 +615,12 @@ export default {
|
|||||||
if (order) {
|
if (order) {
|
||||||
this.form.item_data = order.item_data;
|
this.form.item_data = order.item_data;
|
||||||
this.auditStatus = order.audit_status;
|
this.auditStatus = order.audit_status;
|
||||||
|
// 本单匹数/本单数量:取这张单的总匹数、总数量
|
||||||
|
this.scanDetail = {
|
||||||
|
...this.scanDetail,
|
||||||
|
order_roll: order.total_roll,
|
||||||
|
order_weight: order.total_weight,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(() => null);
|
.catch(() => null);
|
||||||
|
|||||||
Reference in New Issue
Block a user