From 0615f6c8dddf1cff5368e85ce4bfa92c4deebe02 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 18:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/systemSetting/platform/cockpitManage/index.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/views/systemSetting/platform/cockpitManage/index.vue b/src/views/systemSetting/platform/cockpitManage/index.vue
index 7217eb3..64dc551 100644
--- a/src/views/systemSetting/platform/cockpitManage/index.vue
+++ b/src/views/systemSetting/platform/cockpitManage/index.vue
@@ -12,7 +12,9 @@
<div class="search-item">
<span>鐘舵��:</span>
<div class="option">
- <el-input v-model="searchStatus" placeholder="閫夋嫨鐘舵��"></el-input>
+ <el-select v-model="searchStatus" placeholder="閫夋嫨鐘舵��">
+ <el-option v-for="{ label, value } in statusOptions" :key="value" :label="label" :value="value"></el-option>
+ </el-select>
</div>
</div>
<div class="findBtn">
@@ -34,7 +36,7 @@
<el-button type="primary">瀵煎叆</el-button>
</el-upload>
<el-button style="margin-left: 10px" type="primary" @click="exportTable">瀵煎嚭</el-button>
- <el-button type="primary" @click="showAddDialog">娣诲姞</el-button>
+ <el-button class="button-addition" type="primary" @click="showAddDialog">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
@@ -66,6 +68,9 @@
<el-table-column prop="reviewOrLawsuitNumber" label="澶嶈鎴栬瘔璁兼暟" min-width="15" v-if="mystatus === 1">
</el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="15" v-if="mystatus === 1">
+ <template slot-scope="scope">
+ <span>{{scope.row. status=== 1? '鍚姩' : '绂佺敤'}}</span>
+ </template>
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
@@ -134,7 +139,7 @@
import updateUser from "./updateUser";
import detailUser from "./detailUser";
import { deleteTeam, exportTeamInfo, importTeamInfo, searchTeamInfo } from "@/api/system/portal/teamConstruction";
-import {SUCCESS_CODE} from "@/utils";
+import { SUCCESS_CODE } from "@/utils";
import {downloadFile} from "@/utils/helper";
export default {
@@ -162,6 +167,20 @@
myIdx: 0,
preMyIdx: 0,
file: null,
+ statusOptions: [
+ {
+ value: 2,
+ label: '鍏ㄩ儴'
+ },
+ {
+ value: 1,
+ label: '鍚敤'
+ },
+ {
+ value: 0,
+ label: '绂佺敤'
+ }
+ ],
options: [
{
value: 0,
@@ -221,11 +240,6 @@
this.updateDepartmentData = data;
},
- // 鏌ョ湅
- showViewDialog() {
- this.dialogcheck = true;
- },
-
// 娣诲姞鐣岄潰
showAddDialog() {
this.dialogAdd = true;
@@ -234,7 +248,8 @@
// 瀵煎嚭
exportTable() {
- exportTeamInfo({ current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status: this.searchStatus })
+ const status = this.searchStatus === 2 ? null : this.searchStatus;
+ exportTeamInfo({ current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status })
.then(res => {
downloadFile(res);
this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
@@ -345,8 +360,9 @@
// 鑾峰彇鐢ㄦ埛鍒楄〃
getDepartmentList() {
+ const status = this.searchStatus === 2 ? null : this.searchStatus;
const searchInfo = {
- current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status: this.searchStatus
+ current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status
};
searchTeamInfo(searchInfo)
.then(({ records, total }) => {
--
Gitblit v1.8.0