From 0c6b2eb953f5ed4df00a77a5f7b14b9ff6c563fe Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 04 一月 2026 23:59:06 +0800
Subject: [PATCH] 修改代码
---
src/views/archiveManager/archiveMaterial/index.vue | 306 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 234 insertions(+), 72 deletions(-)
diff --git a/src/views/archiveManager/archiveMaterial/index.vue b/src/views/archiveManager/archiveMaterial/index.vue
index 29e4c70..79fd6da 100644
--- a/src/views/archiveManager/archiveMaterial/index.vue
+++ b/src/views/archiveManager/archiveMaterial/index.vue
@@ -1,6 +1,8 @@
<template>
<div class="app-container">
- <h2 class="title-border">娣诲姞妗堝嵎璇︾粏璁板綍</h2>
+
+ <div v-if="sho">
+ <h2 class="title-border">娣诲姞妗堝嵎璇︾粏璁板綍 {褰撳墠褰曞叆浜唟{total}}鏉</h2>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
@@ -15,8 +17,10 @@
<el-col :span="16">
<el-form-item label="璐ｄ换鑰�" prop="creator">
<div class="title-search-wrapper">
- <el-input
- v-model="form.creator"
+ <el-input
+ type="textarea"
+ rows="1"
+ v-model="form.creator"
placeholder="璇疯緭鍏ヨ矗浠昏��"
@input="handleCreatorInput"
@focus="showCreatorSuggestions = true"
@@ -46,6 +50,8 @@
<el-form-item label="鏂囦欢棰樺悕" prop="title">
<div class="title-search-wrapper">
<el-input
+ type="textarea"
+ rows="1"
v-model="form.title"
placeholder="璇疯緭鍏ユ枃浠堕鍚�"
@input="handleTitleInput"
@@ -87,6 +93,7 @@
<el-select
v-model="form.fileStyle"
placeholder="璇烽�夋嫨鏉愭枡绫诲瀷"
+ @change="handleFileStyleChange"
>
<el-option
v-for="item in fileStyleOptions"
@@ -233,7 +240,7 @@
</div>
-
+</div>
<div class="title-border"></div>
@@ -254,6 +261,7 @@
</el-col>
<el-col :span="1.5">
<el-button
+ v-if="sho"
type="success"
plain
icon="el-icon-edit"
@@ -262,6 +270,17 @@
@click="handleUpdate"
v-hasPermi="['system:materials:edit']"
>淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExportDir"
+ v-hasPermi="['system:materials:list']"
+
+ >瀵煎嚭鍗峰唴鐩綍</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -272,10 +291,11 @@
@click="handleExport"
v-hasPermi="['system:materials:list']"
- >瀵煎嚭</el-button>
+ >瀵煎嚭鐢靛瓙鏂囦欢鐩綍</el-button>
</el-col>
<el-col :span="1.5">
<el-button
+ v-if="sho"
type="danger"
plain
icon="el-icon-delete"
@@ -288,6 +308,7 @@
<el-col :span="1.5">
<el-button
+ v-if="sho"
type="success"
plain
icon="el-icon-edit"
@@ -333,7 +354,7 @@
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.5">
+ <el-col v-if="sho" :span="1.5">
<el-upload
action=""
@@ -355,7 +376,7 @@
<el-table v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding ">
+ <el-table-column v-if="sho" label="鎿嶄綔" align="center" width="160" class-name="small-padding ">
<template slot-scope="scope">
<el-button
size="mini"
@@ -392,8 +413,8 @@
</el-table-column>
<el-table-column label="椤靛彿" sortable align="center" prop="pageNumber" />
<el-table-column label="澶囨敞" align="center" prop="remarks" />
- <el-table-column label="椤垫" sortable align="center" prop="pageOrder" />
-
+ <!-- <el-table-column label="椤垫" sortable align="center" prop="pageOrder" />
+--->
<el-table-column label="鎵�澶勯樁娈�" sortable align="center" width="180" prop="stage" />
<el-table-column label="鍏紑灞炴��" sortable align="center" width="180" prop="publicity" />
<el-table-column label="鏄惁涓洪檮鍥惧強闄勪欢" align="center" prop="isAttachment" />
@@ -404,13 +425,13 @@
<el-table-column label="鏄惁娑夊瘑鍙婃晱鎰熶俊鎭�" align="center" prop="isSensitive" />
<el-table-column label="鏄惁娉ㄩ攢" align="center" prop="isCanceled" />
- <el-table-column label="鏍煎紡" align="center" prop="format" />
+ <!-- <el-table-column label="鏍煎紡" align="center" prop="format" />
<el-table-column label="骞呴潰" align="center" prop="sizeType" />
<el-table-column label="姘村钩鍒嗚鲸鐜�" align="center" prop="horizontalResolution" />
<el-table-column label="鍨傜洿鍒嗚鲸鐜�" align="center" prop="verticalResolution" />
<el-table-column label="瀹藉害" align="center" prop="width" />
<el-table-column label="楂樺害" align="center" prop="height" />
- <el-table-column label="澶у皬" align="center" prop="fileSize" />
+ <el-table-column label="澶у皬" align="center" prop="fileSize" /> -->
<el-table-column label="闄勪欢鍙婂巻鍙插彂鏂囧彿" align="center" prop="attachmentHistoryNumbers" />
@@ -438,13 +459,13 @@
<el-row>
<el-col :span="16">
<el-form-item label="璐ｄ换鑰�" prop="creator">
- <el-input v-model="forms.creator" placeholder="璇疯緭鍏ヨ矗浠昏��" />
+ <el-input type="textarea" rows="1" v-model="forms.creator" placeholder="璇疯緭鍏ヨ矗浠昏��" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="鏂囦欢棰樺悕" prop="title">
- <el-input v-model="forms.title" placeholder="璇疯緭鍏ユ枃浠堕鍚�" />
+ <el-input type="textarea" rows="1" v-model="forms.title" placeholder="璇疯緭鍏ユ枃浠堕鍚�" />
</el-form-item>
<el-form-item label="鏃ユ湡" prop="date">
<el-input v-model="forms.date" placeholder="璇疯緭鍏ユ棩鏈� (鏍煎紡锛歽yyy-mm-dd)" style="width: 200px;" />
@@ -461,9 +482,9 @@
<el-form-item label="鏉愭枡绫诲瀷" prop="fileStyle">
<el-select
v-model="forms.fileStyle"
-
placeholder="璇烽�夋嫨鏉愭枡绫诲瀷"
clearable
+ @change="handleFileStyleChange2"
>
<el-option
v-for="item in fileStyleOptions"
@@ -473,7 +494,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="椤靛彿" prop="pageNumber">
+ <el-form-item label="椤靛彿" prop="pageNumber" v-if="forms.fileStyle !== '鍏朵粬鏉愭枡'">
<el-col :span="8">
<el-input
v-model.number="forms.pageNumber"
@@ -616,9 +637,11 @@
<el-form-item label="鏂囦欢棰樺悕" prop="title">
<el-input
v-model="queryParams.title"
- placeholder="璇疯緭鍏ユ枃浠堕鐩�"
+ placeholder="璇疯緭鍏ユ枃浠堕鍚�"
clearable
@keyup.enter.native="handleQuery"
+ :validate-event="false"
+ @blur="validateQueryTitle"
/>
</el-form-item>
<el-form-item label="鏃ユ湡" prop="date">
@@ -785,7 +808,7 @@
</template>
<script>
- import { islegal, listMaterials, enload, getMaterials, delMaterials, addMaterials, updateMaterials } from "@/api/system/materials"
+ import {insertFile, getFileCount,islegal, listMaterials, enload, getMaterials, delMaterials, addMaterials, updateMaterials } from "@/api/system/materials"
import { getToken } from '@/utils/auth'
import store from '@/store'
import { updateStatusById } from "@/api/system/records"
@@ -795,6 +818,9 @@
name: "Materials",
data() {
return {
+ //鏄惁鏄剧ず鐩稿叧鍐呭
+ sho: true,
+ totalPageCount: 0,
// 璁板綍鍏冪礌鍒濆浣嶇疆鍜岀姸鎬�
originalOffsetLeft: 0,
originalWidth: 0,
@@ -802,13 +828,17 @@
importDialogVisible: false,
fileList: [],
- uploadUrl: process.env.VUE_APP_BASE_API +'/system/materials/upload/'+this.recordId, // 鏇挎崲涓哄疄闄呯殑涓婁紶鎺ュ彛
+ uploadUrl: process.env.VUE_APP_BASE_API +'/system/materials/uploads/'+this.recordId, // 鏇挎崲涓哄疄闄呯殑涓婁紶鎺ュ彛
headers: {
Authorization: 'Bearer ' + getToken()
},
uploadParams: {
type: 'material' // 鑷畾涔変笂浼犵被鍨�
},
+ // 涓婁紶鐘舵�佽窡韪�
+ uploadSuccessCount: 0,
+ uploadFailCount: 0,
+ totalUploadFiles: 0,
// 娣诲姞鏉愭枡绫诲瀷閫夐」
fileStyleOptions: [
{ value: '鏂囧瓧鏉愭枡', label: '鏂囧瓧鏉愭枡' },
@@ -920,22 +950,56 @@
// 琛ㄥ崟鏍￠獙
rules: {
creator: [
- // { required: true, message: "鍒涘缓鑰呬笉鑳戒负绌�", trigger: "blur" }
+ // { required: true, message: "鍒涘缓鑰呬笉鑳戒负绌�", trigger: "blur" },
+ { max: 85, message: "鏈�澶ч暱搴︿负85涓瓧绗�", trigger: "blur" }
],
title: [
- { required: true, message: "妗堝嵎棰樺悕涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "妗堝嵎棰樺悕涓嶈兘涓虹┖", trigger: "blur" },
+ { pattern: /^[^\\/:*?"<>涓╙+$/, message: "鏂囦欢鍚嶄笉鑳藉寘鍚� \\\:*?<>涓� 绛夌壒娈婂瓧绗�", trigger: "blur" },
+ { max: 85, message: "鏈�澶ч暱搴︿负85涓瓧绗�", trigger: "blur" }
],
date: [
// { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" },
- { pattern: /^\d{4}-\d{2}-\d{2}$/, message: "鏃ユ湡鏍煎紡蹇呴』涓簓yyy-mm-dd", trigger: "blur" }
+ { pattern: /^\d{4}-\d{2}-\d{2}$/, message: "鏃ユ湡鏍煎紡蹇呴』涓簓yyy-mm-dd", trigger: "blur" },
+ { max: 85, message: "鏈�澶ч暱搴︿负85涓瓧绗�", trigger: "blur" }
],
pageNumber: [
{ required: true, message: "椤靛彿涓嶈兘涓虹┖", trigger: "blur" },
{ type: 'number', message: '椤靛彿蹇呴』涓烘暟瀛楃被鍨�', trigger: ['blur', 'change'] },
- { pattern: /^\d+$/, message: '璇疯緭鍏ユ鏁存暟', trigger: 'blur' }
+ { pattern: /^[1-9]\d*$/, message: '璇疯緭鍏ュぇ浜�0鐨勬鏁存暟', trigger: 'blur' },
+ { validator: (rule, value, callback) => {
+ if (this.totalPageCount > 0 && value > this.totalPageCount) {
+ callback(new Error(`椤靛彿涓嶈兘瓒呰繃鎬婚〉鏁�${this.totalPageCount}`));
+ } else {
+ callback();
+ }
+ }, trigger: ['blur', 'change']
+ },
+ // { max: 85, message: "鏈�澶ч暱搴︿负85涓瓧绗�", trigger: "blur" }
],
stage: [
- { required: true, message: "鎵�澶勯樁娈典笉鑳戒负绌�", trigger: "change" }
+ { required: true, message: "鎵�澶勯樁娈典笉鑳戒负绌�", trigger: "change" },
+ { max: 85, message: "鏈�澶ч暱搴︿负85涓瓧绗�", trigger: "blur" }
+ ],
+ fileStyle: [
+ { required: true, message: "鏉愭枡绫诲瀷涓嶈兘涓虹┖", trigger: "change" },
+ { max: 85, message: "鏈�澶ч暱搴︿负85涓瓧绗�", trigger: "blur" }
+ ],
+ isAttachment: [
+ { required: true, message: "鏄惁涓洪檮浠朵笉鑳戒负绌�", trigger: "change" },
+ { max: 85, message: "鏈�澶ч暱搴︿负85涓瓧绗�", trigger: "blur" }
+ ],
+ retentionPeriod: [
+ { required: true, message: "淇濈鏈熼檺涓嶈兘涓虹┖", trigger: "change" },
+ { max: 85, message: "鏈�澶ч暱搴︿负85涓瓧绗�", trigger: "blur" }
+ ],
+ isSensitive: [
+ { required: true, message: "鏄惁鏁忔劅涓嶈兘涓虹┖", trigger: "change" },
+ { max: 85, message: "鏈�澶ч暱搴︿负85涓瓧绗�", trigger: "blur" }
+ ],
+ isCanceled: [
+ { required: true, message: "鏄惁娉ㄩ攢涓嶈兘涓虹┖", trigger: "change" },
+ { max: 85, message: "鏈�澶ч暱搴︿负85涓瓧绗�", trigger: "blur" }
]
}
}
@@ -963,6 +1027,14 @@
created() {
//const roleId = this.$route.params && this.$route.params.roleId
const recordId = this.$route.params && this.$route.params.recordId
+
+ this.totalPageCount = this.$route.params && this.$route.params.pageCount
+
+ this.sho = this.$route.params && this.$route.params.sho
+ // 灏嗗瓧绗︿覆杞崲涓哄竷灏斿��
+ this.sho = this.sho === true || this.sho === "true"
+
+ //alert(this.totalPageCount)
//alert(recordId)
this.recordId = recordId;
this.uploadUrl = process.env.VUE_APP_BASE_API +'/system/materials/upload/'+this.recordId
@@ -983,30 +1055,49 @@
methods: {
// 涓婁紶澶辫触鍥炶皟
handleError(err, file, fileList) {
- this.$modal.msgError("涓婁紶澶辫触: " + err.message)
- // 娓呴櫎涓婁紶鍒楄〃
- this.$refs.upload.clearFiles();
+ // 澶辫触璁℃暟+1
+ this.uploadFailCount++;
+ // 妫�鏌ユ槸鍚︽墍鏈夋枃浠堕兘涓婁紶瀹屾垚
+ this.checkUploadComplete();
},
// 涓婁紶鎴愬姛鍥炶皟
handleSuccess(response, file, fileList) {
if (response.code === 200) {
- this.$modal.msgSuccess("涓婁紶鎴愬姛")
- // 娓呴櫎涓婁紶鍒楄〃
- this.$refs.upload.clearFiles();
- // 鍏抽棴涓婁紶瀵硅瘽妗�
- this.importDialogVisible = false;
- // 鍒锋柊鍒楄〃鏁版嵁
- this.getList(); // 杩欓噷鍙互璋冪敤鎺ュ彛鍏宠仈涓婁紶鐨勬枃浠跺拰褰撳墠璁板綍
- //鏇存柊妗ｆ鐨勭姸鎬�
-
+ // 鎴愬姛璁℃暟+1
+ this.uploadSuccessCount++;
} else {
- // alert(234)
- console.log(response)
- this.$modal.msgError(response.msg)
+ // 澶辫触璁℃暟+1
+ this.uploadFailCount++;
+ }
+ // 妫�鏌ユ槸鍚︽墍鏈夋枃浠堕兘涓婁紶瀹屾垚
+ this.checkUploadComplete();
+ },
+ // 妫�鏌ユ墍鏈夋枃浠舵槸鍚︿笂浼犲畬鎴�
+ checkUploadComplete() {
+ // 褰撴墍鏈夋枃浠堕兘涓婁紶瀹屾垚鏃�
+ if (this.uploadSuccessCount + this.uploadFailCount === this.totalUploadFiles) {
+ if (this.uploadFailCount === 0) {
+ // 鎵�鏈夋枃浠朵笂浼犳垚鍔�
+ this.$modal.msgSuccess("鎵�鏈夋枃浠朵笂浼犳垚鍔�");
+ } else {
+ // 閮ㄥ垎鏂囦欢涓婁紶澶辫触
+ this.$modal.msgError(`涓婁紶瀹屾垚锛屼絾鏈� ${this.uploadFailCount} 涓枃浠朵笂浼犲け璐);
+ }
+ // 娓呴櫎涓婁紶鍒楄〃
+ this.$refs.upload.clearFiles();
+ // 鍏抽棴涓婁紶瀵硅瘽妗�
+ this.importDialogVisible = false;
+ // 鍒锋柊鍒楄〃鏁版嵁
+ this.getList();
}
},
- // 鎵撳紑瀵煎叆瀵硅瘽妗�
+ // 鎵撳紑瀵煎叆瀵硅瘽妗�
handleImport() {
+ //鐢熸垚鏂扮殑璁板綍
+ insertFile(this.recordId, this.totalPageCount).then(response => {
+ console.log(response)
+ // alert(3245)
+ })
this.importDialogVisible = true
},
// 鏂囦欢绉婚櫎
@@ -1029,26 +1120,35 @@
this.$modal.msgWarning('璇峰厛閫夋嫨鏂囦欢鍐嶄笂浼�')
return
}
- if(fileCount!==this.total)
- {
- this.$modal.msgWarning('璇烽�夋嫨涓庤褰曟暟涓�鑷寸殑鏂囦欢')
- return
- }
+ // alert(this.recordId)
+
+
//鍒ゆ柇椤靛彿涓庝笂浼犱笂浼犵殑鏂囦欢鐨勯〉鍙锋槸涓嶆槸涓�涓�瀵瑰簲鐨�
- islegal(this.recordId).then(response => {
- console.log(response.data)
- var res = response.data
- if(res)
+ // islegal(this.recordId).then(response => {
+ // console.log(response.data)
+ // var res = response.data.res
+ // console.log(res)
+ //alert(response.data.total)
+ if(fileCount!=this.totalPageCount)
{
+ this.$modal.msgWarning('璇烽�夋嫨涓庤褰曟暟涓�鑷寸殑鏂囦欢')
+ return
+ }
+ else
+ {
+ // 鍒濆鍖栦笂浼犵姸鎬佽鏁�
+ this.uploadSuccessCount = 0;
+ this.uploadFailCount = 0;
+ this.totalUploadFiles = fileCount;
// 鎵ц涓婁紶
this.$refs.upload.submit()
this.getList()
}
- else
- {
- this.$modal.msgError("椤靛彿涓嶈繛缁紝璇蜂慨鏀逛负杩炵画姝ｇ‘鐨勯〉鍙凤紒")
- }
- })
+ // else
+ // {
+ // this.$modal.msgError("椤靛彿涓嶈繛缁紝璇蜂慨鏀逛负杩炵画姝ｇ‘鐨勯〉鍙凤紒")
+ // }
+ //})
},
clearFileList() {
@@ -1082,7 +1182,8 @@
this.loading = true
listMaterials(this.queryParams).then(response => {
console.log(response)
- this.materialsList = response.data.data
+ // 杩囨护鎺塿isible涓�0鐨勮褰�
+ this.materialsList = response.data.data.filter(item => item.visible !== 0)
this.total = response.data.total
this.loading = false
})
@@ -1177,7 +1278,7 @@
this.form.title = title;
this.showTitleSuggestions = false;
},
-
+
// 澶勭悊璐ｄ换浜鸿緭鍏ヤ簨浠�
handleCreatorInput() {
// 娓呴櫎涔嬪墠鐨勫畾鏃跺櫒锛堥槻鎶栵級
@@ -1231,6 +1332,21 @@
this.showCreatorSuggestions = false;
},
+ // 澶勭悊鏉愭枡绫诲瀷鍙樺寲
+ handleFileStyleChange(value) {
+ // 褰撻�夋嫨'鍏朵粬鏉愭枡'鏃讹紝娓呯┖椤电爜瀛楁
+ if (value === '鍏朵粬鏉愭枡') {
+ this.form.pageNumber = null;
+ }
+ },
+ // 澶勭悊鏉愭枡绫诲瀷鍙樺寲锛堜慨鏀硅〃鍗曪級
+ handleFileStyleChange2(value) {
+ // 褰撻�夋嫨'鍏朵粬鏉愭枡'鏃讹紝灏嗛〉鍙疯缃负0
+ if (value === '鍏朵粬鏉愭枡') {
+ this.forms.pageNumber = null;
+ }
+ },
+
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
@@ -1263,8 +1379,24 @@
}
this.resetForm("form")
},
+
+ // 楠岃瘉鏌ヨ琛ㄥ崟涓殑鏂囦欢棰樺悕
+ validateQueryTitle() {
+ const illegalCharsPattern = /[\\/:*?<>涓╙/;
+ if (this.queryParams.title && illegalCharsPattern.test(this.queryParams.title)) {
+ this.$message.error("鏂囦欢鍚嶄笉鑳藉寘鍚� \\:/:*?<>涓� 绛夌壒娈婂瓧绗�");
+ this.queryParams.title = this.queryParams.title.replace(illegalCharsPattern, '');
+ }
+ },
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
+ // 鎼滅储鍓嶆牎楠屾枃浠堕鍚�
+ const illegalCharsPattern = /[\\/:*?<>涓╙/;
+ if (this.queryParams.title && illegalCharsPattern.test(this.queryParams.title)) {
+ this.$message.error("鏂囦欢鍚嶄笉鑳藉寘鍚� \\:/:*?<>涓� 绛夌壒娈婂瓧绗�");
+ this.queryParams.title = this.queryParams.title.replace(illegalCharsPattern, '');
+ return; // 闃绘鎼滅储锛岀洿鍒扮敤鎴蜂慨姝ｈ緭鍏�
+ }
this.queryParams.pageNum = 1
this.getList()
},
@@ -1291,6 +1423,10 @@
const materialId = row.materialId || this.ids
getMaterials(materialId).then(response => {
this.forms = response.data
+ // 濡傛灉鏉愭枡绫诲瀷鏄�"鍏朵粬鏉愭枡"锛屽皢椤靛彿璁剧疆涓�0
+ if (this.forms.fileStyle === '鍏朵粬鏉愭枡') {
+ this.forms.pageNumber = null;
+ }
this.open = true
this.title = "淇敼妗堝嵎璇︾粏淇℃伅"
})
@@ -1367,14 +1503,14 @@
// 淇濆瓨鎴愬姛鍚庯紝鍏夋爣璺冲洖鏂囦欢缂栧彿杈撳叆妗�
this.$nextTick(() => {
- this.$refs.documentNumberInput.focus();
+ this.$refs.documentNumberInput.select();
});
this.getList()
- })
- }
- else
- {
- this.$message.error('璇峰～鍐欐墍鏈夊繀濉瓧娈�');
+ })
+ }
+ else
+ {
+ this.$message.error('璇峰～鍐欐墍鏈夊繀濉瓧娈�');
}
})
@@ -1386,10 +1522,7 @@
if (this.forms.materialId != null) {
updateMaterials(this.forms).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛")
- // 淇敼鎴愬姛鍚庯紝鍏夋爣璺冲洖鏂囦欢缂栧彿杈撳叆妗�
- this.$nextTick(() => {
- this.$refs.documentNumberInput.focus();
- });
+
this.open = false
this.getList()
})
@@ -1409,6 +1542,26 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
}).catch(() => {})
},
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 - 鏀寔瀵煎嚭閫変腑琛屾垨鍏ㄩ儴鏁版嵁 */
+ handleExportDir() {
+ // 鍒ゆ柇鏄惁鏈夐�変腑鐨勮
+ if (this.ids && this.ids.length > 0) {
+ // 鏄剧ず瀵煎嚭閫変腑琛岀殑鎻愮ず
+ this.$message.info(`姝ｅ湪瀵煎嚭${this.ids.length}鏉￠�変腑鐨勬暟鎹�...`);
+ // 瀵煎嚭閫変腑鐨勮鏁版嵁
+ this.download('system/materials/exportDir', {
+ ids: this.ids.join(','),
+ // exportType: 'selected'
+ }, `materiaDir_selected_${new Date().getTime()}.xls`)
+ } else {
+ // 鏄剧ず瀵煎嚭鍏ㄩ儴鏁版嵁鐨勬彁绀�
+ this.$message.info('姝ｅ湪瀵煎嚭绗﹀悎褰撳墠鏌ヨ鏉′欢鐨勬墍鏈夋暟鎹�...');
+ // 娌℃湁閫変腑琛屾椂锛屽鍑哄綋鍓嶆煡璇㈡潯浠剁殑鏁版嵁
+ this.download('system/materials/exportDir', {
+ ...this.queryParams
+ }, `materiaDir_${new Date().getTime()}.xls`)
+ }
+ },
/** 瀵煎嚭鎸夐挳鎿嶄綔 - 鏀寔瀵煎嚭閫変腑琛屾垨鍏ㄩ儴鏁版嵁 */
handleExport() {
// 鍒ゆ柇鏄惁鏈夐�変腑鐨勮
@@ -1419,14 +1572,14 @@
this.download('system/materials/export', {
ids: this.ids.join(','),
// exportType: 'selected'
- }, `materials_selected_${new Date().getTime()}.xlsx`)
+ }, `materials_selected_${new Date().getTime()}.xls`)
} else {
// 鏄剧ず瀵煎嚭鍏ㄩ儴鏁版嵁鐨勬彁绀�
this.$message.info('姝ｅ湪瀵煎嚭绗﹀悎褰撳墠鏌ヨ鏉′欢鐨勬墍鏈夋暟鎹�...');
// 娌℃湁閫変腑琛屾椂锛屽鍑哄綋鍓嶆煡璇㈡潯浠剁殑鏁版嵁
this.download('system/materials/export', {
...this.queryParams
- }, `materials_${new Date().getTime()}.xlsx`)
+ }, `materials_${new Date().getTime()}.xls`)
}
},
@@ -1435,7 +1588,7 @@
{
this.download('/system/materials/model', {
- }, `materials_${new Date().getTime()}.xlsx`)
+ }, `materials_${new Date().getTime()}.xls`)
},
/** 瀵煎叆鎿嶄綔*/
async handleImportData({file}){
@@ -1446,7 +1599,7 @@
// }
const formData = new FormData();
formData.append('file', file);
- // formData.append('recordId', this.recordId)
+ formData.append('recordId', this.recordId)
// alert(this.recordId)
console.log(file)
@@ -1508,8 +1661,13 @@
const rect = fixedRow.getBoundingClientRect();
const parentRect = fixedRow.parentNode.getBoundingClientRect();
- // 妫�鏌ュ厓绱犳槸鍚﹀簲璇ヨ繘鍏ユ偓娴姸鎬�
- if (rect.top <= 0) {
+ // 璁板綍鍏冪礌鐨勫師濮嬩綅缃紙鐩稿浜庢枃妗ｉ《閮ㄧ殑浣嶇疆锛�
+ if (!this.originalTop) {
+ this.originalTop = rect.top + window.pageYOffset;
+ }
+
+ // 妫�鏌ュ厓绱犳槸鍚﹀簲璇ヨ繘鍏ユ偓娴姸鎬侊紙褰撴粴鍔ㄤ綅缃秴杩囧厓绱犲師濮嬩綅缃椂锛�
+ if (window.pageYOffset >= this.originalTop) {
// 鍙湪涓嶅湪floating鐘舵�佹椂娣诲姞锛岄伩鍏嶉噸澶嶆搷浣�
if (!fixedRow.classList.contains('floating')) {
// 璁板綍鍏冪礌鍘熷鐨勫乏鍋忕Щ閲忥紙鐩稿浜庣埗瀹瑰櫒锛�
@@ -1533,7 +1691,7 @@
}
}
} else {
- // 褰撳厓绱犲洖鍒拌鍙ｉ《閮ㄤ互涓婃椂锛岀Щ闄ゆ偓娴姸鎬侊紝鎭㈠鍒版枃妗ｆ祦涓�
+ // 褰撴粴鍔ㄤ綅缃洖鍒板厓绱犲師濮嬩綅缃互涓婃椂锛岀Щ闄ゆ偓娴姸鎬侊紝鎭㈠鍒版枃妗ｆ祦涓�
if (fixedRow.classList.contains('floating')) {
// 绉婚櫎floating绫�
fixedRow.classList.remove('floating');
@@ -1607,3 +1765,7 @@
background-color: #fff;
}
</style>
+
+
+
+
--
Gitblit v1.9.1