From 9a33b4c5fce95f7e9039caea6ef44b3d583e68f9 Mon Sep 17 00:00:00 2001 From: dev <182542500@qq.com> Date: Tue, 26 Aug 2025 16:58:59 +0800 Subject: [PATCH] =?UTF-8?q?8=E6=9C=88=E4=BB=BD=E9=9C=80=E6=B1=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/amz/inquiryRequest/types.ts | 4 + src/api/amz/logisticsOrderDetail/types.ts | 9 +- src/api/amz/logisticsQuote/types.ts | 5 + src/api/amz/purchaseOrder/types.ts | 2 + src/api/amz/purchaseOutOrderItem/types.ts | 4 + src/api/amz/shipForward/types.ts | 5 + src/api/amz/shipmentPlan/types.ts | 2 + src/store/modules/permission.ts | 18 +- src/views/amz/amazonStore/index.vue | 4 +- src/views/amz/inquiryRequest/index.vue | 94 +- src/views/amz/logisticsOrder/index.vue | 273 ++- src/views/amz/logisticsOrderDetail/index.vue | 8 +- .../amz/logisticsOrderQuotation/index.vue | 62 +- src/views/amz/logisticsQuote/index.vue | 37 +- src/views/amz/purchaseOrder/index.vue | 11 +- src/views/amz/purchaseOrderConfirm/index.vue | 115 +- src/views/amz/purchaseOrderQuery/index.vue | 9 +- src/views/amz/purchaseOrderSend/index.vue | 1485 +++++++++++++++++ src/views/amz/purchaseOutOrder/index.vue | 331 +++- src/views/amz/sendOrder/index.vue | 4 + src/views/amz/sendOrderConfirm/index.vue | 7 +- src/views/amz/sendOrderLast/index.vue | 8 +- src/views/amz/shipForward/index.vue | 6 + src/views/amz/shipForwardIn/index.vue | 7 +- src/views/amz/shipForwardOut/index.vue | 18 +- src/views/amz/shipmentPlan/index.vue | 10 +- src/views/amz/shipmentPlanAsk/index.vue | 30 +- src/views/amz/shipmentPlanQuery/index.vue | 70 +- src/views/amz/shipmentPlanSend/index.vue | 46 +- 29 files changed, 2472 insertions(+), 212 deletions(-) create mode 100644 src/views/amz/purchaseOrderSend/index.vue diff --git a/src/api/amz/inquiryRequest/types.ts b/src/api/amz/inquiryRequest/types.ts index 74c3f52..741c5f8 100644 --- a/src/api/amz/inquiryRequest/types.ts +++ b/src/api/amz/inquiryRequest/types.ts @@ -142,6 +142,8 @@ export interface InquiryRequestForm extends BaseEntity { * 报价有效的结束日期 */ effectiveEndTime?: string; + + type?: string; } export interface InquiryRequestQuery extends PageQuery { @@ -204,4 +206,6 @@ export interface InquiryRequestQuery extends PageQuery { * 日期范围参数 */ params?: any; + + type?: any; } diff --git a/src/api/amz/logisticsOrderDetail/types.ts b/src/api/amz/logisticsOrderDetail/types.ts index b42c4c8..59fa0be 100644 --- a/src/api/amz/logisticsOrderDetail/types.ts +++ b/src/api/amz/logisticsOrderDetail/types.ts @@ -62,7 +62,14 @@ export interface LogisticsOrderDetailVO { /** * 物流商计重（单位：KG，物流商实际测量值） */ - logisticsWeight: number; + logisticsWeight: string; + + totalPrice?: number; + + length?: string; + width?: string; + height?: string; + totalVolume?: number; /** * 称重差异（应用层计算：物流商计重 - 供应商称重-总重量） diff --git a/src/api/amz/logisticsQuote/types.ts b/src/api/amz/logisticsQuote/types.ts index d9b8987..5b405b9 100644 --- a/src/api/amz/logisticsQuote/types.ts +++ b/src/api/amz/logisticsQuote/types.ts @@ -149,12 +149,17 @@ export interface LogisticsQuoteForm extends BaseEntity { */ isDdp?: string; + customsDeclarationFee?: number; + backLogisticsType?: string; + /** * 单位 */ unit?: string; type: string; + + volumeRatio?: string; shipmentId: string | number; totalPrice: number; diff --git a/src/api/amz/purchaseOrder/types.ts b/src/api/amz/purchaseOrder/types.ts index b613837..ac32012 100644 --- a/src/api/amz/purchaseOrder/types.ts +++ b/src/api/amz/purchaseOrder/types.ts @@ -521,6 +521,8 @@ export interface PurchaseOrderForm extends BaseEntity { */ divTime?: string; + type?: string; + /** * 订单交付变动天数 */ diff --git a/src/api/amz/purchaseOutOrderItem/types.ts b/src/api/amz/purchaseOutOrderItem/types.ts index ad29167..e9622b2 100644 --- a/src/api/amz/purchaseOutOrderItem/types.ts +++ b/src/api/amz/purchaseOutOrderItem/types.ts @@ -64,6 +64,10 @@ export interface OrderOutItemVO { ratio?: number; order?: PurchaseOrderVO; + + forwardType?: string; + + quantityForward?: number; } export interface OrderOutItemForm extends BaseEntity { diff --git a/src/api/amz/shipForward/types.ts b/src/api/amz/shipForward/types.ts index aa46db5..1f188a5 100644 --- a/src/api/amz/shipForward/types.ts +++ b/src/api/amz/shipForward/types.ts @@ -117,6 +117,11 @@ export interface ShipForwardForm extends BaseEntity { */ quantitySend?: number; + /** + * 预计发货数量 + */ + quantityPlan?: number; + /** * 发货供应商名称 */ diff --git a/src/api/amz/shipmentPlan/types.ts b/src/api/amz/shipmentPlan/types.ts index b59949f..9b08fb9 100644 --- a/src/api/amz/shipmentPlan/types.ts +++ b/src/api/amz/shipmentPlan/types.ts @@ -488,6 +488,8 @@ export interface ShipmentPlanForm extends BaseEntity { channelName?: string; linkType?: string; + + customsFlag?: string; } export interface ShipmentPlanQuery extends PageQuery { diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index a7d5c0c..3edb451 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -77,15 +77,15 @@ export const usePermissionStore = defineStore('permission', () => { if (type && route.children) { route.children = filterChildren(route.children, undefined); } - if (route.path === '/demand') { - route.children.forEach((child) => { - if (child.path === 'purchaseOrderConfirm') { - if (useUserStore().roles.includes('gengdan')) { - child.meta.title = '创建发货'; - } - } - }); - } + // if (route.path === '/demand') { + // route.children.forEach((child) => { + // if (child.path === 'purchaseOrderConfirm') { + // if (useUserStore().roles.includes('gengdan')) { + // child.meta.title = '创建发货'; + // } + // } + // }); + // } // Layout ParentView 组件特殊处理 if (route.component?.toString() === 'Layout') { route.component = Layout; diff --git a/src/views/amz/amazonStore/index.vue b/src/views/amz/amazonStore/index.vue index 0b5a1f4..f26628e 100644 --- a/src/views/amz/amazonStore/index.vue +++ b/src/views/amz/amazonStore/index.vue @@ -74,10 +74,12 @@ + + + - diff --git a/src/views/amz/inquiryRequest/index.vue b/src/views/amz/inquiryRequest/index.vue index a7f7a9b..3a41c6f 100644 --- a/src/views/amz/inquiryRequest/index.vue +++ b/src/views/amz/inquiryRequest/index.vue @@ -175,11 +175,11 @@ - - - + + + + + @@ -305,24 +305,34 @@ - + + + + + + + + + + +
- -
- - -
- -
+ + + + + + + + + @@ -351,6 +361,14 @@ + + + + + +
提 交 - 暂 存 + 取 消
@@ -413,6 +431,9 @@ const { back_logistics_type } = toRefs(proxy?.useDict('back_logistics_type' const { sys_yes_no } = toRefs(proxy?.useDict('sys_yes_no')); +const { biz_quote_type } = toRefs(proxy?.useDict('biz_quote_type')); +const { biz_volume_ratio } = toRefs(proxy?.useDict('biz_volume_ratio')); + const inquiryRequestList = ref([]); const buttonLoading = ref(false); const loading = ref(true); @@ -424,6 +445,8 @@ const total = ref(0); const minDay = ref(0); +const typeUnit = ref('元/KG'); + const queryFormRef = ref(); const inquiryRequestFormRef = ref(); const logisticsQuoteFormRef = ref({}); @@ -435,7 +458,7 @@ const dialog = reactive({ const quoteDialog = reactive({ visible: false, - title: '' + title: '提交报价' }); const validatePrice = (rule, value, callback) => { @@ -446,6 +469,20 @@ const validatePrice = (rule, value, callback) => { } }; +const typeChange = (value: string) => { + console.log('value', value); + + if (value === 'weight') { + typeUnit.value = '元/KG'; + } else if (value === 'total') { + typeUnit.value = '元'; + } else if (value === 'volume') { + typeUnit.value = '元/m³'; + } else { + typeUnit.value = '元/KG'; + } +}; + const initFormData: InquiryRequestForm = { id: undefined, inquiryNo: undefined, @@ -458,7 +495,8 @@ const initFormData: InquiryRequestForm = { channelId: undefined, channelName: undefined, effectiveStartTime: undefined, - effectiveEndTime: undefined + effectiveEndTime: undefined, + type: undefined }; const data = reactive>({ @@ -477,6 +515,7 @@ const data = reactive>({ channelName: undefined, effectiveStartTime: undefined, effectiveEndTime: undefined, + type: undefined, params: {} }, rules: { @@ -492,7 +531,9 @@ const data = reactive>({ effectiveEndTime: [{ required: true, message: '报价有效的结束日期不能为空', trigger: 'blur' }], price: [{ validator: validatePrice, trigger: 'blur' }], totalPrice: [{ validator: validatePrice, trigger: 'blur' }], + customsDeclarationFee: [{ validator: validatePrice, trigger: 'blur' }], leadTime: [{ required: true, message: '时效不能为空', trigger: 'blur' }], + type: [{ required: true, message: '报价类型不能为空', trigger: 'blur' }], surcharge: [{ required: true, message: '附加费不能为空', trigger: 'blur' }], quoteDate: [{ required: true, message: '报价生效日期不能为空', trigger: 'blur' }], isSubmitted: [{ required: true, message: '提交状态不能为空', trigger: 'blur' }], @@ -536,8 +577,10 @@ const quoteForm = ref({ isDdp: 'Y', unit: 'kg', backLogisticsType: '快递', - type: 'general', + type: 'weight', shipmentId: undefined, + volumeRatio: '6000', + customsDeclarationFee: 0, totalPrice: 0 }); @@ -662,6 +705,7 @@ const submitQuoteForm = async () => { if (res.code === 200) { ElMessage.success('提交成功'); quoteDialog.visible = false; + getList(); } } else { ElMessageBox.confirm('价格没有竞争力，是否需要修改价格?', '提示', { @@ -727,8 +771,10 @@ const handleSubmit = async (row?: InquiryRequestVO) => { isDdp: 'Y', unit: 'kg', backLogisticsType: '快递', - type: 'general', + type: 'weight', shipmentId: undefined, + volumeRatio: '6000', + customsDeclarationFee: 0, totalPrice: 0 }; quoteForm.value.id = row.id; @@ -740,6 +786,8 @@ const handleSubmit = async (row?: InquiryRequestVO) => { quoteForm.value.type = row.type; quoteForm.value.shipmentId = row.shipmentId; + typeUnit.value = '元/KG'; + quoteDialog.visible = true; console.log(row.effectiveStartTime); // quoteForm.quoteDate[0] = row.effectiveStartTime; @@ -767,6 +815,10 @@ onMounted(() => { getList(); queryTodayQuoteStatus(); }); +onActivated(() => { + getList(); + // queryTodayQuoteStatus(); +}); diff --git a/src/views/amz/logisticsOrderDetail/index.vue b/src/views/amz/logisticsOrderDetail/index.vue index 6c9ca25..a3189a6 100644 --- a/src/views/amz/logisticsOrderDetail/index.vue +++ b/src/views/amz/logisticsOrderDetail/index.vue @@ -705,9 +705,13 @@ const handleExport = () => { ); }; -onMounted(() => { - console.log('组件已挂载，hotInstance:', hotTable.value?.hotInstance); +// onMounted(() => { +// console.log('组件已挂载，hotInstance:', hotTable.value?.hotInstance); +// +// getList(); +// }); +onActivated(() => { getList(); }); diff --git a/src/views/amz/logisticsOrderQuotation/index.vue b/src/views/amz/logisticsOrderQuotation/index.vue index aa9866f..6ad73af 100644 --- a/src/views/amz/logisticsOrderQuotation/index.vue +++ b/src/views/amz/logisticsOrderQuotation/index.vue @@ -75,13 +75,68 @@ + + + + + - + + + + + + + + + + - - - + + + + + - + - - - - - - + + + + + + + + + + @@ -131,17 +135,17 @@ @@ -172,9 +176,9 @@ - + @@ -342,14 +346,14 @@ - - - - - - + + + + + + + + @@ -413,9 +417,9 @@ - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + @@ -310,6 +370,7 @@ + @@ -356,6 +417,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -373,7 +492,10 @@ import { VxeTable, VxeColumn } from 'vxe-table'; import type { VxeTablePropTypes } from 'vxe-table'; import 'vxe-table/lib/style.css'; -import { ShipForwardVO } from '@/api/amz/shipForward/types'; +import { ShipForwardForm, ShipForwardVO } from '@/api/amz/shipForward/types'; +import { QuestionFilled } from '@element-plus/icons-vue'; +import { roleSelectPost } from '@/api/system/user'; +import { addShipForward, updateShipForward } from '@/api/amz/shipForward'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; @@ -406,11 +528,49 @@ const dialog = reactive({ title: '' }); +const forwardDialog = reactive({ + visible: false, + title: '' +}); + const editConfig: VxeTablePropTypes.EditConfig = { trigger: 'dblclick', mode: 'cell' }; +const forwardForm = ref({ + id: undefined, + orderSn: undefined, + storeName: undefined, + sku: undefined, + productName: undefined, + quantitySend: undefined, + outSupplierName: undefined, + outSupplierId: undefined, + inSupplierName: undefined, + inSupplierId: undefined, + shipmentStart: undefined, + shipmentEnd: undefined, + trackerName: undefined, + trackerId: undefined, + fwdStatus: undefined, + sendTime: undefined, + sfgAvlQty: 0 +}); + +const options = ref([]); + +const roleSelectAction = async () => { + const res = await roleSelectPost([5]); + console.log('res', res); + + options.value = res.data.map((user) => ({ + value: user.userId, // 选项值对应 userId + label: user.nickName || '', // 显示文本用 nickName + rawData: user // 保留原始数据（按需） + })); +}; + const initFormData: PurchaseOutOrderForm = { orderSn: undefined, warehouseName: undefined, @@ -478,12 +638,100 @@ const data = reactive>({ // msku: [{ required: true, message: 'MSKU编码列表 (数组存储)不能为空', trigger: 'blur' }], // planSn: [{ required: true, message: '关联计划单号列表 (数组存储)不能为空', trigger: 'blur' }], sellerName: [{ required: true, message: '销售商名称不能为空', trigger: 'blur' }] + }, + rules2: { + id: [{ required: true, message: '$comment不能为空', trigger: 'blur' }], + orderSn: [{ required: true, message: '采购单号不能为空', trigger: 'blur' }], + inOrderSn: [{ required: true, message: '收货方采购单号不能为空', trigger: 'blur' }], + storeName: [{ required: true, message: '采购店铺名称不能为空', trigger: 'blur' }], + sku: [{ required: true, message: '产品唯一标识码不能为空', trigger: 'blur' }], + productName: [{ required: true, message: '产品全称不能为空', trigger: 'blur' }], + quantityPlan: [{ required: true, message: '计划发货数量不能为空', trigger: 'blur' }], + outSupplierName: [{ required: true, message: '发货供应商名称不能为空', trigger: 'blur' }], + outSupplierId: [{ required: true, message: '发货供应商系统ID不能为空', trigger: 'blur' }], + inSupplierName: [{ required: true, message: '收货供应商名称不能为空', trigger: 'blur' }], + inSupplierId: [{ required: true, message: '收货供应商系统ID不能为空', trigger: 'blur' }], + // shipmentStart: [{ required: true, message: '计划发货起始时间不能为空', trigger: 'blur' }], + shipmentEnd: [{ required: true, message: '计划发货截止时间不能为空', trigger: 'blur' }], + trackerName: [{ required: true, message: '跟单人不能为空', trigger: 'blur' }], + trackerId: [{ required: true, message: '跟单id不能为空', trigger: 'blur' }], + fwdStatus: [{ required: true, message: '转发状态不能为空', trigger: 'change' }], + sendTime: [{ required: true, message: '发货时间不能为空', trigger: 'blur' }] } }); -const { queryParams, form, rules } = toRefs(data); +const { queryParams, form, rules, rules2 } = toRefs(data); const quality = ref(0); + +const maxQuality = ref(0); + +const selectUser = ref(); + +const shipForwardFormRef = ref(); + +const selectAction = () => { + console.log('selectUser', selectUser); + + forwardForm.value.inSupplierId = selectUser.value.userId; + forwardForm.value.inSupplierName = selectUser.value.nickName; + selectUser.value = selectUser.value.nickName; +}; + +const handleForward = async (row?, rowM?, rowA?, rowB?) => { + // reset(); + // const _orderSn = row?.orderSn || ids.value[0]; + // const res = await getPurchaseOrder(_orderSn); + // Object.assign(form.value, res.data); + // dialog.visible = true; + // dialog.title = '修改采购单主'; + + console.log('row', row); + console.log('rowM', rowM); + console.log('rowA', rowA); + if (row?.orderStatus === 'ord_unconfirmed') { + proxy?.$modal.msgError('请先让供应商确认订单！'); + return; + } + + maxQuality.value = Number(rowA?.quantityCanForward); + console.log('maxQuality', maxQuality.value); + if (maxQuality.value === 0 || maxQuality.value === undefined) { + console.log('没有可以发的货！'); + proxy?.$modal.msgError('没有可以发的货！'); + return; + } + // roleSelectAction(); + + forwardForm.value.orderSn = row?.orderSn; + forwardForm.value.storeName = rowM?.storeName; + forwardForm.value.sku = row?.sku; + forwardForm.value.productName = row?.productName; + forwardForm.value.quantityPlan = Number(maxQuality.value); + forwardForm.value.outSupplierName = rowM?.supplierName; + forwardForm.value.outSupplierId = rowM?.supplierId; + forwardForm.value.orderDetailId = row?.id; + forwardForm.value.sfgAvlQty = row?.sfgAvlQty; + + // forwardForm.value.inSupplierName = row?.inSupplierName; + // forwardForm.value.inSupplierId = row?.inSupplierId; + // forwardForm.value.shipmentStart = row?.shipmentStart; + // forwardForm.value.shipmentEnd = row?.shipmentEnd; + // forwardForm.value.trackerName = row?.trackerName; + // forwardForm.value.trackerId = row?.trackerId; + // forwardForm.value.fwdStatus = row?.fwdStatus; + // forwardForm.value.sendTime = row?.sendTime; + forwardForm.value.inSupplierName = rowB?.supplierName; + forwardForm.value.inSupplierId = rowB?.supplierId; + forwardForm.value.inOrderSn = null; + + // console.log('row', row); + // console.log('rowM', rowM); + + forwardDialog.visible = true; + forwardDialog.title = '添加转发数据'; +}; + /** 查询组合订单列表 */ const getList = async () => { loading.value = true; @@ -555,11 +803,14 @@ const goToOrderDetail = async (orderStatus?: string, orderSn?: string) => { } }; +const qualityMin = ref(0); + /** 修改按钮操作 */ const handleUpdate = async (row?: PurchaseOutOrderVO) => { reset(); // const orderSn = row?.orderSn || ids.value[0]; // const res = await getPurchaseOutOrder(orderSn); + if (row.quantityLeft <= 0) { proxy?.$modal.msgError('该订单已全部发货'); return; @@ -568,15 +819,40 @@ const handleUpdate = async (row?: PurchaseOutOrderVO) => { proxy?.$modal.msgError('有采购订单没有确认'); return; } + + if (row.items.every((item) => item.fowardType === 'self' && item.quantityForward <= 0)) { + proxy?.$modal.msgError('没有转发完成'); + return; + } + form.value = deepClone(row); - quality.value = form.value.quantityLeft; + + form.value.items.forEach((item) => { + // item.order.quantityReal = item.quantityLeft; + let minQuantity2; + if (item.forwardType === 'other') { + minQuantity2 = Number(item.quantityForward) / Number(item.ratio); + console.log('item', item); + console.log('minQuantity2', minQuantity2); + + form.value.quantityLeft = Math.min(Number(row.quantityLeft), Number(minQuantity2)); + } + }); + + console.log('form.value.quantityLeft', form.value.quantityLeft); + + if (form.value.quantityLeft <= 0) { + proxy?.$modal.msgError('该订单没有可发货数量'); + return; + } + console.log('form', form.value); + form.value.outsourceQuantity = form.value.quantityLeft; + quality.value = form.value.quantityLeft; console.log('quantity', quality.value); console.log('form.value.outsourceQuantity', form.value.outsourceQuantity); form.value.items.forEach((item) => { - // item.order.quantityReal = item.quantityLeft; - item.order.quantityReal = form.value.quantityLeft * item.ratio; }); dialog.visible = true; @@ -604,6 +880,26 @@ const submitForm = () => { }); }; +const forwardSubmitForm = () => { + if (forwardForm.value.inSupplierName === forwardForm.value.outSupplierName) { + proxy?.$modal.msgError('请不要选择相同的供应商'); + return; + } + shipForwardFormRef.value?.validate(async (valid: boolean) => { + if (valid) { + buttonLoading.value = true; + if (forwardForm.value.id) { + await updateShipForward(forwardForm.value).finally(() => (buttonLoading.value = false)); + } else { + await addShipForward(forwardForm.value).finally(() => (buttonLoading.value = false)); + } + proxy?.$modal.msgSuccess('操作成功'); + forwardDialog.visible = false; + await getList(); + } + }); +}; + const submitSendOrderForm = () => { purchaseOutOrderFormRef.value?.validate(async (valid: boolean) => { if (valid) { @@ -646,4 +942,25 @@ const handleExport = () => { onMounted(() => { getList(); }); +onActivated(() => { + getList(); +}); + diff --git a/src/views/amz/sendOrder/index.vue b/src/views/amz/sendOrder/index.vue index 86db99c..6c54e9e 100644 --- a/src/views/amz/sendOrder/index.vue +++ b/src/views/amz/sendOrder/index.vue @@ -753,4 +753,8 @@ const handleExport = () => { onMounted(() => { getList(); }); + +onActivated(() => { + getList(); +}); diff --git a/src/views/amz/sendOrderConfirm/index.vue b/src/views/amz/sendOrderConfirm/index.vue index c0d29c9..da4e2d5 100644 --- a/src/views/amz/sendOrderConfirm/index.vue +++ b/src/views/amz/sendOrderConfirm/index.vue @@ -274,7 +274,7 @@ - + @@ -459,6 +459,7 @@ const transferForm = ref(); const handleTransfer = async (row?: SendOrderVO) => { //调拨 + quantity.value = row?.quantitySend; console.log('row', row); transferForm.value = deepClone(row); transferDialog.visible = true; @@ -514,4 +515,8 @@ const handleExport = () => { onMounted(() => { getList(); }); + +onActivated(() => { + getList(); +}); diff --git a/src/views/amz/sendOrderLast/index.vue b/src/views/amz/sendOrderLast/index.vue index 25bcc21..15414bd 100644 --- a/src/views/amz/sendOrderLast/index.vue +++ b/src/views/amz/sendOrderLast/index.vue @@ -88,9 +88,9 @@ - + @@ -479,6 +479,10 @@ const handleExport = () => { onMounted(() => { getList(); }); + +onActivated(() => { + getList(); +}); diff --git a/src/views/amz/shipForward/index.vue b/src/views/amz/shipForward/index.vue index abc309f..ff555ca 100644 --- a/src/views/amz/shipForward/index.vue +++ b/src/views/amz/shipForward/index.vue @@ -79,9 +79,12 @@ + + + @@ -597,4 +600,7 @@ const handleExport = () => { onMounted(() => { getList(); }); +onActivated(() => { + getList(); +}); diff --git a/src/views/amz/shipForwardIn/index.vue b/src/views/amz/shipForwardIn/index.vue index 0f5348e..52dcf60 100644 --- a/src/views/amz/shipForwardIn/index.vue +++ b/src/views/amz/shipForwardIn/index.vue @@ -81,9 +81,11 @@ + + - + @@ -621,4 +623,7 @@ const handleExport = () => { onMounted(() => { getList(); }); +onActivated(() => { + getList(); +}); diff --git a/src/views/amz/shipForwardOut/index.vue b/src/views/amz/shipForwardOut/index.vue index 42bd5e7..cb2b9a0 100644 --- a/src/views/amz/shipForwardOut/index.vue +++ b/src/views/amz/shipForwardOut/index.vue @@ -80,6 +80,7 @@ + @@ -132,7 +133,7 @@ - + @@ -176,9 +177,14 @@ - - + + + + + + + @@ -591,7 +597,8 @@ const handleUpdate = async (row?: ShipForwardVO) => { const res = await getShipForward(_id); Object.assign(form.value, res.data); form.value.sendTime = getDateToString(new Date()); - + console.log('res', res); + form.value.quantitySend = res.data.quantityPlan; // form.value.shipmentStart = getDateToString(intervalDate.value[0]); // form.value.shipmentEnd = getDateToString(intervalDate.value[1]); dialog.visible = true; @@ -656,4 +663,7 @@ const handleExport = () => { onMounted(() => { getList(); }); +onActivated(() => { + getList(); +}); diff --git a/src/views/amz/shipmentPlan/index.vue b/src/views/amz/shipmentPlan/index.vue index a9812df..a9ef2da 100644 --- a/src/views/amz/shipmentPlan/index.vue +++ b/src/views/amz/shipmentPlan/index.vue @@ -836,7 +836,10 @@ const snycTodayPlan = async () => { const res = await takeTodayAmzPlanData(); if (res.code == 200) { proxy?.$modal.msgSuccess('同步成功'); - await getList(); + + setTimeout(() => { + await getList(); + }, 2000); } }; @@ -907,4 +910,9 @@ onMounted(() => { getList(); getAllChannelData(); }); + +onActivated(() => { + getList(); + getAllChannelData(); +}); diff --git a/src/views/amz/shipmentPlanAsk/index.vue b/src/views/amz/shipmentPlanAsk/index.vue index a72f686..bdd1369 100644 --- a/src/views/amz/shipmentPlanAsk/index.vue +++ b/src/views/amz/shipmentPlanAsk/index.vue @@ -321,7 +321,7 @@ - + @@ -336,14 +336,14 @@ filterable /> - - 通用询价只根据渠道进行报价， 重量询价是包含重量信息 - - - - - - + + + + + + + + @@ -929,7 +929,7 @@ const channelDialogVisibleAction = () => { ElMessage.error('请选择已关联采购单的数据'); return; } - requestType.value = 'general'; + requestType.value = 'weight'; channelDialogVisible.value = true; console.log('channelDialogVisibleAction', selectionDatas.value.length); selectionDatas.value.forEach((item) => { @@ -1084,7 +1084,7 @@ function transformChannels(channels) { const currentDes = ref(''); const currentFBAData = ref(); -const requestType = ref('general'); +const requestType = ref('weight'); // 分组后的渠道数据 const groupedChannels = computed(() => { @@ -1210,6 +1210,7 @@ const checkPrice = async () => { quoteDate: shipDate.value, shipToAddress: currentFBAData.value.shipToAddress, shipmentId: currentFBAData.value.shipmentId, + customsFlag: customsFlag, type: requestType.value }; inquiryRequestItemVOList.value.push(inquiryRequestItemVO); @@ -1301,7 +1302,7 @@ const handleUpdate = async (row?: ShipmentPlanVO) => { console.log(row); currentFBAData.value = row; currentDes.value = row.destination; - requestType.value = 'general'; + requestType.value = 'weight'; }; const linkShipmentPlanVO = ref(); @@ -1529,6 +1530,11 @@ onMounted(() => { getList(); getAllChannelData(); }); + +onActivated(() => { + getList(); + getAllChannelData(); +}); diff --git a/src/views/amz/shipmentPlanQuery/index.vue b/src/views/amz/shipmentPlanQuery/index.vue index bb9291a..da11fc6 100644 --- a/src/views/amz/shipmentPlanQuery/index.vue +++ b/src/views/amz/shipmentPlanQuery/index.vue @@ -168,6 +168,16 @@ {{ scope.row.quantityShipped }} + + + + + +