Merge branch 'test-v2.0-0530' of https://gitee.com/zwyjjc/tl_estate into test-v2.0-0530

application/api/controller/Broker.php

@@ -7,6 +7,7 @@ use app\model\AAgents;
 use app\model\Agents;
 use app\model\Evaluate;
 use app\model\EvaluateSign;
+use app\model\OBargainModel;
 use app\model\Remarks;
 
 /**
@@ -168,30 +169,31 @@ class Broker extends Basic{
         if ($params['agent_id']) {
             $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
             $pageSize = empty($params['pageSize']) ? PAGESIZE : $params['pageSize'];
-            
-            $evalutate = new Evaluate();
-            $remarks  = new Remarks();
-            
-            $fields_evaluate = 'house_id,user_id,user_nick,user_phone,user_pic,evaluate_grade,evaluate_content,evaluate_sign,a.create_time,record_id,a.source';
-            $fields_journal  = 'house_id,apply_id,created';
-            $where['shopuser_id'] = $params['agent_id'];
-            $where['transaction_status'] = 3;
+
+            $bargain = new OBargainModel();
+            $evaluate = new Evaluate();
+
+            $fields_evaluate = 'house_id,user_id,user_nick,user_phone,user_pic,evaluate_grade,evaluate_content,';
+            $fields_evaluate .= 'evaluate_sign,a.create_time,record_id,a.source,a.house_id,c.external_address';
+
+            $bargain_fields  = 'a.id,a.price,a.create_time as singntime,d.external_title as title,d.rent_type,d.shop_sign as shangpu_tags,shop_area_start as room_area';
+
             switch ($params['type']) {
                 case 0:
                     //评价列表信息
-                    $result['evaluate'] = $evalutate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
+                    $result['evaluate'] = $evaluate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
                     //成交记录
-                    $result['journalAccounts'] = $remarks->getJournalHouseInfo($pageNo, $pageSize, 'id desc', $fields_journal, $where, $params['agent_id']);
+                    $result['journalAccounts']  = $bargain->getBargainOrderList($pageNo, $pageSize, '', $bargain_fields, ['a.agent_id'=>$this->params['agent_id']]);
                     $data['data'] = $result;
                     break;
                 case 1:
                     //评价列表信息
-                    $result['evaluate'] = $evalutate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
+                    $result['evaluate'] = $evaluate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
                     $data['data'] = $result;
                     break;
                 case 2:
                     //成交记录
-                    $result['journalAccounts'] = $remarks->getJournalHouseInfo($pageNo, $pageSize, 'id desc', $fields_journal, $where, $params['agent_id']);
+                    $result['journalAccounts']  = $bargain->getBargainOrderList($pageNo, $pageSize, '', $bargain_fields, ['a.agent_id'=>$this->params['agent_id']]);
                     $data['data']   = $result;
                     break;
                 default:
@@ -221,7 +223,7 @@ class Broker extends Basic{
         $data['msg']    = '';
 
         if ($this->params['agent_id']) {
-            $agents = new Agents();
+            $agents = new AAgents();
             $data['data'] = $agents->agentsDetail($this->params['agent_id']);
         } else {
             $data['status'] = 101;

application/api/controller/Index.php

 <?php
+
 namespace app\api\controller;
+
 /**
  * Created by PhpStorm.
  * User : zw
@@ -14,35 +16,41 @@ use app\model\GHouses;
 use app\model\HouseInfos;
 use app\model\JournalAccounts;
 use app\model\OrderModel;
+use app\model\Users;
 
 class Index extends Basic
 {
-  public function banner(){
+    public function banner()
+    {
+
+    }
+
+    /**
+     * 月均价 上周成交量 ==>修改为日均价了==》改成求租人
+     */
+    public function averagePriceAndTurnover()
+    {
+
+        /* $houseInfos = new GHouses();
+         $averagePrice = $houseInfos->getAveragePrice();*/
+        $userModel  = new Users();
+        $user_count = $userModel->countUser();
+        // $journalAccounts = new JournalAccounts();
+        $journalAccounts        = new OrderModel();
+        $turnover               = $journalAccounts->getTurnover();
+        $result['averagePrice'] = $user_count;
+        $result['turnover']     = $turnover * 9;//不要问为什么乘以9，产品说怎么搞就怎么搞
+        return $this->response("request success", "200", $result);
 
-  }
+    }
 
     /**
-     * 月均价 上周成交量 ==>修改为日均价了
+     * 处理错误的url
+     *
+     * @return type
      */
-  public function averagePriceAndTurnover(){
-
-      $houseInfos = new GHouses();
-      $averagePrice = $houseInfos->getAveragePrice();
-     // $journalAccounts = new JournalAccounts();
-      $journalAccounts = new OrderModel();
-      $turnover     = $journalAccounts ->getTurnover();
-      $result['averagePrice'] = $averagePrice;
-      $result['turnover'] = $turnover;
-      return $this->response("request success","200",$result);
-
-  }
-  
-  /**
-   * 处理错误的url
-   * 
-   * @return type
-   */
-  public function miss() {
-      return $this->response('101','URL is error');
-  }
+    public function miss()
+    {
+        return $this->response('101', 'URL is error');
+    }
 }

application/app/controller/Index.php

@@ -52,9 +52,9 @@ class Index
     {
         return view('index/agreement_app');
     }
