From e3b2609c38422afab080be9fd629947e550b506a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 09 九月 2025 14:48:02 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
yarn.lock | 23 ++++++++++++++---------
src/views/tasks/machinereturnfiles.vue | 4 +++-
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/views/tasks/machinereturnfiles.vue b/src/views/tasks/machinereturnfiles.vue
index c0f6786..4f26492 100644
--- a/src/views/tasks/machinereturnfiles.vue
+++ b/src/views/tasks/machinereturnfiles.vue
@@ -73,7 +73,7 @@
size:'mini',
index: true,
selection: true,
- selectionWidth:20,
+ selectionWidth:30,
addBtn: false,
editBtn: false,
delBtn: false,
@@ -297,6 +297,8 @@
params: obj,
}).then(
res => {
+ var screenHeight = window.innerHeight;
+ this.option.maxHeight = (screenHeight - 390) + 'px';
const data = res.data.data;
this.mypage.total = data.total;
this.data = data.records;
diff --git a/yarn.lock b/yarn.lock
index 31fc32e..0547627 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -62,9 +62,9 @@
"resolved" "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz"
"version" "2.3.1"
-"@esbuild/win32-x64@0.21.5":
- "integrity" "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw=="
- "resolved" "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz"
+"@esbuild/darwin-arm64@0.21.5":
+ "integrity" "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ=="
+ "resolved" "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz"
"version" "0.21.5"
"@floating-ui/core@^1.6.0":
@@ -169,9 +169,9 @@
"@nodelib/fs.scandir" "2.1.5"
"fastq" "^1.6.0"
-"@parcel/watcher-win32-x64@2.5.1":
- "integrity" "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA=="
- "resolved" "https://registry.npmmirror.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz"
+"@parcel/watcher-darwin-arm64@2.5.1":
+ "integrity" "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw=="
+ "resolved" "https://registry.npmmirror.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz"
"version" "2.5.1"
"@parcel/watcher@^2.4.1":
@@ -212,9 +212,9 @@
"estree-walker" "^2.0.2"
"picomatch" "^4.0.2"
-"@rollup/rollup-win32-x64-msvc@4.34.2":
- "integrity" "sha512-rUrqINax0TvrPBXrFKg0YbQx18NpPN3NNrgmaao9xRNbTwek7lOXObhx8tQy8gelmQ/gLaGy1WptpU2eKJZImg=="
- "resolved" "https://registry.npmmirror.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.2.tgz"
+"@rollup/rollup-darwin-arm64@4.34.2":
+ "integrity" "sha512-PSN58XG/V/tzqDb9kDGutUruycgylMlUE59f40ny6QIRNsTEIZsrNQTJKUN2keMMSmlzgunMFqyaGLmly39sug=="
+ "resolved" "https://registry.npmmirror.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.2.tgz"
"version" "4.34.2"
"@saber/nf-design-base-elp@^1.3.0":
@@ -1030,6 +1030,11 @@
"jsonfile" "^6.0.1"
"universalify" "^2.0.0"
+"fsevents@~2.3.2", "fsevents@~2.3.3":
+ "integrity" "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="
+ "resolved" "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz"
+ "version" "2.3.3"
+
"function-bind@^1.1.2":
"integrity" "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
"resolved" "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz"
--
Gitblit v1.9.3