From 4e3d77dcbe421a4d6611ebcdd1ac3165cb36ad4b Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 06 二月 2023 14:59:33 +0800
Subject: [PATCH] 系统界面翻新，回车登录，综合展示菜单重复
---
src/views/Archive/dataApplication.vue | 230 ++++++++++++++++----------------------------------------
1 files changed, 67 insertions(+), 163 deletions(-)
diff --git a/src/views/Archive/dataApplication.vue b/src/views/Archive/dataApplication.vue
index 60ce609..67d19b5 100644
--- a/src/views/Archive/dataApplication.vue
+++ b/src/views/Archive/dataApplication.vue
@@ -1,11 +1,11 @@
<template>
- <div class="logLog_box">
+ <div class="logLog_box box_div">
<My-bread :list="[
`${$t('synthesis.synthesis')}`,
`${$t('synthesis.dataApplication')}`,
]"></My-bread>
<el-divider />
- <div class="inquire">
+ <div class="inquire subpage_Div">
<el-form
:inline="true"
ref="sizeForm"
@@ -88,11 +88,10 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box">
+ <div class="table_box subpage_Div">
<el-table
:data="tableData"
style="width: 100%"
-
>
<el-table-column
@@ -216,7 +215,7 @@
<el-table-column
align="center"
prop="uname"
- label="鐢宠浜�"
+ label="瀹℃牳浜�"
/>
<el-table-column
align="center"
@@ -239,30 +238,32 @@
align="center"
prop="status"
label="鐘舵��"
+ :formatter="formatStatus1"
/>
<el-table-column
min-width="150"
:label="$t('common.operate')"
>
<template slot-scope="scope">
+ <div v-if="matchState3(scope,/[]/)">
+ <el-button
+ type="danger"
+ size="mini"
+ @click="handleApplyRepulse(scope.$index, scope.row)"
+ plain
+ >鎵撳洖</el-button>
- <el-button
- v-if="scope.row.status == 0"
- type="danger"
- size="mini"
- @click="handleApplyRepulse(scope.$index, scope.row)"
- plain
- >鎵撳洖</el-button>
-
- <el-button
- v-if="scope.row.status == 0"
- @click="handleApplyAdopt(scope.$index, scope.row)"
- type="success"
- size="mini"
- plain
- >閫氳繃</el-button>
+ <el-button
+ @click="handleApplyAdopt(scope.$index, scope.row)"
+ type="success"
+ size="mini"
+ plain
+ >閫氳繃</el-button>
+ </div>
+ <div v-if="!matchState3(scope,/[]/)">- -</div>
</template>
+
</el-table-column>
</el-table>
</div>
@@ -289,7 +290,9 @@
data() {
return {
- detailsFrom: {},
+ detailsFrom: {
+ tableData:[],
+ },
dialogDetailsVisible: false,
sizeForm: {
start: null,
@@ -316,6 +319,7 @@
if (data.code != 200) {
return this.$message.error("鍒楄〃璋冪敤澶辫触");
}
+
this.showRestData();
},
async handleApplyAdopt(index, row) {
@@ -334,7 +338,7 @@
if (data1.code != 200) {
return this.$message.error("鍒楄〃璋冪敤澶辫触");
}
- this.detailsFrom.tableData = data.result;
+ this.detailsFrom.tableData = data1.result;
},
async handleReApply(index, row) {
const data = await apply_updateForResubmit({ applyid: row.id });
@@ -366,20 +370,35 @@
this.detailsFrom.uname = row.uname;
this.detailsFrom.time = this.format(row.createTime);
this.detailsFrom.status = this.statusFormat(row.status);
- console.log(data.result)
+ this.detailsFrom.statued = row.status;
this.dialogDetailsVisible = true;
},
matchState(state = '', reg) {
var row = state.row;
- if (row.status >= -1 && row.status <= 9 && this.$store.state.uname == row.uname) {
+ if (row.status >= -1 && row.status <= 9 && this.$store.state.unid == row.userid) {
return true
}
return false
},
matchState1(state = '', reg) {
+
var row = state.row;
- if (row.status == -1 && this.$store.state.uname == row.uname) {
+ if (row.status == -1 && this.$store.state.unid == row.userid) {
+ return true
+ }
+ return false
+ },
+ matchState2(state = '', reg) {
+ var row = state.row;
+ if (row.status != -10 && this.$store.state.unid == row.userid) {
+ return true
+ }
+ return false
+ },
+ matchState3(state = '', reg) {
+ var row = state.row;
+ if (row.status == 0 && (this.detailsFrom.statued > -10 && this.detailsFrom.statued < 10) && this.$store.state.unid == row.userid) {
return true
}
return false
@@ -423,14 +442,30 @@
return this.statusFormat(data);
},
statusFormat(res) {
+
if (res >= 0 && res <= 9) {
return "瀹℃牳涓�"
} else if (res == -10) {
- return "閫�鍥�"
+ return "浣滃簾"
} else if (res == -1) {
return "鎵撳洖"
+ }else if (res == 10) {
+ return "閫氳繃"
+ }
+ },
+ formatStatus1(row, column) {
+ let data = row[column.property];
+ if (data == null) {
+ return data;
+ }
+ return this.statusFormat1(data);
+ }, statusFormat1(res) {
+ if (res == 1) {
+ return "閫氳繃"
+ } else if (res == 0) {
+ return "寰呭鏍�"
} else if (res == -1) {
- return "閫�鍥�"
+ return "鎵撳洖"
}
},
resAllTable() {
@@ -485,11 +520,11 @@
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.logLog_box {
- width: 100%;
- padding: 10px;
- height: 100%;
+ width: 98%;
- box-sizing: border-box;
+ height: 95%;
+ padding: 1%;
+
.el-input {
width: 300px;
}
@@ -499,22 +534,13 @@
margin-top: 20px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
margin-bottom: 20px;
.el-form-item {
margin: 7px;
}
- /deep/.el-form-item__label {
- color: white;
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
}
.statusLabel {
- color: white;
padding: 0px 5px;
font-size: 14px;
}
@@ -524,131 +550,9 @@
padding: 10px;
height: auto;
border-radius: 5px;
-
-
- /*淇敼table 琛ㄤ綋鐨勮儗鏅鑹插拰鏂囧瓧棰滆壊*/
-
- .pagination_box {
- /deep/.el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/.el-pagination__total {
- color: white;
- }
- /deep/.el-pagination__jump {
- color: white;
- }
- /deep/.el-pager li.active {
- color: #1890ff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
- }
}
.text-center {
text-align: center;
}
-}
-/deep/ .el-select .el-input__inner {
- border-color: #fff !important;
-}
-
-/deep/.el-form-item__label {
- color: white;
-}
-// 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
-/deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
-}
-/deep/ .el-dialog {
- background: #303030;
-}
-/deep/.el-range-editor.is-active,
-.el-range-editor.is-active:hover,
-.el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
-}
-/deep/.el-dialog__title {
- color: white;
-}
-/deep/ .el-table {
- background-color: transparent;
-
- th,
- td {
- background-color: transparent;
- }
- .el-table__expanded-cell {
- background-color: transparent !important;
- }
-
- // 琛ㄥご鑳屾櫙鑹�
- th.el-table__cell {
- background-color: #303030;
- color: #fff;
- }
- tr > td {
- background-color: #303030;
- color: #fff;
- }
-
- // hover鏁堟灉
- tr:hover > td {
- background-color: rgba(255, 255, 255, 0.3) !important;
- }
-
- tbody tr:hover {
- background-color: rgba(255, 255, 255, 0.3) !important;
- // text-align: center;
- }
-
- // 婊氬姩鏉″楂�
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- height: 5px;
- }
-
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- /*婊氬姩鏉″搴�*/
- height: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .el-table__body-wrapper::-webkit-scrollbar-track {
- box-shadow: 0px 1px 3px #216fe6 inset;
- /*婊氬姩鏉＄殑鑳屾櫙鍖哄煙鐨勫唴闃村奖*/
- border-radius: 10px;
- }
-
- /*瀹氫箟婊戝潡 鍐呴槾褰�+鍦嗚*/
- .el-table__body-wrapper::-webkit-scrollbar-thumb {
- box-shadow: 0px 1px 3px #216fe6 inset;
- border-radius: 6px;
- background-color: #216fe6;
- }
-}
-/deep/.el-textarea__inner {
- background: transparent !important;
- border-color: #fff !important;
- color: white;
-}
-/deep/.el-textarea .el-input__count {
- background: transparent;
}
</style>
--
Gitblit v1.9.3