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/business/unpass/index.vue | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/views/business/unpass/index.vue b/src/views/business/unpass/index.vue
index b3a7250..347357d 100644
--- a/src/views/business/unpass/index.vue
+++ b/src/views/business/unpass/index.vue
@@ -12,8 +12,8 @@
@keyup.enter.native="refreshTable()"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
</el-form-item>
</el-form>
</div>
@@ -43,26 +43,26 @@
tableLoading: false,
column: [
{ label: '缂栧彿', prop: 'no' },
- {
- label: "OA瀹℃牳鐘舵��",
- prop: "oaState",
- width: "100px",
- dataType: "tag",
- formatData: (params) => {
- if (params == 0) {
- return "鍚�";
- } else {
- return "鏄�";
- }
- },
- formatType: (params) => {
- if (params == 0) {
- return "danger";
- } else {
- return "primary";
- }
- },
- },
+ // {
+ // label: "OA瀹℃牳鐘舵��",
+ // prop: "oaState",
+ // width: "100px",
+ // dataType: "tag",
+ // formatData: (params) => {
+ // if (params == 0) {
+ // return "鍚�";
+ // } else {
+ // return "鏄�";
+ // }
+ // },
+ // formatType: (params) => {
+ // if (params == 0) {
+ // return "danger";
+ // } else {
+ // return "primary";
+ // }
+ // },
+ // },
{
dataType: 'action',
fixed: 'right',
@@ -95,7 +95,7 @@
],
page: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
}
--
Gitblit v1.9.3