-    public function download()
+    public function download_c()
     {
-      return view('index/download');
+      return view('index/download_c');
     }
     public function more_pingjia()
     {

application/app/view/index/agent_detail.html

@@ -9,6 +9,12 @@
 		<meta name="Description" content="" />
 		<link rel="stylesheet" href="/app/css/common.css">
 		<link rel="stylesheet" href="/app/css/agent_detail.css">
+		<style>
+			/*因为一些新页面用了vue实现，所以很多这样的元素默认是隐藏的，在common.css里。但原来的文件是需要默认隐藏的*/
+			.loading_pic_new,.no_more,.zanwu_data,.loading_pic_samll_new{
+			 	display: none;
+			}
+		</style>
 	</head>
 	<body>
 		<header id="header">
@@ -135,6 +141,6 @@
 		
 		<script src="/app/js/jquery-1122-min.js" charset="UTF-8"></script>
 		<script src="/app/js/common.js" charset="UTF-8"></script>
-		<script src="/app/js/agent_detail.js" charset="UTF-8"></script>
+		<script src="/app/js/agent_detail.js?new1" charset="UTF-8"></script>
 	</body>
 </html>

application/app/view/index/download.html → application/app/view/index/download_c.html

@@ -41,11 +41,15 @@
         $('#app_ban').attr('src','/app/images/bg_download.png');
         $('title').html('下载');
         $('.xiazai-p-fuju').show();
+        //0是c端，2是b端
         $.ajax({
-            type: "post",
-            url: "/app/getVersionNo",
+            type: "get",
+            url: ServerHostTempC+"/api/getVersionNo",
             timeout: 10000,
             dataType: "json",
+            data: {
+            	'type': 0
+            },
             beforeSend: function() {},
             success: function(data) {
                 $('#android_link').attr('href',data.data.app_path);

application/app/view/index/more_chengjiao.html

@@ -9,6 +9,12 @@
 		<meta name="Description" content="" />
 		<link rel="stylesheet" href="/app/css/common.css">
 		<link rel="stylesheet" href="/app/css/agent_detail.css">
+		<style>
+			/*因为一些新页面用了vue实现，所以很多这样的元素默认是隐藏的，在common.css里。但原来的文件是需要默认隐藏的*/
+			.loading_pic_new,.no_more,.zanwu_data,.loading_pic_samll_new{
+			 	display: none;
+			}
+		</style>
 	</head>
 	<body>
 		<header id="header">

application/app/view/index/more_pingjia.html

@@ -9,6 +9,12 @@
 		<meta name="Description" content="" />
 		<link rel="stylesheet" href="/app/css/common.css">
 		<link rel="stylesheet" href="/app/css/agent_detail.css">
+		<style>
+			/*因为一些新页面用了vue实现，所以很多这样的元素默认是隐藏的，在common.css里。但原来的文件是需要默认隐藏的*/
+			.loading_pic_new,.no_more,.zanwu_data,.loading_pic_samll_new{
+			 	display: none;
+			}
+		</style>
 	</head>
 	<body>
 		<header id="header">

application/app/view/index/share_detail.html

@@ -28,21 +28,21 @@
 		<!--line 1-->
 		<div class="line_a">
 			<p class="a_fonta">
-				恒大国际广场
+				<!--恒大国际广场-->
 			</p>
 			<p class="a_fontb">
-				20000-25000元/月(月租金)
+				<!--20000-25000元/月(月租金)-->
 			</p>
 			<span class="a_fontc">
-    物业管理费：2000元/月
+    <!--物业管理费：2000元/月-->
     </span>
 			<span class="a_fontd">
-    进场费：200000元
+    <!--进场费：200000元-->
     </span>
 		</div>
 		<div class="line_a_ul">
 			<ul class="line_a_ulul">
-				<li>
+				<!--<li>
 					随时看房
 				</li>
 				<li>
@@ -50,7 +50,7 @@
 				</li>
 				<li>
 					随时看房
-				</li>
+				</li>-->
 			</ul>
 		</div>
 		<p class="line_hr"></p>
@@ -187,10 +187,10 @@
 		<!--底部联系人浮窗部分-->
 		<div class="fix_area_bottom">
 			<div>
-				<div>购房请联系：<span id="fix_name">小明</span></div>
+				<div>购房请联系：<span id="fix_name"></span></div>
 				<div>
 					<p><img src="/app/images/tele_icon@2x.png" />
-						<a id="fix_tel" href="javascript:;">13636508937</a>
+						<a id="fix_tel" href="javascript:;"></a>
 					</p>
 				</div>
 			</div>

application/app_broker/controller/Index.php

@@ -110,9 +110,9 @@ class Index
         return view('index/imagebody');
     }
     
-    public function xiazai()
+    public function download_b()
     {
-        return view('index/xiazai');
+        return view('index/download_b');
     }
 	
     public function __construct()

application/app_broker/view/index/bargaininfo_detail_pc.html

@@ -22,6 +22,7 @@
                     <a href="javascript:;" class="btn btn-default">开票税费</a>
                 </h4>
 			</div>
+			<div class="div-seat"></div>
 			<div class="modal-body detail-modal-body">
 				<div>
 					<div class="detail-modal-body-sec">

application/app_broker/view/index/xiazai.html → application/app_broker/view/index/download_b.html

@@ -39,14 +39,18 @@
     		$('#app_ban').attr('src','/app/images/bg_download.png');
     		$('title').html('下载');
     		$('.xiazai-p-fuju').show();
+    		//0是c端，2是b端
     		$.ajax({
-	    	    type: "post",
-	    	    url: ServerHostTempC+"/AppTab5/versions",
+	    	    type: "get",
+	    	    url: ServerHostTempC+"/api/getVersionNo",
 	    	    timeout: 10000,
 	    	    dataType: "json",
+	    	    data: {
+	    	    	'type': 2
+	    	    },
 	    	    beforeSend: function() {},
 	    	    success: function(data) {
-	    	        $('#android_link').attr('href',data.apk_url);
+	    	        $('#android_link').attr('href',data.data.app_path);
 	    	    },
 	    	    error: function() {
 

application/index/controller/Finance.php

@@ -249,6 +249,16 @@ class Finance extends Basic
                 $update_data['trade_type'] = $this->params['trade_type'];
             }
 
+            //业态
+            if (!empty($this->params['industry_type'])) {
+                $update_data['industry_type'] = $this->params['industry_type'];
+            }
+
+            //成交价格
+            if (!empty($this->params['price'])) {
+                $update_data['price'] = $this->params['price'];
+            }
+
             $m_bargain = new OBargainModel();
             $m_real    = new ORealIncome();
 

application/index/controller/Member.php

@@ -263,12 +263,12 @@ class Member extends Basic{
 
         if (empty($user_data) && $params['type'] == 'add') {
             $insert_data['sex']  = $params['sex'];
-            $insert_data['user_name']  = $params['realname'];
+            $insert_data['user_name']  = $params['user_name'];
             $insert_data['user_phone'] = $params['user_phone'];
             $insert_data['user_pswd']  = md5(md5($params['pwd']).'+123');
             $insert_data['status']     = 0;
             $insert_data['create_time']  = $date;
-            $insert_data['update_time']  = $date;
+            $insert_data['source']       = $date;
             $insert_data['agent_id'] = $params['agent_id']; //客方
             $insert_data['industry_type'] = $params['industry_type']; //业态
             $insert_data['price_demand'] = $params['price_demand']; //价格需求 元

application/index/view/auth/auth_rule_index.html

@@ -8,7 +8,7 @@
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">权限管理</a></li>
-                        <li class="active">新增66</li>
+                        <li class="active">新增</li>
                         <div class="pull-right">
                             <ul class="bread_btn">
                                 <li>
@@ -88,7 +88,7 @@
                     </div>
                     <div class="form-group">
                         <label class="col-sm-3 control-label">上级菜单：</label>
-                        <select class="form-control btn6" name="pid" id="pid">
+                        <select class="form-control btn6" name="pid2" id="pid">
 
                         </select>
                     </div>

application/index/view/finance/account_statement.html

@@ -20,7 +20,7 @@
 											<a class="btn btn-info liudan_pic_btn">第一级审核</a>
 											<a class="btn btn-default liudan_pic_btn">第二级审核</a>
 											<a class="btn btn-default liudan_pic_btn">第三级审核</a>
-											<a class="btn btn-default liudan_pic_btn">已结单</a>
+											<a class="btn btn-default liudan_pic_btn">已结单nnnn</a>
 
 										</td>
 									</tr>
@@ -71,10 +71,158 @@
 <!-- 弹出框 详情 -->
 <div class="modal fade" id="modal_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 	<div class="modal-dialog">
-		<!--<div class="modal-content">
-			
-		</div>-->
-		<iframe class="modal-content"></iframe>
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    ×
+                </button>
+				<h4 class="modal-title detail-modal-header-tab">
+                    <a href="javascript:;" class="btn btn-info">成交信息</a>
+                    <a href="javascript:;" class="btn btn-default">分佣提成</a>
+                    <a href="javascript:;" class="btn btn-default">开票税费</a>
+                </h4>
+			</div>
+			<div class="modal-body detail-modal-body">
+				<div>
+					<div class="detail-modal-body-sec">
+						<form class="detail-modal-bargaininfo-form">
+							<div class="detail-modal-bargaininfo-main-left">
+								<span>商铺类型：</span>
+								<span id="bargaininfo_shop_type"></span>
+								<br />
+
+								<span>商铺地址：</span><span id="bargaininfo_internal_address"></span><br>
+								<span>业态：</span>&nbsp;<input class="form-control" id="bargaininfo_yetai" type="text"><br>
+								<span>客户姓名：</span><span id="bargaininfo_user_name"></span><br>
+								<span>成交类型：</span>
+								<select class="form-control" id="bargaininfo_type">
+									<option value="10">出租</option>
+									<option value="20">增佣</option>
+									<option value="30">代理</option>
+									<option value="40">好处费</option>
+								</select>
+								<br />
+								<span>应收总佣金：</span>&nbsp;<input class="form-control" id="bargaininfo_total_commission" type="number">元<br>
+
+							</div>
+							<div class="detail-modal-bargaininfo-main-right">
+								<span>是否开业：</span>
+								<select class="form-control" id="bargaininfo_is_open">
+									<option value="0">否</option>
+									<option value="1">是</option>
+								</select> <br />
+								<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
+								<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
+								<span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
+								<span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" type="number">元
+							</div>
+							<div class="detail-modal-bargaininfo-commission-inputpar">
+								<div class="detail-modal-bargaininfo-commission-addarea">
+									<div class="form-group detail-modal-bargaininfo-commission-sec">
+										<label class="">实收佣金：</label>
+										<div class="input-group">
+											<input type="number" class="form-control" placeholder="请输入">
+											<div class="input-group-addon">元</div>
+										</div>
+										<label class="">收佣日期：</label>
+										<div class="input-group">
+											<input type="date" class="form-control" placeholder="请输入">
+										</div>
+										<!--<mark href="javascript:;" class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png" /></mark>-->
+									</div>
+								</div>
+								<div id="bargaininfo_commission_add_btn">
+									<img src="/resource/image/jia2@2x.png" />
+								</div>
+							</div>
+							<div>
+								<span class="detail-modal-bargaininfo-span-beizhu">备注：</span>
+								<textarea id="bargaininfo_beizhu"></textarea>
+							</div>
+						</form>
+						<div class="tc">
+							<button type="button" class="btn btn-primary" id="bargaininfo_btn_save">保存</button>
+						</div>
+					</div>
+					<div class="detail-modal-body-sec">
+						<div class="detail-modal-maid-top-btn-area oh">
+							<a class="btn btn-success" href="#modal_new_maid" data-toggle="modal">新增</a>
+							<a id="maid_new_btn" class="btn btn-primary" data-toggle="modal">增加实收</a>
+						</div>
+						<table class="table table-striped table-bordered table-hover table-condensed" id="maid_table_main">
+							<thead>
+								<tr>
+									<th class="text-center">分佣方</th>
+									<th class="text-center">业务员</th>
+									<th class="text-center">所属部门/门店</th>
+									<th class="text-center">分佣比例</th>
+									<th class="text-center">应分佣金(元)</th>
+									<th class="text-center">实分佣金(元)</th>
+									<th class="text-center">手续费(元)</th>
+									<th class="text-center">慈善基金(元)</th>
+									<th class="text-center">现金奖(元)</th>
+									<th class="text-center">实收佣金(元)</th>
+									<th class="text-center">确认时间</th>
+								</tr>
+							</thead>
+							<tbody class="text-center" id="maid_new_table_list">
+								<!--<tr>
+									<td>盘方</td>
+									<td>刘丹丹-13918937741</td>
+									<td>同联一部南京东路店</td>
+									<td contenteditable>30%</td>
+									<td contenteditable>350000</td>
+									<td colspan="6" class="detail-modal-maid-mix-td oh">
+										<div class="oh">
+											<span contenteditable></span>
+											<span contenteditable></span>
+											<span contenteditable></span>
+											<span contenteditable></span>
+											<span contenteditable></span>
+											<span></span>
+										</div>
+									</td>
+								</tr>
+								<tr>
+									<td>盘方</td>
+									<td>刘丹丹-13918937741</td>
+									<td>同联一部南京东路店</td>
+									<td contenteditable>30%</td>
+									<td contenteditable>350000</td>
+									<td colspan="6" class="detail-modal-maid-mix-td oh">
+										<div class="oh">
+											<span contenteditable></span>
+											<span contenteditable></span>
+											<span contenteditable></span>
+											<span contenteditable></span>
+											<span contenteditable></span>
+											<span></span>
+										</div>
+									</td>
+								</tr>-->
+							</tbody>
+
+						</table>
+						<div class="detail-modal-maid-bottom-btn-area text-right">
+							<a id="maid_ok_btn" class="btn btn-primary" data-toggle="modal">确认分佣</a>
+							<a id="maid_save_btn" class="btn btn-primary" data-toggle="modal">保存</a>
+						</div>
+						<!--分佣提成-->
+					</div>
+					<div class="detail-modal-body-sec">
+						<div>
+							<div class="tc">
+								<a class="btn btn-success" href="#modal_new_tax" data-toggle="modal">新增开票</a>
+							</div>
+							<div id="tax_main_box">
+								<!--内容为模板生成-->
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<!-- /.modal-content -->
+		</div>
 		<!-- /.modal -->
 	</div>
 </div>

application/index/view/finance/account_statement_ori.html → application/index/view/finance/account_statement_newtri.html

@@ -71,156 +71,10 @@
 <!-- 弹出框 详情 -->
 <div class="modal fade" id="modal_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                    ×
-                </button>
-				<h4 class="modal-title detail-modal-header-tab">
-                    <a href="javascript:;" class="btn btn-info">成交信息</a>
-                    <a href="javascript:;" class="btn btn-default">分佣提成</a>
-                    <a href="javascript:;" class="btn btn-default">开票税费</a>
-                </h4>
-			</div>
-			<div class="modal-body detail-modal-body">
-				<div>
-					<div class="detail-modal-body-sec">
-						<form class="detail-modal-bargaininfo-form">
-							<div class="detail-modal-bargaininfo-main-left">
-								<span>商铺类型：</span>
-								<span id="bargaininfo_shop_type"></span>
-								<br />
-
-								<span>商铺地址：</span><span id="bargaininfo_internal_address"></span><br>
-								<span>客户姓名：</span><span id="bargaininfo_user_name"></span><br>
-								<span>成交类型：</span>
-								<select class="form-control" id="bargaininfo_type">
-									<option value="10">出租</option>
-									<option value="20">增佣</option>
-									<option value="30">代理</option>
-									<option value="40">好处费</option>
-								</select>
-								<br />
-								<span>应收总佣金：</span>&nbsp;<input class="form-control" id="bargaininfo_total_commission" type="number">元<br>
-
-							</div>
-							<div class="detail-modal-bargaininfo-main-right">
-								<span>是否开业：</span>
-								<select class="form-control" id="bargaininfo_is_open">
-									<option value="0">否</option>
-									<option value="1">是</option>
-								</select> <br />
-								<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
-								<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
-								<span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
-							</div>
-							<div class="detail-modal-bargaininfo-commission-inputpar">
-								<div class="detail-modal-bargaininfo-commission-addarea">
-									<div class="form-group detail-modal-bargaininfo-commission-sec">
-										<label class="">实收佣金：</label>
-										<div class="input-group">
-											<input type="number" class="form-control" placeholder="请输入">
-											<div class="input-group-addon">元</div>
-										</div>
-										<label class="">收佣日期：</label>
-										<div class="input-group">
-											<input type="date" class="form-control" placeholder="请输入">
-										</div>
-										<!--<mark href="javascript:;" class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png" /></mark>-->
-									</div>
-								</div>
-								<div id="bargaininfo_commission_add_btn">
-									<img src="/resource/image/jia2@2x.png" />
-								</div>
-							</div>
-							<div>
-								<span class="detail-modal-bargaininfo-span-beizhu">备注：</span>
-								<textarea id="bargaininfo_beizhu"></textarea>
-							</div>
-						</form>
-						<div class="tc">
-							<button type="button" class="btn btn-primary" id="bargaininfo_btn_save">保存</button>
-						</div>
-					</div>
-					<div class="detail-modal-body-sec">
-						<div class="detail-modal-maid-top-btn-area oh">
-							<a class="btn btn-success" href="#modal_new_maid" data-toggle="modal">新增</a>
-							<a id="maid_new_btn" class="btn btn-primary" data-toggle="modal">增加实收</a>
-						</div>
-						<table class="table table-striped table-bordered table-hover table-condensed" id="maid_table_main">
-							<thead>
-								<tr>
-									<th class="text-center">分佣方</th>
-									<th class="text-center">业务员</th>
-									<th class="text-center">所属部门/门店</th>
-									<th class="text-center">分佣比例</th>
-									<th class="text-center">应分佣金(元)</th>
-									<th class="text-center">实分佣金(元)</th>
-									<th class="text-center">手续费(元)</th>
-									<th class="text-center">慈善基金(元)</th>
-									<th class="text-center">现金奖(元)</th>
-									<th class="text-center">实收佣金(元)</th>
-									<th class="text-center">确认时间</th>
-								</tr>
-							</thead>
-							<tbody class="text-center" id="maid_new_table_list">
-								<!--<tr>
-									<td>盘方</td>
-									<td>刘丹丹-13918937741</td>
-									<td>同联一部南京东路店</td>
-									<td contenteditable>30%</td>
-									<td contenteditable>350000</td>
-									<td colspan="6" class="detail-modal-maid-mix-td oh">
-										<div class="oh">
-											<span contenteditable></span>
-											<span contenteditable></span>
-											<span contenteditable></span>
-											<span contenteditable></span>
-											<span contenteditable></span>
-											<span></span>
-										</div>
-									</td>
-								</tr>
-								<tr>
-									<td>盘方</td>
-									<td>刘丹丹-13918937741</td>
-									<td>同联一部南京东路店</td>
-									<td contenteditable>30%</td>
-									<td contenteditable>350000</td>
-									<td colspan="6" class="detail-modal-maid-mix-td oh">
-										<div class="oh">
-											<span contenteditable></span>
-											<span contenteditable></span>
-											<span contenteditable></span>
-											<span contenteditable></span>
-											<span contenteditable></span>
-											<span></span>
-										</div>
-									</td>
-								</tr>-->
-							</tbody>
-
-						</table>
-						<div class="detail-modal-maid-bottom-btn-area text-right">
-							<a id="maid_ok_btn" class="btn btn-primary" data-toggle="modal">确认分佣</a>
-							<a id="maid_save_btn" class="btn btn-primary" data-toggle="modal">保存</a>
-						</div>
-						<!--分佣提成-->
-					</div>
-					<div class="detail-modal-body-sec">
-						<div>
-							<div class="tc">
-								<a class="btn btn-success" href="#modal_new_tax" data-toggle="modal">新增开票</a>
-							</div>
-							<div id="tax_main_box">
-								<!--内容为模板生成-->
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<!-- /.modal-content -->
-		</div>
+		<!--<div class="modal-content">
+			
+		</div>-->
+		<iframe class="modal-content"></iframe>
 		<!-- /.modal -->
 	</div>
 </div>

application/index/view/member/users_list.html

@@ -176,14 +176,14 @@
 												</select>
 												<!--业态选择-->
 												<select class="form-control btn2 margin-top-ld" name="login_status">
-													<option value="-1">是否登录过</option>
+													<option value="-1">下载登录app</option>
 													<option value="1">是</option>
 													<option value="2">否</option>
 												</select>
 												<select class="form-control btn2 margin-top-ld" name="activate">
-													<option value="-1">APP状态筛选</option>
-													<option value="1">激活</option>
-													<option value="2">未激活</option>
+													<option value="-1">是否注册app</option>
+													<option value="1">是</option>
+													<option value="2">否</option>
 												</select>
 
 												<select class="form-control btn2 margin-top-ld" name="male_status">
@@ -196,6 +196,12 @@
 												</select>
 
 												<input class="form-control btn2 margin-top-ld input" data-rule-phoneus="false" data-rule-required="false" id="guest_stores" placeholder="客方所属门店" type="text" value="">
+												<!--邀请人-->
+												<select class="form-control btn2 margin-top-ld input" name="" id="district_id2" placeholder="">
+
+												</select>
+
+												<input class="form-control btn2 margin-top-ld input" data-rule-phoneus="false" data-rule-required="false" id="guest_stores2" placeholder="邀请人所属门店" type="text" value="">
 
 												<select class="form-control btn2 margin-top-ld" name="public_status">
 													<option value="2">客户状态</option>
@@ -223,7 +229,7 @@
 										<th class="text-center">创建时间</th>
 										<th class="text-center">最后跟进时间</th>
 										<th class="text-center">App状态</th>
-										<th class="text-center">是否登录过</th>
+										<th class="text-center">下载登录</th>
 										<th class="text-center">昵称</th>
 										<th class="text-center">注册时间</th>
 										<th class="text-center">操作</th>
@@ -268,7 +274,7 @@
 					<div class="form-group">
 						<label for="inputEmail3" class="col-sm-3 control-label">姓名：</label>
 						<div class="col-sm-9">
-							<input type="text" class="form-control btn6" name="user_nick" id="inputEmail3" placeholder="请输入姓名">
+							<input type="text" class="form-control btn6" name="user_name" id="inputEmail3" placeholder="请输入姓名">
 							<span class="use-span text-danger">(必填)</span>
 						</div>
 					</div>
@@ -276,7 +282,7 @@
 						<label for="inputEmail3" class="col-sm-3 control-label">性别：</label>
 						<div class="col-sm-9">
 							<select class="form-control btn6" id="user_sex">
-								<option value="0" class="successModel">性别</option>
+								<option value="0" class="successModel">请选择</option>
 								<option value="1">男</option>
 								<option value="2">女</option>
 							</select>

application/model/AAgents.php

@@ -835,4 +835,60 @@ class AAgents extends BaseModel
             ->where($where)
             ->find();
     }
+
+    /**
+     * 经纪人详情
+     * @param $id
+     * @return array|bool|false|\PDOStatement|string|Model
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function agentsDetail($id)
+    {
+        if ($id) {
+            $result = $this->field('id,name as realname,create_time,img,store_id')->find($id);
+
+            $result['head_portrait'] = 'user_header/' . $result['img'];   //头像
+            $evaluate_grade          = Db::table('u_evaluate')
+                ->field('sum(evaluate_grade) as evaluate_grade, count(*) as evaluate_num')
+                ->where('agents_id', $id)->where('is_show', 0)->find();
+
+            $m_store = new AStore();
+            $result['sub_shopname'] = $m_store->getStoreKeyById('store_name', ['id'=>$result['store_id']]);
+            if ($evaluate_grade['evaluate_grade']) {
+                $grade = floor(($evaluate_grade['evaluate_grade'] / 2) / $evaluate_grade['evaluate_num']);
+            } else {
+                $grade = 0;
+            }
+
+            $result['evaluate_grade'] = $grade;   //评分等级
+            $result['evaluate_num']   = $evaluate_grade['evaluate_num'];        //评论数量
+            $result['watch_shop']     = Db::table('u_appoint_watch_shop')
+                ->where('agents_id', $id)->count(); //看铺
+
+            $result['head_portrait'] = AGENTHEADERIMGURL.$result['head_portrait'];
+
+            $bargain = new OBargainModel();
+            $result['JournalAccounts'] = $bargain->ifBargainNumByOrderId([ 'agent_id' => $id ]); //成交记录
+
+            $current_time = time();
+            $user_time    = strtotime($result['create_time']);
+            $year         = date('Y', $current_time) - date('Y', $user_time);
+
+            //入职年限
+            if ($year == 0) {
+                $result['created'] = '4年以上';
+            } else {
+                $result['created'] = '5年以上';
+            }
+
+            $result['label'] = array( 0 => '待定标签数据', 1 => '待定标签数据' );
+            $data            = $result;
+        } else {
+            $data = false;
+        }
+
+        return $data;
+    }
 }
\ No newline at end of file

application/model/Evaluate.php

@@ -11,27 +11,30 @@ class Evaluate extends Model
 
     /**
      * 获得评价列表
-     * 
-     * @param type $pageNo
-     * @param type $pageSize
-     * @param type $order_
-     * @param type $field
-     * @param type $params
-     * @param type $agent_id //获得经纪人的评价
-     * @return type
+     *
+     * @param int $pageNo
+     * @param int $pageSize
+     * @param string $order_
+     * @param $field
+     * @param $params
+     * @param string $agent_id
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function getEvaluate($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params, $agent_id = '') {
 
         if ($agent_id) {
             $result = $this->field($field)->alias('a')
                     ->join('u_users b','a.user_id = b.id','left')
+                    ->join('g_houses c','a.house_id = c.id','left')
                     ->where('agents_id',$agent_id)
-                    ->where('is_show',0)
+                    ->where('a.is_show',0)
                     ->order($order_)
                     ->limit($pageSize)
                     ->page($pageNo)
                     ->select();
-
         } else {
             $result = $this->field($field)->alias('a')
                     ->join('u_users b', 'a.user_id = b.id', 'left')
@@ -41,9 +44,9 @@ class Evaluate extends Model
                     ->page($pageNo)
                     ->select();
         }
-        $data    = array();
+        $data    = [];
         $sign    = new EvaluateSign();
-        $watch   = new AppointWatchShop();
+
         foreach ($result as $k=>$v) {
             $v->evaluate_grade = floor($v->evaluate_grade/2);
             $data[$k]   = $v->getData();
@@ -55,25 +58,22 @@ class Evaluate extends Model
                          ->select();
             }
 
-            if ($v->source == 10) {
-                $applies_time = $watch->alias('a')
-                    ->field('b.receptiontime')
-                    ->join('applies b','b.id = a.applies_id','left')
-                    ->where('a.applies_id',$v->record_id)
-                    ->find();
-            } else {
-
-                $applies_time = Db::table('Journalaccounts')->alias('a')
-                    ->field('b.receptiontime')
-                    ->join('applies b','b.id = a.apply_id','left')
-                    ->where('a.apply_id',$v->record_id)
-                    ->find();
+            if (isset($v['house_id'])) {
+                $applies_time = Db::table('o_bargain')->alias('a')
+                    ->join('o_order b', 'a.order_id = b.id', 'left')
+                    ->join('o_report c', 'a.report_id = c.id', 'left')
+                    ->where('b.house_id', $v['house_id'])
+                    ->where('c.user_id', $v['user_id'])
+                    ->where('a.agent_id', $agent_id)
+                    ->value('a.create_time');
             }
 
-            $house_address = Db::table('HouseInfos')->field('address')->where('id',$v['house_id'])->find();
+            if (!empty($v['external_address'])) {
+                $v['internal_address'] = $v['external_address'];
+            }
 
-            $data[$k]['houserAddress'] = $house_address['address'] ? $house_address['address'] : '';
-            $data[$k]['receptiontime'] = $applies_time['receptiontime'];
+            $data[$k]['houserAddress'] = $v['internal_address'];
+            $data[$k]['receptiontime'] = $applies_time;
             $data[$k]['created'] = $v['create_time'] ? $v['create_time']:'';
         }
                 
@@ -82,10 +82,14 @@ class Evaluate extends Model
 
     /**
      * 获取商铺是否评价
-     * @param int $source
+     *
+     * @param $source
      * @param $recordId
      * @param $userId
      * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function getIsEvaluate($source ,$recordId , $userId){
         $params["source"] = $source ;
@@ -94,6 +98,5 @@ class Evaluate extends Model
         return $this->field("id")
             ->where($params)
             ->select();
-
     }
 }

application/model/OBargainModel.php

@@ -492,6 +492,46 @@ class OBargainModel extends Model
         if (isset($data['id'])) {
             $m_fee                 = new ORealIncome();
             $data['practical_fee'] = $m_fee->getBargainTaxes($data['id']);    //获取实收佣金
+        } else {
+            $data = [];
+        }
+
+        return $data;
+    }
+
+    /**
+     * 获取成交报告详情
+     *
+     * @param int $pageNo
+     * @param int $pageSize
+     * @param string $order_
+     * @param $field
+     * @param $params
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getBargainOrderList($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field, $params)
+    {
+        $data = $this->field($field)->alias('a')
+            ->join('o_report b', 'a.report_id = b.id', 'left')
+            ->join('o_order c', 'a.order_id = c.id', 'left')
+            ->join('g_houses d', 'c.house_id = d.id', 'left')
+            ->where($params)
+            ->order($order_)
+            ->limit($pageSize)
+            ->page($pageNo)
+            ->select();
+
+        foreach ($data as $k=>$v) {
+            if (isset($v['singntime'])) {
+                $data[$k]['singntime'] = date('Y-m-d', strtotime($v['singntime']));
+            }
+
+            if (empty($v['shangpu_tags'])) {
+                $data[$k]['shangpu_tags'] = "";
+            }
         }
 
         return $data;

application/model/Users.php

@@ -564,4 +564,13 @@ class Users extends Model
     {
         return $this->saveAll($data);
     }
+
+    public function countUser(){
+        $result = $this
+            ->field("id")
+            ->where(["user_status"=>0])
+            ->count("id");
+       // echo $this->getLastSql();
+        return $result;
+    }
 }

application/route.php

@@ -21,7 +21,7 @@ Route::group('app', [
     'share_register' => [ 'app/index/share_register', [ 'method' => 'get' ] ],
     'agreement'      => [ 'app/index/agreement', [ 'method' => 'get' ] ],
     'agreement_app'  => [ 'app/index/agreement_app', [ 'method' => 'get' ] ],
-    'download'       => [ 'app/index/download', [ 'method' => 'get' ] ],
+    'download_c'       => [ 'app/index/download_c', [ 'method' => 'get' ] ],
     'getShopDetails' => [ 'app/index/getShopDetail', [ 'method' => 'get | post' ] ],
     'getVersionNo'   => [ 'app/index/getVersionNo', [ 'method' => 'get | post' ] ],
     'feed'           => [ 'app/index/feed', [ 'method' => 'get' ] ]
@@ -48,7 +48,7 @@ Route::group('app_broker', [
     'bargaininfo_detail_pc'     => [ 'app_broker/index/bargaininfo_detail_pc', [ 'method' => 'get' ] ],
     'customerinfo_customer_add' => [ 'app_broker/index/customerinfo_customer_add', [ 'method' => 'get' ] ],
     'customerinfo_details_new'  => [ 'app_broker/index/customerinfo_details_new', [ 'method' => 'get' ] ],
-    'xiazai'                    => [ 'app_broker/index/xiazai', [ 'method' => 'get' ] ],
+    'download_b'                    => [ 'app_broker/index/download_b', [ 'method' => 'get' ] ],
     'imagebody'                 => [ 'app_broker/index/imagebody', [ 'method' => 'get' ] ],
 ]);
 
@@ -299,7 +299,7 @@ Route::group('api', [
 
 
     //Version
-    'getVersionNo' => [ 'api/Version/getVersionNo', [ 'method' => 'post' ] ],
+    'getVersionNo' => [ 'api/Version/getVersionNo', [ 'method' => 'post|get' ] ],
 //	'agentUserTb' => [ 'api_broker/Client/agentUserTb', [ 'method' => 'get' ] ],//客户列表
 //    'agentUserFollow' => [ 'api_broker/Client/agentUserFollow', [ 'method' => 'get' ] ],//客户列表
 //    'agentSearch' => [ 'api_broker/Client/agentSearch', [ 'method' => 'get' ] ],//经纪人搜索
@@ -346,7 +346,7 @@ Route::group('task', [
     'updateStatusByNum'  => [ 'task/updateShopStatusTask/updateStatusByNum', [ 'method' => 'get' ] ],  //修改下架根据数量
 
 
-    'totalAgentResults' => [ 'task/ResultsSummaryTask/totalAgentResults', [ 'method' => 'get' ] ], //业绩统计
+    'totalAgentResults_new' => [ 'task/ResultsSummaryTask/totalAgentResults', [ 'method' => 'get' ] ], //业绩统计
 
 
     'rongBilledInformUrl'    => [ 'task/PrivacyNumber/rongBilledInformUrl', [ 'method' => 'post | get' ] ],//隐私号码回调[话单通知]

application/task/controller/ResultsSummaryTask.php

@@ -2,6 +2,7 @@
 
 namespace app\task\controller;
 
+use app\extra\RedisExt;
 use app\model\AAgents;
 use app\model\GHouses;
 use app\model\OBargainModel;
@@ -29,6 +30,7 @@ class ResultsSummaryTask
     private $reportModel;
     private $marchInModel;
     private $payLogModel;
+    private $redis_;
 
     function __construct()
     {
@@ -40,30 +42,37 @@ class ResultsSummaryTask
         $this->reportModel      = new OReportModel();
         $this->marchInModel     = new OMarchInModel();
         $this->payLogModel      = new OPayLogModel();
+        $this->redis_           = RedisExt::getRedis();
     }
 
     public function totalAgentResults()
     {
         set_time_limit(0); // 取消脚本运行时间的超时上限
-            //todo 1.分页查询经纪人，  2遍历执行，判断一个经纪人在统计表最后一条统计数据的日期
-            //TODO 3.日期加一天并判断是否大于等于当前时间大于return  4.执行此日期的统计，5.当次日期小于当前日期，递归日期加一。继续统计
-            $total = $this->agentsModel->getAgentsCountByTask();
-
-            $pageSize  = 200;
-            $pageTotal = ceil($total / $pageSize);
-            for ($pageNo = 1; $pageNo <= $pageTotal; $pageNo++) {
-                $resultArr = $this->agentsModel->getAgentsListByTask($pageNo, $pageSize, "id,store_id,district_id");
-                $this->executeTotal($resultArr);
-                unset($resultArr);
-            }
-            unset($this->agentsModel);
-            unset($this->tAgentTotalModel);
-            unset($this->houseModel);
-            unset($this->userModel);
-            unset($this->bargainModel);
-            unset($this->reportModel);
-            unset($this->marchInModel);
-            unset($this->payLogModel);
+
+        $day = date("Y-m-d", time());
+        if ($this->redis_ && $this->redis_->get("run_total" . $day)) {
+            return false;
+        }
+        $this->redis_->set("run_total" . $day, 1, 24 * 3600);
+        //todo 1.分页查询经纪人，  2遍历执行，判断一个经纪人在统计表最后一条统计数据的日期
+        //TODO 3.日期加一天并判断是否大于等于当前时间大于return  4.执行此日期的统计，5.当次日期小于当前日期，递归日期加一。继续统计
+        $total = $this->agentsModel->getAgentsCountByTask();
+
+        $pageSize  = 200;
+        $pageTotal = ceil($total / $pageSize);
+        for ($pageNo = 1; $pageNo <= $pageTotal; $pageNo++) {
+            $resultArr = $this->agentsModel->getAgentsListByTask($pageNo, $pageSize, "id,store_id,district_id");
+            $this->executeTotal($resultArr);
+            unset($resultArr);
+        }
+        unset($this->agentsModel);
+        unset($this->tAgentTotalModel);
+        unset($this->houseModel);
+        unset($this->userModel);
+        unset($this->bargainModel);
+        unset($this->reportModel);
+        unset($this->marchInModel);
+        unset($this->payLogModel);
 
 
     }

public/app/css/bargaininfo_detail_pc.css

+.modal-header{
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	background-color: white;
+	z-index: 1;
+}
+.div-seat{
+	height: 64px;
+	width: 100%;
+}
 .detail-modal-body {
-	height: 660px;
+	height: 724px;
 	overflow-y: scroll;
 }
 .detail-modal-body-sec+.detail-modal-body-sec{
@@ -89,6 +101,10 @@
 	margin: 0 auto;
 }
 
+#bargaininfo_beizhu{
+	border: 1px solid #ccc;
+}
+
 /*详情弹出框,分佣提成*/
 .detail-modal-maid-top-btn-area{
 	padding: 0 10px 10px;

public/app/js/agent_detail.js

@@ -175,7 +175,7 @@ $(function() {
 											'1': dealStar(item['evaluate_grade']),
 											'2': dealStarText(item['evaluate_grade']),
 											'3': item['created'],
-											'4': (item['receptiontime'] != ''||item['houserAddress'] != '')?(dealTimeKf(item['receptiontime'])+'在'+item['houserAddress']['address']+'看房'):'暂无看房数据',
+											'4': (item['receptiontime'] != ''||item['houserAddress'] != '')?(dealTimeKf(item['receptiontime'])+'在'+item['houserAddress']+'看房'):'暂无看房数据',
 											'5': item['evaluate_content'],
 											'6': item['user_pic'],
 											'7': ServerHost+'/app/images/ic_default_headpic.png'

public/app/js/app_jump.js

@@ -82,8 +82,7 @@ function jumpEvent(){
 	$('#jump_link').click(function(e){
 		e.preventDefault();
 		e.stopPropagation();
-		var _ym = (~ServerHost.indexOf('estate.'))?'https://admin.tonglianjituan.com/mobile4.0/xiazai.html':'https://develop.tonglianjituan.com/mobile4.0/xiazai.html';
-		location.href = _clientType==='b'?_ym:'download';
+		location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
 	});
 	
 //	var _ft = getUrlParam('ft');

public/app/js/main.js

@@ -9,6 +9,7 @@ require.config({
 		'vconsole': 'js/vconsole.min',
 		'common': 'js/common',
 		'style': 'css',
+		'doT': 'js/libs/doT',
 		'layer': 'js/layer',
 		'bootstrapJs': 'js/libs/bootstrap.min',
 	},
@@ -20,6 +21,9 @@ require.config({
 		'bootstrapJs': {
             'deps': ['jquery0325','css!style/bootstrap.css','css!style/bootstrap-theme.min.css'],
             'exports': 'bootstrapJs'
+        },
+        'doT': {
+            'exports': 'doT'
         },
 		'layer': {
 			'deps': ['css!js/need/layer.css'],
@@ -39,7 +43,9 @@ require.config({
 	},
 	'map': {
 		'*': {
-			'css': 'js/libs/css.min'
+			'css': 'js/libs/css.min',
+			'text': 'js/libs/text',
+			'doT': 'js/libs/doT'
 		}
 	}
 });

public/app/js/more_pingjia.js

@@ -90,7 +90,7 @@ $(function() {
 									'1': dealStar(item['evaluate_grade']),
 									'2': dealStarText(item['evaluate_grade']),
 									'3': item['created'],
-									'4': (item['receptiontime'] != ''||item['houserAddress'] != '')?(dealTimeKf(item['receptiontime'])+'在'+item['houserAddress']['address']+'看房'):'暂无看房数据',
+									'4': (item['receptiontime'] != ''||item['houserAddress'] != '')?(dealTimeKf(item['receptiontime'])+'在'+item['houserAddress']+'看房'):'暂无看房数据',
 									'5': item['evaluate_content'],
 									'6': item['user_pic'],
 									'7': ServerHost+'/app/images/ic_default_headpic.png'

public/app/js/share_register.js

@@ -136,7 +136,7 @@ var sends = {
                 if (response.code == 200) {
                     //成功跳转
                     $(".conform").html("提交.");
-                    window.location.href="/app/download";
+                    window.location.href="/app.php/app/download_c";
 
 
                 } else {

public/app/template/reportList_maid_sub1_template_tpl.html

+<script id="reportList_maid_sub1_list_tpl" type="text/template">
+	<div class="oh">
+		<span contenteditable class="detail-modal-maid-span-real-fee"></span>
+		<span contenteditable class="detail-modal-maid-span-service-charge">0</span>
+		<span contenteditable class="detail-modal-maid-span-charity-fund">0</span>
+		<span contenteditable class="detail-modal-maid-span-cash">0</span>
+		<span contenteditable class="detail-modal-maid-span-practical-fee"></span>
+		<span class="detail-modal-maid-span-time"></span>
+	</div>
+</script>
\ No newline at end of file

public/app/template/reportList_maid_template_tpl.html

+<script id="reportList_maid_list_tpl" type="text/template">
+	[% if(it['data'] && it['data'].length && it['data'].length>0) { %]
+	[% var dealT=function(g){if(g&&(g!="null")){return g}else{return""}}; %]
+    [% for(var i in it['data']){ %]
+    <tr class="text-center" data-id="[%= it['data'][i]['id'] %]" data-agentid="[%= it['data'][i]['agent_id'] %]" data-role="[%= it['data'][i]['role'] %]" data-lastid="[%= it['data'][i]['last_commission_id'] %]">
+        <td>[%= it['data'][i]['role_name'] %]</td>
+        <td>[%= it['data'][i]['agent'] %]</td>
+        <td>[%= it['data'][i]['district_store'] %]</td>
+        <td><span contenteditable class="detail-modal-maid-span-scale">[%= it['data'][i]['scale'] %]</span><span>%</span></td>
+        <td contenteditable class="detail-modal-maid-td-should-commission">[%= it['data'][i]['scale_fee'] %]</td>
+        <td colspan="6" class="detail-modal-maid-mix-td oh">
+        	[% if(it['data'][i]['partial_commission'] && it['data'][i]['partial_commission'].length && it['data'][i]['partial_commission'].length>0) { %]
+        		[% for(var j in it['data'][i]['partial_commission']){ %]
+				<div class="oh" data-id="[%= it['data'][i]['partial_commission'][j]['id'] %]">
+					<span contenteditable class="detail-modal-maid-span-real-fee">[%= it['data'][i]['partial_commission'][j]['real_fee'] %]</span>
+					<span contenteditable class="detail-modal-maid-span-service-charge">[%= it['data'][i]['partial_commission'][j]['service_charge'] %]</span>
+					<span contenteditable class="detail-modal-maid-span-charity-fund">[%= it['data'][i]['partial_commission'][j]['charity_fund'] %]</span>
+					<span contenteditable class="detail-modal-maid-span-cash">[%= it['data'][i]['partial_commission'][j]['cash'] %]</span>
+					<span contenteditable class="detail-modal-maid-span-practical-fee">[%= it['data'][i]['partial_commission'][j]['practical_fee'] %]</span>
+					<span class="detail-modal-maid-span-time">[%= dealT(it['data'][i]['partial_commission'][j]['confirm_date']) %]</span>
+				</div>
+				[% } %]
+    		[% }else{ %]
+    		<div class="oh">
+				<span contenteditable class="detail-modal-maid-span-real-fee"></span>
+				<span contenteditable class="detail-modal-maid-span-service-charge">0</span>
+				<span contenteditable class="detail-modal-maid-span-charity-fund">0</span>
+				<span contenteditable class="detail-modal-maid-span-cash">0</span>
+				<span contenteditable class="detail-modal-maid-span-practical-fee"></span>
+				<span class="detail-modal-maid-span-time"></span>
+			</div>	
+    		[% } %]
+		</td>
+    </tr>
+    [% } %]
+    [% }else{ %]
+    <tr>
+        <td colspan="11" style="text-align:center;"> 暂无数据</td>
+    </tr>
+    [% } %]
+</script>
+
+
+
+

public/app/template/reportList_shuiFee_template_tpl.html

+<script id="reportList_shuiFee_list_tpl" type="text/template">
+	[% if(it && it.length && it.length>0) { %]
+    [% for(var item in it){ %]
+    [% var getInfoType=function(r){switch(Number(r)){case 1:return"盘方";case 2:return"客方";case 3:return"反签";case 4:return"独家";case 5:return"合作方";default:return"未定义"}}; %]
+	    <section>
+			<div>
+				<table class="detail-modal-tax-table table-haveborder">
+					<tr>
+						<td>开票金额</td>
+						<td>[%= it[item]['total_fee'] %]</td>
+						<td>开票日期</td>
+						<td>[%= it[item]['operation_date'] %]</td>
+					</tr>
+					<tr>
+						<td>分佣方</td>
+						<td>业务员</td>
+						<td>分佣比例</td>
+						<td>税费</td>
+					</tr>
+					[% if(it[item]['fee_list'] && it[item]['fee_list'].length && it[item]['fee_list'].length>0) { %]
+    				[% for(var item2 in it[item]['fee_list']){ %]
+						<tr data-feeid="[%= it[item]['fee_list'][item2]['fee_id'] %]">
+							<td>[%= getInfoType(it[item]['fee_list'][item2]['role']) %]</td>
+							<td>[%= it[item]['fee_list'][item2]['name']+'-'+it[item]['fee_list'][item2]['phone'] %]</td>
+							<td>[%= it[item]['fee_list'][item2]['scale'] %]</td>
+							<td>[%= it[item]['fee_list'][item2]['fee'] %]</td>
+						</tr>
+					[% } %]
+				    [% }else{ %]
+				    	<tr>暂无</tr>
+				    [% } %]
+				</table>
+			</div>
+			<div>
+				<a class="btn btn-default" href="#modal_new_tax" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">编辑</a>
+			</div>
+		</section>
+	[% } %]
+    [% }else{ %]
+    	<section>暂无数据</section>
+    [% } %]
+</script>
+
+
+
+

public/resource/css/report_list.css

@@ -21,16 +21,229 @@ addtax_
 }
 
 /*详情弹出框*/
-#modal_detail>div {
-	/*width: 1030px;*/
-	width: 1250px;
+.detail-modal-body {
+	height: 660px;
+	overflow-y: scroll;
+}
+.detail-modal-body-sec+.detail-modal-body-sec{
+	display: none;
+}
+/*详情弹出框,成交信息*/
+.detail-modal-bargaininfo-main-left {
+	float: left;
+	width: 340px;
+	line-height: 36px;
+}
+
+#bargaininfo_is_open,
+#bargaininfo_type {
+	width: 100px !important;
+	display: inline-block;
+}
+
+.detail-modal-bargaininfo-main-right {
+	line-height: 36px;
+	width: 580px;
+}
+
+#bargaininfo_yetai{
+	width: 150px;
+	display: inline-block;
+	height: 26px;
+	padding: 3px 6px
+}
+
+#bargaininfo_chengjiao_price,
+#bargaininfo_total_commission {
+	width: 120px;
+	display: inline-block;
+	height: 26px;
+	padding: 3px 6px
+}
+
+.detail-modal-bargaininfo-form {
+	line-height: 48px;
+	width: 620px;
+    margin: 0 auto;
+}
+
+.detail-modal-bargaininfo-commission-inputpar {
+	width: 100%;
+	overflow: hidden;
+	clear: both;
+}
+
+.detail-modal-bargaininfo-commission-sec,
+.addtax-modal-tax-commission-sec {
+	overflow: hidden;
 }
-#modal_detail>div>iframe{
+
+.detail-modal-bargaininfo-commission-sec>label,
+.addtax-modal-tax-commission-sec>label {
+	float: left;
+}
+
+.detail-modal-bargaininfo-commission-sec>label:nth-of-type(2),
+.addtax-modal-tax-commission-sec>label:nth-of-type(2) {
+	margin-left: 50px;
+}
+
+.detail-modal-bargaininfo-commission-sec>div,
+.addtax-modal-tax-commission-sec>div {
+	float: left;
+	width: 160px;
+}
+
+.detail-modal-bargaininfo-commission-sec>mark,
+.addtax-modal-tax-commission-sec>mark {
+	float: left;
+	overflow: hidden;
+	background-color: transparent;
+	padding-top: 5px;
+	padding-left: 10px;
+}
+
+.detail-modal-bargaininfo-commission-sec>mark>img,
+.addtax-modal-tax-commission-sec>mark>img  {
+	float: left;
+	width: 20px;
+}
+
+#bargaininfo_commission_add_btn {
+	width: 100%;
+	margin-bottom: 20px;
+}
+
+#bargaininfo_commission_add_btn>img {
 	display: block;
+	margin: 0 auto;
+}
+
+/*详情弹出框,分佣提成*/
+.detail-modal-maid-top-btn-area{
+	padding: 0 10px 10px;
+}
+.detail-modal-maid-bottom-btn-area>a{
+	
+}
+[href="#modal_new_maid"]{
+	float: left;
+	display: none;
+}
+#maid_new_btn{
+	float: right;
+}
+#maid_table_main>thead th:nth-last-of-type(-n+6){
+	width: 91px;
+}
+
+#maid_table_main>thead th:nth-last-of-type(1){
+	width: 149px;
+}
+
+.detail-modal-maid-mix-td{
+	padding: 0!important;
+}
+.detail-modal-maid-mix-td>div{
 	width: 100%;
-	height: 660px;
+	height: 100%;
+}
+
+.detail-modal-maid-mix-td>div>span{
+	float: left;
+	width: 91px;
+	height: 30px;
+	line-height: 30px;
+	border-right: 1px solid #ddd;
+	border-bottom: 1px solid #ddd;
+}
+.detail-modal-maid-mix-td>div:nth-last-of-type(1)>span{
+	border-bottom: none;
+}
+
+.detail-modal-maid-mix-td>div>span:nth-last-of-type(1){
+	width: 146px;
+	border-right: none;
+}
+
+/*详情弹出框,开票税费*/
+.addtax-modal-tax-table{
+	width:600px;
+}
+.addtax-modal-tax-table td{
+	line-height: 36px;
+	text-align: center;
+}
+#tax_main_box{
+	margin-top: 30px;
+}
+#tax_main_box>section{
+	overflow: hidden;
+	width: 680px;
+	margin: 0 auto;
+}
+#tax_main_box>section+section{
+	margin-top: 40px;
+}
+#tax_main_box>section>div{
+	float: left;
+}
+#tax_main_box>section>div:nth-of-type(2){
+	padding-left: 20px;
+	padding-top: 50px;
+}
+
+.addtax-modal-tax-table{
+	width: 500px;
+	margin:  0 auto;
+}
+
+.addtax-modal-tax-table td{
+	text-align: center;
+	line-height: 40px;
 }
 
+/********************/
+
+/*新增分佣提成弹框部分样式*/
+#addmaid_input_area>div{
+	overflow: hidden;
+	padding: 5px 0;
+}
+#addmaid_input_area>div>span{
+	float: left;
+	height: 34px;
+	line-height: 34px;
+}
+#addmaid_input_area>div>select,
+#addmaid_input_area>div>input{
+	float: left;
+	width: 60%;
+}
+#addmaid_input_area>div>span:nth-of-type(1){
+	display: inline-block;
+	width: 80px;
+}
+#addmaid_input_area>div>span:nth-of-type(2){
+	padding-left: 10px;
+}
+[href="#modal_new_maid_select"]{
+	display: none;
+}
+
+#addmaid_select_ul{
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+#addmaid_select_ul>li{
+	height: 50px;
+	line-height: 50px;
+	cursor: pointer;
+}
+#addmaid_select_ul>li:hover{
+	background-color: rgba(0, 0, 0, .2);
+}
 
 
 /****************************************************************/
