|
@@ -584,7 +584,7 @@ export default {
|
|
|
customerCode: String(orderData.customerCode || ''),
|
|
customerCode: String(orderData.customerCode || ''),
|
|
|
customerName: String(orderData.customerName || ''),
|
|
customerName: String(orderData.customerName || ''),
|
|
|
orderType: Number(orderData.orderType) || ORDER_TYPES.NORMAL,
|
|
orderType: Number(orderData.orderType) || ORDER_TYPES.NORMAL,
|
|
|
- orderQuantity: orderQuantityValidation.isValid ? parseInt(orderQuantityValidation.value) : null,
|
|
|
|
|
|
|
+ orderQuantity: orderQuantityValidation.isValid ? parseInt(orderQuantityValidation.value.toString()) : null,
|
|
|
totalAmount: totalAmountValidation.isValid ? preciseRound(totalAmountValidation.value, 2) : null,
|
|
totalAmount: totalAmountValidation.isValid ? preciseRound(totalAmountValidation.value, 2) : null,
|
|
|
totalQuantity: totalQuantityValidation.isValid ? preciseRound(totalQuantityValidation.value, 4) : null,
|
|
totalQuantity: totalQuantityValidation.isValid ? preciseRound(totalQuantityValidation.value, 4) : null,
|
|
|
addressId: String(orderData.addressId || ''),
|
|
addressId: String(orderData.addressId || ''),
|
|
@@ -716,8 +716,8 @@ export default {
|
|
|
itemStatus: Number(material.itemStatus) || Number(material.status) || 0
|
|
itemStatus: Number(material.itemStatus) || Number(material.status) || 0
|
|
|
}))
|
|
}))
|
|
|
|
|
|
|
|
- // 组装销售订单数据
|
|
|
|
|
- return {
|
|
|
|
|
|
|
+ // 创建销售订单数据对象,不包含orderCode字段
|
|
|
|
|
+ const salesOrderData = {
|
|
|
...formData,
|
|
...formData,
|
|
|
orgId: Number(formData.orgId) || 0,
|
|
orgId: Number(formData.orgId) || 0,
|
|
|
customerId: Number(formData.customerId) || 0,
|
|
customerId: Number(formData.customerId) || 0,
|
|
@@ -728,6 +728,13 @@ export default {
|
|
|
status: Number(formData.status) || 0,
|
|
status: Number(formData.status) || 0,
|
|
|
pcBladeOrderItemList
|
|
pcBladeOrderItemList
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ // 新增模式下,移除orderCode字段
|
|
|
|
|
+ if (!this.isEdit && salesOrderData.orderCode) {
|
|
|
|
|
+ delete salesOrderData.orderCode
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return salesOrderData
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -796,6 +803,11 @@ export default {
|
|
|
Object.keys(data).forEach(key => {
|
|
Object.keys(data).forEach(key => {
|
|
|
const value = data[key]
|
|
const value = data[key]
|
|
|
|
|
|
|
|
|
|
+ // 新增模式下,移除orderCode字段
|
|
|
|
|
+ if (!this.isEdit && key === 'orderCode') {
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// 跳过null、undefined和空字符串,但保留备注字段
|
|
// 跳过null、undefined和空字符串,但保留备注字段
|
|
|
if (value === null || value === undefined || (value === '' && key !== 'remark')) {
|
|
if (value === null || value === undefined || (value === '' && key !== 'remark')) {
|
|
|
return
|
|
return
|