Commit 9386d47a authored by 黄奎's avatar 黄奎

页面修改

parent cafdaa2a
...@@ -500,7 +500,6 @@ export default { ...@@ -500,7 +500,6 @@ export default {
this.apipost("/api/user/GetIsEnableFXDistributorGrade", {}, res => { this.apipost("/api/user/GetIsEnableFXDistributorGrade", {}, res => {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.FxState=res.data.data; this.FxState=res.data.data;
console.log(res,'状态');
} }
}) })
...@@ -813,7 +812,6 @@ export default { ...@@ -813,7 +812,6 @@ export default {
}); });
}, },
getSort(val){//列表的升序降序 getSort(val){//列表的升序降序
console.log(val)
if(val.prop=='Id'){ if(val.prop=='Id'){
if(val.order=='ascending'){ if(val.order=='ascending'){
this.msg.OrderBy=1 this.msg.OrderBy=1
......
...@@ -197,7 +197,6 @@ ...@@ -197,7 +197,6 @@
if(this.addMsg.Introducer == 0){ if(this.addMsg.Introducer == 0){
this.addMsg.SupplierCommissionList = [] this.addMsg.SupplierCommissionList = []
} }
console.log(this.addMsg)
this.apipost('/api/Supplier/SetSupplier',this.addMsg, this.apipost('/api/Supplier/SetSupplier',this.addMsg,
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
......
...@@ -502,7 +502,6 @@ export default { ...@@ -502,7 +502,6 @@ export default {
}) })
}, },
EditCommission(item){ EditCommission(item){
console.log(item)
this.editCommissionMsg.OrderDetailId = item.Id; this.editCommissionMsg.OrderDetailId = item.Id;
this.editCommissionMsg.Commission = item.OrderIntroduction.Commission; this.editCommissionMsg.Commission = item.OrderIntroduction.Commission;
this.editUserName= item.OrderIntroduction.UserName; this.editUserName= item.OrderIntroduction.UserName;
......
...@@ -326,7 +326,6 @@ ...@@ -326,7 +326,6 @@
} }
if(this.dateList && this.dateList.length>0){ if(this.dateList && this.dateList.length>0){
console.log(this.dateList)
msg.StartTime=this.dateList[0]; msg.StartTime=this.dateList[0];
msg.EndTime=this.dateList[1]; msg.EndTime=this.dateList[1];
......
...@@ -234,7 +234,6 @@ ...@@ -234,7 +234,6 @@
}, },
created() { created() {
this.currentUser = this.getLocalStorage(); this.currentUser = this.getLocalStorage();
console.log(this.getLocalStorage())
this.ERPEmpId = this.currentUser.ERPEmpId this.ERPEmpId = this.currentUser.ERPEmpId
this.isChecked=this.$route.path; this.isChecked=this.$route.path;
if(this.$route.query.FIndex){ if(this.$route.query.FIndex){
......
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
}, },
}, },
mounted() { mounted() {
console.log("hotspotArray", this.hotspotArray);
}, },
methods: { methods: {
click(e) { click(e) {
......
...@@ -303,13 +303,10 @@ ...@@ -303,13 +303,10 @@
}, },
chooseFl(){ chooseFl(){
let CategoryIds=[]; let CategoryIds=[];
console.log(this.checkList)
this.checkList.forEach(item=>{ this.checkList.forEach(item=>{
CategoryIds.push(item.Id) CategoryIds.push(item.Id)
}) })
this.msg.pageIndex=1 this.msg.pageIndex=1
console.log(CategoryIds)
// this.getList();
this.setSyncGoodsToMaterial(CategoryIds) this.setSyncGoodsToMaterial(CategoryIds)
this.flDig=false; this.flDig=false;
}, },
......
...@@ -323,8 +323,7 @@ export default { ...@@ -323,8 +323,7 @@ export default {
x.page = 'page'+(i+1) x.page = 'page'+(i+1)
x.xpage = 'xpage'+(i+1) x.xpage = 'xpage'+(i+1)
}); });
console.log(this.checkList)
this.$forceUpdate() this.$forceUpdate()
}, },
allcheckbtn(){ allcheckbtn(){
...@@ -354,7 +353,6 @@ export default { ...@@ -354,7 +353,6 @@ export default {
}) })
this.checkList=[] this.checkList=[]
} }
console.log(this.checkList)
this.$forceUpdate() this.$forceUpdate()
}, },
btnradio(){ btnradio(){
...@@ -396,7 +394,6 @@ export default { ...@@ -396,7 +394,6 @@ export default {
// LODOP.PREVIEW()//预览打印 // LODOP.PREVIEW()//预览打印
// LODOP.PRINT_DESIGN()//进入打印设计 // LODOP.PRINT_DESIGN()//进入打印设计
// LODOP.PRINT()//直接打印打印 // LODOP.PRINT()//直接打印打印
console.log(page)
let num = n let num = n
if(n ==1){ if(n ==1){
this.loading = true this.loading = true
...@@ -404,17 +401,13 @@ export default { ...@@ -404,17 +401,13 @@ export default {
if(LODOP.CVERSION){ if(LODOP.CVERSION){
LODOP.On_Return = function(TaskID, Value){ LODOP.On_Return = function(TaskID, Value){
if(Value){ if(Value){
console.log(num)
num++;//循环打印 num++;//循环打印
console.log(num)
if(conunt>=num){ if(conunt>=num){
setTimeout(()=>{ setTimeout(()=>{
that.batchprint(num) that.batchprint(num)
},200) },200)
}else{ }else{
console.log('打印完成')
that.loading = false; that.loading = false;
that.checkList=[]; that.checkList=[];
that.dataList.forEach((x,i)=>{ that.dataList.forEach((x,i)=>{
...@@ -428,7 +421,6 @@ export default { ...@@ -428,7 +421,6 @@ export default {
return return
} }
}else{ }else{
console.log('错误')
} }
} }
LODOP.PRINT() LODOP.PRINT()
...@@ -447,7 +439,6 @@ export default { ...@@ -447,7 +439,6 @@ export default {
// return // return
// } // }
// }else{ // }else{
// console.log('错误')
// } // }
// } // }
......
...@@ -451,7 +451,6 @@ ...@@ -451,7 +451,6 @@
}, },
methods: { methods: {
changeMsg(e) { changeMsg(e) {
console.log(e);
this.$forceUpdate(); this.$forceUpdate();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
...@@ -602,7 +601,6 @@ ...@@ -602,7 +601,6 @@
}, },
//生成采购单 //生成采购单
chooseFl(msg) { chooseFl(msg) {
// console.log(this.addMsg)
this.$refs[msg].validate(valid => { this.$refs[msg].validate(valid => {
if (valid) { if (valid) {
if(this.selectGoods.length==0){ if(this.selectGoods.length==0){
......
...@@ -770,7 +770,6 @@ ...@@ -770,7 +770,6 @@
); );
}, },
getSort(val){ getSort(val){
console.log(val)
if(val.prop == 'Income'){ if(val.prop == 'Income'){
if(val.order=='ascending'){ if(val.order=='ascending'){
this.basicQMsg.OrderBy='Income asc' this.basicQMsg.OrderBy='Income asc'
......
...@@ -302,7 +302,6 @@ ...@@ -302,7 +302,6 @@
arr.splice(j, 1); arr.splice(j, 1);
j--; // 每删除一个数j的值就减1 j--; // 每删除一个数j的值就减1
len--; // j值减小时len也要相应减1(减少循环次数,节省性能) len--; // j值减小时len也要相应减1(减少循环次数,节省性能)
// console.log(j,len)
} }
} }
} }
...@@ -323,7 +322,6 @@ ...@@ -323,7 +322,6 @@
this.tableData.forEach(j=>{ this.tableData.forEach(j=>{
if(x.OrderGoodsId == j.Id){ if(x.OrderGoodsId == j.Id){
let obj = {} let obj = {}
console.log(j)
obj.OrderGoodsId = j.Id; obj.OrderGoodsId = j.Id;
obj.NewSpecificationSort = j.NewSpecificationSort; obj.NewSpecificationSort = j.NewSpecificationSort;
obj.NewNumber = j.NewNumber; obj.NewNumber = j.NewNumber;
...@@ -343,7 +341,6 @@ ...@@ -343,7 +341,6 @@
} }
array = this.unique(array) array = this.unique(array)
this.outobj.WarehouseOutGoodsList = array; this.outobj.WarehouseOutGoodsList = array;
console.log( this.outobj.WarehouseOutGoodsList)
that.$confirm('是否申请出库?', '提示', { that.$confirm('是否申请出库?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
......
...@@ -392,7 +392,7 @@ ...@@ -392,7 +392,7 @@
</el-card> </el-card>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="阶梯团设置"> <el-tab-pane label="阶梯团设置">
<groupStep @getGroup="getGroup" @setNewVal="setNewVal" :SpecList="TempSpecList" :GroupPriceList="TempGroupPriceList" <groupStep @setNewVal="setNewVal" :SpecList="TempSpecList" :GroupPriceList="TempGroupPriceList"
:SpecPriceList="TempSpecPriceList"></groupStep> :SpecPriceList="TempSpecPriceList"></groupStep>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="分销价设置"> <el-tab-pane label="分销价设置">
...@@ -526,9 +526,10 @@ ...@@ -526,9 +526,10 @@
App_share_title: '', //自定义分享标题、 App_share_title: '', //自定义分享标题、
App_share_pic: '', //自定义分享图片 App_share_pic: '', //自定义分享图片
IsCustomSpecification: 2, // 是否自定义规格 1是 2否 IsCustomSpecification: 2, // 是否自定义规格 1是 2否
GroupList:[],//阶梯价格
}, },
IsShowSpec: false, //是否显示规格 IsShowSpec: false, //是否显示规格
GroupList: [], //阶梯价格列表
TempSpecList: [], //规格列表 TempSpecList: [], //规格列表
TempSpecPriceList: [], //规格价格列表 TempSpecPriceList: [], //规格价格列表
TempGroupPriceList: [], //阶梯团价 TempGroupPriceList: [], //阶梯团价
...@@ -638,7 +639,7 @@ ...@@ -638,7 +639,7 @@
this.addMsg.IsCustomSpecification = 1; this.addMsg.IsCustomSpecification = 1;
} }
this.apipost("/api/GroupBuy/SetGroupbuyActivity", this.addMsg, res => { this.apipost("/api/GroupBuy/SetGroupbuyActivity", this.addMsg, res => {
console.log("res", res); console.log("res", res.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.CommonJump("pintuanList", {}); this.CommonJump("pintuanList", {});
this.Success(res.data.message); this.Success(res.data.message);
...@@ -749,12 +750,11 @@ ...@@ -749,12 +750,11 @@
this.addMsg.App_share_pic = that.getIconLink(msg[0].url); this.addMsg.App_share_pic = that.getIconLink(msg[0].url);
this.imgDialog = false; this.imgDialog = false;
}, },
//获取子组件group_list
getGroup(group_list) {
this.TempGroupPriceList = group_list;
this.addMsg.GroupList = group_list;
},
setNewVal(val){ setNewVal(val){
console.log("setNewVal",val);
this.TempGroupPriceList = val;
this.addMsg.GroupList = val;
this.shareGroup_list = val; this.shareGroup_list = val;
}, },
//获取子组件规格 //获取子组件规格
......
...@@ -136,7 +136,6 @@ ...@@ -136,7 +136,6 @@
this.loading = true; this.loading = true;
this.apipost("/api/GroupBuy/GetGroupbuyActivityPageList", this.msg, res => { this.apipost("/api/GroupBuy/GetGroupbuyActivityPageList", this.msg, res => {
this.loading = false; this.loading = false;
console.log("GetGroupbuyActivityPageList",res.data.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
let pageData = res.data.data.pageData; let pageData = res.data.data.pageData;
......
...@@ -136,8 +136,6 @@ ...@@ -136,8 +136,6 @@
}; };
}, },
created() { created() {
console.log(this.shareGroup_list, 'shareGroup_list');
}, },
methods: { methods: {
handleSelectionChange() { handleSelectionChange() {
...@@ -146,7 +144,6 @@ ...@@ -146,7 +144,6 @@
getDistributor() { getDistributor() {
this.apipost("/api/user/GetDistributorBasicsInfo", {}, res => { this.apipost("/api/user/GetDistributorBasicsInfo", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res, 'resss');
this.butorInt = res.data.data.DistributorTier; this.butorInt = res.data.data.DistributorTier;
this.butorIntList = []; this.butorIntList = [];
for (let i = 0; i < this.butorInt; i++) { for (let i = 0; i < this.butorInt; i++) {
......
...@@ -355,7 +355,6 @@ ...@@ -355,7 +355,6 @@
this.calcList(this.skuList, this.SpecificationList); this.calcList(this.skuList, this.SpecificationList);
}, },
calcList(list, calist) { calcList(list, calist) {
console.log("skuList", list)
let oldArr = JSON.parse(JSON.stringify(this.SpecificationPriceList)) let oldArr = JSON.parse(JSON.stringify(this.SpecificationPriceList))
this.SpecificationPriceList = []; this.SpecificationPriceList = [];
let arrList = []; let arrList = [];
......
...@@ -109,11 +109,10 @@ ...@@ -109,11 +109,10 @@
}, },
'group_list':{ 'group_list':{
handler: function (newVal) { handler: function (newVal) {
this.$emit('setNewVal', newVal); //params是传递的参数 this.$emit('getGroup', newVal); //params是传递的参数
}, },
deep:true deep:true
} }
}, },
created() {}, created() {},
methods: { methods: {
...@@ -180,6 +179,7 @@ ...@@ -180,6 +179,7 @@
Group_Num:0, Group_Num:0,
StepPriceList: attr StepPriceList: attr
}); });
}, },
//删除拼团 //删除拼团
destroyPintuan(index) { destroyPintuan(index) {
......
...@@ -771,7 +771,6 @@ ...@@ -771,7 +771,6 @@
// 热区选择(edit) // 热区选择(edit)
selectHotspot(list) { selectHotspot(list) {
//console.log("list",list);
this.rubData.data.hotspot = list; this.rubData.data.hotspot = list;
}, },
//选择图片 //选择图片
......
...@@ -269,7 +269,6 @@ ...@@ -269,7 +269,6 @@
this.getIntegraStatisticslList() this.getIntegraStatisticslList()
}, },
getSort(val){ getSort(val){
console.log(val)
if(val.prop == 'IsSued'){ if(val.prop == 'IsSued'){
if(val.order=='ascending'){ if(val.order=='ascending'){
this.msg.OrderBy='IsSued asc' 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