Skip to content

E
ElectricitySheep
Commit 29c2b379 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents 31bdc10b 17a37757
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 92 deletions
src/components/CommodityMan/goodsList.vue
View file @ 29c2b379
......@@ -500,7 +500,6 @@ export default {
this.apipost("/api/user/GetIsEnableFXDistributorGrade", {}, res => {
if(res.data.resultCode==1){
this.FxState=res.data.data;
console.log(res,'状态');
}
})
......@@ -813,7 +812,6 @@ export default {
});
},
getSort(val){//列表的升序降序
console.log(val)
if(val.prop=='Id'){
if(val.order=='ascending'){
this.msg.OrderBy=1
......
src/components/CommodityMan/supplierEdit.vue
View file @ 29c2b379
......@@ -197,7 +197,6 @@
if(this.addMsg.Introducer == 0){
this.addMsg.SupplierCommissionList = []
}
console.log(this.addMsg)
this.apipost('/api/Supplier/SetSupplier',this.addMsg,
res => {
if (res.data.resultCode === 1) {
......
src/components/UserMan/RecommendRebate.vue
View file @ 29c2b379
......@@ -502,7 +502,6 @@ export default {
})
},
EditCommission(item){
console.log(item)
this.editCommissionMsg.OrderDetailId = item.Id;
this.editCommissionMsg.Commission = item.OrderIntroduction.Commission;
this.editUserName= item.OrderIntroduction.UserName;
......
src/components/UserMan/usersList.vue
View file @ 29c2b379
......@@ -326,7 +326,6 @@
}
if(this.dateList && this.dateList.length>0){
console.log(this.dateList)
msg.StartTime=this.dateList[0];
msg.EndTime=this.dateList[1];
......
src/components/authorize.vue
View file @ 29c2b379
......@@ -234,7 +234,6 @@
},
created() {
this.currentUser = this.getLocalStorage();
console.log(this.getLocalStorage())
this.ERPEmpId = this.currentUser.ERPEmpId
this.isChecked=this.$route.path;
if(this.$route.query.FIndex){
......
src/components/common/choiceArea.vue
View file @ 29c2b379
......@@ -264,7 +264,7 @@
},
},
mounted() {
console.log("hotspotArray", this.hotspotArray);
},
methods: {
click(e) {
......
src/components/empower/materialQuery.vue
View file @ 29c2b379
......@@ -303,13 +303,10 @@
},
chooseFl(){
let CategoryIds=[];
console.log(this.checkList)
this.checkList.forEach(item=>{
CategoryIds.push(item.Id)
})
this.msg.pageIndex=1
console.log(CategoryIds)
// this.getList();
this.setSyncGoodsToMaterial(CategoryIds)
this.flDig=false;
},
......
src/components/empower/printManage.vue
View file @ 29c2b379
......@@ -323,8 +323,7 @@ export default {
x.page = 'page'+(i+1)
x.xpage = 'xpage'+(i+1)
});
console.log(this.checkList)
this.$forceUpdate()
},
allcheckbtn(){
......@@ -354,7 +353,6 @@ export default {
})
this.checkList=[]
}
console.log(this.checkList)
this.$forceUpdate()
},
btnradio(){
......@@ -396,7 +394,6 @@ export default {
// LODOP.PREVIEW()//预览打印
// LODOP.PRINT_DESIGN()//进入打印设计
// LODOP.PRINT()//直接打印打印
console.log(page)
let num = n
if(n ==1){
this.loading = true
......@@ -404,17 +401,13 @@ export default {
if(LODOP.CVERSION){
LODOP.On_Return = function(TaskID, Value){
if(Value){
console.log(num)
num++;//循环打印
console.log(num)
if(conunt>=num){
setTimeout(()=>{
that.batchprint(num)
},200)
}else{
console.log('打印完成')
that.loading = false;
that.checkList=[];
that.dataList.forEach((x,i)=>{
......@@ -428,7 +421,6 @@ export default {
return
}
}else{
console.log('错误')
}
}
LODOP.PRINT()
......@@ -447,7 +439,6 @@ export default {
// return
// }
// }else{
// console.log('错误')
// }
// }
......
src/components/empower/procurementMange.vue
View file @ 29c2b379
......@@ -451,7 +451,6 @@
},
methods: {
changeMsg(e) {
console.log(e);
this.$forceUpdate();
},
handleCurrentChange(val) {
......@@ -602,7 +601,6 @@
},
//生成采购单
chooseFl(msg) {
// console.log(this.addMsg)
this.$refs[msg].validate(valid => {
if (valid) {
if(this.selectGoods.length==0){
......
src/components/mallIndex.vue
View file @ 29c2b379
......@@ -770,7 +770,6 @@
);
},
getSort(val){
console.log(val)
if(val.prop == 'Income'){
if(val.order=='ascending'){
this.basicQMsg.OrderBy='Income asc'
......
src/components/orderMan/outboundManage.vue
View file @ 29c2b379
......@@ -302,7 +302,6 @@
arr.splice(j, 1);
j--; // 每删除一个数j的值就减1
len--; // j值减小时len也要相应减1（减少循环次数，节省性能）
// console.log(j,len)
}
}
}
......@@ -323,7 +322,6 @@
this.tableData.forEach(j=>{
if(x.OrderGoodsId == j.Id){
let obj = {}
console.log(j)
obj.OrderGoodsId = j.Id;
obj.NewSpecificationSort = j.NewSpecificationSort;
obj.NewNumber = j.NewNumber;
......@@ -343,7 +341,6 @@
}
array = this.unique(array)
this.outobj.WarehouseOutGoodsList = array;
console.log( this.outobj.WarehouseOutGoodsList)
that.$confirm('是否申请出库?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......
src/components/pintuan/pintuanActive.vue
View file @ 29c2b379
......@@ -392,7 +392,7 @@
</el-card>
</el-tab-pane>
<el-tab-pane label="阶梯团设置">
<groupStep @getGroup="getGroup" :SpecList="TempSpecList" :GroupPriceList="TempGroupPriceList"
<groupStep v-if="TempSpecList&&TempSpecList.length>0" @setNewVal="setNewVal" :SpecList="TempSpecList" :GroupPriceList="TempGroupPriceList"
:SpecPriceList="TempSpecPriceList"></groupStep>
</el-tab-pane>
<el-tab-pane label="分销价设置">
......@@ -526,9 +526,9 @@
App_share_title: '', //自定义分享标题、
App_share_pic: '', //自定义分享图片
IsCustomSpecification: 2, // 是否自定义规格 1是 2否
GroupList:[],//阶梯价格
},
IsShowSpec: false, //是否显示规格
GroupList: [], //阶梯价格列表
TempSpecList: [], //规格列表
TempSpecPriceList: [], //规格价格列表
TempGroupPriceList: [], //阶梯团价
......@@ -638,7 +638,7 @@
this.addMsg.IsCustomSpecification = 1;
}
this.apipost("/api/GroupBuy/SetGroupbuyActivity", this.addMsg, res => {
console.log("res", res);
console.log("res", res.data);
if (res.data.resultCode == 1) {
this.CommonJump("pintuanList", {});
this.Success(res.data.message);
......@@ -749,11 +749,13 @@
this.addMsg.App_share_pic = that.getIconLink(msg[0].url);
this.imgDialog = false;
},
//获取子组件group_list
getGroup(group_list) {
this.TempGroupPriceList = group_list;
this.addMsg.GroupList = group_list;
this.shareGroup_list = group_list;
//设置阶梯价格
setNewVal(val){
console.log("setNewVal",val);
var tempObj=JSON.parse(JSON.stringify(val));
this.TempGroupPriceList =tempObj ;
this.addMsg.GroupList = tempObj;
this.shareGroup_list = tempObj;
},
//获取子组件规格
getSpecList(val) {
......
src/components/pintuan/pintuanList.vue
View file @ 29c2b379
......@@ -66,12 +66,12 @@
</div>
</template>
</el-table-column>
<el-table-column prop="groups" width="200" label="拼团组/拼团价">
<el-table-column prop="GroupList" width="200" label="拼团组/拼团价">
<template slot-scope="scope">
<div class="cell">
<div flex="dir:top">
<div v-for="(SubItem,SubIndex) in scope.row.groups" :key="SubIndex">
<el-tag style="margin-bottom:10px;">{{SubItem.people_num}}人|￥{{SubItem.price}}</el-tag>
<div v-for="(SubItem,SubIndex) in scope.row.GroupList" :key="SubIndex">
<el-tag style="margin-bottom:10px;">{{SubItem.People_Num}}人|￥<template v-if="SubItem.StepPriceList&&SubItem.StepPriceList.length>0">{{SubItem.StepPriceList[0].PinTuanPrice}}</template></el-tag>
</div>
</div>
</div>
......
src/components/pintuan/pintuanPlugin/distributePrice.vue
View file @ 29c2b379
......@@ -54,26 +54,56 @@
</el-input>
<el-button size="small" type="primary">设置</el-button>
</div>
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark"
<el-table ref="multipleTable" :data="GradeCommissionList" tooltip-effect="dark"
style="width: 100%;border:1px solid #E8EAEE" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column label="等级名称" prop="leval" width="100">
</el-table-column>
<el-table-column label="一级分销" width="576">
<template slot-scope="scope">
<el-input type="text" size="small" v-model="scope.row.yiji">
<el-button slot="append">元</el-button>
</el-input>
</template>
</el-table-column>
<el-table-column label="二级分销" width="575">
<template slot-scope="scope">
<el-input type="text" size="small" v-model="scope.row.erji">
<el-button slot="append">元</el-button>
</el-input>
</template>
<el-table-column width="100" label="等级名称">
<template slot-scope="scope">
<template v-for="(item2, index) in DropdownList">
<span :key="index+'9'" v-if="scope.row.DistributorGrade == item2.Id">{{ item2.Name }}</span>
</template>
</template>
</el-table-column>
<template v-for="(item, index) in butorIntList">
<el-table-column :key="index+'10'" :label="item.Name">
<template slot-scope="scope">
<span>
<el-input v-model="scope.row.OneCommission" v-if="index == 0" size="small">
<el-button slot="append">
<span v-if="
msg.SeparateDistributionMoneyType == 2
">元</span>
<span v-if="
msg.SeparateDistributionMoneyType == 1
">%</span>
</el-button>
</el-input>
<el-input v-model="scope.row.TwoCommission" v-if="index == 1" size="small">
<el-button slot="append">
<span v-if="
msg.SeparateDistributionMoneyType == 2
">元</span>
<span v-if="
msg.SeparateDistributionMoneyType == 1
">%</span>
</el-button>
</el-input>
<el-input v-model="scope.row.ThreeCommission" v-if="index == 2" size="small">
<el-button slot="append">
<span v-if="
msg.SeparateDistributionMoneyType == 2
">元</span>
<span v-if="
msg.SeparateDistributionMoneyType == 1
">%</span>
</el-button>
</el-input>
</span>
</template>
</el-table-column>
</template>
</el-table>
</div>
</el-card>
......@@ -90,6 +120,9 @@
fxVal: '',
butorInt: 0,
butorIntList: [],
GradeCommissionList:[],
DropdownList:[],
msg: {
SeparateDistribution: 0, //是否开启分销佣金
SeparateDistributionType: 1, //分销类型
......@@ -103,8 +136,6 @@
};
},
created() {
console.log(this.shareGroup_list, 'shareGroup_list');
},
methods: {
handleSelectionChange() {
......@@ -113,14 +144,72 @@
getDistributor() {
this.apipost("/api/user/GetDistributorBasicsInfo", {}, res => {
if (res.data.resultCode == 1) {
console.log(res,'resss');
this.butorInt = res.data.data.DistributorTier;
this.butorIntList = [];
for (let i = 0; i < this.butorInt; i++) {
let msg = {
Name: i + 1 + "级分销"
};
this.butorIntList.push(msg);
}
}
});
},
GetDropdownList() {
let msg = {
Id: 0,
Grade: 0,
Name: "",
Enabled: 1
};
this.apipost("/api/user/GetDistributorGradeDropdownList", msg, res => {
this.DropdownList = JSON.parse(JSON.stringify(res.data.data));
let msg = {
Grade: 0,
GradeCommissionList: [],
Name: "默认等级",
SpecificationSort: "",
Id: 0
};
this.DropdownList.unshift(msg);
this.DropdownList.forEach(item => {
item.GradeCommissionList = [];
item.SpecificationSort = "";
for (let i = 0; i < this.butorInt; i++) {
let obj = {
DistributorGrade: item.Id,
OneCommission: 0,
TwoCommission: 0,
ThreeCommission: 0
};
item.GradeCommissionList.push(obj);
}
});
this.DropdownList = JSON.parse(JSON.stringify(this.DropdownList));
if (!this.$route.query.Id){
this.GradeCommissionList = [];
this.DropdownList.forEach(item => {
let obj2 = {
DistributorGrade: item.Id,
OneCommission: 0,
TwoCommission: 0,
ThreeCommission: 0,
Name: item.Name
};
this.GradeCommissionList.push(obj2);
});
this.GradeCommissionList = JSON.parse(
JSON.stringify(this.GradeCommissionList)
);
}
});
},
},
mounted() {
this.getDistributor();
this.GetDropdownList();
},
computed: {
......
src/components/pintuan/pintuanPlugin/goodsSpecifica.vue
View file @ 29c2b379
......@@ -355,7 +355,6 @@
this.calcList(this.skuList, this.SpecificationList);
},
calcList(list, calist) {
console.log("skuList", list)
let oldArr = JSON.parse(JSON.stringify(this.SpecificationPriceList))
this.SpecificationPriceList = [];
let arrList = [];
......
src/components/pintuan/pintuanPlugin/groupPrice.vue
View file @ 29c2b379
......@@ -140,7 +140,7 @@
};
},
created() {
console.log("attrGroups",this.attrGroups);
},
methods: {
......
src/components/pintuan/pintuanPlugin/groupStep.vue
View file @ 29c2b379
......@@ -86,27 +86,18 @@
data() {
return {
group_list: [],
new_attr_groups: [],
new_SpecPriceList: [],
group_list: this.GroupPriceList,
new_attr_groups:this.SpecList,
new_SpecPriceList: this.SpecPriceList,
};
},
watch: {
'GroupPriceList': {
'group_list':{
handler: function (val, oldval) {
this.group_list = JSON.parse(JSON.stringify(val));
this.$emit('setNewVal', val); //params是传递的参数
},
},
'SpecList': {
handler: function (val, oldval) {
this.new_attr_groups = JSON.parse(JSON.stringify(val));
},
},
'SpecPriceList': {
handler: function (val, oldval) {
this.new_SpecPriceList = JSON.parse(JSON.stringify(val));
},
},
deep:true
}
},
created() {},
methods: {
......@@ -159,6 +150,7 @@
this.new_SpecPriceList.forEach(item => {
var obj = {
AttrList: item.AttrList,
SpecificationSort: item.SpecificationSort,
PinTuanPrice: 0,
PinTuanStock: 0
}
......@@ -173,12 +165,11 @@
Group_Num:0,
StepPriceList: attr
});
this.$emit('getGroup', this.group_list); //params是传递的参数
},
//删除拼团
destroyPintuan(index) {
this.group_list.splice(index, 1);
this.$emit('getGroup', this.group_list); //params是传递的参数
}
},
mounted() {
......
src/components/pintuan/pintuanPlugin/memberPrice.vue
View file @ 29c2b379
......@@ -30,7 +30,7 @@
</el-input>
</el-form-item>
</div>
<el-table ref="table" :data="memberList2" border style="width: 100%"
<el-table ref="table" border style="width: 100%"
@selection-change="TbaleSelectionChange">
<el-table-column type="selection" width="55">
</el-table-column>
......@@ -100,19 +100,19 @@
}
});
},
// HySet() {
// this.memberList2.forEach(item => {
// this.memberCheck.forEach(check => {
// if (item.Id == check.Id) {
// item.GradePriceList.forEach(list1 => {
// if (list1.MemberGrade == this.memberVal) {
// list1.MemberPrice = this.memberinput;
// }
// });
// }
// });
// });
// },
HySet() {
// this.memberList2.forEach(item => {
// this.memberCheck.forEach(check => {
// if (item.Id == check.Id) {
// item.GradePriceList.forEach(list1 => {
// if (list1.MemberGrade == this.memberVal) {
// list1.MemberPrice = this.memberinput;
// }
// });
// }
// });
// });
},
TbaleSelectionChange(){
}
......
src/components/sallCenter/plugin/rubik.vue
View file @ 29c2b379
......@@ -771,7 +771,6 @@
// 热区选择(edit)
selectHotspot(list) {
//console.log("list",list);
this.rubData.data.hotspot = list;
},
//选择图片
......
src/components/statistics/grantStatistics.vue
View file @ 29c2b379
......@@ -269,7 +269,6 @@
this.getIntegraStatisticslList()
},
getSort(val){
console.log(val)
if(val.prop == 'IsSued'){
if(val.order=='ascending'){
this.msg.OrderBy='IsSued asc'
......
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