周报日报相关暂存2

application/app_broker/view/index/daily_achieve_dz.html

@@ -59,26 +59,25 @@
 								</tr>
 								<tr>
 									<td>业绩(元)</td>
-									<td><input type="number" placeholder="填写" v-model.number="mubiao" /></td>
-									<td><input type="number" class="table-yue-td" placeholder="填写" v-model.number="wancheng" /></td>
-									<td>{{mubiao-wancheng}}</td>
-									<td>{{renjun}}</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="mubiao" /></td>
-									<td><input type="number" class="table-yue-td" placeholder="填写" v-model.number="wancheng" /></td>
-									<td>{{mubiao-wancheng}}</td>
-									<td>{{renjun}}</td>
+									<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="mubiao" /></td>
-									<td><input type="number" class="table-yue-td" placeholder="填写" v-model.number="wancheng" /></td>
-									<td>实收(元)</td>
 									<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 is="my-tr1" v-for="(item, index) in trArr" v-bind:data="item" :peoplenum="peopleNum" :daynum="nowDayNum" :key="item.titlename"></tr>-->
 							</tbody>
 						</table>
 
@@ -131,11 +130,11 @@
 									<td>开单</td>
 								</tr>
 								<tr>
+									<td><input type="number" placeholder="填写" v-model.number="daikan_self"/></td>
 									<td><input type="number" placeholder="填写" /></td>
 									<td><input type="number" placeholder="填写" /></td>
 									<td><input type="number" placeholder="填写" /></td>
-									<td><input type="number" placeholder="填写" /></td>
-									<td><input type="text" placeholder="填写" /></td>
+									<td><input type="number" placeholder="填写" v-model.number="kaidan_self" /></td>
 								</tr>
 							</tbody>
 						</table>

application/app_broker/view/index/daily_achieve_ywy.html

@@ -37,9 +37,9 @@
 								<tr class="table-tr-riwancheng">
 									<td>日完成</td>
 									<td>{{fangyuan}}</td>
-									<td><input type="number" placeholder="填写" /></td>
+									<td><input type="number" placeholder="填写" v-model.number="keyuan_day" /></td>
 									<td>{{daikan}}</td>
-									<td><input type="number" placeholder="填写" /></td>
+									<td><input type="number" placeholder="填写" v-model.number="yeji_day" /></td>
 									<td><input type="number" placeholder="填写" /></td>
 								</tr>
 							</tbody>
@@ -56,12 +56,23 @@
 									<td>月完成</td>
 									<td>差额</td>
 								</tr>
-								<tr is="my-tr1" v-for="(item, index) in trArr" v-bind:data="item" :key="item.titlename"></tr>
-								<tr class="table-tr-textarea tr-padding60">
-									<td>数据情况总结</td>
-									<td colspan="3">
-										<div class="div-textarea" contenteditable="true">点击填写</div>
-									</td>
+								<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>
+								</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>
+								</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>
 								</tr>
 							</tbody>
 						</table>

public/app/js/daily_achieve_dz.js

@@ -18,6 +18,14 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 			daikan: 0,
 			yeji_day: 0,
 			dateNow: backNowDate(),
+			yeji_yue_mubiao: '',
+			yeji_yue_wancheng: 0,
+			shishou_yue_mubiao: '',
+			shishou_yue_wancheng: '',
+			chengjiao_yue_mubiao: '',
+			chengjiao_yue_wancheng: 0,
+			daikan_self: '',//店长个人带看
+			kaidan_self: '',//店长个人开单
 			reportLink: 'daily_my',
 			trArr: [{
 				'titlename': '业绩(元)'
@@ -32,22 +40,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 			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;
@@ -81,6 +74,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');
@@ -105,13 +116,18 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 								_this.keyuan = _data.data.add_user_num;
 								_this.daikan = _data.data.follow_up_num;
 								_this.yeji_day = _data.data.performance_day;
-								_this.peopleNum = Number(_data.data.agent_total);
+								if(_data.data.agent_total>0){
+									_this.peopleNum = Number(_data.data.agent_total);
+								}else{
+									console.log('人数为0');
+								};
+								
 								_this.peopleList = _data.data.store_list;
-								_this.$nextTick(function(){
-									var _tempTd = $('.table-yue-td');
-									_tempTd[0].value = _data.data.performance_month;
-									_tempTd[2].value = _data.data.bargain_sum;
-								});
+								
+								_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/daily_achieve_ywy.js

@@ -15,7 +15,15 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 			userId: '',
 			fangyuan: 0,
 			daikan: 0,
+			keyuan_day: 0,
+			yeji_day: 0,
 			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': '业绩(元)'
@@ -70,6 +78,13 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 					history.go(-1);
 				}
 			},
+			chae: function(a,b){
+				if(a == '' || b == ''){
+					return '';
+				}else{
+					return a-b;
+				};
+			},
 			loadMain: function() {
 				var _this = this;
 				_this.token = localStorage.getItem('token');
@@ -92,6 +107,11 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
 							if(_data['code'] == '200') {
 								_this.fangyuan = _data.data.house_num;
 								_this.daikan = _data.data.follow_up_num;
+								_this.keyuan_day = _data.data.add_user_num;
+								_this.yeji_day = _data.data.performance_day;
+								
+								_this.yeji_yue_wancheng = _data.data.performance_month;
+								_this.chengjiao_yue_wancheng = _data.data.bargain_sum;
 							} else {
 								layerTipsX(_data['msg']);
 							}

public/app/js/weekly_achieve_dz.js

@@ -329,7 +329,11 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
 			},
 			danshuChae: function(){
 				var _this = this;
-				return dealJineNum(_this.dsmb - _this.dswc);
+				if(_this.dsmb == ''){
+					return '';
+				}else{
+					return dealJineNum(_this.dsmb - _this.dswc);
+				}
 			},
 			danshuRenjun: function(){
 				var _this = this;