From 3a597ff321125e83de645f034f43655539999e21 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 17 十一月 2025 11:50:17 +0800
Subject: [PATCH] 修改了对应代码
---
src/views/archiveManager/archiveMaterial/index.vue | 24 ++++++++++++++++++++----
src/views/archiveManager/index.vue | 24 +++++++++++++++---------
2 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/views/archiveManager/archiveMaterial/index.vue b/src/views/archiveManager/archiveMaterial/index.vue
index 7551f1d..6b2df7a 100644
--- a/src/views/archiveManager/archiveMaterial/index.vue
+++ b/src/views/archiveManager/archiveMaterial/index.vue
@@ -379,6 +379,9 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
+
+
+
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="forms" :model="forms" :rules="rules" label-width="100px">
@@ -410,11 +413,11 @@
<!-- <el-form-item label="椤垫" prop="pageOrder">
<el-input v-model="forms.pageOrder" placeholder="璇疯緭鍏ラ〉娆�" />
</el-form-item> -->
- <el-form-item label="鏂囧瓧鏉愭枡" prop="fileStyle">
+ <el-form-item label="鏉愭枡绫诲瀷" prop="fileStyle">
<el-select
v-model="forms.fileStyle"
- placeholder="璇烽�夋嫨鏂囧瓧鏉愭枡"
+ placeholder="璇烽�夋嫨鏉愭枡绫诲瀷"
clearable
>
<el-option
@@ -425,7 +428,19 @@
/>
</el-select>
</el-form-item>
-
+ <el-form-item label="椤靛彿" prop="pageNumber">
+ <el-col :span="8">
+ <el-input
+ v-model.number="forms.pageNumber"
+ placeholder="璇疯緭鍏ラ〉鍙凤紙鏁板瓧绫诲瀷锛�"
+ clearable
+ type="number"
+ min="1"
+ oninput="value=value.replace(/[^\d]/g,'')"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-col>
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="forms.remarks" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
@@ -946,9 +961,10 @@
}
if(fileCount!==this.total)
{
- this.$modal.msgWarning('璇烽�夋嫨涓庤褰曟暟涓�鑷寸殑鏂囦欢')
+ this.$modal.msgWarning('璇烽�夋嫨涓庤褰曟暟涓�鑷寸殑鏂囦欢鎴栬�呬慨鏀瑰搴旂殑椤电爜浣垮叾瀵瑰簲')
return
}
+ //鍒ゆ柇椤靛彿涓庝笂浼犱笂浼犵殑鏂囦欢鐨勯〉鍙锋槸涓嶆槸涓�涓�瀵瑰簲鐨�
// 鎵ц涓婁紶
this.$refs.upload.submit()
},
diff --git a/src/views/archiveManager/index.vue b/src/views/archiveManager/index.vue
index f19eec4..0a0a9a4 100644
--- a/src/views/archiveManager/index.vue
+++ b/src/views/archiveManager/index.vue
@@ -300,7 +300,7 @@
icon="el-icon-edit"
@click="handleInfo(scope.row)"
v-hasPermi="['system:records:edit']"
- >妗堝嵎璇︾粏淇℃伅</el-button>
+ >缂栬緫鍗峰唴鐩綍</el-button>
<el-button
size="mini"
@@ -446,9 +446,8 @@
</div>
</div>
<!-- 浼樺寲鐨凟xcel棰勮缁勪欢 -->
- <el-dialog class="excel-preview-wrapper" :visible.sync="showExcelPreview" :modal="false" width="80%">
-
- <div >
+ <el-dialog class="excel-preview-wrapper" :visible.sync="showExcelPreview" :modal="false" width="80%" :show-close="true" @click="closeExcelPreviewDialog">
+ <div @click.stop>
<!-- 涓昏棰勮缁勪欢 -->
<vue-office-excel
v-if="currentExcelUrl"
@@ -808,6 +807,7 @@
name: "Records",
data() {
return {
+ showExcelPreview: false,
excel: 'http://localhost:8080/profile/upload/12.xls', //璁剧疆鏂囨。缃戠粶鍦板潃锛屽彲浠ユ槸鐩稿鍦板潃
open_check: false,
@@ -1379,6 +1379,7 @@
/** 鍏抽棴Excel寮圭獥骞舵竻鐞嗚祫婧� */
closeExcelDialog() {
this.excelDialogVisible = false;
+ // alert(this.excelDialogVisible)
if (this.excelPreviewTimeout) {
clearTimeout(this.excelPreviewTimeout);
this.excelPreviewTimeout = null;
@@ -1389,14 +1390,18 @@
}
this.currentExcelBlob = null;
},
+closeExcelPreviewDialog()
+{
+ this.showExcelPreview = false;
+},
/** 澶勭悊棰勮鎸夐挳鐐瑰嚮 */
handlePreviewClick() {
this.showExcelPreview = true;
this.excelRenderError = '';
var id = this.recordId ;
this.$modal.loading('姝ｅ湪鑾峰彇Excel鏂囦欢锛岃绋嶅��...');
- alert(id)
+
// 浠庡悗绔幏鍙朎xcel鏂囦欢
this.getExcelFile(id).then(blob => {
this.$modal.closeLoading();
@@ -1580,9 +1585,9 @@
// 鏋勫缓鏂囦欢鍚嶏紝鍖呭惈閫夐」淇℃伅
let filename = `record_${this.currentExcelId}`;
if (includeQrCode) filename += '_qr';
- if (selectedAnnotations.length > 0) {
- filename += `_anno${selectedAnnotations.join('')}`;
- }
+ // if (selectedAnnotations.length > 0) {
+ // filename += `_anno${selectedAnnotations.join('')}`;
+ // }
filename += `_${new Date().getTime()}.xlsx`;
link.download = filename;
@@ -1618,7 +1623,7 @@
});
},
- /** 娓呯悊Excel棰勮鐩稿叧璧勬簮 */
+ /** 娓呯悊Excel棰勮鐩稿叧璧勬簮骞跺叧闂璇濇 */
cleanupExcelPreview(iframe, url) {
setTimeout(() => {
if (iframe && iframe.parentNode) {
@@ -1628,6 +1633,7 @@
URL.revokeObjectURL(url);
}
this.excelRenderError = '';
+ this.showExcelPreview = false; // 鍏抽棴棰勮瀵硅瘽妗�
}, 1000);
},
--
Gitblit v1.9.1