优化

application/index/view/cell_phone/index.html

@@ -310,12 +310,12 @@
                                 <tr>
                                     <td colspan="12">
                                         <form id="form_search">
-                                            <span class="fore-span ld-Marheight">拨打类型:</span>
+                                            <!--<span class="fore-span ld-Marheight">拨打类型:</span>
                                             <select class="form-control btn2 ld-Marheight" id="call_type">
                                                 <option value="0">未分配</option>
                                                 <option value="1">阿里云</option>
                                                 <option value="2">容联云</option>
-                                            </select>
+                                            </select>-->
                                             <span class="fore-span ld-Marheight">呼叫方式:</span>
                                             <select class="form-control btn2 ld-Marheight" id="call_style">
                                                 <option value="0">请选择</option>
@@ -330,8 +330,8 @@
 											</select>-->
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="姓名" type="text" value="">
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="手机号" type="phone" value="">
-                                             <div class="clear">
-                                            </div>
+                                             <!--<div class="clear">
+                                            </div>-->
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="ali_yun_phone" placeholder="隐私号码" type="phone" value="">
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_id" placeholder="客户ID" type="phone" value="">
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_id" placeholder="商铺房东ID" type="phone" value="">
@@ -342,8 +342,8 @@
                                             <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="call_id" placeholder="通话ID" type="text" value="">
 
-                                            <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
-                                            <span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
+                                            <span class="btn btn-info btn3 ld-Marheight" id="search" style="float: left;">搜索</span>
+                                            <span class="btn btn-info btn3 ld-Marheight" id="reset" style="float: left;">重置</span>
                                         </form>
                                     </td>
                                 </tr>

application/index/view/cost/publicCostDetails.html

@@ -92,6 +92,7 @@
 							<div>
 								<div>
 									<div class="modal-header">
+										<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 										<h4 class="modal-title tit_con active shoukuanxiangqing" style="width:auto!important;float:left">费用详情</h4>
 										<h4 class="modal-title tit_con" style="width:auto!important;float:left;margin-left:20px;">费用图片</h4>
 									</div>

application/index/view/cost/quicklyGenerate.html

@@ -319,7 +319,7 @@
 											<div style="margin-bottom: 10px;">社保报销核对人1：周小雨        核对人2：王丹丹</div>
 											<div style="margin-bottom: 10px;">总部成本+发展基金+总经理基薪 核对人1：周小叶    核对人2：王晓丹 </div>
 											<div style="margin-bottom: 10px;">办公室房租+办公室绑定门店 核对人1：周小雨    核对人2：王丹丹</div>
-											<div style="margin-top: 20px;"><span class="btn btn-info btn3 ld-Marheight" id="">一键生成当月费用</span></div>
+											<div style="margin-top: 20px;"><span class="btn btn-info btn3 ld-Marheight" id="key">一键生成当月费用</span></div>
 										</td>
 										
 									</tr>

public/resource/js/callPhoneIndex.js

@@ -1308,7 +1308,7 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'css!style/home.css', 'c
             params.call_phone  = $('#dish') .val();//拨打人手机号
             params.start_date  = $('#start_date') .val();//时间1
             params.end_date  = $('#end_date') .val();//时间2
-            params.call_type = $("#call_type").val();
+//          params.call_type = $("#call_type").val();
             params.call_style = $("#call_style").val();
             params.ali_yun_phone = $("#ali_yun_phone").val();
             params.house_id = $("#house_id").val();//客户id精确搜索

public/resource/js/costCheck.js

@@ -189,7 +189,7 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
                     $('#commit_shop').html(''); //先清空
                     if(_id && _id != '0') {
                         that.getDistrictStoreList(_id, function(_data) {
-                            var _str = '<option value="0">全部</option>';
+                            var _str = '<option value="">全部</option>';
                             $.each(_data, function(i, item) {
                                 _str += '<option value="' + item.id + '">' + item.store_name + '</option>';
                             });
@@ -663,8 +663,8 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
 			var params = {};
 			var paramsStr = "" ;
 			if ( count_time ) {
-				params.count_time = count_time;
-				paramsStr += "count_time=" + count_time +'&';
+				params.count_time = count_time + '-01';
+				paramsStr += "count_time=" + count_time + '-01' +'&';
 			}
 			if ( create_time_start ) {
 				params.create_time_start = create_time_start;

public/resource/js/publicCostDetails.js

@@ -31,6 +31,12 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
 			$(document).on('click','#pass_ok_btn',function(e){
 				that.checkCost();
 			});
+			//点击关闭按钮
+			$(document).on('click','.close',function(e){
+				$(parent.document).find('.close').click();
+			});
+
+			
 			//编辑 费用类型切换
 			$("#payType").change(function() {
 				$("#payItem").val('');//置空费用项目

public/resource/js/quicklyGenerate.js

@@ -31,6 +31,11 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
 			$(document).on('click','#reset',function(e){
 				that.resetAll();
 			});
+			
+			//点击一键生成
+			$(document).on('click','#key',function(e){
+				that.totalFee();
+			});
 			//点击考勤
 			$(document).on('click','#kaoqin',function(e){
 				var time = $('#comit_time_start').val();
@@ -142,19 +147,22 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
 				}
 			});
 		},
-        //删除退款	    
-	    deleteRefund: function(id) { 
+        //点击一键生成	    
+	    totalFee: function() { 
+	        var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
+	    	
 			$.ajax({
-				url: '/index/delRefund',
+				url: '/index/creationStoreFee',
 				type: 'POST',
 				async: true,
 				data: {
-					"refund_id": id
+					"setting_date": $('#comit_time_start').val() + '-01',
+					"agent_id": user_info_obj.id
 				},
 				dataType: 'json',
 				success: function(data) {
 					if(data.code == 200) {
-						cost.getList(cost.pageNo);
+//						cost.getList(cost.pageNo);
 						alert(data.msg);
 					} else {
 						alert(data.msg);

public/resource/template/callPhone_template_tpl.html

@@ -60,7 +60,11 @@
             <td width="16%">
 			[% if((check_auth('auth_vip') &&  it[item]['vip']) || (it[item]['agent_id'] == 0) || (it[item]['agent_id'] == it[item]['current_agent_id']) || (check_auth('index/useraction_search') && it[item]['vip'] == 0)) { %]
 				
+			[% if(it[item]['user_type'] == 0){ %]
 			<a class="btn1 caozuo genj_ure btn-success" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["user_id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a><p style="display: none;">[%= JSON.stringify(delName(it[item])) %]</p>&nbsp;
+			[% } %]
+			
+			
             <!--<a class="btn1 btn-info is_show" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收藏</a>
 			<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp;-->
 			

public/resource/template/cost_details_template_tpl.html

@@ -13,7 +13,7 @@
         <td>[%= it[item]['store_name'] %]</td>
         <td>[%= it[item]['assume_fee'] %]</td>
         <td>
-        	<a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-status='[%= it[item]["status"] %]'>详情</a>
+        	<a class="btn1 btn-success checkCost" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["cost_id"] %]' data-status='[%= it[item]["status"] %]'>详情</a>
         </td>
     </tr>
     [% } %]