Merge remote-tracking branch 'origin/manage-release' into manage-release

This commit is contained in:
yuping
2022-12-28 19:04:43 +08:00
4 changed files with 28 additions and 1 deletions

View File

@@ -707,6 +707,7 @@ function handleStageOk() {
stageVisible.value = false; stageVisible.value = false;
visiable.value = false; visiable.value = false;
emit("finash", false); emit("finash", false);
nameSearch.value.keyword = "";
saveStu({ saveStu({
targetId: props.id, targetId: props.id,
type: props.type, type: props.type,

View File

@@ -701,6 +701,7 @@
<div class="opa"> <div class="opa">
<div class="opacation"> <div class="opacation">
<span <span
v-if="element.type!==5"
style=" style="
color: #4ea6ff; color: #4ea6ff;
margin-right: 25px; margin-right: 25px;
@@ -716,6 +717,14 @@
> >
编辑 编辑
</span> </span>
<span
v-else
style="
color: #4ea6ff;
margin-right: 55px;
cursor: pointer;
">
</span>
<span <span
style="color: #4ea6ff; cursor: pointer" style="color: #4ea6ff; cursor: pointer"
@click="showDeleteModal(element.id)" @click="showDeleteModal(element.id)"

View File

@@ -506,7 +506,7 @@
"> ">
<div class="opa"> <div class="opa">
<div class="opacation"> <div class="opacation">
<span style=" <span v-if="element.type!==5" style="
color: #4ea6ff; color: #4ea6ff;
margin-right: 25px; margin-right: 25px;
cursor: pointer; cursor: pointer;
@@ -519,6 +519,14 @@
"> ">
编辑 编辑
</span> </span>
<span
v-else
style="
color: #4ea6ff;
margin-right: 55px;
cursor: pointer;
">
</span>
<span style="color: #4ea6ff; cursor: pointer" @click="showDelete(element.id)"> <span style="color: #4ea6ff; cursor: pointer" @click="showDelete(element.id)">
删除 删除
</span> </span>

View File

@@ -660,6 +660,7 @@
<div class="opa"> <div class="opa">
<div class="opacation"> <div class="opacation">
<span <span
v-if="element.type!==5"
style=" style="
color: #4ea6ff; color: #4ea6ff;
margin-right: 25px; margin-right: 25px;
@@ -675,6 +676,14 @@
> >
编辑 编辑
</span> </span>
<span
v-else
style="
color: #4ea6ff;
margin-right: 55px;
cursor: pointer;
">
</span>
<span <span
style="color: #4ea6ff; cursor: pointer" style="color: #4ea6ff; cursor: pointer"
@click="showDelete(element.id)" @click="showDelete(element.id)"