|
|
@@ -8,7 +8,7 @@ import { add, update as updateOrderHeader, getDetail } from '@/api/order/order'
|
|
|
import { getList as getOrderItemList } from '@/api/order/order-item'
|
|
|
import { createSalesOrder, updateOrder, addOrderItem, updateOrderItem } from '@/api/order/sales-order'
|
|
|
import { getCustomerInfo, getCustomerAddressSelectList } from '@/api/common/index'
|
|
|
-import { submitOrderToU9 } from '@/api/order/sales-order'
|
|
|
+import { createSalesOrderSync, modifySalesOrderSync } from '@/api/order/sales-order'
|
|
|
|
|
|
// 常量和枚举导入
|
|
|
import {
|
|
|
@@ -180,7 +180,13 @@ export default {
|
|
|
// 事件常量,用于模板中的动态事件绑定
|
|
|
CUSTOMER_SELECT_EVENTS,
|
|
|
ADDRESS_SELECT_EVENTS,
|
|
|
- MATERIAL_DETAIL_EVENTS
|
|
|
+ MATERIAL_DETAIL_EVENTS,
|
|
|
+ /**
|
|
|
+ * 进入表单时是否为编辑模式(用于区分“新增保存后切换为编辑”与“编辑进入”)
|
|
|
+ * @description 仅在组件创建时记录一次,不随 isEdit props 变化而变化
|
|
|
+ * @type {boolean}
|
|
|
+ */
|
|
|
+ entryIsEdit: Boolean(this.isEdit)
|
|
|
}
|
|
|
},
|
|
|
|
|
|
@@ -1055,26 +1061,34 @@ export default {
|
|
|
|
|
|
loadingInstance = this.$loading({
|
|
|
lock: true,
|
|
|
- text: '正在处理...',
|
|
|
+ text: '正在提交...',
|
|
|
spinner: 'el-icon-loading',
|
|
|
background: 'rgba(0, 0, 0, 0.7)'
|
|
|
})
|
|
|
|
|
|
- // 注释掉U9接口调用,直接返回列表页
|
|
|
- /*
|
|
|
- const response = await submitOrderToU9({ id: String(orderId) })
|
|
|
- if (response && response.data && response.data.success) {
|
|
|
- this.$message.success('订单提交成功')
|
|
|
- // 提交成功后,重新加载详情以更新状态
|
|
|
- if (orderId) {
|
|
|
- await this.loadOrderDetail(orderId)
|
|
|
- }
|
|
|
+ // 以订单编码为准调用 U9Cloud 同步接口
|
|
|
+ let orderCode = (this.formData && this.formData.orderCode) || this.initialOrderCode
|
|
|
+ if (!orderCode && orderId) {
|
|
|
+ await this.loadOrderDetail(String(orderId))
|
|
|
+ orderCode = this.formData && this.formData.orderCode
|
|
|
+ }
|
|
|
+ if (!orderCode) {
|
|
|
+ this.$message.error('未获取到订单编码,无法提交')
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ // 新增进入(保存后切换编辑):创建同步任务;编辑进入:修改同步任务
|
|
|
+ const apiCall = this.entryIsEdit ? modifySalesOrderSync : createSalesOrderSync
|
|
|
+ const response = await apiCall({ orderCode: String(orderCode) })
|
|
|
+ const ok = response && response.data && response.data.success
|
|
|
+ if (ok) {
|
|
|
+ this.$message.success('提交成功')
|
|
|
} else {
|
|
|
- this.$message.error((response && response.data && response.data.msg) || '提交失败')
|
|
|
+ const msg = (response && response.data && (response.data.msg || response.data.message)) || '提交失败'
|
|
|
+ this.$message.error(msg)
|
|
|
+ return
|
|
|
}
|
|
|
- */
|
|
|
|
|
|
- this.$message.success('订单已提交')
|
|
|
// 直接返回订单列表页
|
|
|
this.handleBack()
|
|
|
} catch (error) {
|