@@ -43,7 +256,20 @@ addtax_
 	margin-top: -20px;
 }
 
-
+/*新增分佣提成*/
+#addmaid_input_ywy+ul{
+	width: 60%;
+	margin-left: 80px;
+    list-style: none;
+    padding-left: 0;
+    border: 1px solid #ccc;
+    border-top: none;
+    background-color: white;
+    display: none;
+}
+#addmaid_input_ywy+ul>li{
+	line-height: 40px;
+}
 
 
 /*******************/
@@ -67,9 +293,31 @@ addtax_
 
 
 
+#modal_detail>div {
+	/*width: 1030px;*/
+	width: 1250px;
+}
 
+/*成交信息tab*/
+.detail-modal-bargaininfo-span-beizhu{
+	/*display: inline-block;
+	height: 150px;
+	line-height: 150px;*/
+}
+#bargaininfo_beizhu{
+	width: 480px;
+	height: 150px;
+}
 
 
+/*详情弹出框，开票税费下的表格*/
+.detail-modal-tax-table{
+	width: 600px;
+}
+.detail-modal-tax-table td{
+	height: 40px;
+	text-align: center;
+}
 /*main-table部分,待补充*/
 .maintable-tr-bar{}
 .maintable-tr-bar>th:nth-of-type(1){}

