Commit 04e3622c authored by xishifeng's avatar xishifeng

业绩周报修改

parent db5d355a
......@@ -75,7 +75,11 @@
</section>
<ul class='achieve_zz_ul' v-for="(item,index) in tabsMain" :key="item.title" v-show="index == initTabNumMain" :id="'listall_'+index">
<li v-for="(item2,index2) in item.dataList" :data-id="item2.store_id">
<div>{{item2.store_name}}</div>
<!--<div>{{dealName(item2.store_name, item2.name)}}</div>-->
<div class="db-line">
<div class="ellipsis">{{item2.store_name}}</div>
<div class="ellipsis">{{item2.name}}</div>
</div>
<div>{{item2.add_house_num}}</div>
<div>{{item2.add_user_num}}</div>
<div>{{item2.march_in_num}}</div>
......
......@@ -31,6 +31,18 @@
<tbody>
<tr class="table-tr-single"><td colspan="4">月数据</td></tr>
<tr is="my-tr1" v-for="(item, index) in trArr" v-bind:data="item" :peoplenum="peopleNum" :key="item.titlename"></tr>
<tr>
<td>本月目标单数</td>
<td><input type="number" placeholder="填写" v-model.number="dsmb" /></td>
<td>本月完成单数</td>
<td><input type="number" placeholder="填写" v-model.number="dswc" /></td>
</tr>
<tr>
<td>单数差额</td>
<td>{{danshuChae}}</td>
<td>人均单数</td>
<td>{{danshuRenjun}}</td>
</tr>
<!--<tr class="">
<td>本月业绩(元)</td>
<td><input type="number" placeholder="填写" /></td>
......
......@@ -105,6 +105,18 @@
<td>人均实收(元)</td>
<td class="shishou_renjun" contenteditable="true"></td>
</tr>
<tr>
<td>本月目标单数</td>
<td><input type="number" placeholder="填写" class="danshu_mubiao" /></td>
<td>本月完成单数</td>
<td><input type="number" placeholder="填写" class="danshu_wancheng" /></td>
</tr>
<tr>
<td>单数差额</td>
<td class="danshu_chae"></td>
<td>人均单数</td>
<td class="danshu_renjun" contenteditable="true"></td>
</tr>
<tr class="table-tr-textarea tr-padding20">
<td>下周工作重<br /></td>
<td colspan="3">
......
......@@ -869,3 +869,13 @@ div.pop_box>ul>li+li{
.mask_shop_area_content>.article_main>ul>li+li{
border-top: 1px solid #e6e6e6;
}
/*补充*/
.db-line{
padding-top: .2rem;
}
.db-line>div{
line-height: .4rem;
font-size: .3rem;
}
......@@ -90,7 +90,11 @@ require(['vue', 'css!style/achieve_temp.css', 'jquery0325', 'common'], function(
_this.startDate = start_date;
_this.endDate = end_date;
_this.ajaxMainNum(function(){
_this.ajaxUl();
if(_this.userLevel == '30'||_this.userLevel == '40'){
_this.ajaxUl(_this.initTabNumMain===0?2:1);
}else{
_this.ajaxUl(1);
}
});
});
},
......@@ -99,7 +103,11 @@ require(['vue', 'css!style/achieve_temp.css', 'jquery0325', 'common'], function(
_this.initTabNumMain = index;
if(!_this.tabsMain[index].isLoadMain) {
//Vue.set(_this.tabsMain[index], 'isLoadMain', true);
_this.ajaxUl();
if(_this.userLevel == '30'||_this.userLevel == '40'){
_this.ajaxUl(_this.initTabNumMain===0?2:1);
}else{
_this.ajaxUl(1);
}
}
},
initTime: function(callback) {
......@@ -159,7 +167,11 @@ require(['vue', 'css!style/achieve_temp.css', 'jquery0325', 'common'], function(
sessionStorage.setItem('achieve_search_start_date', _this.startDate);
sessionStorage.setItem('achieve_search_end_date', _this.endDate);
_this.ajaxMainNum(function(){
_this.ajaxUl();
if(_this.userLevel == '30'||_this.userLevel == '40'){
_this.ajaxUl(_this.initTabNumMain===0?2:1);
}else{
_this.ajaxUl(1);
}
});
},
......@@ -215,7 +227,7 @@ require(['vue', 'css!style/achieve_temp.css', 'jquery0325', 'common'], function(
}
});
},
ajaxUl: function(){
ajaxUl: function(type){
var _this = this;
$.ajax({
type: 'GET',
......@@ -224,7 +236,8 @@ require(['vue', 'css!style/achieve_temp.css', 'jquery0325', 'common'], function(
'AuthToken': _this.token,
'agent_id': _this.ywyId,
'start_time': _this.startDate,
'end_time': _this.endDate
'end_time': _this.endDate,
'is_store': type
// 'agent_id': 1,
// 'start_time': '2018-03-10',
// 'end_time': '2018-03-23'
......@@ -259,6 +272,9 @@ require(['vue', 'css!style/achieve_temp.css', 'jquery0325', 'common'], function(
};
}
});
},
dealName: function(str1, str2){
return str1 + '<br />' + str2;
}
},
computed: {
......
......@@ -14,7 +14,7 @@ function getUrlParam(name) {
//手机号码格式正则验证 by xishifeng
function is_mobile(text) {
return /^1[34578]\d{9}$/.test(text)?1:0;
return /^1[1234567890]\d{9}$/.test(text)?1:0;
}
//device判断设备是安卓还是苹果 by xishfieng 2017.04.26
......@@ -250,11 +250,31 @@ function loginCs(phone, pwd){
},
dataType: "json",
success: function(data) {
console.log(data.data.AuthToken);
},
error: function() {
error: function(data) {
},
complete: function(xhr, textStatus) {
}
});
}
function loginCsNew(phone, pwd){
var myHeaders = new Headers();
myHeaders.append('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
var formData = new FormData();
formData.append('phone', phone);
formData.append('pwd', pwd);
var request = new Request('https://pre2.tonglianjituan.com/broker/login', {
method: 'post',
mode: 'cors',
body: formData,
headers:myHeaders
});
fetch(request).then(function(response){
console.log(response);
//response.json();
}).then(function(result){
console.log(result);
});
};
......@@ -16,6 +16,8 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
'titlename': '业绩(元)'
}, {
'titlename': '实收(元)'
}, {
'titlename': '成交单数'
}],
peopleNum: 1,
nowDayNum: parseInt(new Date().getDate()),
......
......@@ -14,6 +14,8 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
'titlename': '业绩(元)'
}, {
'titlename': '实收(元)'
}, {
'titlename': '成交单数'
}],
peopleNum: 1,
nowDayNum: parseInt(new Date().getDate()),
......
......@@ -16,6 +16,8 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
'titlename': '业绩(元)'
}, {
'titlename': '实收(元)'
}, {
'titlename': '成交单数'
}],
canClickFlag: true
},
......
......@@ -26,7 +26,9 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
'titlename2': '人均实收(元)',
}],
peopleNum: 1,
token: ''
token: '',
dsmb: '',
dswc: ''
},
components: {
'my-tr1': {
......@@ -42,6 +44,24 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
return dealJineNum(this.wancheng/this.peoplenum);
}
}
},
'my-tr2': {
props: ['data','peoplenum'],
template: '#tr1',
data: function() {
return {
mubiao: '',
wancheng: ''
}
},
computed: {
chae: function () {
return dealJineNum(this.mubiao - this.wancheng);
},
renjun: function () {
return dealJineNum(this.wancheng/this.peoplenum);
}
}
}
},
created: function() {
......@@ -319,6 +339,16 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
});
}
}
},
computed: {
danshuChae: function(){
var _this = this;
return dealJineNum(_this.dsmb - _this.dswc);
},
danshuRenjun: function(){
var _this = this;
return dealJineNum(_this.dswc/_this.peopleNum);
}
}
});
......
......@@ -79,6 +79,8 @@ $(function() {
'yjbz': $.trim(_tableFirstObj.find('.yeji_benzhou').val()),
'yjby': $.trim(_tableFirstObj.find('.yeji_benyue').val()),
'ssmq': $.trim(_tableFirstObj.find('.shishou_muqian').val()),
'dsmbby': $.trim(_tableFirstObj.find('.danshu_mubiao').val()),
'dswcby': $.trim(_tableFirstObj.find('.danshu_wancheng').val()),
'xzGzzd': $.trim(_tableFirstObj.find('.xz_gzzd').html() == '点击填写' ? '' : _tableFirstObj.find('.xz_gzzd').html()),
'rsjGlfa': $.trim(_tableFirstObj.find('.rsj_glfa').html() == '点击填写' ? '' : _tableFirstObj.find('.rsj_glfa').html()),
'xzRyGscs': $.trim(_tableFirstObj.find('.xz_ry_gscs').html() == '点击填写' ? '' : _tableFirstObj.find('.xz_ry_gscs').html())
......@@ -145,6 +147,15 @@ $(function() {
if(_mdzjZbData['zjyj']['yjbz'] != '' && _mdzjZbData['zjyj']['yjsz'] != '') {
_tableFirstObj.find('.shangsheng_xiahua').html(dealJineNum(Number(_mdzjZbData['zjyj']['yjbz']) - Number(_mdzjZbData['zjyj']['yjsz'])));
};
if(_mdzjZbData['zjyj']['dswcby'] != '') {
_tableFirstObj.find('.danshu_wancheng').val(_mdzjZbData['zjyj']['dswcby']);
_tableFirstObj.find('.danshu_renjun').html(dealJineNum(Number(_mdzjZbData['zjyj']['dswcby'])/Number(_tableFirstObj.find('.renshu_benzhou').html())));
if(_mdzjZbData['zjyj']['dsmbby'] != '') {
_tableFirstObj.find('.danshu_mubiao').val(_mdzjZbData['zjyj']['dsmbby']);
_tableFirstObj.find('.danshu_chae').html(dealJineNum(Number(_mdzjZbData['zjyj']['dsmbby'])-Number(_mdzjZbData['zjyj']['dswcby'])));
};
};
};
// _mdzjZbData['sjcn']['jl'] != '' && _sjcnObjJl.html(_mdzjZbData['sjcn']['jl']).addClass('color-submit');
......@@ -468,6 +479,27 @@ $(function() {
_tableObj.find('.shangsheng_xiahua').html(dealJineNum(Number(_yejiBenzhou) - Number(_this.val())));
}
});
_doc.on('input', '.danshu_mubiao', function(e) {
e.preventDefault();
e.stopPropagation();
var _this = $(this);
var _tableObj = _this.closest('table');
var _danshuWancheng = _tableObj.find('.danshu_wancheng').val();
if(_danshuWancheng !== '') {
_tableObj.find('.danshu_chae').html(dealJineNum(Number(_this.val()) - Number(_danshuWancheng)));
}
});
_doc.on('input', '.danshu_wancheng', function(e) {
e.preventDefault();
e.stopPropagation();
var _this = $(this);
var _tableObj = _this.closest('table');
var _danshuMubiao = _tableObj.find('.danshu_mubiao').val();
if(_danshuMubiao !== '') {
_tableObj.find('.danshu_chae').html(dealJineNum(Number(_danshuMubiao)- Number(_this.val())));
_tableObj.find('.danshu_renjun').html(dealJineNum(Number(_this.val())/Number(_tableObj.find('.renshu_benzhou').html())));
}
});
_btnOkObj.click(function(e) {
e.preventDefault();
......
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