From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue | 140 +++++++++-------------------------------------
1 files changed, 29 insertions(+), 111 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue b/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
index ef71f30..59cadd7 100644
--- a/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
@@ -1,40 +1,39 @@
<template>
<!-- 鏂囦欢瀹℃壒璁板綍 -->
- <div class="DocumentApprovalRecords">
+ <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" 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 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: 0 8px">
<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>
+ <el-button size="small" type="primary" @click="handleDown" :loading="outLoading">瀵煎嚭</el-button>
</div>
</div>
<div class="table">
<lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
- :height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
+ :height="'calc(100vh - 230px)'" @pagination="pagination"></lims-table>
</div>
<!-- 鏂板/缂栬緫 -->
<el-dialog :title="title" :visible.sync="addDia" width="500px">
- <el-form :model="addForm" ref="addForm" :rules="addRules" label-position="right" label-width="120px">
+ <el-form :model="addForm" ref="addForm" :rules="addRules" label-position="right" label-width="100px">
<el-form-item label="鏂囦欢鍚嶇О" prop="documentName">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.documentName"></el-input>
</el-form-item>
@@ -96,6 +95,7 @@
pageManageRecordCheck
} from '@/api/cnas/systemManagement/documentRecords.js'
export default {
+ name: 'ApprovalRecord',
components: {
limsTable
},
@@ -116,9 +116,9 @@
prop: "documentVersion",
},
{ label: "缂栧埗", prop: "writeUser" },
- { label: "瀹℃牳", prop: "checkUser" },
- { label: "鎵瑰噯", prop: "ratifyUser" },
- { label: "鎵瑰噯鏃ユ湡", prop: "ratifyDate" },
+ { label: "瀹℃牳浜�", prop: "checkUserName" },
+ { label: "鎵瑰噯浜�", prop: "ratifyUserName" },
+ // { label: "鎵瑰噯鏃ユ湡", prop: "ratifyDate" },
{ label: "澶囨敞", prop: "remark" },
{
dataType: "action",
@@ -193,50 +193,6 @@
this.getAuthorizedPerson()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let add = false
- let del = false
- let up = false;
- let out = false;
- let check = false
- let ratify = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addManageRecordCheck') {
- add = true
- }
- if (power[i].menuMethod == 'delManageRecordCheck') {
- del = true
- }
- if (power[i].menuMethod == 'exportInManageRecordCheck') {
- up = true
- }
- if (power[i].menuMethod == 'checkManageRecordCheck') {
- check = true
- }
- if (power[i].menuMethod == 'ratifyManageRecordCheck') {
- ratify = true
- }
- if (power[i].menuMethod == 'exportOutManageRecordCheck') {
- out = true
- }
- }
- if (!ratify) {
- this.componentData.do.splice(3, 1)
- }
- if (!check) {
- 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
- },
getList() {
this.tableLoading = true;
let param = { ...this.queryParams, ...this.page };
@@ -283,9 +239,7 @@
// queryParams
exportOutManageRecordCheck(this.queryParams).then(res => {
this.outLoading = false
- if (res.code == 201) return this.$message.error('瀵煎嚭澶辫触')
- let url = this.javaApi + '/word/' + res.data
- this.$download.saveAs(url, '鏂囦欢瀹℃壒璁板綍')
+ this.$download.saveAs(res.data, '鏂囦欢瀹℃壒璁板綍')
})
},
getAuthorizedPerson() {
@@ -313,7 +267,6 @@
if (action === 'confirm') {
// 鐐瑰嚮鈥滅‘瀹氣�濇寜閽紝鍏佽鍏抽棴
checkManageRecordCheck({ id: row.id, checkState: '閫氳繃' }).then(res => {
- if (res.code === 201) return
this.refreshTable()
done();
this.$message({
@@ -327,7 +280,6 @@
} else if (action === 'cancel') {
// 鐐瑰嚮鈥滃彇娑堚�濇寜閽紝涓嶅厑璁稿叧闂�
checkManageRecordCheck({ id: row.id, checkState: '涓嶉�氳繃' }).then(res => {
- if (res.code === 201) return
this.refreshTable()
done();
this.$message({
@@ -359,7 +311,6 @@
if (action === 'confirm') {
// 鐐瑰嚮鈥滅‘瀹氣�濇寜閽紝鍏佽鍏抽棴
ratifyManageRecordCheck({ id: row.id, ratifyState: '閫氳繃' }).then(res => {
- if (res.code === 201) return
this.refreshTable()
done();
this.$message({
@@ -373,7 +324,6 @@
} else if (action === 'cancel') {
// 鐐瑰嚮鈥滃彇娑堚�濇寜閽紝涓嶅厑璁稿叧闂�
ratifyManageRecordCheck({ id: row.id, ratifyState: '涓嶉�氳繃' }).then(res => {
- if (res.code === 201) return
this.refreshTable()
done();
this.$message({
@@ -462,7 +412,6 @@
})
.then(() => {
delManageRecordCheck({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
@@ -475,39 +424,8 @@
<style scoped>
.search {
- background-color: #fff;
- height: 80px;
+ height: 46px;
display: flex;
- align-items: center;
- position: relative;
-}
-
-.search_thing {
- width: 350px;
- display: flex;
- align-items: center;
-}
-
-.search_label {
- width: 110px;
- font-size: 14px;
- text-align: right;
-}
-
-.search_input {
- width: calc(100% - 110px);
-}
-
-.btn {
- position: absolute;
- right: 16px;
- top: 20px;
-}
-
-.table {
- margin-top: 10px;
- background-color: #fff;
- height: calc(100% - 60px - 80px - 10px - 40px);
- padding: 20px;
+ justify-content: space-between;
}
</style>
--
Gitblit v1.9.3