From 878414aeb2108e0b8c6be9adaa9b6c4de726b0bc Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 29 Apr 2020 13:52:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TestResourceController.class.php          | 16 ++++++-
 .../View/TestResource/supportNumberList.html  | 47 +++++++++++++++++--
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/TestResourceController.class.php b/Application/Admin/Controller/TestResourceController.class.php
index f9d1fde7a..6a22b9c3d 100644
--- a/Application/Admin/Controller/TestResourceController.class.php
+++ b/Application/Admin/Controller/TestResourceController.class.php
@@ -78,8 +78,18 @@ class TestResourceController extends ThinkController
       if(!empty(I('user_account'))){
           $map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
       }
-      if(!empty(I('promote_name'))){
-          $map['tab_test_resource.promote_account']=['like','%'.I('promote_name').'%'];
+      if(!empty(I('promote_id'))){
+
+          $promote_id = I('promote_id');
+
+          $promnote_arr = M("promote","tab_")->field("id")->where("chain like '%/{$promote_id}/%'")->select();
+
+          $promnote_arr  = array_column($promnote_arr,"id");
+          array_push($promnote_arr,$promote_id);
+
+          $promnote_arr = implode(",",$promnote_arr);
+
+          $map['tab_test_resource.promote_id']=['in',$promnote_arr];
       }
       //为数据权限添加
       setPowerPromoteIds($map, 'tab_test_resource.promote_id');
@@ -91,6 +101,8 @@ class TestResourceController extends ThinkController
           ->order('tab_test_resource.create_time DESC')
           ->select();
 
+//      var_dump($data);die();
+
       foreach ($data as $key => $value) {
           $data[$key]['create_time'] = date('Y-m-d H:i:s',$value['create_time']);
       }
diff --git a/Application/Admin/View/TestResource/supportNumberList.html b/Application/Admin/View/TestResource/supportNumberList.html
index 341c8abf6..98ddc53c2 100644
--- a/Application/Admin/View/TestResource/supportNumberList.html
+++ b/Application/Admin/View/TestResource/supportNumberList.html
@@ -74,10 +74,27 @@
 
         <input type="text"  name="user_account" placeholder="测试账号" class="" value="{:I('user_account')}"/>&nbsp;
       </div>
-      <div class="input-list">
-
-        <input type="text"  name="promote_name" placeholder="所属推广员" class="" value="{:I('promote_name')}"/>&nbsp;
+<!--      <div class="input-list">-->
+
+<!--        <input type="text"  name="promote_name" placeholder="所属推广员" class="" value="{:I('promote_name')}"/>&nbsp;-->
+<!--      </div>-->
+
+      <div class="input-list search_item input-list-gamenoticestatus">
+        <select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">
+          <option value="">请选择推广员等级</option>
+          <option value="1" <?php if ($_POST['promote_level'] == 1):?>selected<?php endif;?>>会长</option>
+          <option value="2" <?php if ($_POST['promote_level'] == 2):?>selected<?php endif;?>>部门长</option>
+          <option value="3" <?php if ($_POST['promote_level'] == 3):?>selected<?php endif;?>>组长</option>
+          <option value="4" <?php if ($_POST['promote_level'] == 4):?>selected<?php endif;?>>组员</option>
+        </select>
+        -
       </div>
+      <div class="input-list search_item input-list-gamenoticestatus">
+        <select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
+          <option value="">请选择推广员</option>
+        </select>
+      </div>
+
       </empty>
       <input type="hidden" name="" value="" class="sortBy">
       <input type="hidden" name="type" value="{$_GET['type']}">
@@ -200,6 +217,7 @@
   <script type="text/javascript">
     //导航高亮
     highlight_subnav('{:U('testResource/supportNumberList')}');
+    $(".select_gallery").select2();
     $(function(){
 
       $('.froze-btn').on({
@@ -221,6 +239,29 @@
         }
       })
 
+
+      var promote_id = "{:I('promote_id')}";
+      $("#promote_level").change(function(){
+        $.ajax({
+          url:"{:U('Ajax/getPromotersByLevelOther')}",
+          type:"get",
+          data:{level:$("#promote_level option:selected").val()},
+          dataType:'json',
+          success:function(response){
+            str = '<option value="">请选择推广员</option>' +
+              // '<option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>' +
+              '';
+            data = response.data;
+            for (var i in data){
+              str += "<option value='"+data[i].id+"' "+(promote_id && data[i].id == promote_id?'selected':'')+">"+data[i].nickname+"</option>"
+            }
+            $("#promote_id").empty();
+            $("#promote_id").append(str);
+            $("#promote_id").select2();
+          }
+        })
+      });
+      $("#promote_level").change();
       $('#batch_freeze').click(function () {
         var ids = $('.ids:checked');
 

From 132b601f7453246f0301f7a4cd93db3f7159e8a8 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 29 Apr 2020 15:12:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/AjaxController.class.php | 11 ++++++++
 .../TestResourceController.class.php          |  7 +++++-
 .../Admin/Model/PromoteModel.class.php        | 25 +++++++++++++++++++
 .../View/TestResource/supportNumberList.html  |  2 +-
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php
index c438a2f3f..f579f16c6 100644
--- a/Application/Admin/Controller/AjaxController.class.php
+++ b/Application/Admin/Controller/AjaxController.class.php
@@ -587,4 +587,15 @@ class AjaxController extends ThinkController{
         $result = M('promote', 'tab_')->field("id,account,nickname")->where(['parent_id'=>$pid])->select();
         $this->ajaxReturn(['code'=>1, 'data'=>$result]);
     }
+
+    public function getPromotersByLevelResource()
+    {
+        $level = I('level');
+        if (!$level) {
+//            return $this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>[]]);
+            $level = '';
+        }
+        $this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>(new PromoteModel)->getPromotersByLevelResource($level)]);
+    }
+
 }
\ No newline at end of file
diff --git a/Application/Admin/Controller/TestResourceController.class.php b/Application/Admin/Controller/TestResourceController.class.php
index 6a22b9c3d..b2ee6593b 100644
--- a/Application/Admin/Controller/TestResourceController.class.php
+++ b/Application/Admin/Controller/TestResourceController.class.php
@@ -78,7 +78,7 @@ class TestResourceController extends ThinkController
       if(!empty(I('user_account'))){
           $map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
       }
-      if(!empty(I('promote_id'))){
+      if(!empty(I('promote_id')) || I('promote_id')=="0"){
 
           $promote_id = I('promote_id');
 
@@ -90,6 +90,11 @@ class TestResourceController extends ThinkController
           $promnote_arr = implode(",",$promnote_arr);
 
           $map['tab_test_resource.promote_id']=['in',$promnote_arr];
+
+          if (!I("promote_level")) {
+              $map['tab_test_resource.promote_id']=I('promote_id');
+          }
+
       }
       //为数据权限添加
       setPowerPromoteIds($map, 'tab_test_resource.promote_id');
diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php
index 6b80b7179..b5d1d781f 100644
--- a/Application/Admin/Model/PromoteModel.class.php
+++ b/Application/Admin/Model/PromoteModel.class.php
@@ -450,5 +450,30 @@ class PromoteModel extends Model{
         
     }
 
+    public function getPromotersByLevelResource($level)
+    {
+
+        if ($level) {
+            $where['level'] =  $level;
+        }
+
+        $userAuth = session('user_auth');
+        setPowerPromoteIds($where,'id');
+
+        $offcialData = [0=>['id'=>0,'nickname'=>'官方渠道']];
+
+        $result = $this->field("*")->where($where)->select();
+        foreach ($result as &$item) {
+            $item['nickname'] = $item['account'] . ($item['nickname'] ? "({$item['nickname']})" : "");
+        }
+
+        if ((in_array('0',explode(',',$where['id'][1]))||$userAuth['data_empower_type']==1)) {
+            $result = array_merge($offcialData,$result);
+//            dump($result);die();
+        }
+
+        return $result;
+    }
+
 
 }
\ No newline at end of file
diff --git a/Application/Admin/View/TestResource/supportNumberList.html b/Application/Admin/View/TestResource/supportNumberList.html
index 98ddc53c2..41934642b 100644
--- a/Application/Admin/View/TestResource/supportNumberList.html
+++ b/Application/Admin/View/TestResource/supportNumberList.html
@@ -243,7 +243,7 @@
       var promote_id = "{:I('promote_id')}";
       $("#promote_level").change(function(){
         $.ajax({
-          url:"{:U('Ajax/getPromotersByLevelOther')}",
+          url:"{:U('Ajax/getPromotersByLevelResource')}",
           type:"get",
           data:{level:$("#promote_level option:selected").val()},
           dataType:'json',

From 6557938e535d9307cfa87ac4af3222ae9a3c33a1 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Sat, 9 May 2020 15:19:41 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=9A=E5=90=88?=
 =?UTF-8?q?=E6=B8=A0=E9=81=93=E8=B4=A2=E5=8A=A1=E7=BB=93=E7=AE=97=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AggregateFinanceStatementController.class.php    |  5 +++--
 .../AggregateFinanceStatement/createStatement.html   | 12 ++++++------
 .../AggregateFinanceStatement/editStatement.html     | 12 ++++++------
 .../Admin/View/AggregateFinanceStatement/lists.html  |  4 +++-
 .../AggregateFinanceStatement/viewStatement.html     | 12 ++++++------
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
index e1a3a7bcf..deab109d2 100644
--- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php
+++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
@@ -110,7 +110,8 @@ class AggregateFinanceStatementController extends ThinkController
 
             $data[$key]['oplist'] = $this->OpAuth($value);
         }
-        $count =  M("aggregate_statement","tab_")->field("count(id) count,SUM(ratio_money) ratio_money,SUM(pay_money) pay_money")->where($map)->find();
+        $count =  M("aggregate_statement","tab_")->field("count(id) count,SUM(ratio_money) ratio_money")->where($map)->find();
+        $pay_money_count = M("aggregate_statement","tab_")->field("SUM(pay_money) pay_money")->where($map)->where("withdraw_type <> 2")->find()['pay_money'];
 
         //分页
         $parameter['p'] = $page;
@@ -123,7 +124,7 @@ class AggregateFinanceStatementController extends ThinkController
         $this->assign('menubtn',$this->menuAuth());
         $this->assign('data',$data);
         $this->assign('total',$count['ratio_money']);
-        $this->assign('pay_money',$count['pay_money']);
+        $this->assign('pay_money',$pay_money_count);
         $this->assign('channel',$this->getAggChannel());
         $this->assign('verify_status',$this->verify_status);
         $this->display();
diff --git a/Application/Admin/View/AggregateFinanceStatement/createStatement.html b/Application/Admin/View/AggregateFinanceStatement/createStatement.html
index 15b16ea59..c2786ac5e 100644
--- a/Application/Admin/View/AggregateFinanceStatement/createStatement.html
+++ b/Application/Admin/View/AggregateFinanceStatement/createStatement.html
@@ -224,10 +224,10 @@
                 <tr>
                     <th style="border-right: solid 1px #b6cad2;">结算时间</th>
                     <th style="border-right: solid 1px #b6cad2;">产品</th>
-                    <th style="border-right: solid 1px #b6cad2;">平台总额</th>
+                    <th style="border-right: solid 1px #b6cad2;">平台总额(元)</th>
                     <th style="border-right: solid 1px #b6cad2;">分成比例</th>
                     <th style="border-right: solid 1px #b6cad2;">税费费率</th>
-                    <th >结算金额</th>
+                    <th >结算金额(元)</th>
                 </tr>
                 </thead>
 
@@ -408,20 +408,20 @@
         <tr>
             <td>${it.begintime}~${it.endtime}</td>
             <td>${it.game_name}</td>
-            <td>${it.money}元</td>
+            <td>${it.money}</td>
             <td><input type="text" class="txt statementchange" name="ratio" data-index ="${index}" data-change="statement_info[${index}]['ratio']" value="${it.ratio}" style="width: 40px;">%</td>
             <td><input type="text" class="txt statementchange" name="fax_ratio" data-index ="${index}" data-change="statement_info[${index}]['fax_ratio']" value="${it.fax_ratio}" style="width: 40px;">%</td>
-            <td>${it.ratio_money}元</td>
+            <td>${it.ratio_money}</td>
         </tr>
     {@/each}
 
     <tr>
         <td>合计</td>
         <td></td>
-        <td>${count.pay_money}元</td>
+        <td>${count.pay_money}</td>
         <td></td>
         <td></td>
-        <td>${count.ratio_money}元</td>
+        <td>${count.ratio_money}</td>
     </tr>
     <tr>
         <td colspan=5>本月分成总金额(人民币大写):</td>
diff --git a/Application/Admin/View/AggregateFinanceStatement/editStatement.html b/Application/Admin/View/AggregateFinanceStatement/editStatement.html
index 319ccda07..0a4759a80 100644
--- a/Application/Admin/View/AggregateFinanceStatement/editStatement.html
+++ b/Application/Admin/View/AggregateFinanceStatement/editStatement.html
@@ -210,10 +210,10 @@
                 <tr>
                     <th style="border-right: solid 1px #b6cad2;">结算时间</th>
                     <th style="border-right: solid 1px #b6cad2;">产品</th>
-                    <th style="border-right: solid 1px #b6cad2;">平台总额</th>
+                    <th style="border-right: solid 1px #b6cad2;">平台总额(元)</th>
                     <th style="border-right: solid 1px #b6cad2;">分成比例</th>
                     <th style="border-right: solid 1px #b6cad2;">税费费率</th>
-                    <th >结算金额</th>
+                    <th >结算金额(元)</th>
                 </tr>
                 </thead>
 
@@ -394,20 +394,20 @@
         <tr>
             <td>${it.begintime}~${it.endtime}</td>
             <td>${it.game_name}</td>
-            <td>${it.money}元</td>
+            <td>${it.money}</td>
             <td><input type="text" class="txt statementchange" name="ratio" data-index ="${index}" data-change="statement_info[${index}]['ratio']" value="${it.ratio}" style="width: 40px;">%</td>
             <td><input type="text" class="txt statementchange" name="fax_ratio" data-index ="${index}" data-change="statement_info[${index}]['fax_ratio']" value="${it.fax_ratio}" style="width: 40px;">%</td>
-            <td>${it.ratio_money}元</td>
+            <td>${it.ratio_money}</td>
         </tr>
     {@/each}
 
     <tr>
         <td>合计</td>
         <td></td>
-        <td>${count.pay_money}元</td>
+        <td>${count.pay_money}</td>
         <td></td>
         <td></td>
-        <td>${count.ratio_money}元</td>
+        <td>${count.ratio_money}</td>
     </tr>
     <tr>
         <td colspan=5>本月分成总金额(人民币大写):</td>
diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index f37b6fd03..9a828bb2a 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -132,6 +132,7 @@
                         <th>结算日期</th>
                         <th>结算周期</th>
                         <th>结算类型</th>
+                        <th>结算流水</th>
                         <th>结算金额</th>
                         <th>审批状态</th>
                         <th>操作人</th>
@@ -156,6 +157,7 @@
                                 <td>{$data.begintime}-{$data.endtime}</td>
                                 <td>{$data.withdraw_type_1}</td>
                                 <td>{$data.withdraw_type_2}</td>
+                                <td>{$data.pay_money}</td>
                                 <td>{$data.ratio_money}</td>
                                 <td>{$data.verify_status_str}</td>
                                 <td>{$data.admin_name}</td>
@@ -168,7 +170,7 @@
                                 
                             </tr>
                         </volist>
-                        <tr><td>合计</td><td colspan="10">结算总流水：{$pay_money}元&#12288;&#12288;&#12288;&#12288;结算金额：{$total}元 </td></tr>
+                        <tr><td>合计</td><td colspan="10">结算总流水：{$pay_money}元(补点单据不重复计算在内)&#12288;&#12288;&#12288;&#12288;结算总金额：{$total}元 </td></tr>
                     </notemtpy>
                     </tbody>
                 </table>
diff --git a/Application/Admin/View/AggregateFinanceStatement/viewStatement.html b/Application/Admin/View/AggregateFinanceStatement/viewStatement.html
index 9d7bf0bb3..037f7d39a 100644
--- a/Application/Admin/View/AggregateFinanceStatement/viewStatement.html
+++ b/Application/Admin/View/AggregateFinanceStatement/viewStatement.html
@@ -192,10 +192,10 @@
                 <tr>
                     <th style="border-right: solid 1px #b6cad2;">结算时间</th>
                     <th style="border-right: solid 1px #b6cad2;">产品</th>
-                    <th style="border-right: solid 1px #b6cad2;">平台总额</th>
+                    <th style="border-right: solid 1px #b6cad2;">平台总额(元)</th>
                     <th style="border-right: solid 1px #b6cad2;">分成比例</th>
                     <th style="border-right: solid 1px #b6cad2;">税费费率</th>
-                    <th >结算金额</th>
+                    <th >结算金额(元)</th>
                 </tr>
                 </thead>
                 <tbody id="statementShow">
@@ -203,10 +203,10 @@
                         <tr>
                             <td>{$it.begintime}~{$it.endtime}</td>
                             <td>{$it.game_name}</td>
-                            <td>{$it.money}元</td>
+                            <td>{$it.money}</td>
                             <td><input type="text" class="txt statementchange" name="ratio" disabled="disabled" value="{$it.ratio}" style="width: 40px;">%</td>
                             <td><input type="text" class="txt statementchange" name="fax_ratio" disabled="disabled" value="{$it.fax_ratio}" style="width: 40px;">%</td>
-                            <td>{$it.ratio_money}元</td>
+                            <td>{$it.ratio_money}</td>
                         </tr>
                         <!-- {$key}|{$vo} -->
                     </foreach>
@@ -214,10 +214,10 @@
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td>{$data.statement_count.pay_money}元</td>
+                        <td>{$data.statement_count.pay_money}</td>
                         <td></td>
                         <td></td>
-                        <td>{$data.statement_count.ratio_money}元</td>
+                        <td>{$data.statement_count.ratio_money}</td>
                     </tr>
                     <tr>
                         <td colspan=5>本月分成总金额(人民币大写):</td>

From e1e431804c895d75b00f449a460a0e24ed18197b Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Sat, 9 May 2020 15:36:36 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...gregateFinanceStatementController.class.php |  4 ++--
 .../View/AggregateFinanceStatement/lists.html  | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
index deab109d2..8de0b0f1d 100644
--- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php
+++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
@@ -8,10 +8,10 @@ namespace Admin\Controller;
 class AggregateFinanceStatementController extends ThinkController
 {
     public $verify_status = [
-        "-1"=>"审核拒绝", 
+        "-1"=>"审批拒绝", 
         "0"=>"未申请开票", 
         "1"=>"申请开票", 
-        "2"=>"审核同意", 
+        "2"=>"审批同意", 
         "3"=>"已开票", 
         "4"=>"已上传凭证", 
         "5"=>"已到账"
diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index 9a828bb2a..4715c0911 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -49,7 +49,7 @@
 
     <div class="cf main-place top_nav_list navtab_list">
         <h3 class="page_title">聚合渠道结算单管理</h3>
-       <p class="description_text">流程说明：结算自动生成对账单--->发起人申请开票--->财务审核开票--->寄发票--->发起人上传收款凭证--->财务确认到账</p>
+       <p class="description_text">流程说明：结算自动生成对账单--->发起人申请开票--->财务审批开票--->寄发票--->发起人上传收款凭证--->财务确认到账</p>
     </div>
     <div class="cf top_nav_list" style="height: 38px;">
         <!-- 高级搜索 -->
@@ -89,7 +89,7 @@
             
             <div class="input-list input-list-promote search_label_rehab">
                 <select id="verify_status" name="verify_status" class="select_gallery" >
-                    <option value="">请选择审核状态</option>
+                    <option value="">请选择审批状态</option>
                     <foreach name="verify_status" item="vo" >
                         <option  value="{$key}" <?php echo (isset($_REQUEST['verify_status']) && $key == I('verify_status')) ? 'selected':''; ?>  >{$vo}</option>
                     </foreach>
@@ -241,7 +241,7 @@
                     }
                 }).get().join(",");
                 if(text == ''){
-                    layer.msg("<font style='color:white'>" + '无需要审核通过的结算单,仅[已申请发票]状态可以进行审核通过' + "</font>");
+                    layer.msg("<font style='color:white'>" + '无需要审批通过的结算单,仅[已申请发票]状态可以进行审批通过' + "</font>");
                     return;
                 }
                 if(flag){
@@ -282,7 +282,7 @@
                     }
                 }).get().join(",");
                 if(text == ''){
-                    layer.msg("<font style='color:white'>" + '无需要审核拒绝的结算单,仅[已申请发票]状态可以进行审核拒绝' + "</font>");
+                    layer.msg("<font style='color:white'>" + '无需要批拒绝的结算单,仅[已申请发票]状态可以进行审批拒绝' + "</font>");
                     return;
                 }
                 if(flag){
@@ -323,11 +323,11 @@
                     }
                 }).get().join(",");
                 if(text == ''){
-                    layer.msg("<font style='color:white'>" + '无需要进行已开票的结算单,仅[审核同意]状态可以进行已开票' + "</font>");
+                    layer.msg("<font style='color:white'>" + '无需要进行已开票的结算单,仅[审批同意]状态可以进行已开票' + "</font>");
                     return;
                 }
                 if(flag){
-                    layer.confirm("已开票仅会对 [审核同意] 结算单处理，选择中包含其他的状态的结算单将被忽略，点击取消停止操作",{title:false}, function(index){    
+                    layer.confirm("已开票仅会对 [审批同意] 结算单处理，选择中包含其他的状态的结算单将被忽略，点击取消停止操作",{title:false}, function(index){    
                         _doInvoiced();                
                         layer.close(index);
                     });  
@@ -405,7 +405,7 @@
                     // return $(elem).val();
                 }).get().join(",");
                 if(text == ''){
-                    layer.msg("<font style='color:white'>" + '无需要进行重新结算的结算单,仅[未申请发票][申请开票][审核拒绝]状态可以进行重新结算' + "</font>");
+                    layer.msg("<font style='color:white'>" + '无需要进行重新结算的结算单,仅[未申请发票][申请开票][审批拒绝]状态可以进行重新结算' + "</font>");
                     return;
                 }
                 layer.confirm("重算结算金额会对结算单回退到未申请发票状态，请慎重处理，点击取消停止操作",{title:false}, function(index){    
@@ -577,10 +577,10 @@
                     content:"<div style='width: 300;height:auto;margin: auto;padding:20px;'>"+remark+"</div>"
                 });
             });
-            //撤销审核
+            //撤销审批
             $(".cancelVerify").click(function(){
                 var id = $(this).data("id");
-                layer.confirm("撤销审核将回退到[已申请开票]状态，点击取消停止操作",{title:false}, function(index){    
+                layer.confirm("撤销审批将回退到[已申请开票]状态，点击取消停止操作",{title:false}, function(index){    
                     $.ajax({
                         type: "POST",
                         url: "{:U('cancelVerify')}",