public/resource/css/report_list_newtri.css

+/*
+ * id为pagediv的无法修改，与分页插件有关
+maintable-
+detail-modal-
+detail-modal-bargaininfo-
+detail-modal-maid-
+detail-modal-tax-
+pass-modal-
+addtax-modal-
+addmaid-modal-
+
+bargaininfo_
+addtax_
+ * 
+ * 
+ * 
+ * */
+/*页面主要内容table区域*/
+#maintable_form_span_zhi{
+	margin-left: 10px;
+}
+
+/*详情弹出框*/
+#modal_detail>div {
+	/*width: 1030px;*/
+	width: 1250px;
+}
+#modal_detail>div>iframe{
+	display: block;
+	width: 100%;
+	height: 660px;
+}
+
+
+
+/****************************************************************/
+
+
+/*弹出框,通过*/
+#pass_beizhu {
+	width: 80%;
+	margin-left: 48px;
+	margin-top: -20px;
+}
+
+
+
+
+/*******************/
+.clear {
+	clear: both;
+}
+
+.clear div {
+	clear: both;
+}
+
+.right-data {
+	float: right;
+}
+
+.right-date {
+	margin-left: 130px;
+}
+
+/*输入框自定义样式*/
+
+
+
+
+
+
+/*main-table部分,待补充*/
+.maintable-tr-bar{}
+.maintable-tr-bar>th:nth-of-type(1){}
+
+
+

