From 4284aff3bb9d4905d2f91a05ac883349ba438118 Mon Sep 17 00:00:00 2001 From: 97694731 <97694731@qq.com> Date: Thu, 4 Jun 2026 11:39:58 +0800 Subject: [PATCH] change mirror --- .github/workflows/ci.yaml | 26 ++++++++++++++++++++++++ .idea/vcs.xml | 6 ++++++ node_modules/.vite/deps/_metadata.json | 26 ++++++++++++------------ src/components/product/byGoods/index.vue | 2 +- src/components/wave/camera.vue | 13 +++++++++++- src/views/wave/Wave.vue | 20 ++++++++++++++++-- 6 files changed, 76 insertions(+), 17 deletions(-) create mode 100644 .idea/vcs.xml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d12429fa..4f5d5735 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,6 +6,9 @@ on: pull_request: branches: [ main, master, develop ] +env: + NODE_MIRROR: 'https://npmmirror.com/mirrors/node' + jobs: build: runs-on: ubuntu-latest @@ -23,9 +26,14 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: 'npm' + registry-url: 'https://registry.npmmirror.com' + env: + NODE_MIRROR: 'https://npmmirror.com/mirrors/node' - name: Install dependencies run: npm ci + env: + NODE_REGISTRY: 'https://registry.npmmirror.com' - name: Build run: npm run build @@ -49,9 +57,14 @@ jobs: with: node-version: '20.x' cache: 'npm' + registry-url: 'https://registry.npmmirror.com' + env: + NODE_MIRROR: 'https://npmmirror.com/mirrors/node' - name: Install dependencies run: npm ci + env: + NODE_REGISTRY: 'https://registry.npmmirror.com' - name: Run ESLint run: npm run lint @@ -72,9 +85,14 @@ jobs: with: node-version: '20.x' cache: 'npm' + registry-url: 'https://registry.npmmirror.com' + env: + NODE_MIRROR: 'https://npmmirror.com/mirrors/node' - name: Install dependencies run: npm ci + env: + NODE_REGISTRY: 'https://registry.npmmirror.com' - name: Run tests run: npm run test @@ -106,6 +124,14 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20.x' + registry-url: 'https://registry.npmmirror.com' + env: + NODE_MIRROR: 'https://npmmirror.com/mirrors/node' + - name: Run npm audit run: npm audit --audit-level=moderate continue-on-error: true diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/node_modules/.vite/deps/_metadata.json b/node_modules/.vite/deps/_metadata.json index 606e6588..69a87e91 100644 --- a/node_modules/.vite/deps/_metadata.json +++ b/node_modules/.vite/deps/_metadata.json @@ -1,71 +1,71 @@ { - "hash": "c8d6646a", - "browserHash": "51f44cd9", + "hash": "a0d5344e", + "browserHash": "906d96e7", "optimized": { "@element-plus/icons-vue": { "src": "../../@element-plus/icons-vue/dist/index.js", "file": "@element-plus_icons-vue.js", - "fileHash": "e1804a89", + "fileHash": "b0bff00e", "needsInterop": false }, "axios": { "src": "../../axios/index.js", "file": "axios.js", - "fileHash": "5e251265", + "fileHash": "3661d772", "needsInterop": false }, "crypto-js": { "src": "../../crypto-js/index.js", "file": "crypto-js.js", - "fileHash": "04a448bd", + "fileHash": "42456c05", "needsInterop": true }, "dayjs": { "src": "../../dayjs/dayjs.min.js", "file": "dayjs.js", - "fileHash": "0e7fdea7", + "fileHash": "00d3ce60", "needsInterop": true }, "element-plus": { "src": "../../element-plus/es/index.mjs", "file": "element-plus.js", - "fileHash": "aee2348a", + "fileHash": "8289c005", "needsInterop": false }, "element-plus/es/locale/lang/zh-cn": { "src": "../../element-plus/es/locale/lang/zh-cn.mjs", "file": "element-plus_es_locale_lang_zh-cn.js", - "fileHash": "76c0457d", + "fileHash": "2b74d0fe", "needsInterop": false }, "jsbarcode": { "src": "../../jsbarcode/bin/JsBarcode.js", "file": "jsbarcode.js", - "fileHash": "85a1d1c7", + "fileHash": "5774375a", "needsInterop": true }, "json-bigint": { "src": "../../json-bigint/index.js", "file": "json-bigint.js", - "fileHash": "c0eb862c", + "fileHash": "a76f358e", "needsInterop": true }, "pinia": { "src": "../../pinia/dist/pinia.mjs", "file": "pinia.js", - "fileHash": "d3cad104", + "fileHash": "3c37150a", "needsInterop": false }, "vue": { "src": "../../vue/dist/vue.runtime.esm-bundler.js", "file": "vue.js", - "fileHash": "7f734e4f", + "fileHash": "c01889f7", "needsInterop": false }, "vue-router": { "src": "../../vue-router/dist/vue-router.mjs", "file": "vue-router.js", - "fileHash": "fd382cd4", + "fileHash": "ced1274b", "needsInterop": false } }, diff --git a/src/components/product/byGoods/index.vue b/src/components/product/byGoods/index.vue index 6dddad74..e616206d 100644 --- a/src/components/product/byGoods/index.vue +++ b/src/components/product/byGoods/index.vue @@ -22,7 +22,7 @@ 修改 删除 导出 - 到处模板 + 导出模板 导入 发布 一键发布 diff --git a/src/components/wave/camera.vue b/src/components/wave/camera.vue index e77220da..494c8fc7 100644 --- a/src/components/wave/camera.vue +++ b/src/components/wave/camera.vue @@ -104,6 +104,7 @@ import { ref, onMounted, onBeforeUnmount, watch, computed, Ref, nextTick, unref, inject, provide } from 'vue' import { ElButton, ElMessage, ElMessageBox } from 'element-plus' import { createPurchaseOrderWithWave, releaseWave, updatePurchaseOrder } from '@/api/purchase-order' +import { getWaveStatusById } from '@/api/wave-task.js' import type { GoodsInfo } from './goodsInfo.vue' import SuitBookDialog from './suitBookDialog.vue' import OcrResultDialog from './OcrResultDialog.vue' @@ -1961,6 +1962,16 @@ async function handleScannedCode(code: string) { } emit('update:modelValue', newFormData) + // 有活跃波次时，先查询波次状态并打印到控制台 + if (hasActiveWave.value && currentWaveId.value) { + try { + const res = await getWaveStatusById(currentWaveId.value) + console.log('[WaveStatus] 波次状态:', res) + } catch (err) { + console.error('[WaveStatus] 查询失败:', err) + } + } + // 尝试多种ISBN格式验证 if (isValidISBN13(normalizedCode) || isValidISBN10(normalizedCode)) { // 使用规范化后的条码 @@ -2879,7 +2890,7 @@ async function callSyncBookApi(params: { } } -defineExpose({ hasActiveWave, handlePhotoAction, retakePhoto, loadBookInfo }) +defineExpose({ hasActiveWave, handlePhotoAction, retakePhoto, loadBookInfo, currentWaveId, waveNo })