feat: submit procurement identity and relabel charge

src/modules/cross-border/api/businessOrders.ts

@@ -59,6 +59,7 @@ export interface ProcurementDetail {
 }
 
 export interface ProcurementCreate {
+  customerName: string
   purchaseCategory: string
   productName: string
   productSpecification?: string

src/modules/cross-border/components/BusinessOrdersView.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref } from 'vue'
 import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { useAuthStore } from '@/modules/auth/public'
 import {
   createProcurement,
   createTransport,
@@ -14,6 +15,7 @@ import {
 } from '../api/businessOrders'
 
 const props = defineProps<{ kind: CrossBorderBusinessKind }>()
+const auth = useAuthStore()
 
 type BusinessRow = ProcurementSummary | TransportSummary
 type BusinessDetail = ProcurementDetail | TransportDetail
@@ -227,6 +229,7 @@ async function submit() {
   try {
     if (props.kind === 'procurement') {
       await createProcurement({
+        customerName: auth.user?.tenantName || '',
         purchaseCategory: form.purchaseCategory, productName: form.productName,
         productSpecification: form.productSpecification || undefined, productUrl: form.productUrl || undefined,
         purchaseQuantity: form.purchaseQuantity, budgetUnitPrice: form.budgetAmount,

src/modules/overseas-warehouse/api/warehouseServices.ts

@@ -15,7 +15,7 @@ export interface TransferCreate {
 }
 export interface RelabelCreate {
   customerOrderNo: string; overseasWarehouseId: string; labelDeadline: string; contactName: string; contactPhone: string
-  remark?: string; idempotencyKey: string
+  chargeAmount: number; remark?: string; idempotencyKey: string
   items: Array<{ skuCode: string; productNameZh: string; totalPackageCount: number; notifiedPackageCount: number; shipmentNo: string; trackingCode?: string; newSkuCode: string; labelRequirement?: string }>
 }
 

src/modules/overseas-warehouse/views/WarehouseServiceView.vue

@@ -27,7 +27,7 @@ const statusOptions = computed(() => props.service === 'labeling'
     : [{ label: '待审核', value: 'PENDING_REVIEW' }, { label: '已通过', value: 'APPROVED' }, { label: '待分配', value: 'PENDING_ASSIGNMENT' }, { label: '已分配', value: 'ALLOCATED' }, { label: '已出库', value: 'OUTBOUNDED' }, { label: '部分收货', value: 'PARTIALLY_RECEIVED' }, { label: '已收货', value: 'RECEIVED' }, { label: '已拒绝', value: 'REJECTED' }])
 const mode = ref<PageMode>('list')
 const filters = reactive({ number: '', inboundNo: '', warehouse: '', destination: '', status: '', start: '', end: '' })
-const form = reactive({ customerNo: '', inboundNo: '', sourceWarehouse: '', warehouse: '', destination: '', address: '', contact: '', phone: '', deliveryMethod: '', trackingNo: '', reason: '', requirement: '', relabel: false, remark: '', labelDeadline: '', estimatedArrivalAt: '', fbaShipmentNo: '', volumeCbm: 0.01 })
+const form = reactive({ customerNo: '', inboundNo: '', sourceWarehouse: '', warehouse: '', destination: '', address: '', contact: '', phone: '', deliveryMethod: '', trackingNo: '', reason: '', requirement: '', relabel: false, remark: '', labelDeadline: '', estimatedArrivalAt: '', fbaShipmentNo: '', volumeCbm: 0.01, chargeAmount: 0 })
 const cargoRows = ref<CargoRow[]>([])
 const submittedRows = ref<Record<string, string>[]>([])
 const selectedDetail = ref<Record<string, string> | null>(null)
@@ -42,7 +42,7 @@ watch(() => props.service, () => { mode.value = 'list'; resetFilters(); resetFor
 onMounted(() => { void load() })
 function resetFilters() { Object.assign(filters, { number: '', inboundNo: '', warehouse: '', destination: '', status: '', start: '', end: '' }) }
 function resetForm() {
-  Object.assign(form, { customerNo: '', inboundNo: '', sourceWarehouse: '', warehouse: '', destination: '', address: '', contact: '', phone: '', deliveryMethod: '', trackingNo: '', reason: '', requirement: '', relabel: false, remark: '', labelDeadline: '', estimatedArrivalAt: '', fbaShipmentNo: '', volumeCbm: 0.01 })
+  Object.assign(form, { customerNo: '', inboundNo: '', sourceWarehouse: '', warehouse: '', destination: '', address: '', contact: '', phone: '', deliveryMethod: '', trackingNo: '', reason: '', requirement: '', relabel: false, remark: '', labelDeadline: '', estimatedArrivalAt: '', fbaShipmentNo: '', volumeCbm: 0.01, chargeAmount: 0 })
   cargoRows.value = []
   discardCandidates.value = []
   selectedDiscardOrderId.value = ''
@@ -101,8 +101,8 @@ async function submit() {
   if ((!form.customerNo && !form.inboundNo) || !primaryWarehouse || invalidCargo) {
     ElMessage.warning('请填写必填信息和完整的货物明细'); return
   }
-  if (props.service === 'labeling' && (!form.labelDeadline || !form.contact || !form.phone || cargoRows.value.some((item) => !item.shipmentNo || !item.newSkuCode))) {
-    ElMessage.warning('请填写贴标截止时间、联系人以及货物的货件编号和新 SKU'); return
+  if (props.service === 'labeling' && (!form.labelDeadline || !form.contact || !form.phone || form.chargeAmount <= 0 || cargoRows.value.some((item) => !item.shipmentNo || !item.newSkuCode))) {
+    ElMessage.warning('请填写贴标截止时间、联系人、换标费用以及货物的货件编号和新 SKU'); return
   }
   if (props.service === 'disposal' && !form.reason) {
     ElMessage.warning('请选择废弃原因'); return
@@ -115,7 +115,7 @@ async function submit() {
   try {
     const idempotencyKey = crypto.randomUUID()
     if (props.service === 'labeling') {
-      await createRelabel({ customerOrderNo: form.customerNo, overseasWarehouseId: form.warehouse, labelDeadline: form.labelDeadline, contactName: form.contact, contactPhone: form.phone, remark: form.remark || undefined, idempotencyKey, items: cargoRows.value.map((item) => ({ skuCode: item.sku, productNameZh: item.name, totalPackageCount: item.quantity, notifiedPackageCount: item.quantity, shipmentNo: item.shipmentNo, trackingCode: form.trackingNo || undefined, newSkuCode: item.newSkuCode, labelRequirement: form.requirement || undefined })) })
+      await createRelabel({ customerOrderNo: form.customerNo, overseasWarehouseId: form.warehouse, labelDeadline: form.labelDeadline, contactName: form.contact, contactPhone: form.phone, chargeAmount: form.chargeAmount, remark: form.remark || undefined, idempotencyKey, items: cargoRows.value.map((item) => ({ skuCode: item.sku, productNameZh: item.name, totalPackageCount: item.quantity, notifiedPackageCount: item.quantity, shipmentNo: item.shipmentNo, trackingCode: form.trackingNo || undefined, newSkuCode: item.newSkuCode, labelRequirement: form.requirement || undefined })) })
     } else if (props.service === 'disposal') {
       const items = cargoRows.value.filter((item) => item.quantity > 0).map((item) => {
         if (!item.sourceOrderId || item.sourceOrderId !== selectedDiscardOrderId.value || item.quantity > Number(item.availableQuantity || 0)) {
@@ -184,6 +184,7 @@ async function openDetail(value: Record<string, string>) {
             <label v-if="props.service === 'labeling'"><span><i>*</i>联系人</span><el-input v-model="form.contact" placeholder="请输入联系人" /></label>
             <label v-if="props.service === 'labeling'"><span><i>*</i>联系电话</span><el-input v-model="form.phone" placeholder="请输入联系电话" /></label>
             <label v-if="props.service === 'labeling'"><span><i>*</i>贴标截止时间</span><el-date-picker v-model="form.labelDeadline" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择截止时间" /></label>
+            <label v-if="props.service === 'labeling'"><span><i>*</i>换标费用（CNY）</span><el-input-number v-model="form.chargeAmount" :min="0.01" :precision="2" controls-position="right" placeholder="请输入换标费用" /></label>
             <label v-if="props.service === 'transfer' || props.service === 'relabel'" class="warehouse-span-2"><span><i>*</i>详细派送地址</span><el-input v-model="form.address" placeholder="请输入派送地址" /></label>
             <label v-if="props.service === 'transfer' || props.service === 'relabel'"><span><i>*</i>总体积（CBM）</span><el-input-number v-model="form.volumeCbm" :min="0.0001" :precision="4" controls-position="right" placeholder="请输入总体积" /></label>
             <label v-if="props.service === 'transfer' || props.service === 'relabel'"><span><i>*</i>预计到达时间</span><el-date-picker v-model="form.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预计到达时间" /></label>