Commit 4a1d71e7 by huaying

fix: ui,bug

parent 96a4c067
...@@ -84,6 +84,7 @@ export default { ...@@ -84,6 +84,7 @@ export default {
setTimeout(() => { setTimeout(() => {
this.$route.meta.refresh = true; this.$route.meta.refresh = true;
this.$refs.setActCodePage.btnLoading = false; this.$refs.setActCodePage.btnLoading = false;
this.$refs.setActCodePage.saveLoading = false;
this.$router.go(-1); this.$router.go(-1);
this.form = { this.form = {
hmType: 1, hmType: 1,
...@@ -93,6 +94,7 @@ export default { ...@@ -93,6 +94,7 @@ export default {
}, 1000); }, 1000);
} else { } else {
this.$refs.setActCodePage.btnLoading = false; this.$refs.setActCodePage.btnLoading = false;
this.$refs.setActCodePage.saveLoading = false;
return this.$message.error(res.data.message); return this.$message.error(res.data.message);
} }
}); });
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<span :title="listItem.groupName" class="listItemName overflow-ellipsis">{{ listItem.groupName }}</span> <span :title="listItem.groupName" class="listItemName overflow-ellipsis">{{ listItem.groupName }}</span>
<span>{{ `(${listItem.referNum})` }}</span> <span>{{ `(${listItem.referNum})` }}</span>
</div> </div>
<el-popover placement="bottom" trigger="click" v-if="isShowGroupListItemMore(listItem)"> <el-popover placement="bottom" trigger="hover" v-if="isShowGroupListItemMore(listItem)">
<p class="more" @click="editGroupListItem(listItem)">编辑</p> <p class="more" @click="editGroupListItem(listItem)">编辑</p>
<p class="more" @click="delGroupListItem(listItem)" v-if="!listItem.referNum">删除</p> <p class="more" @click="delGroupListItem(listItem)" v-if="!listItem.referNum">删除</p>
<i slot="reference" class="iconfont-hb3 icongengduo3 icon iconhover" v-if="listItem.groupName != '全部分组' && listItem.groupName != '默认分组'"></i> <i slot="reference" class="iconfont-hb3 icongengduo3 icon iconhover" v-if="listItem.groupName != '全部分组' && listItem.groupName != '默认分组'"></i>
...@@ -308,18 +308,14 @@ export default { ...@@ -308,18 +308,14 @@ export default {
&.active-li { &.active-li {
color: #2f54eb; color: #2f54eb;
background: #ebeffe; background: #ebeffe;
.iconhover { .iconhover:hover {
background: #d8defc; background: #d8defc;
border-radius: 2px; border-radius: 2px;
} }
} }
.iconhover:hover { .iconhover:hover {
background: #d8defc; background: #e5e6eb;
border-radius: 2px; border-radius: 2px;
&:active {
background: #d8defc;
border-radius: 2px;
}
} }
} }
.more { .more {
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
</el-form-item> </el-form-item>
</template> </template>
</setActCode> </setActCode>
<div v-if="showMark" class="mark"></div>
</div> </div>
</template> </template>
<script> <script>
...@@ -33,7 +32,6 @@ export default { ...@@ -33,7 +32,6 @@ export default {
components: { setActCode, SelectClerk }, components: { setActCode, SelectClerk },
data() { data() {
return { return {
showMark: false,
loading: false, loading: false,
form: { form: {
hmType: 1, hmType: 1,
...@@ -116,7 +114,7 @@ export default { ...@@ -116,7 +114,7 @@ export default {
setTimeout(() => { setTimeout(() => {
this.$router.go(-1); this.$router.go(-1);
this.$refs.setActCodePage.btnLoading = false; this.$refs.setActCodePage.btnLoading = false;
this.showMark = false; this.$refs.setActCodePage.saveLoading = false;
this.form = { this.form = {
hmType: 1, hmType: 1,
name: '', name: '',
...@@ -126,7 +124,7 @@ export default { ...@@ -126,7 +124,7 @@ export default {
}, 1000); }, 1000);
} else { } else {
this.$refs.setActCodePage.btnLoading = false; this.$refs.setActCodePage.btnLoading = false;
this.showMark = false; this.$refs.setActCodePage.saveLoading = false;
return this.$message.error(res.data.message); return this.$message.error(res.data.message);
} }
}); });
...@@ -136,8 +134,8 @@ export default { ...@@ -136,8 +134,8 @@ export default {
if (res.data.code == 0) { if (res.data.code == 0) {
setTimeout(() => { setTimeout(() => {
this.$route.meta.refresh = true; this.$route.meta.refresh = true;
this.showMark = false;
this.$refs.setActCodePage.btnLoading = false; this.$refs.setActCodePage.btnLoading = false;
this.$refs.setActCodePage.saveLoading = false;
this.$router.go(-1); this.$router.go(-1);
this.form = { this.form = {
hmType: 1, hmType: 1,
...@@ -147,8 +145,8 @@ export default { ...@@ -147,8 +145,8 @@ export default {
}; };
}, 1000); }, 1000);
} else { } else {
this.showMark = false;
this.$refs.setActCodePage.btnLoading = false; this.$refs.setActCodePage.btnLoading = false;
this.$refs.setActCodePage.saveLoading = false;
return this.$message.error(res.data.message); return this.$message.error(res.data.message);
} }
}); });
...@@ -169,10 +167,4 @@ export default { ...@@ -169,10 +167,4 @@ export default {
font-size: 12px; font-size: 12px;
color: #909399; color: #909399;
} }
.mark {
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0);
z-index: 99;
}
</style> </style>
<template> <template>
<div> <div>
<div class="m20 formBox"> <div class="m20 formBox" v-loading="saveLoading">
<dm-sub-title text="基础信息" type="line" /> <dm-sub-title text="基础信息" type="line" />
<el-form class="mt20" ref="form" :model="form" :rules="rules" label-width="110px"> <el-form class="mt20" ref="form" :model="form" :rules="rules" label-width="110px">
<slot name="typeCode"></slot> <slot name="typeCode"></slot>
...@@ -60,6 +60,7 @@ export default { ...@@ -60,6 +60,7 @@ export default {
data() { data() {
return { return {
btnLoading: false, btnLoading: false,
saveLoading: false,
welcomeType: 1, welcomeType: 1,
form: { form: {
// hmType: 1, //1单人 2多人 // hmType: 1, //1单人 2多人
...@@ -171,8 +172,8 @@ export default { ...@@ -171,8 +172,8 @@ export default {
this.$refs.form.validate(async valid => { this.$refs.form.validate(async valid => {
if (valid) { if (valid) {
// this.form.passFlag = this.form.passFlag ? 1 : 0; // this.form.passFlag = this.form.passFlag ? 1 : 0;
this.$parent.showMark = true;
this.btnLoading = true; this.btnLoading = true;
this.saveLoading = true;
this.$emit('sumbit', this.form); this.$emit('sumbit', this.form);
} }
}); });
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="新增总人数" prop="addNumT" sortable></el-table-column> <el-table-column label="新增总人数" prop="addNumT" sortable></el-table-column>
<el-table-column label="今日新增人数" prop="addNum" sortable></el-table-column> <el-table-column label="今日新增人数" prop="addNum" sortable></el-table-column>
<!-- <el-table-column label="今日流失人数" prop="toadyLess" sortable></el-table-column> <!-- <el-table-column label="今日流失人数" prop="toadyLess" sortable></el-table-column>
<el-table-column label="流失总人数" prop="lessTotal" sortable></el-table-column> --> <el-table-column label="流失总人数" prop="lessTotal" sortable></el-table-column> -->
<el-table-column label="今日已达上限" prop="overFlag"> <el-table-column label="今日已达上限" prop="overFlag">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment