From 296dfdd98abba4f97bf23c79e3fb513578dd1fcd Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 20 七月 2022 09:39:13 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/contingency/index.vue | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/views/contingencyManagement/contingency/index.vue b/src/views/contingencyManagement/contingency/index.vue
index 595aa7c..68f6335 100644
--- a/src/views/contingencyManagement/contingency/index.vue
+++ b/src/views/contingencyManagement/contingency/index.vue
@@ -4,10 +4,10 @@
<div class="system-user-search mb15">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item>
- <el-input size="default" v-model="formInline.teamName" placeholder="队伍名称"> </el-input>
+ <el-input size="default" v-model="formInline.searchParams.teamName" placeholder="队伍名称"> </el-input>
</el-form-item>
<el-form-item>
- <el-select size="default" v-model="formInline.teamType" placeholder="请选择队伍级别">
+ <el-select size="default" v-model="formInline.searchParams.teamType" placeholder="请选择队伍级别">
<el-option label="公司" value="shanghai"></el-option>
<el-option label="分厂-车间" value="beijing"></el-option>
<el-option label="工序-班组等" value="beijing"></el-option>
@@ -73,7 +73,7 @@
<el-table-column prop="teamDescription" label="队伍描述" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="teamPhone" label="负责人手机" show-overflow-tooltip sortable></el-table-column>
<el-table-column prop="attachments" label="相关附件" show-overflow-tooltip sortable></el-table-column>
- <el-table-column label="操作" width="200" align="center">
+ <el-table-column label="操作" width="200" align="center" fixed="right">
<template #default="scope">
<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenSee(scope.row)">
<el-icon style="margin-right: 5px;">
@@ -141,8 +141,6 @@
import OpenSee from '/@/views/contingencyManagement/contingency/component/openSee.vue';
import UpData from '/@/views/contingencyManagement/contingency/component/upData.vue';
import {contingencyApi} from "/@/api/contingency";
-import {Session} from "/@/utils/storage";
-import {initBackEndControlRoutes} from "/@/router/backEnd";
// 定义表格数据类型
@@ -173,10 +171,6 @@
data: Array<TableDataRow>;
total: number;
loading: boolean;
- param: {
- pageIndex: number;
- pageSize: number;
- }
};
}
export default defineComponent({
@@ -388,4 +382,24 @@
.el-form .el-form-item:last-of-type{
margin-bottom: 22px!important;
}
+//弹窗底部边框线
+::v-deep .el-dialog__footer{
+ border-top: 1px solid #e8e8e8;
+ border-radius: 0 0 4px 4px;
+}
+//弹窗顶部边框线
+::v-deep .el-dialog__header {
+ border-bottom: 1px solid #e8e8e8;
+ margin-right: 0;
+ border-radius: 4px 4px 0 0;
+}
+//表头
+::v-deep .el-table th.el-table__cell {
+ background-color: #f6f7fa;
+ font-weight: 400;
+ color: #909399;
+}
+.el-table .sort-caret.ascending{
+ border-bottom-color: #c0c4cc;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.2