Skip to content

T
tl_estate
Commit 5a45320b authored by xishifeng's avatar xishifeng
Browse files
Options

商学院bug处理

parent e6ec3abe
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 65 deletions
application/app_broker/view/index/daily_achieve_mdzj.html
View file @ 5a45320b
......@@ -32,7 +32,27 @@
<td>差额</td>
<td>人均</td>
</tr>
<tr is="my-tr1" v-for="(item, index) in trArr" v-bind:data="item" :peoplenum="peopleNum" :daynum="nowDayNum" :key="item.titlename"></tr>
<tr>
<td>业绩(元)</td>
<td><input type="number" placeholder="填写" v-model.number="yeji_yue_mubiao" /></td>
<td><input type="number" placeholder="填写" v-model.number="yeji_yue_wancheng" /></td>
<td>{{chae(yeji_yue_mubiao, yeji_yue_wancheng)}}</td>
<td>{{renjun(yeji_yue_wancheng)}}</td>
</tr>
<tr>
<td>实收(元)</td>
<td><input type="number" placeholder="填写" v-model.number="shishou_yue_mubiao" /></td>
<td><input type="number" placeholder="填写" v-model.number="shishou_yue_wancheng" /></td>
<td>{{chae(shishou_yue_mubiao, shishou_yue_wancheng)}}</td>
<td>{{renjun(shishou_yue_wancheng)}}</td>
</tr>
<tr>
<td>成交单数</td>
<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_mubiao" /></td>
<td><input type="number" placeholder="填写" v-model.number="chengjiao_yue_wancheng" /></td>
<td>{{chae(chengjiao_yue_mubiao, chengjiao_yue_wancheng)}}</td>
<td>{{renjun(chengjiao_yue_wancheng)}}</td>
</tr>
<tr class="table-tr-textarea tr-padding20">
<td>业绩方面<br />的当前工<br />作重点</td>
<td colspan="4">
......@@ -143,15 +163,6 @@
</div>
<script src="/app/js/libs/require.min.js" data-js="/app/js/daily_achieve_mdzj.js" data-main="/app/js/main" data-norem="yes" defer async="true"></script>
<script type="text/x-template" id="tr1">
<tr>
<td>{{data.titlename}}</td>
<td><input type="number" placeholder="填写" v-model.number="mubiao" /></td>
<td><input type="number" placeholder="填写" v-model.number="wancheng" /></td>
<td>{{mubiao-wancheng}}</td>
<td>{{renjun}}</td>
</tr>
</script>
</body>
</html>
\ No newline at end of file
public/app/js/daily_achieve_dz.js
View file @ 5a45320b
......@@ -27,13 +27,6 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
daikan_self: '',//店长个人带看
kaidan_self: '',//店长个人开单
reportLink: 'daily_my',
trArr: [{
'titlename': '业绩(元)'
}, {
'titlename': '实收(元)'
}, {
'titlename': '成交单数'
}],
peopleNum: 1,
peopleList: [],
nowDayNum: parseInt(new Date().getDate()),
......
public/app/js/daily_achieve_mdzj.js
View file @ 5a45320b
......@@ -14,35 +14,19 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
userName: '',
userId: '',
dateNow: backNowDate(),
yeji_yue_mubiao: '',
yeji_yue_wancheng: 0,
shishou_yue_mubiao: '',
shishou_yue_wancheng: '',
chengjiao_yue_mubiao: '',
chengjiao_yue_wancheng: 0,
reportLink: 'daily_my',
trArr: [{
'titlename': '业绩(元)'
}, {
'titlename': '实收(元)'
}, {
'titlename': '成交单数'
}],
peopleNum: 1,
nowDayNum: parseInt(new Date().getDate()),
canClickFlag: true
},
components: {
'my-tr1': {
props: ['data','peoplenum', 'daynum'],
template: '#tr1',
data: function() {
return {
mubiao: '',
wancheng: ''
}
},
computed: {
renjun: function () {
//return dealJineNum(this.wancheng/this.peoplenum*30/this.daynum);
return dealJineNum(this.wancheng/this.peoplenum);
}
}
}
},
created: function() {
var _this = this;
......@@ -76,6 +60,24 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
history.go(-1);
}
},
renjun: function(s) {
if(s == ''){
return '';
}else{
if(this.peopleNum < 1){
return s;
}else{
return dealJineNum(s/this.peopleNum);
}
}
},
chae: function(a,b){
if(a == '' || b == ''){
return '';
}else{
return a-b;
};
},
loadMain: function() {
var _this = this;
_this.token = localStorage.getItem('token');
......@@ -97,6 +99,11 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
if(typeof _data === 'object') {
if(_data['code'] == '200') {
_this.peopleNum = Number(_data.data.agent_total);
_this.yeji_yue_wancheng = _data.data.performance_month;
_this.chengjiao_yue_wancheng = _data.data.bargain_sum;
_this.daikan_self = _data.data.look_at_num_day_store;//总监个人带看
_this.kaidan_self = _data.data.bargain_sum_store;//总监个人开单
} else {
layerTipsX(_data['msg']);
}
......
public/app/js/weekly_achieve_mdzj.js
View file @ 5a45320b
......@@ -75,12 +75,8 @@ $(function() {
'cf': $.trim(_sjcnObjCf.html() == '点击填写' ? '' : _sjcnObjCf.html())
};
_data['zjyj'] = {
'yjsz': $.trim(_tableFirstObj.find('.yeji_shangzhou').val()),
'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())
......@@ -97,12 +93,8 @@ $(function() {
for(var i = 0; i < _objTemp.length; i++) {
_data['yjData'].push({
'id': _objTemp.eq(i).attr('data-id'),
'yjsz': $.trim(_objTemp.eq(i).find('.yeji_shangzhou').val()),
'yjbz': $.trim(_objTemp.eq(i).find('.yeji_benzhou').val()),
'yjby': $.trim(_objTemp.eq(i).find('.yeji_benyue').val()),
'ssmq': $.trim(_objTemp.eq(i).find('.shishou_muqian').val()),
'dsmbby': $.trim(_objTemp.eq(i).find('.danshu_mubiao').val()),
'dswcby': $.trim(_objTemp.eq(i).find('.danshu_wancheng').val()),
'dp': $.trim(_objTemp.eq(i).find('.dianping').html() == '点击填写' ? '' : _objTemp.eq(i).find('.dianping').html())
});
};
......@@ -135,22 +127,18 @@ $(function() {
//判断日期是否是对应存储的日期，如果对得上才进入下边的内容
_sjcnObjMbsz.val(_mdzjZbData['sjcn']['mbsz'] == '' ? '' : _mdzjZbData['sjcn']['mbsz']);
_sjcnObjMbxz.val(_mdzjZbData['sjcn']['mbxz'] == '' ? '' : _mdzjZbData['sjcn']['mbxz']);
_tableFirstObj.find('.yeji_shangzhou').val(_mdzjZbData['zjyj']['yjsz'] == '' ? '' : _mdzjZbData['zjyj']['yjsz']);
_tableFirstObj.find('.yeji_benzhou').val(_mdzjZbData['zjyj']['yjbz'] == '' ? '' : _mdzjZbData['zjyj']['yjbz']);
if(_mdzjZbData['zjyj']['ssmq'] != '') {
_tableFirstObj.find('.shishou_muqian').val(_mdzjZbData['zjyj']['ssmq']);
_tableFirstObj.find('.shishou_renjun').html(dealJineNum(Number(_mdzjZbData['zjyj']['ssmq']) / Number(_tableFirstObj.find('.renshu_benzhou').html()) * 30 / _dayNum));
_tableFirstObj.find('.yingkui').html(dealJineNum((Number(_mdzjZbData['zjyj']['ssmq']) - Number(_tableFirstObj.find('.renshu_benzhou').html()) * 8000) / 30 * _dayNum));
};
if(_mdzjZbData['zjyj']['yjby'] != '') {
_tableFirstObj.find('.yeji_benyue').val(_mdzjZbData['zjyj']['yjby']);
_tableFirstObj.find('.yeji_renjun').html(dealJineNum(Number(_mdzjZbData['zjyj']['yjby']) / Number(_tableFirstObj.find('.renshu_benzhou').html()) * 30 / _dayNum));
};
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']);
......@@ -239,22 +227,18 @@ $(function() {
};
if(_timeFlag) {
_tempTable.find('.yeji_shangzhou').val(_mdzjZbData['yjData'][i]['yjsz'] == '' ? '' : _mdzjZbData['yjData'][i]['yjsz']);
_tempTable.find('.yeji_benzhou').val(_mdzjZbData['yjData'][i]['yjbz'] == '' ? '' : _mdzjZbData['yjData'][i]['yjbz']);
if(_mdzjZbData['yjData'][i]['ssmq'] != '') {
_tempTable.find('.shishou_muqian').val(_mdzjZbData['yjData'][i]['ssmq']);
_tempTable.find('.shishou_renjun').html(dealJineNum(Number(_mdzjZbData['yjData'][i]['ssmq']) / Number(_tempTable.find('.renshu_benzhou').html()) * 30 / _dayNum));
_tempTable.find('.yingkui').html(dealJineNum((Number(_mdzjZbData['yjData'][i]['ssmq']) - Number(_tempTable.find('.renshu_benzhou').html()) * 8000) / 30 * _dayNum));
};
if(_mdzjZbData['yjData'][i]['yjby'] != '') {
_tempTable.find('.yeji_benyue').val(_mdzjZbData['yjData'][i]['yjby']);
_tempTable.find('.yeji_renjun').html(dealJineNum(Number(_mdzjZbData['yjData'][i]['yjby']) / Number(_tempTable.find('.renshu_benzhou').html()) * 30 / _dayNum));
};
if(_mdzjZbData['yjData'][i]['yjbz'] != '' && _mdzjZbData['zjyj']['yjsz'] != '') {
_tempTable.find('.shangsheng_xiahua').html(dealJineNum(Number(_mdzjZbData['yjData'][i]['yjbz']) - Number(_mdzjZbData['yjData'][i]['yjsz'])));
};
if(_mdzjZbData['yjData'][i]['dswcby'] != '') {
_tempTable.find('.danshu_wancheng').val(_mdzjZbData['yjData'][i]['dswcby']);
_tempTable.find('.danshu_renjun').html(dealJineNum(Number(_mdzjZbData['yjData'][i]['dswcby'])/Number(_tempTable.find('.renshu_benzhou').html())));
if(_mdzjZbData['yjData'][i]['dsmbby'] != '') {
_tempTable.find('.danshu_mubiao').val(_mdzjZbData['yjData'][i]['dsmbby']);
......@@ -286,6 +270,7 @@ $(function() {
$.ajax({
type: "POST",
url: ServerHostTempC + '/broker/dayStatement',
//url: '/broker/dayStatement',
data: {
'AuthToken': _token,
'agent_id': _id,
......@@ -301,6 +286,11 @@ $(function() {
if(typeof data == 'object') {
if(data['code'] == 200) {
_tableFirstObj.find('.yeji_shangzhou').val(10);
_tableFirstObj.find('.yeji_benyue').val(data['data']['performance_month']).change();
_tableFirstObj.find('.yeji_benzhou').val(data['data']['performance_week']).change();
_tableFirstObj.find('.danshu_wancheng').val(data['data']['bargain_sum']).change();
_tableFirstObj.find('.renshu_shangzhou').html(data['data']['last_week_total']);
_tableFirstObj.find('.renshu_benzhou').html(data['data']['agent_total']);
......@@ -391,6 +381,7 @@ $(function() {
};
//解析content字段成自定义json对象结束
//在接口请求完毕后在读缓存
readLocalCache(_contentFlag, _dataServer, (_weekly_data['startdate'] == _mdzjZbData['searchTimeStart'])); //读取本次存储的用户输入
_timer = setInterval(autoLocalStorage, 120000); //2分钟存储一次
//setInterval(autoLocalStorage, 60000); //1分钟存储一次
......@@ -455,14 +446,14 @@ $(function() {
}
});
_doc.on('input', '.yeji_benyue', function(e) {
_doc.on('input, change', '.yeji_benyue', function(e) {
e.preventDefault();
e.stopPropagation();
var _this = $(this);
var _tableObj = _this.closest('table');
_tableObj.find('.yeji_renjun').html(dealJineNum(Number(_this.val()) / Number(_tableObj.find('.renshu_benzhou').html())));
});
_doc.on('input', '.shishou_muqian', function(e) {
_doc.on('input, change', '.shishou_muqian', function(e) {
e.preventDefault();
e.stopPropagation();
var _this = $(this);
......@@ -470,7 +461,7 @@ $(function() {
_tableObj.find('.shishou_renjun').html(dealJineNum(Number(_this.val()) / Number(_tableObj.find('.renshu_benzhou').html())));
_tableObj.find('.yingkui').html(dealJineNum((Number(_this.val()) - Number(_tableObj.find('.renshu_benzhou').html()) * 8000) / 30 * _dayNum));
});
_doc.on('input', '.yeji_benzhou', function(e) {
_doc.on('input, change', '.yeji_benzhou', function(e) {
e.preventDefault();
e.stopPropagation();
var _this = $(this);
......@@ -480,7 +471,7 @@ $(function() {
_tableObj.find('.shangsheng_xiahua').html(dealJineNum(Number(_this.val()) - Number(_yejiShangzhou)));
}
});
_doc.on('input', '.yeji_shangzhou', function(e) {
_doc.on('input, change', '.yeji_shangzhou', function(e) {
e.preventDefault();
e.stopPropagation();
var _this = $(this);
......@@ -490,7 +481,7 @@ $(function() {
_tableObj.find('.shangsheng_xiahua').html(dealJineNum(Number(_yejiBenzhou) - Number(_this.val())));
}
});
_doc.on('input', '.danshu_mubiao', function(e) {
_doc.on('input, change', '.danshu_mubiao', function(e) {
e.preventDefault();
e.stopPropagation();
var _this = $(this);
......@@ -500,7 +491,7 @@ $(function() {
_tableObj.find('.danshu_chae').html(dealJineNum(Number(_this.val()) - Number(_danshuWancheng)));
}
});
_doc.on('input', '.danshu_wancheng', function(e) {
_doc.on('input, change', '.danshu_wancheng', function(e) {
e.preventDefault();
e.stopPropagation();
var _this = $(this);
......
public/appnew/src/components/businessCollege/articleList.vue
View file @ 5a45320b
......@@ -101,8 +101,7 @@
urlImg(u) {
let _this = this;
console.log(_this.common.ServerHost + '/app/images/' +u);
//return _this.common.ServerHost + '/app/images/' +u;
return 'http://c.tonglianjituan.com' + '/app/images/' +u;
return _this.common.ServerHost + '/app/images/' +u;
},
loadMain() {
let _this = this;
......
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