diff --git a/src/modules/overseas-warehouse/pages/DispatchDetailView.vue b/src/modules/overseas-warehouse/pages/DispatchDetailView.vue index ac67429d..40c4d536 100644 --- a/src/modules/overseas-warehouse/pages/DispatchDetailView.vue +++ b/src/modules/overseas-warehouse/pages/DispatchDetailView.vue @@ -33,6 +33,7 @@ const pdaError = ref(null) const pdaPushKey = ref('') const pdaReason = ref('') const pickForm = ref({ itemId: 0, positionId: 0, packages: 1, productQuantity: 1, idempotencyKey: '' }) +const pdaCompleted = computed(() => pdaTask.value?.status === 'COMPLETED') const dispatchStatusLabels: Record = { PENDING_DEPARTURE: '待发车', @@ -190,8 +191,9 @@ onMounted(load) -
拣货明细:{{ pickForm.itemId || '未选择' }}拣货并扣减库存
-
完成拣货
+
拣货明细:{{ pickForm.itemId || '未选择' }}拣货并扣减库存
+
完成拣货
+ diff --git a/vite.config.ts b/vite.config.ts index 653bfe6c..f8e12e3b 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -8,6 +8,9 @@ import { ElementPlusResolver } from 'unplugin-vue-components/resolvers' export default defineConfig(({ mode }) => { const env = loadEnv(mode, process.cwd(), '') const proxyTarget = env.API_PROXY_TARGET || 'http://localhost:8080' + const authProxyTarget = env.AUTH_API_PROXY_TARGET || proxyTarget + const iamProxyTarget = env.IAM_API_PROXY_TARGET || proxyTarget + const warehouseProxyTarget = env.WAREHOUSE_API_PROXY_TARGET || proxyTarget const overseasProxyTarget = env.OVERSEAS_API_PROXY_TARGET || 'http://localhost:9300' return { @@ -30,6 +33,33 @@ export default defineConfig(({ mode }) => { server: { strictPort: true, proxy: { + '/api/auth': { + target: authProxyTarget, + changeOrigin: true, + configure(proxy) { + proxy.on('proxyReq', (proxyRequest) => { + proxyRequest.removeHeader('origin') + }) + }, + }, + '/api/platform/v1/iam': { + target: iamProxyTarget, + changeOrigin: true, + configure(proxy) { + proxy.on('proxyReq', (proxyRequest) => { + proxyRequest.removeHeader('origin') + }) + }, + }, + '/api/platform/v1/warehouse-admin': { + target: warehouseProxyTarget, + changeOrigin: true, + configure(proxy) { + proxy.on('proxyReq', (proxyRequest) => { + proxyRequest.removeHeader('origin') + }) + }, + }, '/api': { target: proxyTarget, changeOrigin: true,