From 33845b056d3a9a580eaae1b5d1f7d89a340252ba Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期二, 09 十二月 2025 21:05:47 +0800
Subject: [PATCH] 修改了代码
---
src/views/archiveManager/archiveMaterial/index.vue | 77 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 29 deletions(-)
diff --git a/src/views/archiveManager/archiveMaterial/index.vue b/src/views/archiveManager/archiveMaterial/index.vue
index 6603f55..57442dd 100644
--- a/src/views/archiveManager/archiveMaterial/index.vue
+++ b/src/views/archiveManager/archiveMaterial/index.vue
@@ -405,13 +405,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" />
@@ -462,9 +462,9 @@
<el-form-item label="鏉愭枡绫诲瀷" prop="fileStyle">
<el-select
v-model="forms.fileStyle"
-
placeholder="璇烽�夋嫨鏉愭枡绫诲瀷"
clearable
+ @change="handleFileStyleChange2"
>
<el-option
v-for="item in fileStyleOptions"
@@ -474,7 +474,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"
@@ -634,14 +634,6 @@
placeholder="璇烽�夋嫨鏃ユ湡">
</el-date-picker> -->
</el-form-item>
- <el-form-item label="妗f鍙�" prop="fileNumber">
- <el-input
- v-model="queryParams.fileNumber"
- placeholder="璇疯緭鍏ユ。妗堝彿锛堟敮鎸佽寖鍥存悳绱紝濡傦細B1.3-05-2024-0001~0003锛�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
<!-- <el-form-item label="椤靛彿" prop="pageNumber">
<el-col :span="8">
<el-input
@@ -796,7 +788,7 @@
</template>
<script>
- import { getFileCount,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"
@@ -806,6 +798,7 @@
name: "Materials",
data() {
return {
+ totalPageCount: 0,
// 璁板綍鍏冪礌鍒濆浣嶇疆鍜岀姸鎬�
originalOffsetLeft: 0,
originalWidth: 0,
@@ -1000,6 +993,9 @@
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
+ //alert(this.totalPageCount)
//alert(recordId)
this.recordId = recordId;
this.uploadUrl = process.env.VUE_APP_BASE_API +'/system/materials/upload/'+this.recordId
@@ -1044,6 +1040,11 @@
},
// 鎵撳紑瀵煎叆瀵硅瘽妗�
handleImport() {
+ //鐢熸垚鏂扮殑璁板綍
+ insertFile(this.recordId, this.totalPageCount).then(response => {
+ console.log(response)
+ // alert(3245)
+ })
this.importDialogVisible = true
},
// 鏂囦欢绉婚櫎
@@ -1070,26 +1071,27 @@
//鍒ゆ柇椤靛彿涓庝笂浼犱笂浼犵殑鏂囦欢鐨勯〉鍙锋槸涓嶆槸涓�涓�瀵瑰簲鐨�
- islegal(this.recordId).then(response => {
- console.log(response.data)
- var res = response.data.res
+ // islegal(this.recordId).then(response => {
+ // console.log(response.data)
+ // var res = response.data.res
+ // console.log(res)
//alert(response.data.total)
- if(fileCount!==response.data.total)
+ if(fileCount!=this.totalPageCount)
{
this.$modal.msgWarning('璇烽�夋嫨涓庤褰曟暟涓�鑷寸殑鏂囦欢')
return
}
- if(res)
+ else
{
// 鎵ц涓婁紶
this.$refs.upload.submit()
this.getList()
}
- else
- {
- this.$modal.msgError("椤靛彿涓嶈繛缁紝璇蜂慨鏀逛负杩炵画姝g‘鐨勯〉鍙凤紒")
- }
- })
+ // else
+ // {
+ // this.$modal.msgError("椤靛彿涓嶈繛缁紝璇蜂慨鏀逛负杩炵画姝g‘鐨勯〉鍙凤紒")
+ // }
+ //})
},
clearFileList() {
@@ -1138,7 +1140,8 @@
listMaterials(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
})
@@ -1287,11 +1290,18 @@
this.showCreatorSuggestions = false;
},
- // 澶勭悊鏉愭枡绫诲瀷鍙樺寲
+ // 澶勭悊鏉愭枡绫诲瀷鍙樺寲锛堟柊澧炶〃鍗曪級
handleFileStyleChange(value) {
- // 褰撻�夋嫨'鍏朵粬鏉愭枡'鏃讹紝娓呯┖椤电爜瀛楁
+ // 褰撻�夋嫨'鍏朵粬鏉愭枡'鏃讹紝灏嗛〉鍙疯缃负0
if (value === '鍏朵粬鏉愭枡') {
this.form.pageNumber = null;
+ }
+ },
+ // 澶勭悊鏉愭枡绫诲瀷鍙樺寲锛堜慨鏀硅〃鍗曪級
+ handleFileStyleChange2(value) {
+ // 褰撻�夋嫨'鍏朵粬鏉愭枡'鏃讹紝灏嗛〉鍙疯缃负0
+ if (value === '鍏朵粬鏉愭枡') {
+ this.forms.pageNumber = null;
}
},
@@ -1371,6 +1381,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 = "淇敼妗堝嵎璇︾粏淇℃伅"
})
@@ -1588,8 +1602,13 @@
const rect = fixedRow.getBoundingClientRect();
const parentRect = fixedRow.parentNode.getBoundingClientRect();
- // 妫�鏌ュ厓绱犳槸鍚﹀簲璇ヨ繘鍏ユ偓娴姸鎬�
- if (rect.top <= 0) {
+ // 璁板綍鍏冪礌鐨勫師濮嬩綅缃紙鐩稿浜庢枃妗i《閮ㄧ殑浣嶇疆锛�
+ if (!this.originalTop) {
+ this.originalTop = rect.top + window.pageYOffset;
+ }
+
+ // 妫�鏌ュ厓绱犳槸鍚﹀簲璇ヨ繘鍏ユ偓娴姸鎬侊紙褰撴粴鍔ㄤ綅缃秴杩囧厓绱犲師濮嬩綅缃椂锛�
+ if (window.pageYOffset >= this.originalTop) {
// 鍙湪涓嶅湪floating鐘舵�佹椂娣诲姞锛岄伩鍏嶉噸澶嶆搷浣�
if (!fixedRow.classList.contains('floating')) {
// 璁板綍鍏冪礌鍘熷鐨勫乏鍋忕Щ閲忥紙鐩稿浜庣埗瀹瑰櫒锛�
@@ -1613,7 +1632,7 @@
}
}
} else {
- // 褰撳厓绱犲洖鍒拌鍙i《閮ㄤ互涓婃椂锛岀Щ闄ゆ偓娴姸鎬侊紝鎭㈠鍒版枃妗f祦涓�
+ // 褰撴粴鍔ㄤ綅缃洖鍒板厓绱犲師濮嬩綅缃互涓婃椂锛岀Щ闄ゆ偓娴姸鎬侊紝鎭㈠鍒版枃妗f祦涓�
if (fixedRow.classList.contains('floating')) {
// 绉婚櫎floating绫�
fixedRow.classList.remove('floating');
--
Gitblit v1.9.1