Skip to content

M
memberTag-web
Commit 374c790c by huaying
Options

fix: 客户分组bug

parent 9b218f41
Showing with 33 additions and 19 deletions
src/view/memberGroup/group-list.vue
......@@ -82,7 +82,7 @@ export default {
this.getMemberGroupList();
},
onScroll(e) {
if ((e.target.scrollTop + e.target.clientHeight) >= this.lists.length * 40) {
if ((e.target.scrollTop + e.target.clientHeight) >= this.lists.length * 20) {
this.onPageNumChange();
}
},
......
src/view/memberGroup/memberGroupEdit.vue
......@@ -624,6 +624,11 @@ export default {
if (res.data.errorCode == 0) {
showMsg.showmsg(this.ruleForm.memberTagGroupId ? '编辑成功' : '新增成功', 'success');
this.changeRoute('/memberGroupList');
}else if(res.data.errorCode == '200009'){
this.$alert(res.data.message, '提示', {
confirmButtonText: '知道了',
type: 'warning'
})
} else {
this.$message.warning(res.data.message);
}
......
src/view/memberGroup/memberGroupList.vue
......@@ -76,10 +76,11 @@
</el-popover>
</template>
</el-table-column>
<el-table-column prop="latestUpdateTime" min-width="100" label="更新时间">
<el-table-column prop="latestUpdateTime" width="100" label="更新时间">
<template slot-scope="scope">
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeHMS }}</p>
<!-- <p class="h-18">{{ scope.row.latestUpdateTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeHMS }}</p> -->
{{scope.row.latestUpdateTime}}
</template>
</el-table-column>
<el-table-column prop="state" label="状态" min-width="80">
......@@ -128,10 +129,11 @@
<el-table-column label="创建人" prop="createUserName" min-width="110" v-if="[2,3].includes($store.state.departAuth) || $store.state.isSuperAdmin">
<template slot-scope="{ row }">{{ row.createUserName || '--'}}</template>
</el-table-column>
<el-table-column prop="createTime" min-width="100" label="创建时间">
<el-table-column prop="createTime" width="100" label="创建时间">
<template slot-scope="scope">
<p class="h-18">{{ scope.row.createTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.createTime | formatTimeHMS }}</p>
<!-- <p class="h-18">{{ scope.row.createTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.createTime | formatTimeHMS }}</p> -->
{{scope.row.createTime}}
</template>
</el-table-column>
<el-table-column label="操作" width="180" fixed="right" v-if="$getButtonLimit($buttonCode.memberTagDelGroup) || $getButtonLimit($buttonCode.memberTagFixedPile)">
......@@ -246,8 +248,9 @@
</el-table-column>
<el-table-column label="最近更新时间" width="110">
<template slot-scope="scope">
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeHMS }}</p>
<!-- <p class="h-18">{{ scope.row.latestUpdateTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeHMS }}</p> -->
{{scope.row.latestUpdateTime}}
</template>
</el-table-column>
<el-table-column prop="state" label="状态" min-width="70">
......@@ -295,11 +298,12 @@
<el-table-column label="创建人" min-width="110" prop="createUserName" v-if="[2,3].includes($store.state.departAuth) || $store.state.isSuperAdmin">
<template slot-scope="{ row }">{{ row.createUserName || '--'}}</template>
</el-table-column>
<el-table-column prop="recentUpdateDate" min-width="100" label="到期时间">
<el-table-column prop="recentUpdateDate" width="100" label="到期时间">
<template slot-scope="scope">
<template v-if="!scope.row.isRealTime">
<p class="h-18">{{ scope.row.effectiveDate | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.effectiveDate | formatTimeHMS }}</p>
<!-- <p class="h-18">{{ scope.row.effectiveDate | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.effectiveDate | formatTimeHMS }}</p> -->
{{scope.row.effectiveDate}}
</template>
<template v-else>--</template>
</template>
......@@ -307,15 +311,19 @@
<el-table-column prop="updateTime" min-width="110" label="最近编辑时间">
<template slot-scope="scope">
<p class="h-18">{{ scope.row.updateTime ? dateformat(new Date(scope.row.updateTime), 'yyyy-MM-dd') : '--' }}</p>
<p class="h-18">{{ scope.row.updateTime ? dateformat(new Date(scope.row.updateTime), 'hh:mm:ss') : '--' }}</p>
<template v-if="scope.row.updateTime">
<p class="h-18">{{ scope.row.updateTime ? dateformat(new Date(scope.row.updateTime), 'yyyy-MM-dd') : '--' }}</p>
<p class="h-18">{{ scope.row.updateTime ? dateformat(new Date(scope.row.updateTime), 'hh:mm:ss') : '--' }}</p>
</template>
<template v-else>--</template>
</template>
</el-table-column>
<el-table-column prop="createTime" min-width="100" label="创建时间">
<el-table-column prop="createTime" width="100" label="创建时间">
<template slot-scope="scope">
<p class="h-18">{{ scope.row.createTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.createTime | formatTimeHMS }}</p>
<!-- <p class="h-18">{{ scope.row.createTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.createTime | formatTimeHMS }}</p> -->
{{ scope.row.createTime}}
</template>
</el-table-column>
......@@ -395,8 +403,9 @@
</el-table-column>
<el-table-column label="最近更新时间" prop="latestUpdateTime" min-width="100">
<template slot-scope="scope">
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeHMS }}</p>
<!-- <p class="h-18">{{ scope.row.latestUpdateTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeHMS }}</p> -->
{{scope.row.latestUpdateTime}}
</template>
</el-table-column>
<el-table-column label="分类名称" prop="groupClassifyName" min-width="100">
......
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