Commit 52f15874 authored by zhengke's avatar zhengke

修改

parent 8a5bcc56
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
margin:39px auto; margin:39px auto;
border:1px solid #F4F4F4; border:1px solid #F4F4F4;
padding:3px; padding:3px;
border-radius: 50%;
} }
.Person_Header img{ .Person_Header img{
width:100%; width:100%;
...@@ -588,7 +589,7 @@ ...@@ -588,7 +589,7 @@
position: relative; position: relative;
cursor: pointer; cursor: pointer;
color: #888; color: #888;
background: #fafafa; background: #fff;
overflow: hidden; overflow: hidden;
display: inline-block; display: inline-block;
*display: inline; *display: inline;
...@@ -604,6 +605,11 @@ ...@@ -604,6 +605,11 @@
filter: alpha(opacity=0); filter: alpha(opacity=0);
cursor: pointer cursor: pointer
} }
.cancel_Btnn{
background-color: #fff!important;
border:1px solid #e95252!important;
color:#e95252!important;
}
</style> </style>
<template> <template>
...@@ -838,9 +844,10 @@ ...@@ -838,9 +844,10 @@
</div> </div>
<div id="demo"> <div id="demo">
<div class="container" v-show="panel"> <div class="container" v-show="panel">
<div style="width:400px;height:400px;margin:5% 0 0 36%;position:relative;"> <div style="width:400px;height:400px;margin:5% 0 0 36%;position:relative;background-color:#fff;">
<img id="image" :src="url" alt="Picture"> <img id="image" :src="url" alt="Picture">
<button type="button" id="button" style="bottom:0;" @click="crop">确定</button> <button type="button" class="cancel_Btnn" id="button" style="bottom:-50px;right:105px;" @click="CancelUpImg">取消</button>
<button type="button" id="button" style="bottom:-50px;" @click="crop">确定</button>
</div> </div>
</div> </div>
<div style="padding:20px;"> <div style="padding:20px;">
...@@ -1065,7 +1072,6 @@ ...@@ -1065,7 +1072,6 @@
// //修改成功后退出登录 // //修改成功后退出登录
setTimeout(()=>{ setTimeout(()=>{
console.log('执行了');
this.$store.dispatch("logout") this.$store.dispatch("logout")
localStorage.removeItem("userInfo"); localStorage.removeItem("userInfo");
localStorage.removeItem("previousPathInfo"); localStorage.removeItem("previousPathInfo");
...@@ -1171,7 +1177,6 @@ ...@@ -1171,7 +1177,6 @@
Id:userInfo.EmployeeId Id:userInfo.EmployeeId
} }
this.apipost('admin_get_EmployeeGet',msg,res=>{ this.apipost('admin_get_EmployeeGet',msg,res=>{
console.log(res,'resss');
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.dataList=res.data.data; this.dataList=res.data.data;
this.getAccount(); this.getAccount();
...@@ -1303,12 +1308,10 @@ ...@@ -1303,12 +1308,10 @@
} }
// Crop // Crop
croppedCanvas = this.cropper.getCroppedCanvas(); croppedCanvas = this.cropper.getCroppedCanvas();
console.log(this.cropper)
// Round // Round
roundedCanvas = this.getRoundedCanvas(croppedCanvas); roundedCanvas = this.getRoundedCanvas(croppedCanvas);
this.headerImage = roundedCanvas.toDataURL(); this.headerImage = roundedCanvas.toDataURL();
console.log(this.headerImage,'headerImage');
let that = this; let that = this;
let blob = that.base64ToBlob(this.headerImage); let blob = that.base64ToBlob(this.headerImage);
let newArr = []; let newArr = [];
...@@ -1316,7 +1319,6 @@ ...@@ -1316,7 +1319,6 @@
var fileName = `${that.uuid(10,10)}.png`; var fileName = `${that.uuid(10,10)}.png`;
var path = `/Upload/Temporary`; var path = `/Upload/Temporary`;
that.uploadSelfBlob(path, newArr, x => { that.uploadSelfBlob(path, newArr, x => {
console.log(x);
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath; let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
this.postImg(allPath) this.postImg(allPath)
}) })
...@@ -1387,9 +1389,12 @@ ...@@ -1387,9 +1389,12 @@
} }
},err=>{}) },err=>{})
},
//取消上传
CancelUpImg(){
this.panel=false;
} }
}, },
mounted() { mounted() {
this.getList(); this.getList();
......
...@@ -11,6 +11,14 @@ ...@@ -11,6 +11,14 @@
font-size:12px; font-size:12px;
margin-left:10px; margin-left:10px;
} }
.ShareDisClick{
color:gray;
}
.Sale_UnlessWords{
display:inline-block;
margin:25px 0 0 80px;
color:#E95252;
}
</style> </style>
<template> <template>
...@@ -48,7 +56,7 @@ ...@@ -48,7 +56,7 @@
<span>本月提成</span> <span>本月提成</span>
<template v-if="data.comissionGeneralId>0"> <template v-if="data.comissionGeneralId>0">
<span v-if="data.share==1" class="Sale_Share" style="color:#333;cursor:default;">已确认</span> <span v-if="data.share==1" class="Sale_Share" style="color:#333;cursor:default;">已确认</span>
<span v-if="data.share==0" @click="tichengDialog=true" class="Sale_Share">分享并确认</span> <span v-if="data.share==0" @click="tichengDialog=true" class="Sale_Share" :class="{'ShareDisClick':!isSubmit}">分享并确认</span>
</template> </template>
</div> </div>
</div> </div>
...@@ -502,10 +510,13 @@ ...@@ -502,10 +510,13 @@
<!-- 分享业绩 --> <!-- 分享业绩 -->
<el-dialog custom-class='w500' title="分享提成" :visible.sync="tichengDialog" center :before-close="resetCommission"> <el-dialog custom-class='w500' title="分享提成" :visible.sync="tichengDialog" center :before-close="resetCommission">
<el-form :model="shareMsg" :rules="rules" ref="shareMsg" label-width="80px"> <el-form :model="shareMsg" :rules="rules" ref="shareMsg" label-width="80px">
<el-form-item label="个人宣言" style="margin-bottom:0;"> <el-form-item label="个人宣言" style="margin-bottom:0;" prop="ShareContent">
<el-input type="textarea" rows="6" resize="none" maxlength="100" v-model="shareMsg.ShareContent" placeholder=""></el-input> <el-input type="textarea" rows="6" resize="none" maxlength="100" v-model="shareMsg.ShareContent" placeholder=""></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span class="Sale_UnlessWords">
不能少于4个字
</span>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="tichengDialog=false">取消</button> <button class="hollowFixedBtn" @click="tichengDialog=false">取消</button>
<button class="normalBtn" @click="shareCommission">确定</button> <button class="normalBtn" @click="shareCommission">确定</button>
...@@ -546,6 +557,8 @@ ...@@ -546,6 +557,8 @@
trigger: 'blur' trigger: 'blur'
}] }]
}, },
//验证重复提交
isSubmit: true,
} }
}, },
components:{ components:{
...@@ -775,25 +788,45 @@ ...@@ -775,25 +788,45 @@
path: path path: path
}) })
}, },
//锅炉除开标点符号的字数
getFilteredNum(val){
//var pattern=new RegExp("[`~%!@#$^=''?~!@#¥……&——‘”“'?*()(),,。.、<>《》\\[\\]【】\\“\\”{}=+-|\/:;;:]");
var pattern=new RegExp("[`~%!@#$^=''?~!@#¥……&——‘”“'?*()(),,。.、<>《》:;; +-=]");
//[]内输入你要过滤的字符,这里基本包含全部的标点符号,\\是转义字符
var rs="";
for(var i=0;i<val.length;i++){
rs+=val.substr(i,1).replace(pattern,'');
}
return rs
},
//确定分享业绩 //确定分享业绩
shareCommission(){ shareCommission(){
if(this.shareMsg.ShareContent==''){ if(this.shareMsg.ShareContent==''){
this.Error('请填写个人宣言'); this.Error('请填写个人宣言');
return; return;
} }
this.shareMsg.PeriodsId=this.data.comissionGeneralId; let FilterNum=this.getFilteredNum(this.shareMsg.ShareContent);
this.shareMsg.totalCommission=this.data.totalCommission; if(FilterNum.length<4){
this.apipost('customerIndex_post_SetSellComissionGeneralSure', this.shareMsg ,res=>{ this.Error('字数太少了,再多说点吧!');
if(res.data.resultCode==1){ return;
this.Success(res.data.message); }else{
this.iWorkbench(); this.shareMsg.PeriodsId=this.data.comissionGeneralId;
this.resetCommission(); this.shareMsg.totalCommission=this.data.totalCommission;
this.MsgBus.$emit('reSetMSG'); if (this.isSubmit) {
this.isSubmit = false;
}else{ this.apipost('customerIndex_post_SetSellComissionGeneralSure', this.shareMsg ,res=>{
this.Error(res.data.message); this.isSubmit=true;
if(res.data.resultCode==1){
this.Success(res.data.message);
this.iWorkbench();
this.resetCommission();
this.MsgBus.$emit('reSetMSG');
}else{
this.Error(res.data.message);
}
},err=>{})
} }
},err=>{}) }
}, },
//关闭重置输入框 //关闭重置输入框
resetCommission(){ resetCommission(){
......
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