From e43478e41aafb7460d200059deca9a9a63ddbd9a Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 07 Aug 2021 18:12:42 +0800
Subject: [PATCH] 冲突
---
src/views/trainingRegistration/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index ea71700..e389a84 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container class="recruitmentManagement">
+ <basic-container>
<avue-crud
:option="option"
:table-loading="loading"
@@ -43,10 +43,10 @@
>
<el-button
icon="el-icon-folder-checked"
+ style="display: none"
@click="affirmApply(row)"
:size="size"
:type="type"
- :disabled="row.cancel == 2"
>确认报名</el-button
>
</template>
@@ -83,12 +83,13 @@
height: 583,
index: true,
labelWidth: "120",
- menuWidth: 230,
+ menuWidth: 100,
align: "center",
selection: true,
column: column,
delBtn: false,
editBtn: false,
+ addBtn: false,
},
};
},
--
Gitblit v1.9.3