public/resource/css/report_list_ori.css

-/*
- * id为pagediv的无法修改，与分页插件有关
-maintable-
-detail-modal-
-detail-modal-bargaininfo-
-detail-modal-maid-
-detail-modal-tax-
-pass-modal-
-addtax-modal-
-addmaid-modal-
-
-bargaininfo_
-addtax_
- * 
- * 
- * 
- * */
-/*页面主要内容table区域*/
-#maintable_form_span_zhi{
-	margin-left: 10px;
-}
-
-/*详情弹出框*/
-.detail-modal-body {
-	height: 660px;
-	overflow-y: scroll;
-}
-.detail-modal-body-sec+.detail-modal-body-sec{
-	display: none;
-}
-/*详情弹出框,成交信息*/
-.detail-modal-bargaininfo-main-left {
-	float: left;
-	width: 340px;
-	line-height: 36px;
-}
-
-#bargaininfo_is_open,
-#bargaininfo_type {
-	width: 100px !important;
-	display: inline-block;
-}
-
-.detail-modal-bargaininfo-main-right {
-	line-height: 36px;
-	width: 560px;
-}
-
-#bargaininfo_total_commission {
-	width: 150px;
-	display: inline-block;
-	height: 26px;
-	padding: 3px 6px
-}
-
-.detail-modal-bargaininfo-form {
-	line-height: 48px;
-	width: 620px;
-    margin: 0 auto;
-}
-
-.detail-modal-bargaininfo-commission-inputpar {
-	float: left;
-	width: 100%;
-	overflow: hidden;
-	clear: both;
-}
-
-.detail-modal-bargaininfo-commission-sec,
-.addtax-modal-tax-commission-sec {
-	overflow: hidden;
-}
-
-.detail-modal-bargaininfo-commission-sec>label,
-.addtax-modal-tax-commission-sec>label {
-	float: left;
-}
-
-.detail-modal-bargaininfo-commission-sec>label:nth-of-type(2),
-.addtax-modal-tax-commission-sec>label:nth-of-type(2) {
-	margin-left: 50px;
-}
-
-.detail-modal-bargaininfo-commission-sec>div,
-.addtax-modal-tax-commission-sec>div {
-	float: left;
-	width: 160px;
-}
-
-.detail-modal-bargaininfo-commission-sec>mark,
-.addtax-modal-tax-commission-sec>mark {
-	float: left;
-	overflow: hidden;
-	background-color: transparent;
-	padding-top: 5px;
-	padding-left: 10px;
-}
-
-.detail-modal-bargaininfo-commission-sec>mark>img,
-.addtax-modal-tax-commission-sec>mark>img  {
-	float: left;
-	width: 20px;
-}
-
-#bargaininfo_commission_add_btn {
-	width: 100%;
-	margin-bottom: 20px;
-}
-
-#bargaininfo_commission_add_btn>img {
-	display: block;
-	margin: 0 auto;
-}
-
-/*详情弹出框,分佣提成*/
-.detail-modal-maid-top-btn-area{
-	padding: 0 10px 10px;
-}
-.detail-modal-maid-bottom-btn-area>a{
-	
-}
-[href="#modal_new_maid"]{
-	float: left;
-	display: none;
-}
-#maid_new_btn{
-	float: right;
-}
-#maid_table_main>thead th:nth-last-of-type(-n+6){
-	width: 91px;
-}
-
-#maid_table_main>thead th:nth-last-of-type(1){
-	width: 149px;
-}
-
-.detail-modal-maid-mix-td{
-	padding: 0!important;
-}
-.detail-modal-maid-mix-td>div{
-	width: 100%;
-	height: 100%;
-}
-
-.detail-modal-maid-mix-td>div>span{
-	float: left;
-	width: 91px;
-	height: 30px;
-	line-height: 30px;
-	border-right: 1px solid #ddd;
-	border-bottom: 1px solid #ddd;
-}
-.detail-modal-maid-mix-td>div:nth-last-of-type(1)>span{
-	border-bottom: none;
-}
-
-.detail-modal-maid-mix-td>div>span:nth-last-of-type(1){
-	width: 146px;
-	border-right: none;
-}
-
-/*详情弹出框,开票税费*/
-.addtax-modal-tax-table{
-	width:600px;
-}
-.addtax-modal-tax-table td{
-	line-height: 36px;
-	text-align: center;
-}
-#tax_main_box{
-	margin-top: 30px;
-}
-#tax_main_box>section{
-	overflow: hidden;
-	width: 680px;
-	margin: 0 auto;
-}
-#tax_main_box>section+section{
-	margin-top: 40px;
-}
-#tax_main_box>section>div{
-	float: left;
-}
-#tax_main_box>section>div:nth-of-type(2){
-	padding-left: 20px;
-	padding-top: 50px;
-}
-
-.addtax-modal-tax-table{
-	width: 500px;
-	margin:  0 auto;
-}
-
-.addtax-modal-tax-table td{
-	text-align: center;
-	line-height: 40px;
-}
-
-/********************/
-
-/*新增分佣提成弹框部分样式*/
-#addmaid_input_area>div{
-	overflow: hidden;
-	padding: 5px 0;
-}
-#addmaid_input_area>div>span{
-	float: left;
-	height: 34px;
-	line-height: 34px;
-}
-#addmaid_input_area>div>select,
-#addmaid_input_area>div>input{
-	float: left;
-	width: 60%;
-}
-#addmaid_input_area>div>span:nth-of-type(1){
-	display: inline-block;
-	width: 80px;
-}
-#addmaid_input_area>div>span:nth-of-type(2){
-	padding-left: 10px;
-}
-[href="#modal_new_maid_select"]{
-	display: none;
-}
-
-#addmaid_select_ul{
-	list-style: none;
-	padding: 0;
-	margin: 0;
-}
-#addmaid_select_ul>li{
-	height: 50px;
-	line-height: 50px;
-	cursor: pointer;
-}
-#addmaid_select_ul>li:hover{
-	background-color: rgba(0, 0, 0, .2);
-}
-
-
-/****************************************************************/
-
-
-/*弹出框,通过*/
-#pass_beizhu {
-	width: 80%;
-	margin-left: 48px;
-	margin-top: -20px;
-}
-
-/*新增分佣提成*/
-#addmaid_input_ywy+ul{
-	width: 60%;
-	margin-left: 80px;
-    list-style: none;
-    padding-left: 0;
-    border: 1px solid #ccc;
-    border-top: none;
-    background-color: white;
-    display: none;
-}
-#addmaid_input_ywy+ul>li{
-	line-height: 40px;
-}
-
-
-/*******************/
-.clear {
-	clear: both;
-}
-
-.clear div {
-	clear: both;
-}
-
-.right-data {
-	float: right;
-}
-
-.right-date {
-	margin-left: 130px;
-}
-
-/*输入框自定义样式*/
-
-
-
-#modal_detail>div {
-	/*width: 1030px;*/
-	width: 1250px;
-}
-
-/*成交信息tab*/
-.detail-modal-bargaininfo-span-beizhu{
-	/*display: inline-block;
-	height: 150px;
-	line-height: 150px;*/
-}
-#bargaininfo_beizhu{
-	width: 480px;
-	height: 150px;
-}
-
-
-/*详情弹出框，开票税费下的表格*/
-.detail-modal-tax-table{
-	width: 600px;
-}
-.detail-modal-tax-table td{
-	height: 40px;
-	text-align: center;
-}
-/*main-table部分,待补充*/
-.maintable-tr-bar{}
-.maintable-tr-bar>th:nth-of-type(1){}
-
-
-

