From febbfe17f1ae201e62b9f23c7f29671251348e38 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 26 九月 2025 16:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/fileManagement/borrow/index.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/fileManagement/borrow/index.vue b/src/views/fileManagement/borrow/index.vue
index 531feb6..5bd6d64 100644
--- a/src/views/fileManagement/borrow/index.vue
+++ b/src/views/fileManagement/borrow/index.vue
@@ -201,7 +201,7 @@
const borrowList = ref([]);
const selectedRows = ref([]);
const documentList = ref([]); // 鏂囨。鍒楄〃锛岀敤浜庡�熼槄涔︾睄閫夋嫨
-const scanContent = ref('') // 鎵爜鍐呭
+const scanContent = ref() // 鎵爜鍐呭
// 鍒嗛〉鐩稿叧
const pagination = reactive({
currentPage: 1,
@@ -234,7 +234,7 @@
// 琛ㄥ崟楠岃瘉瑙勫垯
const borrowRules = reactive({
- documentationId: [{ required: true, message: "璇烽�夋嫨鍊熼槄涔︾睄", trigger: "change" }],
+
borrower: [{ required: true, message: "璇疯緭鍏ュ�熼槄浜�", trigger: "blur" }],
borrowPurpose: [{ required: true, message: "璇疯緭鍏ュ�熼槄鐩殑", trigger: "blur" }],
borrowDate: [{ required: true, message: "璇烽�夋嫨鍊熼槄鏃ユ湡", trigger: "change" }],
@@ -308,6 +308,7 @@
const res = await getDocumentList();
if (res.code === 200) {
documentList.value = res.data || [];
+ console.log("shuju",documentList.value)
} else {
ElMessage.error(res.msg || "鑾峰彇鏂囨。鍒楄〃澶辫触");
documentList.value = [];
@@ -389,18 +390,19 @@
// 澶勭悊鎵爜鍐呭
const handleScanContent = async (value) => {
-if (!value) return;
-
+ if (!value) return;
try {
// 鏌ユ壘鎵弿鍐呭瀵瑰簲鐨勬枃妗�
- // 鍋囪浜岀淮鐮佸寘鍚殑鏄枃妗D鎴栨枃妗ｅ悕绉�
const matchedDoc = documentList.value.find(item =>
- item.documentationId === value
+ item.id == value
);
+ console.log("matchedDoc", matchedDoc);
+
if (matchedDoc) {
+
// 鎵惧埌鍖归厤鐨勬枃妗ｏ紝璁剧疆琛ㄥ崟鍊�
- borrowForm.documentationId = matchedDoc.documentationId;
+ borrowForm.documentationId = matchedDoc.id;
ElMessage.success(`宸查�夋嫨: ${matchedDoc.docName || matchedDoc.name}`);
} else {
// 鏈壘鍒板尮閰嶇殑鏂囨。锛屾彁绀虹敤鎴�
--
Gitblit v1.9.3