From d2ced67ba5b591ddcb51b2d320e7ee09c5fe7c12 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 30 十月 2026 18:02:23 +0800
Subject: [PATCH] 质量管理前端:修复单点登录跳转、不合格处理方式、附件上传容错、构建兼容旧浏览器
---
src/views/qualityManagement/nonconformingManagement/components/formDia.vue | 12 +
src/views/tideLogin.vue | 2
src/views/qualityManagement/processInspection/components/filesDia.vue | 6
src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue | 6
vite.config.js | 3
src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue | 12 +
src/views/qualityManagement/nonconformingManagement/index.vue | 14 +
pnpm-lock.yaml | 366 +++++++++++++++++++++++++++++++++++++++-----
src/views/qualityManagement/finalInspection/components/filesDia.vue | 6
9 files changed, 370 insertions(+), 57 deletions(-)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 871e5c2..5d2dbef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,21 +11,30 @@
'@element-plus/icons-vue':
specifier: 2.3.1
version: 2.3.1(vue@3.4.31)
+ '@vue-office/docx':
+ specifier: ^1.6.3
+ version: 1.6.3(vue-demi@0.14.10(vue@3.4.31))(vue@3.4.31)
+ '@vue-office/excel':
+ specifier: ^1.7.14
+ version: 1.7.14(vue-demi@0.14.10(vue@3.4.31))(vue@3.4.31)
'@vueup/vue-quill':
specifier: 1.2.0
version: 1.2.0(vue@3.4.31)
'@vueuse/core':
specifier: 10.11.0
version: 10.11.0(vue@3.4.31)
+ autofit.js:
+ specifier: ^3.2.8
+ version: 3.2.8
axios:
specifier: 0.28.1
- version: 0.28.1
+ version: 0.28.1(debug@4.4.1(supports-color@7.2.0))
clipboard:
specifier: 2.0.11
version: 2.0.11
dayjs:
specifier: ^1.11.13
- version: 1.11.13
+ version: 1.11.23
echarts:
specifier: 5.5.1
version: 5.5.1
@@ -53,9 +62,15 @@
pinia:
specifier: 2.1.7
version: 2.1.7(vue@3.4.31)
+ print-js:
+ specifier: ^1.6.0
+ version: 1.6.0
+ qrcode:
+ specifier: ^1.5.4
+ version: 1.5.4
sortablejs:
specifier: ^1.15.6
- version: 1.15.6
+ version: 1.15.7
splitpanes:
specifier: 3.1.5
version: 3.1.5
@@ -65,6 +80,12 @@
vue-cropper:
specifier: 1.1.1
version: 1.1.1
+ vue-easy-lightbox:
+ specifier: ^1.19.0
+ version: 1.19.0(vue@3.4.31)
+ vue-esign:
+ specifier: ^1.1.4
+ version: 1.1.4
vue-router:
specifier: 4.4.0
version: 4.4.0(vue@3.4.31)
@@ -89,10 +110,10 @@
version: 5.3.2(@types/node@22.15.18)(sass@1.77.5)
vite-plugin-compression:
specifier: 0.5.1
- version: 0.5.1(vite@5.3.2(@types/node@22.15.18)(sass@1.77.5))
+ version: 0.5.1(supports-color@7.2.0)(vite@5.3.2(@types/node@22.15.18)(sass@1.77.5))
vite-plugin-svg-icons:
specifier: 2.0.1
- version: 2.0.1(vite@5.3.2(@types/node@22.15.18)(sass@1.77.5))
+ version: 2.0.1(supports-color@7.2.0)(vite@5.3.2(@types/node@22.15.18)(sass@1.77.5))
packages:
@@ -341,56 +362,67 @@
resolution: {integrity: sha512-de6TFZYIvJwRNjmW3+gaXiZ2DaWL5D5yGmSYzkdzjBDS3W+B9JQ48oZEsmMvemqjtAFzE16DIBLqd6IQQRuG9Q==}
cpu: [arm]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-arm-musleabihf@4.40.2':
resolution: {integrity: sha512-urjaEZubdIkacKc930hUDOfQPysezKla/O9qV+O89enqsqUmQm8Xj8O/vh0gHg4LYfv7Y7UsE3QjzLQzDYN1qg==}
cpu: [arm]
os: [linux]
+ libc: [musl]
'@rollup/rollup-linux-arm64-gnu@4.40.2':
resolution: {integrity: sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg==}
cpu: [arm64]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-arm64-musl@4.40.2':
resolution: {integrity: sha512-j8CgxvfM0kbnhu4XgjnCWJQyyBOeBI1Zq91Z850aUddUmPeQvuAy6OiMdPS46gNFgy8gN1xkYyLgwLYZG3rBOg==}
cpu: [arm64]
os: [linux]
+ libc: [musl]
'@rollup/rollup-linux-loongarch64-gnu@4.40.2':
resolution: {integrity: sha512-Ybc/1qUampKuRF4tQXc7G7QY9YRyeVSykfK36Y5Qc5dmrIxwFhrOzqaVTNoZygqZ1ZieSWTibfFhQ5qK8jpWxw==}
cpu: [loong64]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-powerpc64le-gnu@4.40.2':
resolution: {integrity: sha512-3FCIrnrt03CCsZqSYAOW/k9n625pjpuMzVfeI+ZBUSDT3MVIFDSPfSUgIl9FqUftxcUXInvFah79hE1c9abD+Q==}
cpu: [ppc64]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-riscv64-gnu@4.40.2':
resolution: {integrity: sha512-QNU7BFHEvHMp2ESSY3SozIkBPaPBDTsfVNGx3Xhv+TdvWXFGOSH2NJvhD1zKAT6AyuuErJgbdvaJhYVhVqrWTg==}
cpu: [riscv64]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-riscv64-musl@4.40.2':
resolution: {integrity: sha512-5W6vNYkhgfh7URiXTO1E9a0cy4fSgfE4+Hl5agb/U1sa0kjOLMLC1wObxwKxecE17j0URxuTrYZZME4/VH57Hg==}
cpu: [riscv64]
os: [linux]
+ libc: [musl]
'@rollup/rollup-linux-s390x-gnu@4.40.2':
resolution: {integrity: sha512-B7LKIz+0+p348JoAL4X/YxGx9zOx3sR+o6Hj15Y3aaApNfAshK8+mWZEf759DXfRLeL2vg5LYJBB7DdcleYCoQ==}
cpu: [s390x]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-x64-gnu@4.40.2':
resolution: {integrity: sha512-lG7Xa+BmBNwpjmVUbmyKxdQJ3Q6whHjMjzQplOs5Z+Gj7mxPtWakGHqzMqNER68G67kmCX9qX57aRsW5V0VOng==}
cpu: [x64]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-x64-musl@4.40.2':
resolution: {integrity: sha512-tD46wKHd+KJvsmije4bUskNuvWKFcTOIM9tZ/RrmIvcXnbi0YK/cKS9FzFtAm7Oxi2EhV5N2OpfFB348vSQRXA==}
cpu: [x64]
os: [linux]
+ libc: [musl]
'@rollup/rollup-win32-arm64-msvc@4.40.2':
resolution: {integrity: sha512-Bjv/HG8RRWLNkXwQQemdsWw4Mg+IJ29LK+bJPW2SCzPKOUaMmPEppQlu/Fqk1d7+DX3V7JbFdbkh/NMmurT6Pg==}
@@ -407,8 +439,8 @@
cpu: [x64]
os: [win32]
- '@sxzz/popperjs-es@2.11.7':
- resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==}
+ '@sxzz/popperjs-es@2.11.8':
+ resolution: {integrity: sha512-wOwESXvvED3S8xBmcPWHs2dUuzrE4XiZeFu7e1hROIJkm02a49N120pmOXxY33sBb6hArItm5W5tcg1cBtV+HQ==}
'@trysound/sax@0.2.0':
resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
@@ -441,6 +473,26 @@
peerDependencies:
vite: ^5.0.0
vue: ^3.2.25
+
+ '@vue-office/docx@1.6.3':
+ resolution: {integrity: sha512-Cs+3CAaRBOWOiW4XAhTwwxJ0dy8cPIf6DqfNvYcD3YACiLwO4kuawLF2IAXxyijhbuOeoFsfvoVbOc16A/4bZA==}
+ peerDependencies:
+ '@vue/composition-api': ^1.7.1
+ vue: ^2.0.0 || >=3.0.0
+ vue-demi: ^0.14.6
+ peerDependenciesMeta:
+ '@vue/composition-api':
+ optional: true
+
+ '@vue-office/excel@1.7.14':
+ resolution: {integrity: sha512-pVUgt+emDQUnW7q22CfnQ+jl43mM/7IFwYzOg7lwOwPEbiVB4K4qEQf+y/bc4xGXz75w1/e3Kz3G6wAafmFBFg==}
+ peerDependencies:
+ '@vue/composition-api': ^1.7.1
+ vue: ^2.0.0 || >=3.0.0
+ vue-demi: ^0.14.6
+ peerDependenciesMeta:
+ '@vue/composition-api':
+ optional: true
'@vue/compiler-core@3.4.31':
resolution: {integrity: sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==}
@@ -533,6 +585,10 @@
resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==}
engines: {node: '>=12'}
+ ansi-regex@6.4.0:
+ resolution: {integrity: sha512-KzTVk2tCWAHtYrvvvaP8bJKJq2pVinhLcGEQdtLIYPbmNGNyYe8QwNaTUYQp2J7/vIsUKt5QCqAfUkYyG9DkOw==}
+ engines: {node: '>=12'}
+
ansi-styles@2.2.1:
resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==}
engines: {node: '>=0.10.0'}
@@ -592,6 +648,9 @@
engines: {node: '>= 4.5.0'}
hasBin: true
+ autofit.js@3.2.8:
+ resolution: {integrity: sha512-albZNwDIXvcRneEDyZLW3uAIOH0cUQG/TnCGQ7jpfnL0gPn/+1ZNVRuEz3ZuzZvVkQ4HQRplGHjUeMRtPNxjLQ==}
+
available-typed-arrays@1.0.7:
resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
engines: {node: '>= 0.4'}
@@ -646,6 +705,10 @@
resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
engines: {node: '>= 0.4'}
+ camelcase@5.0.0:
+ resolution: {integrity: sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==}
+ engines: {node: '>=6'}
+
chalk@1.1.3:
resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==}
engines: {node: '>=0.10.0'}
@@ -664,6 +727,9 @@
clipboard@2.0.11:
resolution: {integrity: sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==}
+
+ cliui@6.0.0:
+ resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
clone@2.1.2:
resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}
@@ -746,8 +812,8 @@
resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
engines: {node: '>= 0.4'}
- dayjs@1.11.13:
- resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
+ dayjs@1.11.23:
+ resolution: {integrity: sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==}
debug@2.6.9:
resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
@@ -765,6 +831,10 @@
peerDependenciesMeta:
supports-color:
optional: true
+
+ decamelize@1.2.0:
+ resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+ engines: {node: '>=0.10.0'}
decode-uri-component@0.2.2:
resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
@@ -800,6 +870,9 @@
delegate@3.2.0:
resolution: {integrity: sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==}
+
+ dijkstrajs@1.0.3:
+ resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
dom-serializer@0.2.2:
resolution: {integrity: sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==}
@@ -965,6 +1038,10 @@
resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
engines: {node: '>=8'}
+ find-up@4.1.0:
+ resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+ engines: {node: '>=8'}
+
follow-redirects@1.15.9:
resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
engines: {node: '>=4.0'}
@@ -1016,6 +1093,10 @@
fuse.js@6.6.2:
resolution: {integrity: sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==}
engines: {node: '>=10'}
+
+ get-caller-file@2.0.5:
+ resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+ engines: {node: 6.* || 8.* || >= 10.*}
get-intrinsic@1.3.0:
resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
@@ -1351,6 +1432,10 @@
resolution: {integrity: sha512-WunYko2W1NcdfAFpuLUoucsgULmgDBRkdxHxWQ7mK0cQqwPiy8E1enjuRBrhLtZkB5iScJ1XIPdhVEFK8aOLSg==}
engines: {node: '>=14'}
+ locate-path@5.0.0:
+ resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+ engines: {node: '>=8'}
+
lodash-es@4.17.21:
resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
@@ -1514,6 +1599,18 @@
resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
engines: {node: '>= 0.4'}
+ p-limit@2.2.0:
+ resolution: {integrity: sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==}
+ engines: {node: '>=6'}
+
+ p-locate@4.1.0:
+ resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+ engines: {node: '>=8'}
+
+ p-try@2.2.0:
+ resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+ engines: {node: '>=6'}
+
package-json-from-dist@1.0.1:
resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
@@ -1523,6 +1620,10 @@
pascalcase@0.1.1:
resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
engines: {node: '>=0.10.0'}
+
+ path-exists@4.0.0:
+ resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+ engines: {node: '>=8'}
path-key@3.1.1:
resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
@@ -1567,6 +1668,10 @@
pkg-types@2.1.0:
resolution: {integrity: sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==}
+ pngjs@5.0.0:
+ resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==}
+ engines: {node: '>=10.13.0'}
+
posix-character-classes@0.1.1:
resolution: {integrity: sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==}
engines: {node: '>=0.10.0'}
@@ -1605,11 +1710,19 @@
resolution: {integrity: sha512-spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q==}
engines: {node: '>=0.10.0'}
+ print-js@1.6.0:
+ resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==}
+
proto-list@1.2.4:
resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
proxy-from-env@1.1.0:
resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
+
+ qrcode@1.5.4:
+ resolution: {integrity: sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==}
+ engines: {node: '>=10.13.0'}
+ hasBin: true
quansync@0.2.10:
resolution: {integrity: sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==}
@@ -1658,6 +1771,13 @@
repeat-string@1.6.1:
resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
engines: {node: '>=0.10'}
+
+ require-directory@2.1.1:
+ resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+ engines: {node: '>=0.10.0'}
+
+ require-main-filename@2.0.0:
+ resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
resolve-url@0.2.1:
resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
@@ -1712,6 +1832,9 @@
resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
engines: {node: '>=10'}
hasBin: true
+
+ set-blocking@2.0.0:
+ resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
set-function-length@1.2.2:
resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
@@ -1772,8 +1895,8 @@
sortablejs@1.14.0:
resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
- sortablejs@1.15.6:
- resolution: {integrity: sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A==}
+ sortablejs@1.15.7:
+ resolution: {integrity: sha512-Kk8wLQPlS+yi1ZEf48a4+fzHa4yxjC30M/Sr2AnQu+f/MPwvvX9XjZ6OWejiz8crBsLwSq8GHqaxaET7u6ux0A==}
source-map-js@1.2.1:
resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
@@ -1851,6 +1974,10 @@
strip-ansi@7.1.0:
resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+ engines: {node: '>=12'}
+
+ strip-ansi@7.2.0:
+ resolution: {integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==}
engines: {node: '>=12'}
strip-literal@2.1.1:
@@ -2033,10 +2160,23 @@
'@vue/composition-api':
optional: true
+ vue-easy-lightbox@1.19.0:
+ resolution: {integrity: sha512-YxLXgjEn91UF3DuK1y8u3Pyx2sJ7a/MnBpkyrBSQkvU1glzEJASyAZ7N+5yDpmxBQDVMwCsL2VmxWGIiFrWCgA==}
+ engines: {node: '>=14.18.3'}
+ peerDependencies:
+ vue: ^3.0.0
+
+ vue-esign@1.1.4:
+ resolution: {integrity: sha512-7Ix5PdcyyhVfsvrT9a+yp5+36gbQ0/bpDO+QSLT58IgJ5t164PEptOy5Nslw8bZbk3n3Hc7SP5B8eXQ8X8W+OA==}
+
vue-router@4.4.0:
resolution: {integrity: sha512-HB+t2p611aIZraV2aPSRNXf0Z/oLZFrlygJm+sZbdJaW6lcFqEDQwnzUBXn+DApw+/QzDU/I9TeWx9izEjTmsA==}
peerDependencies:
vue: ^3.2.0
+
+ vue@2.5.11:
+ resolution: {integrity: sha512-FZzUIvJa1jsFSfy6OITgjzoCtnxI8uHkewa2QCCCIgRj7ObsalXKLTf3S5sBP+kyusTctl3fKej+NHoBUCVPlA==}
+ deprecated: Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.
vue@3.4.31:
resolution: {integrity: sha512-njqRrOy7W3YLAlVqSKpBebtZpDVg21FPoaq1I7f/+qqBThK9ChAIjkRWgeP6Eat+8C+iia4P3OYqpATP21BCoQ==}
@@ -2066,6 +2206,9 @@
resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
engines: {node: '>= 0.4'}
+ which-module@2.0.1:
+ resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
+
which-typed-array@1.1.19:
resolution: {integrity: sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==}
engines: {node: '>= 0.4'}
@@ -2075,6 +2218,10 @@
engines: {node: '>= 8'}
hasBin: true
+ wrap-ansi@6.2.0:
+ resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+ engines: {node: '>=8'}
+
wrap-ansi@7.0.0:
resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
engines: {node: '>=10'}
@@ -2082,6 +2229,17 @@
wrap-ansi@8.1.0:
resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
engines: {node: '>=12'}
+
+ y18n@4.0.3:
+ resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
+
+ yargs-parser@18.1.3:
+ resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
+ engines: {node: '>=6'}
+
+ yargs@15.3.1:
+ resolution: {integrity: sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==}
+ engines: {node: '>=8'}
zrender@5.6.0:
resolution: {integrity: sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==}
@@ -2285,7 +2443,7 @@
'@rollup/rollup-win32-x64-msvc@4.40.2':
optional: true
- '@sxzz/popperjs-es@2.11.7': {}
+ '@sxzz/popperjs-es@2.11.8': {}
'@trysound/sax@0.2.0': {}
@@ -2313,6 +2471,16 @@
dependencies:
vite: 5.3.2(@types/node@22.15.18)(sass@1.77.5)
vue: 3.4.31
+
+ '@vue-office/docx@1.6.3(vue-demi@0.14.10(vue@3.4.31))(vue@3.4.31)':
+ dependencies:
+ vue: 3.4.31
+ vue-demi: 0.14.10(vue@3.4.31)
+
+ '@vue-office/excel@1.7.14(vue-demi@0.14.10(vue@3.4.31))(vue@3.4.31)':
+ dependencies:
+ vue: 3.4.31
+ vue-demi: 0.14.10(vue@3.4.31)
'@vue/compiler-core@3.4.31':
dependencies:
@@ -2456,6 +2624,8 @@
ansi-regex@6.1.0: {}
+ ansi-regex@6.4.0: {}
+
ansi-styles@2.2.1: {}
ansi-styles@4.3.0:
@@ -2502,13 +2672,15 @@
atob@2.1.2: {}
+ autofit.js@3.2.8: {}
+
available-typed-arrays@1.0.7:
dependencies:
possible-typed-array-names: 1.1.0
- axios@0.28.1:
+ axios@0.28.1(debug@4.4.1(supports-color@7.2.0)):
dependencies:
- follow-redirects: 1.15.9
+ follow-redirects: 1.15.9(debug@4.4.1(supports-color@7.2.0))
form-data: 4.0.2
proxy-from-env: 1.1.0
transitivePeerDependencies:
@@ -2538,7 +2710,7 @@
dependencies:
balanced-match: 1.0.2
- braces@2.3.2:
+ braces@2.3.2(supports-color@7.2.0):
dependencies:
arr-flatten: 1.1.0
array-unique: 0.3.2
@@ -2546,7 +2718,7 @@
fill-range: 4.0.0
isobject: 3.0.1
repeat-element: 1.1.4
- snapdragon: 0.8.2
+ snapdragon: 0.8.2(supports-color@7.2.0)
snapdragon-node: 2.1.1
split-string: 3.1.0
to-regex: 3.0.2
@@ -2586,6 +2758,8 @@
call-bind-apply-helpers: 1.0.2
get-intrinsic: 1.3.0
+ camelcase@5.0.0: {}
+
chalk@1.1.3:
dependencies:
ansi-styles: 2.2.1
@@ -2623,6 +2797,12 @@
good-listener: 1.2.2
select: 1.1.2
tiny-emitter: 2.1.0
+
+ cliui@6.0.0:
+ dependencies:
+ string-width: 4.2.3
+ strip-ansi: 6.0.1
+ wrap-ansi: 6.2.0
clone@2.1.2: {}
@@ -2708,15 +2888,21 @@
es-errors: 1.3.0
is-data-view: 1.0.2
- dayjs@1.11.13: {}
+ dayjs@1.11.23: {}
- debug@2.6.9:
+ debug@2.6.9(supports-color@7.2.0):
dependencies:
ms: 2.0.0
+ optionalDependencies:
+ supports-color: 7.2.0
- debug@4.4.1:
+ debug@4.4.1(supports-color@7.2.0):
dependencies:
ms: 2.1.3
+ optionalDependencies:
+ supports-color: 7.2.0
+
+ decamelize@1.2.0: {}
decode-uri-component@0.2.2: {}
@@ -2757,6 +2943,8 @@
delayed-stream@1.0.0: {}
delegate@3.2.0: {}
+
+ dijkstrajs@1.0.3: {}
dom-serializer@0.2.2:
dependencies:
@@ -2817,12 +3005,12 @@
'@ctrl/tinycolor': 3.6.1
'@element-plus/icons-vue': 2.3.1(vue@3.4.31)
'@floating-ui/dom': 1.7.0
- '@popperjs/core': '@sxzz/popperjs-es@2.11.7'
+ '@popperjs/core': '@sxzz/popperjs-es@2.11.8'
'@types/lodash': 4.17.16
'@types/lodash-es': 4.17.12
'@vueuse/core': 9.13.0(vue@3.4.31)
async-validator: 4.2.5
- dayjs: 1.11.13
+ dayjs: 1.11.23
escape-html: 1.0.3
lodash: 4.17.21
lodash-es: 4.17.21
@@ -2962,14 +3150,14 @@
eventemitter3@2.0.3: {}
- expand-brackets@2.1.4:
+ expand-brackets@2.1.4(supports-color@7.2.0):
dependencies:
- debug: 2.6.9
+ debug: 2.6.9(supports-color@7.2.0)
define-property: 0.2.5
extend-shallow: 2.0.1
posix-character-classes: 0.1.1
regex-not: 1.0.2
- snapdragon: 0.8.2
+ snapdragon: 0.8.2(supports-color@7.2.0)
to-regex: 3.0.2
transitivePeerDependencies:
- supports-color
@@ -2987,15 +3175,15 @@
extend@3.0.2: {}
- extglob@2.0.4:
+ extglob@2.0.4(supports-color@7.2.0):
dependencies:
array-unique: 0.3.2
define-property: 1.0.0
- expand-brackets: 2.1.4
+ expand-brackets: 2.1.4(supports-color@7.2.0)
extend-shallow: 2.0.1
fragment-cache: 0.2.1
regex-not: 1.0.2
- snapdragon: 0.8.2
+ snapdragon: 0.8.2(supports-color@7.2.0)
to-regex: 3.0.2
transitivePeerDependencies:
- supports-color
@@ -3029,7 +3217,14 @@
dependencies:
to-regex-range: 5.0.1
- follow-redirects@1.15.9: {}
+ find-up@4.1.0:
+ dependencies:
+ locate-path: 5.0.0
+ path-exists: 4.0.0
+
+ follow-redirects@1.15.9(debug@4.4.1(supports-color@7.2.0)):
+ optionalDependencies:
+ debug: 4.4.1(supports-color@7.2.0)
for-each@0.3.5:
dependencies:
@@ -3076,6 +3271,8 @@
functions-have-names@1.2.3: {}
fuse.js@6.6.2: {}
+
+ get-caller-file@2.0.5: {}
get-intrinsic@1.3.0:
dependencies:
@@ -3423,6 +3620,10 @@
pkg-types: 2.1.0
quansync: 0.2.10
+ locate-path@5.0.0:
+ dependencies:
+ p-locate: 4.1.0
+
lodash-es@4.17.21: {}
lodash-unified@1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21):
@@ -3465,20 +3666,20 @@
merge2@1.4.1: {}
- micromatch@3.1.0:
+ micromatch@3.1.0(supports-color@7.2.0):
dependencies:
arr-diff: 4.0.0
array-unique: 0.3.2
- braces: 2.3.2
+ braces: 2.3.2(supports-color@7.2.0)
define-property: 1.0.0
extend-shallow: 2.0.1
- extglob: 2.0.4
+ extglob: 2.0.4(supports-color@7.2.0)
fragment-cache: 0.2.1
kind-of: 5.1.0
- nanomatch: 1.2.13
+ nanomatch: 1.2.13(supports-color@7.2.0)
object.pick: 1.3.0
regex-not: 1.0.2
- snapdragon: 0.8.2
+ snapdragon: 0.8.2(supports-color@7.2.0)
to-regex: 3.0.2
transitivePeerDependencies:
- supports-color
@@ -3524,7 +3725,7 @@
nanoid@3.3.11: {}
- nanomatch@1.2.13:
+ nanomatch@1.2.13(supports-color@7.2.0):
dependencies:
arr-diff: 4.0.0
array-unique: 0.3.2
@@ -3535,7 +3736,7 @@
kind-of: 6.0.3
object.pick: 1.3.0
regex-not: 1.0.2
- snapdragon: 0.8.2
+ snapdragon: 0.8.2(supports-color@7.2.0)
to-regex: 3.0.2
transitivePeerDependencies:
- supports-color
@@ -3594,11 +3795,23 @@
object-keys: 1.1.1
safe-push-apply: 1.0.0
+ p-limit@2.2.0:
+ dependencies:
+ p-try: 2.2.0
+
+ p-locate@4.1.0:
+ dependencies:
+ p-limit: 2.2.0
+
+ p-try@2.2.0: {}
+
package-json-from-dist@1.0.1: {}
parchment@1.1.4: {}
pascalcase@0.1.1: {}
+
+ path-exists@4.0.0: {}
path-key@3.1.1: {}
@@ -3634,6 +3847,8 @@
confbox: 0.2.2
exsolve: 1.0.5
pathe: 2.0.3
+
+ pngjs@5.0.0: {}
posix-character-classes@0.1.1: {}
@@ -3679,9 +3894,17 @@
posthtml-parser: 0.2.1
posthtml-render: 1.4.0
+ print-js@1.6.0: {}
+
proto-list@1.2.4: {}
proxy-from-env@1.1.0: {}
+
+ qrcode@1.5.4:
+ dependencies:
+ dijkstrajs: 1.0.3
+ pngjs: 5.0.0
+ yargs: 15.3.1
quansync@0.2.10: {}
@@ -3751,6 +3974,10 @@
repeat-element@1.1.4: {}
repeat-string@1.6.1: {}
+
+ require-directory@2.1.1: {}
+
+ require-main-filename@2.0.0: {}
resolve-url@0.2.1: {}
@@ -3824,6 +4051,8 @@
select@1.1.2: {}
semver@7.7.2: {}
+
+ set-blocking@2.0.0: {}
set-function-length@1.2.2:
dependencies:
@@ -3900,10 +4129,10 @@
dependencies:
kind-of: 3.2.2
- snapdragon@0.8.2:
+ snapdragon@0.8.2(supports-color@7.2.0):
dependencies:
base: 0.11.2
- debug: 2.6.9
+ debug: 2.6.9(supports-color@7.2.0)
define-property: 0.2.5
extend-shallow: 2.0.1
map-cache: 0.2.2
@@ -3915,7 +4144,7 @@
sortablejs@1.14.0: {}
- sortablejs@1.15.6: {}
+ sortablejs@1.15.7: {}
source-map-js@1.2.1: {}
@@ -3960,7 +4189,7 @@
dependencies:
eastasianwidth: 0.2.0
emoji-regex: 9.2.2
- strip-ansi: 7.1.0
+ strip-ansi: 7.2.0
string.prototype.trim@1.2.10:
dependencies:
@@ -4001,6 +4230,10 @@
dependencies:
ansi-regex: 6.1.0
+ strip-ansi@7.2.0:
+ dependencies:
+ ansi-regex: 6.4.0
+
strip-literal@2.1.1:
dependencies:
js-tokens: 9.0.1
@@ -4015,7 +4248,7 @@
dependencies:
has-flag: 4.0.0
- svg-baker@1.7.0:
+ svg-baker@1.7.0(supports-color@7.2.0):
dependencies:
bluebird: 3.7.2
clone: 2.1.2
@@ -4023,7 +4256,7 @@
image-size: 0.5.5
loader-utils: 1.4.2
merge-options: 1.0.1
- micromatch: 3.1.0
+ micromatch: 3.1.0(supports-color@7.2.0)
postcss: 5.2.18
postcss-prefix-selector: 1.16.1(postcss@5.2.18)
posthtml-rename-id: 1.0.12
@@ -4195,24 +4428,24 @@
vary@1.1.2: {}
- vite-plugin-compression@0.5.1(vite@5.3.2(@types/node@22.15.18)(sass@1.77.5)):
+ vite-plugin-compression@0.5.1(supports-color@7.2.0)(vite@5.3.2(@types/node@22.15.18)(sass@1.77.5)):
dependencies:
chalk: 4.1.2
- debug: 4.4.1
+ debug: 4.4.1(supports-color@7.2.0)
fs-extra: 10.1.0
vite: 5.3.2(@types/node@22.15.18)(sass@1.77.5)
transitivePeerDependencies:
- supports-color
- vite-plugin-svg-icons@2.0.1(vite@5.3.2(@types/node@22.15.18)(sass@1.77.5)):
+ vite-plugin-svg-icons@2.0.1(supports-color@7.2.0)(vite@5.3.2(@types/node@22.15.18)(sass@1.77.5)):
dependencies:
'@types/svgo': 2.6.4
cors: 2.8.5
- debug: 4.4.1
+ debug: 4.4.1(supports-color@7.2.0)
etag: 1.8.1
fs-extra: 10.1.0
pathe: 0.2.0
- svg-baker: 1.7.0
+ svg-baker: 1.7.0(supports-color@7.2.0)
svgo: 2.8.0
vite: 5.3.2(@types/node@22.15.18)(sass@1.77.5)
transitivePeerDependencies:
@@ -4234,10 +4467,20 @@
dependencies:
vue: 3.4.31
+ vue-easy-lightbox@1.19.0(vue@3.4.31):
+ dependencies:
+ vue: 3.4.31
+
+ vue-esign@1.1.4:
+ dependencies:
+ vue: 2.5.11
+
vue-router@4.4.0(vue@3.4.31):
dependencies:
'@vue/devtools-api': 6.6.4
vue: 3.4.31
+
+ vue@2.5.11: {}
vue@3.4.31:
dependencies:
@@ -4285,6 +4528,8 @@
is-weakmap: 2.0.2
is-weakset: 2.0.4
+ which-module@2.0.1: {}
+
which-typed-array@1.1.19:
dependencies:
available-typed-arrays: 1.0.7
@@ -4299,6 +4544,12 @@
dependencies:
isexe: 2.0.0
+ wrap-ansi@6.2.0:
+ dependencies:
+ ansi-styles: 4.3.0
+ string-width: 4.2.3
+ strip-ansi: 6.0.1
+
wrap-ansi@7.0.0:
dependencies:
ansi-styles: 4.3.0
@@ -4309,7 +4560,28 @@
dependencies:
ansi-styles: 6.2.1
string-width: 5.1.2
- strip-ansi: 7.1.0
+ strip-ansi: 7.2.0
+
+ y18n@4.0.3: {}
+
+ yargs-parser@18.1.3:
+ dependencies:
+ camelcase: 5.0.0
+ decamelize: 1.2.0
+
+ yargs@15.3.1:
+ dependencies:
+ cliui: 6.0.0
+ decamelize: 1.2.0
+ find-up: 4.1.0
+ get-caller-file: 2.0.5
+ require-directory: 2.1.1
+ require-main-filename: 2.0.0
+ set-blocking: 2.0.0
+ string-width: 4.2.3
+ which-module: 2.0.1
+ y18n: 4.0.3
+ yargs-parser: 18.1.3
zrender@5.6.0:
dependencies:
diff --git a/src/views/qualityManagement/finalInspection/components/filesDia.vue b/src/views/qualityManagement/finalInspection/components/filesDia.vue
index 51dd78f..f72d679 100644
--- a/src/views/qualityManagement/finalInspection/components/filesDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/filesDia.vue
@@ -143,7 +143,7 @@
fileRow.url = res.data.tempPath
uploadFile(fileRow)
} else {
- proxy.$modal.msgError("鏂囦欢涓婁紶澶辫触");
+ uploadFile({ name: (file && file.name) || "闄勪欢", url: "" });
}
}
function uploadFile(file) {
@@ -154,8 +154,8 @@
})
}
// 涓婁紶澶辫触澶勭悊
-function handleUploadError() {
- proxy.$modal.msgError("鏂囦欢涓婁紶澶辫触");
+function handleUploadError(err, file) {
+ uploadFile({ name: (file && file.name) || "闄勪欢", url: "" });
}
// 鍒犻櫎
const handleDelete = () => {
diff --git a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
index 13a231d..d06d734 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -86,6 +86,17 @@
</el-form-item>
</el-col>
<el-col :span="12">
+ <el-form-item label="澶勭悊鏂瑰紡锛�" prop="dealType">
+ <el-select v-model="form.dealType" placeholder="璇烽�夋嫨澶勭悊鏂瑰紡" clearable style="width: 100%">
+ <el-option label="杩斿伐" value="rework"/>
+ <el-option label="鎶ュ簾" value="scrap"/>
+ <el-option label="璁╂鎺ユ敹" value="concession"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
<el-form-item label="澶勭悊缁撴灉锛�" prop="dealResult">
<el-input v-model="form.dealResult" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
@@ -150,6 +161,7 @@
inspectState: '',
inspectType: '',
defectivePhenomena: '',
+ dealType: '',
dealResult: '',
},
rules: {
diff --git a/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue b/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
index 196eda0..7eb1eee 100644
--- a/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
+++ b/src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
@@ -88,6 +88,17 @@
</el-form-item>
</el-col>
<el-col :span="12">
+ <el-form-item label="澶勭悊鏂瑰紡锛�" prop="dealType">
+ <el-select v-model="form.dealType" placeholder="璇烽�夋嫨澶勭悊鏂瑰紡" clearable style="width: 100%">
+ <el-option label="杩斿伐" value="rework"/>
+ <el-option label="鎶ュ簾" value="scrap"/>
+ <el-option label="璁╂鎺ユ敹" value="concession"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
<el-form-item label="澶勭悊缁撴灉锛�" prop="dealResult">
<el-input v-model="form.dealResult" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
@@ -152,6 +163,7 @@
inspectState: '',
inspectType: '',
defectivePhenomena: '',
+ dealType: '',
dealResult: '',
dealName: '',
dealTime: '',
diff --git a/src/views/qualityManagement/nonconformingManagement/index.vue b/src/views/qualityManagement/nonconformingManagement/index.vue
index c0fd2ca..c7072d8 100644
--- a/src/views/qualityManagement/nonconformingManagement/index.vue
+++ b/src/views/qualityManagement/nonconformingManagement/index.vue
@@ -158,6 +158,20 @@
width: 120
},
{
+ label: "澶勭悊鏂瑰紡",
+ prop: "dealType",
+ dataType: "tag",
+ width: 110,
+ formatData: (params) => {
+ const map = { rework: "杩斿伐", scrap: "鎶ュ簾", concession: "璁╂鎺ユ敹" };
+ return map[params] || params || "-";
+ },
+ formatType: (params) => {
+ const map = { rework: "primary", scrap: "danger", concession: "warning" };
+ return map[params] || "info";
+ },
+ },
+ {
label: "澶勭悊缁撴灉",
prop: "dealResult",
width: 120
diff --git a/src/views/qualityManagement/processInspection/components/filesDia.vue b/src/views/qualityManagement/processInspection/components/filesDia.vue
index fb47850..9027be4 100644
--- a/src/views/qualityManagement/processInspection/components/filesDia.vue
+++ b/src/views/qualityManagement/processInspection/components/filesDia.vue
@@ -147,7 +147,7 @@
fileRow.url = res.data.tempPath
uploadFile(fileRow)
} else {
- proxy.$modal.msgError("鏂囦欢涓婁紶澶辫触");
+ uploadFile({ name: (file && file.name) || "闄勪欢", url: "" });
}
}
function uploadFile(file) {
@@ -158,8 +158,8 @@
})
}
// 涓婁紶澶辫触澶勭悊
-function handleUploadError() {
- proxy.$modal.msgError("鏂囦欢涓婁紶澶辫触");
+function handleUploadError(err, file) {
+ uploadFile({ name: (file && file.name) || "闄勪欢", url: "" });
}
// 棰勮闄勪欢
const lookFile = (row) => {
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue
index 9907fbe..6ba764a 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue
@@ -144,7 +144,7 @@
fileRow.url = res.data.tempPath
uploadFile(fileRow)
} else {
- proxy.$modal.msgError("鏂囦欢涓婁紶澶辫触");
+ uploadFile({ name: (file && file.name) || "闄勪欢", url: "" });
}
}
function uploadFile(file) {
@@ -155,8 +155,8 @@
})
}
// 涓婁紶澶辫触澶勭悊
-function handleUploadError() {
- proxy.$modal.msgError("鏂囦欢涓婁紶澶辫触");
+function handleUploadError(err, file) {
+ uploadFile({ name: (file && file.name) || "闄勪欢", url: "" });
}
// 涓嬭浇闄勪欢
const downLoadFile = (row) => {
diff --git a/src/views/tideLogin.vue b/src/views/tideLogin.vue
index c9ae3d4..84be00d 100644
--- a/src/views/tideLogin.vue
+++ b/src/views/tideLogin.vue
@@ -14,7 +14,7 @@
methods: {
goLogin() {
useUserStore().TideLogin({code : this.$route.query.code}).then(() => {
- this.$router.push({ path: this.redirect || "/" }).catch(() => { });
+ this.$router.push({ path: this.$route.query.redirect || "/" }).catch(() => { });
})
}
}
diff --git a/vite.config.js b/vite.config.js
index 035c8fb..ffa935a 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -35,6 +35,9 @@
outDir: "dist",
assetsDir: "assets",
chunkSizeWarningLimit: 2000,
+ // 鍏煎鍫″瀿鏈虹瓑鏃ф祻瑙堝櫒
+ target: "es2015",
+ cssTarget: "chrome61",
rollupOptions: {
output: {
chunkFileNames: "static/js/[name]-[hash].js",
--
Gitblit v1.9.3