public/resource/js/auth_rule_index.js

@@ -14,8 +14,9 @@ authRule={
         });
         $ (document).delegate (".edit", "click", function () {//点击编辑
             authRule.house_id = $ (this).attr ("data-id");
-            authRule.Edid_add();
-            authRule.Edit();
+            authRule.Edid_add(function(){
+            	authRule.Edit();
+            });
         });
         $ (document).delegate (".submit_edit", "click", function () {//提交编辑
             authRule.Submit_edit();
@@ -61,7 +62,8 @@ authRule={
 
         });
     },
-    Edid_add:function(){
+     
+    Edid_add:function(fn){
         $.ajax({
             url: '/index/classList/type/1',//获取后台菜单
             type: 'GET',
@@ -72,9 +74,11 @@ authRule={
                 var temp=document.getElementById('auth_class_tpl').innerHTML;
                 var doTempl=doT.template(temp);
                 $("#pid").html(doTempl(data.data));//赋值
+                fn && fn();//加载完模板 在修改dom
             }
         });
     },
+    
     Edit:function(){//获取
         $.ajax({
             'type': 'GET',
@@ -84,10 +88,10 @@ authRule={
             dataType: "json",
             success: function (data) {
                 $("input[name = id]").val(data.data.id);
-                $("input[name = title]").val(data.data.title2);
+                $("input[name = title]").val(data.data.title);
                 $("input[name = name]").val(data.data.name);
                 $("input[name = sort]").val(data.data.sort);
-                $("#pid").val(data.data.pid);
+                $("select[name = pid2]").val(data.data.pid)
                 if(data.data.is_menu==0){
                     $("#is_menu2").attr('checked',true);
                 }else{
@@ -96,6 +100,7 @@ authRule={
             }
         });
     },
+   
     Submit_edit:function(){//提交编辑的信息
         var par={}
         par.id= authRule.house_id;

public/resource/js/reportList.js

@@ -95,7 +95,6 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
 				bargain.detailTabIndex = 0;
 				$('.detail-modal-body-sec:nth-of-type(1)').show().siblings().hide();
 				bargain.bargaininfoShow();
-				$('#modal_detail').find('iframe').attr('src', '/app_broker/bargaininfo_detail_pc');
 			});
 			
 			//详情弹出框里的tab点击事件,成交信息，分佣提成，开票税费
@@ -448,6 +447,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
 							$("#bargaininfo_type").val(data.data.trade_type);
 							$("#bargaininfo_total_commission").val(data.data.commission);
 							$("#bargaininfo_create_time").html(data.data.create_time);
+							$("#bargaininfo_yetai").val(data.data.industry_type);
+							$("#bargaininfo_chengjiao_price").val(data.data.price);
 							
 							bargain.maidTotalCommission = Number(data.data.commission);//总佣金
 							bargain.order_id = Number(data.data.order_id);//订单id
@@ -479,7 +480,10 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
 				'commission': $.trim($('#bargaininfo_total_commission').val()),
 				'content': $.trim($('#bargaininfo_beizhu').val()),
 				'is_open': $('#bargaininfo_is_open').val(),
-				'trade_type': $('#bargaininfo_type').val()
+				'trade_type': $('#bargaininfo_type').val(),
+				'industry_type': $.trim($('#bargaininfo_yetai').val()),
+				'price': $('#bargaininfo_chengjiao_price').val()
+				
 			};
 			$.each($('.detail-modal-bargaininfo-commission-sec'), function(i, v) {
 				_data['practical_fee['+i+']'] = {

public/resource/js/reportList_newtri.js

+define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_shuiFee_template_tpl.html', 'text!temp/reportList_maid_template_tpl.html', 'text!temp/reportList_maid_sub1_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
+	bargain = {
+		pageNo: 1,
+		/*第几页*/
+		pageSize: 10,
+		/*每页显示多少条*/
+		mainTabIndex: 0,
+		detailTabIndex: 0,
+		bargain_id: '',
+		order_id: 0, //订单id
+		panfangData: null,
+		maidTotalCommission: 0, //应收总佣金
+		init: function() {
+			//初始化dot
+			$(document.body).append(template + template_tax + template_maid + template_maid_sub1);
+			bargain.getList(1);
+			bargain.event();
+		},
+		event: function() {
+			var _doc = $(document);
+			//主页面一级审核，二级审核，三级审核，结单四个tab的点击事件
+			//专员审核 总监审核 经理审核 出纳审核
+			_doc.on('click', '.maintable-top-sub-tr>a', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+				var _this = $(this);
+
+				_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
+				bargain.mainTabIndex = _this.index();
+				console.log(bargain.mainTabIndex);
+				bargain.getList(1);
+			});
+
+			//搜索按钮的事件
+			_doc.on('click', '#maintable_search', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+				bargain.getList(1); //一级审核搜索
+			});
+
+			//搜索的重置
+			$("#maintable_reset").click(function() {
+				document.getElementById("maintable_form_search").reset();
+			});
+
+			//时间轴按钮
+			_doc.on("click", ".timeline", function() {
+				bargain.Timeline();
+			});
+
+			//转到一级审核
+			_doc.on('click', '.maintable-btn-trans-one', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+				bargain.bargain_id = $(this).closest('tr').attr("data-id");
+				layer.open({
+					content: '确定转到一级审核?',
+					btn: ['确定', '取消'],
+					yes: function(_index) {
+						bargain.transFirstExamine();
+						layer.close(_index);
+					}
+				});
+			});
+
+			//结单
+			_doc.on('click', '.maintable-btn-account', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+				bargain.bargain_id = $(this).closest('tr').attr("data-id");
+				layer.open({
+					content: '确定结单?',
+					btn: ['确定', '取消'],
+					yes: function(_index) {
+						bargain.account();
+						layer.close(_index);
+					}
+				});
+			});
+
+			//点击通过,修改全局bargain_id,弹出框出来
+			_doc.on('click', '[href=\"#modal-pass\"]', function() {
+				bargain.bargain_id = $(this).closest('tr').attr("data-id");
+			});
+
+			//点击通过，确定按钮触发的事件
+			_doc.on('click', '#pass_ok_btn', function() {
+				bargain.pass();
+			});
+
+			//点击详情按钮事件，获取报告详情
+			_doc.on('click', '.details-btn', function() {
+				bargain.bargain_id = $(this).closest('tr').attr("data-id");
+				$('#modal_detail').find('iframe').attr('src', '/app_broker/bargaininfo_detail_pc?bargain_id=' + bargain.bargain_id);
+			});
+
+			//时间轴点击事件
+			_doc.on('click', 'a[href="#modal-time"]', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+				var _this = $(this);
+				var _id = _this.closest('tr').data('orderid');
+				console.log(_id);
+				$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id=' + _id);
+			});
+		},
+
+		//通过
+		pass: function() { //点击通过
+			var a_url = '';
+			if(bargain.mainTabIndex == 0) {
+				a_url = "/index/checkReportAttache/0"
+			};
+			if(bargain.mainTabIndex == 1) {
+				a_url = "/index/checkReportManager/1"
+			};
+			//			if(bargain.mainTabIndex == 2) {
+			//				a_url = "/index/checkReportMajordomo/2"
+			//			};
+			//			if(bargain.mainTabIndex == 3) {
+			//				a_url = "/index/checkReportCashier/3"
+			//			};
+			//审核来源 1.成交报告申请结单 2.待撤销（退款） 3.申请撤销成交报告
+			//成交报告状态 10已提交 20待撤销
+			$.ajax({
+				'type': 'POST',
+				'url': a_url,
+				data: {
+					"id": bargain.bargain_id,
+					"source": 1,
+					"status": 10,
+					"remark": $.trim($("#pass_beizhu").val()),
+				},
+				dataType: "json",
+				success: function(data) {
+					if(data.code == 200) {
+						if(data.data) {
+
+							bargain.getList(1);
+						}
+					} else {
+						alert('获取失败！');
+					}
+				}
+			});
+		},
+
+		//转到一级审核
+		transFirstExamine: function() {
+			$.ajax({
+				type: 'POST',
+				url: '/index/toReportListOne',
+				data: {
+					'bargain_id': bargain.bargain_id
+				},
+				timeout: 30000,
+				dataType: 'json',
+				beforeSend: function() {},
+				success: function(_data) {
+					if(typeof _data === 'object') {
+						if(_data['code'] == '200') {
+							alert('修改成功');
+							bargain.getList(1);
+						} else {
+							layerTipsX(_data['msg']);
+						}
+					} else {
+						layerTipsX('数据错误');
+					};
+				},
+				error: function() {
+					layerTipsX('enter error');
+				},
+				complete: function(xhr, textStatus) {
+					if(textStatus === 'timeout') {
+						//处理超时的逻辑
+						layerTipsX('请求超时,请重试');
+					};
+				}
+			});
+		},
+		account: function() {
+			$.ajax({
+				type: 'POST',
+				url: '/index/checkOver',
+				data: {
+					'bargain_id': bargain.bargain_id
+				},
+				timeout: 30000,
+				dataType: 'json',
+				beforeSend: function() {},
+				success: function(_data) {
+					if(typeof _data === 'object') {
+						if(_data['code'] == '200') {
+							alert('结单成功!');
+							bargain.getList(1);
+						} else {
+							layerTipsX(_data['msg']);
+						}
+					} else {
+						layerTipsX('数据错误');
+					};
+				},
+				error: function() {
+					layerTipsX('enter error');
+				},
+				complete: function(xhr, textStatus) {
+					if(textStatus === 'timeout') {
+						//处理超时的逻辑
+						layerTipsX('请求超时,请重试');
+					};
+				}
+			});
+		},
+		//获取一级审核，二级审核，三级审核，结单不同的ajax请求url
+		switchUrl: function() {
+			switch(Number(this.mainTabIndex)) {
+				case 0:
+					return '/index/reportListOne/1';
+				case 1:
+					return '/index/reportListTwo/2';
+				case 2:
+					return '/index/reportListThree/3';
+				case 3:
+					return '/index/reportListStatement/4';
+				default:
+					return '';
+			}
+		},
+		//获取一级审核，二级审核，三级审核，结单数据列表共用的方法
+		getList: function(pageNo) {
+			console.count('bar');
+			var params = {
+				'pageNo': pageNo,
+				'pageSize': bargain.pageSize,
+				'create_time': $.trim($('#maintable_create_time').val()),
+				'end_time': $.trim($('#maintable_end_time').val()),
+				'internal_address': $.trim($('#maintable_internal_address').val()),
+				'user_phone': $.trim($('#maintable_user_phone').val()),
+				'house_number': $.trim($('#maintable_shop_num').val())
+			};
+			$.ajax({
+				type: 'GET',
+				url: bargain.switchUrl(),
+				data: params,
+				timeout: 30000,
+				dataType: 'json',
+				beforeSend: function() {},
+				success: function(data) {
+					if(typeof data === 'object') {
+						if(data.code == 200) {
+							var doTtmpl = doT.template(document.getElementById('reportList_list_tpl').innerHTML);
+							$("#maintable_list").html(doTtmpl(data.data));
+							// var user_info_obj = JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo')));
+							/*分页代码*/
+							add_page(data.data.total, pageNo, bargain.pageSize, bargain.getList);
+
+						} else {
+							alert(data['msg']);
+						};
+					} else {
+						alert('数据错误');
+					};
+				},
+				error: function() {
+					alert('error');
+				},
+				complete: function(xhr, textStatus) {
+					if(textStatus === 'timeout') {
+						alert('请求超时');
+					};
+				}
+			});
+		}
+	};
+	return bargain;
+});
\ No newline at end of file

