Merge remote-tracking branch 'origin/test' into test

application/app_broker/view/index/weekly_achieve_mdzj.html

@@ -186,15 +186,9 @@
 								<td class="danshu_renjun" contenteditable="true"></td>
 							</tr>
 							<tr class="table-tr-textarea tr-padding20">
-								<td>本周工作重点</td>
+								<td>点评</td>
 								<td colspan="3">
-									<div class="div-textarea" contenteditable="true">点击填写</div>
-								</td>
-							</tr>
-							<tr class="table-tr-textarea tr-padding20">
-								<td>日数据管理方案</td>
-								<td colspan="3">
-									<div class="div-textarea rsj_glfa" contenteditable="true">点击填写</div>
+									<div class="dianping div-textarea" contenteditable="true">点击填写</div>
 								</td>
 							</tr>
 							<tr class="canshu_data">
@@ -203,12 +197,6 @@
 								<td>本周人数</td>
 								<td class="renshu_benzhou">{2}</td>
 							</tr>
-							<tr class="table-tr-textarea tr-padding20">
-								<td>下周人员改善措施</td>
-								<td colspan="3">
-									<div class="div-textarea xz_ry_gscs" contenteditable="true">点击填写</div>
-								</td>
-							</tr>
 						</tbody>
 					</table>-->
 					

public/app/js/achieve_fork.js

 'use strict';
-require(['vue', 'css!style/achieve_fork.css', 'jquery0325', 'common'],function(Vue){
+require(['vue', 'vconsole', 'css!style/achieve_fork.css', 'jquery0325', 'common'],function(Vue, VConsole){
+	var vConsole = new VConsole();
 	var _token = getUrlParam('token');
 	var vm = new Vue({
 		el: '#app',

public/app/js/weekly_achieve_mdzj.js

@@ -314,7 +314,7 @@ $(function() {
 //							});
 //						});
 						$.each(data['data']['district_list'], function(i, item) {
-							_htmlGroupInfo += '<table data-id={3} border="0" cellspacing="0" cellpadding="0" class="table-type8"><tbody><tr class="table-tr-single"><td colspan="4">{0}</td></tr><tr><td>上周业绩（元）</td><td><input type="number" placeholder="填写"></td><td>本月业绩（元）</td><td><input type="number" placeholder="填写" class="yeji_benyue"></td></tr><tr><td>本周业绩（元）</td><td><input type="number" placeholder="填写"></td><td>人均业绩（元）</td><td class="yeji_renjun"></td></tr><tr><td>上升下滑（元）</td><td><input type="number" placeholder="填写"></td><td>目前实收（元）</td><td><input type="number" placeholder="填写" class="shishou_muqian"></td></tr><tr><td>盈亏（元）</td><td><input type="number" placeholder="填写"></td><td>人均实收（元）</td><td class="shishou_renjun"></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>本周工作重点</td><td colspan="3"><div class="div-textarea" contenteditable="true">点击填写</div></td></tr><tr class="table-tr-textarea tr-padding20"><td>日数据管理方案</td><td colspan="3"><div class="div-textarea" contenteditable="true">点击填写</div></td></tr><tr class="canshu_data"><td>上周人数</td><td class="renshu_shangzhou">{1}</td><td>本周人数</td><td class="renshu_benzhou">{2}</td></tr><tr class="table-tr-textarea tr-padding20"><td>下周人员改善措施</td><td colspan="3"><div class="div-textarea" contenteditable="true">点击填写</div></td></tr></tbody></table>'.stringFormatObj({
+							_htmlGroupInfo += '<table data-id="{3}" border="0" cellspacing="0" cellpadding="0" class="table-type8"><tbody><tr class="table-tr-single"><td colspan="4">{0}</td></tr><tr><td>上周业绩（元）</td><td><input type="number" placeholder="填写" class="yeji_shangzhou"></td><td>本月业绩（元）</td><td><input type="number" placeholder="填写" class="yeji_benyue"></td></tr><tr><td>本周业绩（元）</td><td><input type="number" placeholder="填写" class="yeji_benzhou"></td><td>人均业绩（元）</td><td class="yeji_renjun"></td></tr><tr><td>上升下滑（元）</td><td class="shangsheng_xiahua"></td><td>目前实收（元）</td><td><input type="number" placeholder="填写" class="shishou_muqian"></td></tr><tr><td>盈亏（元）</td><td class="yingkui"></td><td>人均实收（元）</td><td class="shishou_renjun"></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"></td></tr><tr class="table-tr-textarea tr-padding20"><td>点评</td><td colspan="3"><div class="dianping div-textarea" contenteditable="true">点击填写</div></td></tr><tr class="canshu_data"><td>上周人数</td><td class="renshu_shangzhou">{1}</td><td>本周人数</td><td class="renshu_benzhou">{2}</td></tr></tbody></table>'.stringFormatObj({
 								'0': item['store_name'] + '(' + item['name'] + ')业绩总结',
 								'1': item['last_week_num'],
 								'2': (item['agent_num'] == null) ? 0 : item['agent_num'],

public/resource/js/banner.js

@@ -85,9 +85,9 @@ define (['doT', 'text!temp/banner_template_tpl.html', 'ckfinder', 'ckfinderStart
                 var item = $ (this).parents ("tr").find ("td");
                 $ ("#id").val ($ (this).attr ("data-id"));
                 $ ("#title").val (item.eq (0).html ());
-                $ ("#url").val (item.eq (2).html ());
+                $ ("#url").val (item.eq (3).html ());
                 $ ("#cover_image").val (item.eq (1).find ("input").val ());
-                $ ("#sort").val (item.eq (3).html ());
+                $ ("#sort").val (item.eq (4).html ());
             });
 
             $ (document).delegate (".delete_banner", "click", function () {