public/crmeb_java
1
0
Fork 0
mirror of https://gitee.com/ZhongBangKeJi/crmeb_java.git synced 2026-04-24 20:28:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新代码

Browse Source
This commit is contained in:
guaishoudemao
2021-02-06 16:42:26 +08:00
parent fdbd2ef1f1
commit c9b86697c3
80 changed files with 3056 additions and 2156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin/src/views/user/grade/index.vue
View File

@@ -74,8 +74,8 @@
</el-table-column>
<el-table-column label="操作" min-width="120" fixed="right" align="center">
<template slot-scope="scope">
<el-button type="text" @click="edit(scope.row.id)" class="mr10">编辑</el-button>
<!--<el-button type="text" @click="handleDelete(scope.row.id, scope.$index)">删除</el-button>-->
<el-button type="text" size="small" @click="edit(scope.row.id)" class="mr10">编辑</el-button>
<el-button type="text" size="small" @click="handleDelete(scope.row.id, scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -163,7 +163,7 @@
},
// 删除
handleDelete(id, idx) {
this.$modalSure().then(() => {
this.$modalSure('删除吗？所有用户已经关联的数据都会清除').then(() => {
levelDeleteApi({id:id}).then(() => {
this.$message.success('删除成功')
this.tableData.data.splice(idx, 1)

4
admin/src/views/user/group/index.vue
View File

@@ -31,7 +31,7 @@
<el-table-column label="操作" min-width="120" fixed="right" align="center">
<template slot-scope="scope">
<el-button class="mr10" type="text" size="small" @click="onAdd(scope.row)">编辑</el-button>
<!--<el-button type="text" size="small" @click="handleDelete(scope.row.id, scope.$index)" disable>删除</el-button>-->
<el-button type="text" size="small" @click="handleDelete(scope.row.id, scope.$index)" disable>删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -132,7 +132,7 @@
},
// 删除
handleDelete(id, idx) {
this.$modalSure().then(() => {
this.$modalSure('删除吗？所有用户已经关联的数据都会清除').then(() => {
this.$route.path.indexOf('group') !== -1 ? groupDeleteApi({id:id}).then(() => {
this.$message.success('删除成功')
this.tableData.data.splice(idx, 1)

44
admin/src/views/user/list/index.vue
View File

@@ -52,7 +52,7 @@
<el-select v-model="userFrom.country" placeholder="请选择" class="selWidth" clearable @on-change="changeCountry">
<el-option value="" label="全部"></el-option>
<el-option value="CN" label="中国"></el-option>
<el-option value="OTHER" label="其他"></el-option>
<el-option value="OTHER" label="国外"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -333,7 +333,7 @@
<el-dialog
title="用户列表"
:visible.sync="userVisible"
width="700px">
width="900px">
<user-list v-if="userVisible" @getTemplateRow="getTemplateRow"></user-list>
<span slot="footer" class="dialog-footer">
<el-button @click="userVisible = false">取 消</el-button>
@@ -418,7 +418,7 @@
label="积分"
required
>
<el-input-number type="text" v-model="PointValidateForm.integralValue" :max="999999"></el-input-number>
<el-input-number type="text" step-strictly v-model="PointValidateForm.integralValue" :max="999999"></el-input-number>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -430,7 +430,7 @@
<el-dialog
title="用户详情"
:visible.sync="Visible"
width="1000px"
width="1100px"
v-if="uid"
:before-close="Close">
<user-details ref="userDetails" :uid="uid" v-if="Visible"></user-details>
@@ -734,6 +734,7 @@
_this.formValidate.give_coupon_ids.push(item.coupon_id)
_this.couponData.push(item.title)
})
_this.selectionList = []
},this.userIds)
},
Close() {
@@ -784,13 +785,15 @@
this.visible = true
},
submitForm(formName) {
let data = [];
if(this.multipleSelectionAll.length){
this.multipleSelectionAll.map((item) => {
data.push(item.uid)
});
this.userIds = data.join(',');
}
// let data = [];
// if(!this.userIds){
// if(this.multipleSelectionAll.length){
// this.multipleSelectionAll.map((item) => {
// data.push(item.uid)
// });
// this.userIds = data.join(',');
// }
// }
this.$refs[formName].validate((valid) => {
if (valid) {
this.loading = true
@@ -816,13 +819,21 @@
},
setBatch(name, row){
this.batchName = name
if(row) this.userIds = row.uid
if(row){
this.userIds = row.uid
if(this.batchName ==='group'){
this.dynamicValidateForm.groupId = row.groupId?Number(row.groupId):''
}else{
this.dynamicValidateForm.groupId = row.tagId?row.tagId.split(',').map(Number):[]
}
}else{
this.dynamicValidateForm.groupId = ''
}
if (this.multipleSelectionAll.length === 0 && !row) return this.$message.warning('请选择要设置的用户')
this.dialogVisible = true
},
handleClose(){
this.dialogVisible = false
this.multipleSelectionAll = [];
this.$refs['dynamicValidateForm'].resetFields();
},
// 全选
@@ -830,6 +841,13 @@
this.selectionList = selection;
setTimeout(() => {
this.changePageCoreRecordData()
let data = [];
if(this.multipleSelectionAll.length){
this.multipleSelectionAll.map((item) => {
data.push(item.uid)
});
this.userIds = data.join(',');
}
}, 50)
},
// 搜索

6
admin/src/views/user/list/userDetails.vue
View File

@@ -27,7 +27,7 @@
</el-menu>
</el-col>
<el-col :span="20">
<el-table :data="tableData.data" class="tabNumWidth" size="mini" v-loading="loading">
<el-table :data="tableData.data" class="tabNumWidth" size="mini" v-loading="loading" max-height="400">
<el-table-column
:prop="item.key"
:label="item.title"
@@ -37,7 +37,7 @@
</el-table>
<div class="block">
<el-pagination
:page-sizes="[20, 40, 60, 80]"
:page-sizes="[6, 12, 18, 24]"
:page-size="tableFrom.limit"
:current-page="tableFrom.page"
layout="total, sizes, prev, pager, next, jumper"
@@ -236,7 +236,7 @@
},
{
title: '类型',
key: 'type',
key: 'title',
minWidth: 120
},
{