Skip to content

E
ElectricitySheep
Commit 33a8acdb authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 87c39158
Show whitespace changes
Inline Side-by-side
Showing with 321 additions and 333 deletions
src/components/UserMan/PeaceDistributionSet.vue
View file @ 33a8acdb
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
{{item.CategoryName}} {{item.CategoryName}}
</el-tag> </el-tag>
</template> </template>
<el-button type="primary" @click="flDig=true,keepCategoryList=addMsg.CategoryList" <el-button type="primary" @click="flDig=true,keepCategoryList=addMsg.CategoryList" style="margin:0 10px;"
style="margin:0 10px;" size="small">选择分类</el-button> size="small">选择分类</el-button>
</el-form-item> </el-form-item>
<!-- <el-form-item label="分销名称" prop="Name"> <!-- <el-form-item label="分销名称" prop="Name">
<el-input v-model="addMsg.Name" size="small"></el-input> <el-input v-model="addMsg.Name" size="small"></el-input>
...@@ -21,30 +21,22 @@ ...@@ -21,30 +21,22 @@
<el-form-item label="等级"> <el-form-item label="等级">
<el-button @click="gradeDig=true" size="small" type="primary" style="margin-bottom:10px">选择等级</el-button> <el-button @click="gradeDig=true" size="small" type="primary" style="margin-bottom:10px">选择等级</el-button>
<el-table <el-table :data="addMsg.RatioList" border style="width: 100%">
:data="addMsg.RatioList" <el-table-column prop="GradeName" label="名称">
border
style="width: 100%">
<el-table-column
prop="GradeName"
label="名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="address" label="比例">
prop="address"
label="比例">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input @input="inputVal(scope.row)" type="number" min="1" v-model="scope.row.CommissionRatio" size="small" placeholder="请输入"> <el-input @input="inputVal(scope.row)" type="number" min="1" v-model="scope.row.CommissionRatio"
size="small" placeholder="请输入">
<el-button slot="append">%</el-button> <el-button slot="append">%</el-button>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column width="80px" prop="address" label="操作">
width="80px"
prop="address"
label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<img @click="Delete(scope.row,scope.$index)" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/del.png" alt=""> <img @click="Delete(scope.row,scope.$index)" style="width:32px;height:32px;margin:0 10px"
src="../../assets/img/userman/del.png" alt="">
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
...@@ -129,14 +121,16 @@ ...@@ -129,14 +121,16 @@
</el-dialog> </el-dialog>
<!-- 选择等级 --> <!-- 选择等级 -->
<el-dialog title="选择等级" :visible.sync="gradeDig" width="510px"> <el-dialog title="选择等级" :visible.sync="gradeDig" width="510px">
<div style="box-sizing: border-box;background-color: #F3F5F6;width: 100%;padding-left: 20px;height: 50px;line-height: 50px;"> <div
style="box-sizing: border-box;background-color: #F3F5F6;width: 100%;padding-left: 20px;height: 50px;line-height: 50px;">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选 <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
</el-checkbox> </el-checkbox>
</div> </div>
<div style="margin: 15px 0;"></div> <div style="margin: 15px 0;"></div>
<div style="padding: 10px 25px 20px;"> <div style="padding: 10px 25px 20px;">
<el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange"> <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
<el-checkbox style="margin-bottom:10px;width:110px" v-for="city in cities" :label="city.Id" :key="city.GradeName"> <el-checkbox style="margin-bottom:10px;width:110px" v-for="city in cities" :label="city.Id"
:key="city.GradeName">
{{city.GradeName}}</el-checkbox> {{city.GradeName}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
...@@ -156,15 +150,15 @@ ...@@ -156,15 +150,15 @@
cities: [], cities: [],
cityOptions: [], cityOptions: [],
isIndeterminate: true, isIndeterminate: true,
gradeDig:false, gradeDig: false,
flDig:false, flDig: false,
addMsg: { addMsg: {
Id: 0, Id: 0,
DecimalType: 2, DecimalType: 2,
Name: '', Name: '',
Enabled:2, Enabled: 2,
RatioList:[], RatioList: [],
CategoryList:[], CategoryList: [],
}, },
rules: { rules: {
Name: [{ Name: [{
...@@ -172,23 +166,27 @@ ...@@ -172,23 +166,27 @@
message: '请输入分销名称', message: '请输入分销名称',
trigger: 'blur' trigger: 'blur'
}], }],
DecimalType: [ DecimalType: [{
{ required: true, message: '请选择类型', trigger: 'change' } required: true,
], message: '请选择类型',
Enabled: [ trigger: 'change'
{ required: true, message: '请选择是否启用', trigger: 'change' } }],
], Enabled: [{
required: true,
message: '请选择是否启用',
trigger: 'change'
}],
}, },
GradeId: '', GradeId: '',
loading: false, loading: false,
gradeList: [], gradeList: [],
fenleiData:[], fenleiData: [],
checkList: [], checkList: [],
childList2: [], childList2: [],
childList3: [], childList3: [],
keepCategoryList: [], keepCategoryList: [],
HpGradeList:[], HpGradeList: [],
NewCategoryList:[], NewCategoryList: [],
}; };
}, },
created() { created() {
...@@ -197,51 +195,51 @@ ...@@ -197,51 +195,51 @@
this.getHpDistributorGrade(); this.getHpDistributorGrade();
}, },
methods: { methods: {
inputVal(row){ inputVal(row) {
if(Number(row.CommissionRatio)<0){ if (Number(row.CommissionRatio) < 0) {
row.CommissionRatio=1; row.CommissionRatio = 1;
} }
if(Number(row.CommissionRatio)>100){ if (Number(row.CommissionRatio) > 100) {
row.CommissionRatio=100; row.CommissionRatio = 100;
} }
}, },
Delete(item,index){ Delete(item, index) {
this.addMsg.RatioList.splice(index, 1); this.addMsg.RatioList.splice(index, 1);
this.checkedCities.forEach((list,k)=>{ this.checkedCities.forEach((list, k) => {
if(list==item.GradeId){ if (list == item.GradeId) {
this.checkedCities.splice(k, 1); this.checkedCities.splice(k, 1);
} }
}) })
}, },
chooseGrade(){ chooseGrade() {
let arr=[]; let arr = [];
this.addMsg.RatioList=[]; this.addMsg.RatioList = [];
this.cities.forEach(item=>{ this.cities.forEach(item => {
this.checkedCities.forEach(list=>{ this.checkedCities.forEach(list => {
if(item.Id==list){ if (item.Id == list) {
let Obj={ let Obj = {
Grade:item.Grade, Grade: item.Grade,
GradeId:item.Id, GradeId: item.Id,
CommissionRatio:'', CommissionRatio: '',
GradeName:item.GradeName, GradeName: item.GradeName,
} }
arr.push(Obj); arr.push(Obj);
} }
}) })
}) })
let list=arr.sort(this.compareGrade("Grade",true)); let list = arr.sort(this.compareGrade("Grade", true));
this.addMsg.RatioList=list; this.addMsg.RatioList = list;
this.gradeDig=false; this.gradeDig = false;
}, },
compareGrade(property,desc) { compareGrade(property, desc) {
return function (a, b) { return function (a, b) {
var value1 = a[property]; var value1 = a[property];
var value2 = b[property]; var value2 = b[property];
if(desc==true){ if (desc == true) {
// 升序排列 // 升序排列
return value1 - value2; return value1 - value2;
}else{ } else {
// 降序排列 // 降序排列
return value2 - value1; return value2 - value1;
} }
...@@ -260,7 +258,7 @@ ...@@ -260,7 +258,7 @@
Save(formName) { Save(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
if(this.addMsg.RatioList.length==0){ if (this.addMsg.RatioList.length == 0) {
this.Error("请选择返佣等级！"); this.Error("请选择返佣等级！");
return; return;
} }
...@@ -276,38 +274,35 @@ ...@@ -276,38 +274,35 @@
} }
}); });
}, },
ExitCateList(){ ExitCateList() {
this.NewCategoryList=[]; this.NewCategoryList = [];
this.addMsg.CategoryList.forEach(item=>{ this.addMsg.CategoryList.forEach(item => {
item.Name=item.CategoryName; item.Name = item.CategoryName;
this.NewCategoryList.push(item.CategoryId) this.NewCategoryList.push(item.CategoryId)
}) })
}, },
handleCheckChange() { handleCheckChange() {
this.addMsg.CategoryList=[]; this.addMsg.CategoryList = [];
this.NewCategoryList.forEach(list=>{ this.NewCategoryList.forEach(list => {
this.fenleiData.forEach(item => { this.fenleiData.forEach(item => {
if(list==item.Id){ if (list == item.Id) {
item.CategoryId=item.Id; item.CategoryId = item.Id;
this.addMsg.CategoryList.push(item) this.addMsg.CategoryList.push(item)
} }
item.ChildList.forEach(item2=>{ item.ChildList.forEach(item2 => {
if(list==item2.Id){ if (list == item2.Id) {
item2.CategoryId=item2.Id; item2.CategoryId = item2.Id;
this.addMsg.CategoryList.push(item2) this.addMsg.CategoryList.push(item2)
} }
item2.ChildList.forEach(item3=>{ item2.ChildList.forEach(item3 => {
if(list==item3.Id){ if (list == item3.Id) {
item3.CategoryId=item3.Id; item3.CategoryId = item3.Id;
this.addMsg.CategoryList.push(item3) this.addMsg.CategoryList.push(item3)
} }
}) })
}) })
}) })
}) })
console.log("this.addMsg.CategoryList",this.addMsg.CategoryList)
}, },
exitCheck(item, index) { exitCheck(item, index) {
this.addMsg.CategoryList.forEach((list, k) => { this.addMsg.CategoryList.forEach((list, k) => {
...@@ -338,15 +333,14 @@ ...@@ -338,15 +333,14 @@
this.fenleiData = pageData; this.fenleiData = pageData;
this.fenleiData.forEach(item => { this.fenleiData.forEach(item => {
item.CategoryName = item.Name; item.CategoryName = item.Name;
item.ChildList.forEach(item2=>{ item.ChildList.forEach(item2 => {
item2.CategoryName = item2.Name; item2.CategoryName = item2.Name;
item2.ChildList.forEach(item3=>{ item2.ChildList.forEach(item3 => {
item3.CategoryName = item3.Name; item3.CategoryName = item3.Name;
}) })
}) })
}) })
} }
}) })
}, },
getHpDistributorGrade() { getHpDistributorGrade() {
...@@ -361,8 +355,6 @@ ...@@ -361,8 +355,6 @@
this.GradeId = this.$route.query.UserId; this.GradeId = this.$route.query.UserId;
this.getData() this.getData()
} }
}) })
}, },
getData() { getData() {
...@@ -372,33 +364,28 @@ ...@@ -372,33 +364,28 @@
}, res => { }, res => {
this.loading = false; this.loading = false;
this.addMsg = res.data.data; this.addMsg = res.data.data;
this.NewCategoryList=[]; this.NewCategoryList = [];
this.addMsg.CategoryList.forEach(item=>{ this.addMsg.CategoryList.forEach(item => {
item.Name=item.CategoryName; item.Name = item.CategoryName;
this.NewCategoryList.push(item.CategoryId) this.NewCategoryList.push(item.CategoryId)
}) })
this.checkedCities=[]; this.checkedCities = [];
this.addMsg.RatioList.forEach(item=>{ this.addMsg.RatioList.forEach(item => {
this.cities.forEach(list=>{ this.cities.forEach(list => {
if(item.GradeId==list.Id){ if (item.GradeId == list.Id) {
this.checkedCities.push(list.Id); this.checkedCities.push(list.Id);
} }
}) })
}) })
//
}) })
}, },
}, },
mounted() { mounted() {
} }
}; };
</script> </script>
<style> <style>
.app-add-cat .el-checkbox-group { .app-add-cat .el-checkbox-group {
font-size: 14px !important; font-size: 14px !important;
} }
...@@ -435,6 +422,7 @@ ...@@ -435,6 +422,7 @@
overflow: scroll; overflow: scroll;
height: 400px; height: 400px;
} }
.usersListEdit .tip { .usersListEdit .tip {
margin-left: 10px; margin-left: 10px;
display: inline-block; display: inline-block;
......
src/components/sallCenter/plugin/rubik.vue
View file @ 33a8acdb
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</template> </template>
<template v-if="!rubData.data.list[rubik]"> <template v-if="rubData.data.list&&!rubData.data.list[rubik]">
<el-form-item label="图片上传"> <el-form-item label="图片上传">
<span>请先在左边选择图片位置</span> <span>请先在左边选择图片位置</span>
</el-form-item> </el-form-item>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<el-card shadow="never"> <el-card shadow="never">
<el-form-item label="图片上传"> <el-form-item label="图片上传">
<el-button size="mini" @click="choicImg=true">选择图片</el-button> <el-button size="mini" @click="choicImg=true">选择图片</el-button>
<div flex style="flex-wrap: wrap;" v-if="rubData.data.list[rubik].pic_url"> <div flex style="flex-wrap: wrap;" v-if="rubData.data.list&&rubData.data.list[rubik].pic_url">
<div flex="main:center cross:center" class="app-gallery-item" <div flex="main:center cross:center" class="app-gallery-item"
style="height: 100px; width: 100px;"> style="height: 100px; width: 100px;">
<img :src="getIconLink(rubData.data.list[rubik].pic_url)" style="width:100%;height:100%;"> <img :src="getIconLink(rubData.data.list[rubik].pic_url)" style="width:100%;height:100%;">
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="选择链接"> <el-form-item label="选择链接">
<el-input size="small" v-model="rubData.data.list[rubik].link[0].PageName" :disabled="true"> <el-input size="small" v-model="rubData.data.list&&rubData.data.list[rubik].link[0].PageName" :disabled="true">
<template slot="append"> <template slot="append">
<el-button @click="isShowLink=true">选择链接</el-button> <el-button @click="isShowLink=true">选择链接</el-button>
</template> </template>
......
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