From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue | 91 ++++++++++-----------------------------------
1 files changed, 21 insertions(+), 70 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
index 879f070..24b4063 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
@@ -1,24 +1,26 @@
<template>
<!-- 鍙戞斁鍥炴敹璁板綍 -->
- <div class="distribution-collection-record" style="height: 100%;">
+ <div>
<div class="search">
- <div class="search_thing">
- <div class="search_label">鏂囦欢缂栧彿锛�</div>
- <div class="search_input"><el-input v-model="queryParams.documentCode" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable()"></el-input></div>
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="鏂囦欢缂栧彿" prop="documentCode">
+ <el-input v-model="queryParams.documentCode" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item label="鏂囦欢鍚嶇О" prop="laboratoryNumber">
+ <el-input v-model="queryParams.name" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button 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 v-model="queryParams.name" clearable placeholder="璇疯緭鍏�" size="small"
- @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="btns" style="padding-left: 30px;">
- <el-button v-if="addPower" size="small" type="primary"
- @click="addDialogVisible = true, addInfo = {}, radio = '鍙戞斁', file = null">娣诲姞鍙戞斁璁板綍</el-button>
+ <div>
+ <el-button v-if="addPower" size="small" type="primary" icon="el-icon-plus"
+ @click="addDialogVisible = true, addInfo = {}, radio = '鍙戞斁', file = null">娣诲姞鍙戞斁璁板綍</el-button>
<el-button v-if="outPower" :loading="outLoading" size="small" type="primary" @click="handleOut">瀵煎嚭</el-button>
</div>
</div>
@@ -288,38 +290,6 @@
this.selectEnumByCategory()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let out = false
- let del = false
- let add = false
- // let check = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'exportManageDocumentIssueRecycle') {
- out = true
- }
- if (power[i].menuMethod == 'addManageDocumentIssueRecycle') {
- add = true
- }
- if (power[i].menuMethod == 'delManageDocumentIssueRecycle') {
- del = true
- }
- // if (power[i].menuMethod == 'checkManageDocumentControlled') {
- // check = true
- // }
- }
- // if (!check) {
- // this.componentData.do.splice(2, 1)
- // }
- if (!del) {
- this.componentData.do.splice(1, 1)
- }
- if (!add) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- this.outPower = out
- },
getList() {
this.tableLoading = true;
let param = { ...this.queryParams, ...this.page };
@@ -553,17 +523,10 @@
</script>
<style scoped>
-.title {
- height: 60px;
- line-height: 60px;
-}
-
.search {
- background-color: #fff;
- height: 40px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
+ justify-content: space-between;
}
.search_thing {
@@ -580,17 +543,5 @@
.search_input {
width: calc(100% - 110px);
-}
-
-.table {
- background-color: #fff;
- height: calc(100% - 60px - 80px);
- padding: 20px;
-}
-
-.btns {
- position: absolute;
- right: 20px;
- top: 5px;
}
</style>
--
Gitblit v1.9.3