public/resource/js/user.js

@@ -12,6 +12,7 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
             user.getList ();
             user.event ();
             user.getDistrict();
+            user.getDistricttwo();
             //时间控件初始化
          /*   $('#datetimepicker').datetimepicker({
                 format: 'yyyy-MM-dd',
@@ -393,7 +394,9 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
             params.rent_user=$("select[name=public_status]").val();
             params.public_user=$("select[name=male_status]").val();
             params.store_name=$("#guest_stores").val();
-            params.district_id=$("#district_id").val()
+            params.referrer_store_name=$("#guest_stores2").val();
+            params.district_name=$("#district_id").val()
+            params.referrer_district_id=$("#district_id2").val()
             params.login_status = $("select[name=login_status]").val();
             params.activate = $("select[name=activate]").val();
             params.pageNo = user.pageNo;
@@ -403,10 +406,6 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
             params.price_type = $("select[name=price_type]").val();
             params.industry_type = $("select[name=industry_type]").val();
             
-            
-            
-            
-
             $.ajax ({
                 url: '/index/users_list',
                 type: 'GET',
@@ -423,7 +422,7 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
                     add_page(data.data.total,pageNo,user.pageSize,user.getList);
                     $("#total_page").html(data.data.total);
                     console.log(data.data.total);
-                    console.log(user.pageSize);+
+                    console.log(user.pageSize);
                     console.log(pageNo);
 
 
@@ -432,7 +431,7 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
         },
         add_user : function () {
             var params = {};
-            params.user_nick    = $("#add_user_form input[name='user_nick']").val();
+            params.user_name    = $("#add_user_form input[name='user_name']").val();
             params.user_phone  = $("#add_user_form input[name='user_phone']").val();
             params.agents_id  = $("#add_user_form input[name='agent_id']").val();//客方
             params.sex = $("#user_sex option:selected").val();
@@ -441,9 +440,9 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
             params.industry_type=$("#industry_type2").val();
             params.type='add';
        
-            if (params.user_nick == '') {
+            if (params.user_name == '') {
                 alert('姓名不能为空');
-                $("input[name='realname']").focus();
+                $("input[name='user_name']").focus();
                 return ;
             }
             if (params.user_phone == '') {
@@ -524,6 +523,26 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
                             str += '<option value="'+item.id+'">'+item.district_name+'</option>';
                         });
                         $("#district_id").html(str);
+                        
+                    }
+                }
+            });
+        },
+         getDistricttwo : function () {
+            $.ajax ({
+                url: '/index/getDistrict',
+                type: 'GET',
+                async: true,
+                data: {"pageSize":50},
+                dataType: 'json',
+                success: function (data) {
+                    if (data.code == 200 && data.data != null) {
+                        var str = '<option value="-1">邀请人所属部门</option>';
+                        $.each(data.data, function(i,item) {
+                            str += '<option value="'+item.id+'">'+item.district_name+'</option>';
+                        });
+                        $("#district_id2").html(str);
+                        
                     }
                 }
             });

public/resource/template/auth_rule_index_template_tpl.html

@@ -33,7 +33,7 @@
 </script>
 <!--权限管理模板-->
 <script id="auth_class_tpl" type="text/template">
-    <option selected="" value="0">顶级菜单</option>
+    <option value="0">顶级菜单</option>
     [% if(it) { %]
     [% for(var item in it){ %]
 

public/resource/template/user_template_tpl.html

@@ -17,9 +17,9 @@
         </td>
         <td>
             [% if(it[item]["status"] == -1) { %]
-                未激活
+                未注册
             [% }else if(it[item]["status"] == 0) { %]
-                已激活
+                注册
             [% }else{ %]
                 删除
             [% } %]