From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue | 98 ++++++++++++-------------------------------------
1 files changed, 24 insertions(+), 74 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
index cf9982a..617c274 100644
--- a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
@@ -1,31 +1,31 @@
<template>
<!-- 鎵�鏈夋枃浠讹紙鍐呫�佸閮ㄦ枃浠讹級鐨勫彂鏀句笌鍥炴敹璁板綍 -->
- <div class="DistributionRetrievalRecordsAllDocuments">
+ <div class="capacity-scope">
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏂囦欢鍚嶇О锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentName"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鏂囦欢鍚嶇О" prop="documentName">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentName"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item label="鏂囦欢缂栧彿" prop="documentCode">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="search_thing">
- <div class="search_label">鏂囦欢缂栧彿锛�</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.documentCode"
- @keyup.enter.native="refreshTable()"></el-input>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
- <div class="btn">
+ <div>
<el-button size="small" type="primary" @click="openAdd">鏂板</el-button>
<el-upload :action="action" :multiple="false" :show-file-list="false" accept='.doc,.docx'
- :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload'
- :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
+ :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload'
+ :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
<el-button type="primary" size="small">瀵煎叆</el-button></el-upload>
<el-button size="small" type="primary" @click="handleDown" :loading="outLoading"
- style="display:inline-block;margin-left: 20px;">瀵煎嚭</el-button>
+ style="display:inline-block;margin-left: 20px;">瀵煎嚭</el-button>
</div>
</div>
<div class="table">
@@ -149,6 +149,7 @@
} from '@/api/cnas/systemManagement/documentControl.js'
import { mapGetters } from "vuex";
export default {
+ name: 'DistributionCollectionRecord',
components: {
limsTable
},
@@ -246,43 +247,6 @@
// this.selectTreeList()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let add = false
- let del = false
- let up = false;
- let out = false;
- let edit = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addManageRecordIssueRecycle') {
- add = true
- }
- if (power[i].menuMethod == 'delManageRecordIssueRecycle') {
- del = true
- }
- if (power[i].menuMethod == 'exportInManageRecordIssueRecycle') {
- up = true
- }
- if (power[i].menuMethod == 'doManageRecordIssueRecycle') {
- edit = true
- }
- if (power[i].menuMethod == 'exportOutManageRecordIssueRecycle') {
- out = true
- }
- }
- if (!add) {
- this.componentData.do.splice(2, 1)
- }
- if (!add) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- this.outPower = out
- this.upPower = up
- },
// 鏂板
openAdd() {
// this.$refs.ValueTable.openAddDia(this.$api.manageRecordIssueRecycle.addManageRecordIssueRecycle);
@@ -300,7 +264,7 @@
this.outLoading = true
exportOutManageRecordIssueRecycle(this.queryParams).then(res => {
this.outLoading = false
- this.$download.downloadFileFromUrl(res.data, '鏂囦欢鍙戞斁涓庡洖鏀惰褰�')
+ this.$download.saveAs(res.data, '鏂囦欢鍙戞斁涓庡洖鏀惰褰�')
})
},
getList() {
@@ -472,16 +436,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 80px;
+ height: 46px;
display: flex;
- align-items: center;
+ justify-content: space-between;
}
.search_thing {
@@ -498,13 +456,5 @@
.search_input {
width: calc(100% - 110px);
-}
-
-.table {
- margin-top: 10px;
- background-color: #fff;
- height: calc(100% - 60px - 80px - 10px - 40px);
- padding: 20px;
- padding-top: 0;
}
</style>
--
Gitblit v1.9.3