From 168e47693cb1c9c656203d24ebfbbae0d42ecabf Mon Sep 17 00:00:00 2001
From: ZHAOTONGHUA <2066753415@qq.com>
Date: Mon, 25 Nov 2019 16:06:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/views/finance/ticheng-jisuan.php | 13 ++++++-------
 frontend/views/gift/gift-use.php          | 16 ++++++++--------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/frontend/views/finance/ticheng-jisuan.php b/frontend/views/finance/ticheng-jisuan.php
index d16e8ad..f8410df 100644
--- a/frontend/views/finance/ticheng-jisuan.php
+++ b/frontend/views/finance/ticheng-jisuan.php
@@ -130,8 +130,8 @@ use \common\libs\MyLib;
                 <hr>
             </form>
             <div class="row">
-                <div class="col-md-12 custom-table">
-                    <table id="listTable" class = "table table-bordered">
+                <div class="col-md-12">
+                    <table id="listTable">
                         <thead class="bg-warning">
                         <tr>
                             <th data-field="state" data-checkbox="true"></th>
@@ -234,12 +234,11 @@ use \common\libs\MyLib;
             }, 'json');
         });
 
-        var a=$(".gray-bg").height();
-        var b=$('#searchFrm').height();
-        var c=$('.ibox-title').height()
+        //使得table有一定的高度，出现滚动条
+        var a=$(".gray-bg").height();   //获取body高度
+        var b=$('#searchFrm').height();   //获取条件选择高度
+        var c=$('.ibox-title').height()  //获取标题高度
         var d=a-b-c-100;
-        console.log("body:"+a+"条件选择："+b+"标题"+c);
-        console.log(d);
         $('.fixed-table-body').css({'height': d});
     });
 </script>
diff --git a/frontend/views/gift/gift-use.php b/frontend/views/gift/gift-use.php
index 549889e..ae85425 100644
--- a/frontend/views/gift/gift-use.php
+++ b/frontend/views/gift/gift-use.php
@@ -21,19 +21,19 @@ use \common\libs\MyLib;
                     <label for="code">礼品编号</label>
                     <input type="text" id="code" name="code" class="form-control">
                 </div>
-                <div class="form-group" style="margin-bottom: 8px;">
+                <div class="form-group" style="margin-bottom: 8px;margin-left: 20px;">
                     <label for="car_no">车牌</label>
                     <input type="text" id="car_no" name="car_no" class="form-control">
                 </div>
-                <div class="form-group" style="margin-bottom: 8px;">
+                <div class="form-group" style="margin-bottom: 8px;margin-left: 20px;">
                     <label for="frame_no">车架号</label>
                     <input type="text" id="frame_no" name="frame_no" class="form-control">
                 </div>
-                <div class="form-group" style="margin-bottom: 8px;">
+                <div class="form-group" style="margin-bottom: 8px;margin-left: 20px;">
                     <label for="engine_no">发动机号</label>
                     <input type="text" id="engine_no" name="engine_no" class="form-control">
                 </div>
-                <div class="form-group" style="margin-bottom: 8px;">
+                <div class="form-group" style="margin-bottom: 8px;margin-left: 20px;">
                     <label for="status">状态</label>
                     <select name="status" id="status" class="form-control">
                         <option value="0" >全部</option>
@@ -54,11 +54,11 @@ use \common\libs\MyLib;
                         ?>
                     </select>
                 </div>
-                <div class="form-group" style="margin-bottom: 8px;">
+                <div class="form-group" style="margin-bottom: 8px;margin-left: 20px;">
                     <label for="username">业务工号</label>
                     <input type="text" id="username" name="username" class="form-control">
                 </div>
-                <div class="form-group" style="margin-bottom: 8px;">
+                <div class="form-group" style="margin-bottom: 8px;margin-left: 20px;">
                     <label for="insurer1_no">商业保单号</label>
                     <input type="text" id="insurer1_no" name="insurer1_no" class="form-control">
                 </div>
@@ -70,7 +70,7 @@ use \common\libs\MyLib;
                         <input type="text" class="input-sm form-control" id="s_end_date" name="s_end_date" autocomplete="off" value="" />
                     </div>
                 </div>
-                <div class="form-group" style="margin-bottom: 8px;">
+                <div class="form-group" style="margin-bottom: 8px;margin-left: 20px;">
                     <label for="datepicker2">正本日期</label>
                     <div class="input-daterange input-group" id="datepicker2">
                         <input type="text" class="input-sm form-control" id="p_start_date" name="p_start_date" autocomplete="off" value="" />
@@ -83,7 +83,7 @@ use \common\libs\MyLib;
             <div class="row">
                 <div class="col-md-12">
                     <table id="listTable">
-                        <thead>
+                        <thead class="bg-warning">
                         <tr>
                             <th width="50" data-field="id">ID</th>
                             <th data-field="code">礼品编号</th>