Ver Fonte

'cheweifei'

aiyou há 3 anos atrás
pai
commit
81d3346809

+ 1 - 1
application/admin/controller/Ajax.php

@@ -473,7 +473,7 @@ class Ajax extends Backend
             }elseif ($v['name']=='2'){
                 $list[$k]['name']=$dong.'垃圾处理费';
             }elseif ($v['name']=='3'){
-                $list[$k]['name']=$dong.'车位费';
+                $list[$k]['name']=$dong.'车位服务费';
             }
         }
         $this->success('', null, $list);

+ 25 - 2
application/admin/controller/cost/CostAdd.php

@@ -104,6 +104,7 @@ class CostAdd extends Backend
                     }else{
                         $get_hu_list=VillageHu::where('village_id',$params['village_id'])->where(['dong_id'=>['in',explode(',',$get_item['dong_id'])]])->field('id,big_area,village_id,dong_id,danyuan_id')->select();
                     }
+
                    if ($get_item['item']=='1' || $get_item['item']=='2'  || $get_item['item']=='3'){//如果是物业和垃圾处理费
 //                        <option value="1">元/每平方/月</option>
 //                        <option value="2">元/每户/年</option>
@@ -136,7 +137,7 @@ class CostAdd extends Backend
                           //  }
                         }elseif($get_item['method']=='2'){//按照户收费
 
-                           // if ($get_item['danwei']=='1'){//按照月收费
+                            if ($get_item['danwei']=='3'){//按照月收费
 
                                 foreach ($get_hu_list as $k=>$v){
                                     $insert=[];
@@ -156,7 +157,29 @@ class CostAdd extends Backend
                                         CostBill::insert($insert);
                                     }
                                 }
-                           // }
+                            }elseif($get_item['danwei']=='2'){
+
+                                foreach ($get_hu_list as $k=>$v){
+
+                                    $insert=[];
+                                    $insert['order_number']=time().rand('1000','9999');
+                                    $price=$get_item['price']*$get_item['month']/12;//价格*平方*周期
+                                    $insert['item_id']=$params['item_id'];
+                                    $insert['village_id']=$v['village_id'];
+                                    $insert['dong_id']=$v['dong_id'];
+                                    $insert['danyuan_id']=$v['danyuan_id'];
+                                    $insert['hu_id']=$v['id'];
+                                    $insert['price']=$price;
+                                    $insert['true_price']=$price;
+                                    foreach ($list_time as $kn=>$vn){
+                                        $insert['start_time']=$vn['starttime'];
+                                        $insert['end_time']=$vn['endtime'];
+                                        $insert['createtime']=$insert['updatetime']=time();
+                                        CostBill::insert($insert);
+                                    }
+                                }
+                            }
+
                         }
                     }
 

+ 2 - 2
application/admin/controller/cost/CostBill.php

@@ -206,7 +206,7 @@ class CostBill extends Backend
         }elseif($row['item_id']=='2'){
             $row['item_name']='电费';
         }elseif($row['item_id']=='999999999'){
-            $row['item_name']='车位费';
+            $row['item_name']='车位服务费';
         }else{
           //  $get_itme=CostItem::where('id',$row['item_id'])->field('item')->find();
             if ($row['item']['item']=='1'){
@@ -214,7 +214,7 @@ class CostBill extends Backend
             }elseif ($row['item']['item']=='2'){
                 $row['item_name']='垃圾处理费';
             }elseif ($row['item']['item']=='3'){
-                $row['item_name']='车位费';
+                $row['item_name']='车位服务费';
             }else{
                 $row['item_name']='未知';
             }

+ 2 - 2
application/admin/controller/cost/CostBillAuto.php

@@ -209,7 +209,7 @@ class CostBillAuto extends Backend
         }elseif($row['item_id']=='2'){
             $row['item_name']='电费';
         }elseif($row['item_id']=='999999999'){
-            $row['item_name']='车位费';
+            $row['item_name']='车位服务费';
         }else{
             //  $get_itme=CostItem::where('id',$row['item_id'])->field('item')->find();
             if ($row['item']['item']=='1'){
@@ -217,7 +217,7 @@ class CostBillAuto extends Backend
             }elseif ($row['item']['item']=='2'){
                 $row['item_name']='垃圾处理费';
             }elseif ($row['item']['item']=='3'){
-                $row['item_name']='车位费';
+                $row['item_name']='车位服务费';
             }else{
                 $row['item_name']='未知';
             }

+ 4 - 4
application/admin/controller/cost/CostBillMouth.php

@@ -151,7 +151,7 @@ class CostBillMouth extends Backend
             }elseif($v['item']=='2'){
                 $get_item[$k]['name']='垃圾处理费';
             }elseif($v['item']=='3'){
-                $get_item[$k]['name']='车位费';
+                $get_item[$k]['name']='车位服务费';
             }else{
                 $get_item[$k]['name']='未知';
             }
@@ -165,7 +165,7 @@ class CostBillMouth extends Backend
                 'value'=>2,'item'=>'2','name'=>'电费',
             ],
             [
-                'value'=>999999999,'item'=>'999999999','name'=>'车位费',
+                'value'=>999999999,'item'=>'999999999','name'=>'车位服务费',
             ]
         ];
 
@@ -219,7 +219,7 @@ class CostBillMouth extends Backend
             }elseif($v['item_id']=='2'){
                 $list[$k]['item_name']='电费';
             }elseif($v['item_id']=='9999999999'){
-                $list[$k]['item_name']='车位费';
+                $list[$k]['item_name']='车位服务费';
             }else{
                 //  $get_itme=CostItem::where('id',$row['item_id'])->field('item')->find();
                 if ($v['item']['item']=='1'){
@@ -227,7 +227,7 @@ class CostBillMouth extends Backend
                 }elseif ($v['item']['item']=='2'){
                     $list[$k]['item_name']='垃圾处理费';
                 }elseif ($v['item']['item']=='3'){
-                    $list[$k]['item_name']='车位费';
+                    $list[$k]['item_name']='车位服务费';
                 }else{
                     $list[$k]['item_name']='未知';
                 }

+ 2 - 2
application/admin/controller/cost/CostBillPaid.php

@@ -168,14 +168,14 @@ class CostBillPaid extends Backend
                 $item_name= '电费';
             }else{
                 if ($item=='999999999'){
-                    $item_name= '车位费';
+                    $item_name= '车位服务费';
                 }else {
                     if($item=='10'){
                         $item_name= '物业费';
                     }elseif($item=='20'){
                         $item_name= '垃圾处理费';
                     }else{
-                        $item_name= '车位费';
+                        $item_name= '车位服务费';
                     }
                 }
 

+ 2 - 2
application/admin/controller/cost/CostBillShouyin.php

@@ -202,7 +202,7 @@ class CostBillShouyin extends Backend
         }elseif($row['item_id']=='2'){
             $row['item_name']='电费';
         }elseif($row['item_id']=='999999999'){
-            $row['item_name']='车位费';
+            $row['item_name']='车位服务费';
         }else{
             //  $get_itme=CostItem::where('id',$row['item_id'])->field('item')->find();
             if ($row['item']['item']=='1'){
@@ -210,7 +210,7 @@ class CostBillShouyin extends Backend
             }elseif ($row['item']['item']=='2'){
                 $row['item_name']='垃圾处理费';
             }elseif ($row['item']['item']=='3'){
-                $row['item_name']='车位费';
+                $row['item_name']='车位服务费';
             }else{
                 $row['item_name']='未知';
             }

+ 4 - 4
application/admin/controller/cost/CostEdit.php

@@ -76,7 +76,7 @@ class CostEdit extends Backend
                 }elseif($get_house['item_id']=='2'){
                     $list[$k]['item_name']='电费';
                 }elseif($get_house['item_id']=='999999999'){
-                    $list[$k]['item_name']='车位费';
+                    $list[$k]['item_name']='车位服务费';
                 }else{
                     //  $get_itme=CostItem::where('id',$row['item_id'])->field('item')->find();
                     if ($get_house['item']['item']=='1'){
@@ -84,7 +84,7 @@ class CostEdit extends Backend
                     }elseif ($get_house['item']['item']=='2'){
                         $list[$k]['item_name']='垃圾处理费';
                     }elseif ($get_house['item']['item']=='3'){
-                        $list[$k]['item_name']='车位费';
+                        $list[$k]['item_name']='车位服务费';
                     }else{
                         $list[$k]['item_name']='未知';
                     }
@@ -170,7 +170,7 @@ class CostEdit extends Backend
         }elseif($get_house['item_id']=='2'){
             $row['item_name']='电费';
         }elseif($get_house['item_id']=='999999999'){
-            $row['item_name']='车位费';
+            $row['item_name']='车位服务费';
         }else{
             //  $get_itme=CostItem::where('id',$row['item_id'])->field('item')->find();
             if ($get_house['item']['item']=='1'){
@@ -178,7 +178,7 @@ class CostEdit extends Backend
             }elseif ($get_house['item']['item']=='2'){
                 $row['item_name']='垃圾处理费';
             }elseif ($get_house['item']['item']=='3'){
-                $row['item_name']='车位费';
+                $row['item_name']='车位服务费';
             }else{
                 $row['item_name']='未知';
             }

+ 1 - 0
application/admin/view/cost/cost_bill_dayin/index.html

@@ -1,3 +1,4 @@
+
 <div class="panel panel-default panel-intro">
     {:build_heading()}
 

+ 18 - 6
application/admin/view/cost/cost_bill_print/index_p.html

@@ -1,12 +1,17 @@
 
 <style type="text/css" media=print>
     .noprint{display : none}
+    body{height: auto}
+    html, body{
+        height: auto!important;
+        min-height: auto!important;
+    }
     table tr td{padding: 3px !important; background-color: #FD482C  !important;font-size: 10px;}
 </style>
 
 <!--startprint-->
 
-<div class="widget-body no-padding">
+<div class="widget-body no-padding" style="border: 1px; ">
 
     <div class="toolbar" style=" font-size: 15px;text-align: center">
        收费凭证
@@ -17,7 +22,7 @@
         &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
         业主:{$row.hu.usesr_name}
         &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-        房产:{$row.village.name}{$row.dong.name}{$row.danyuan.name}{$row.hu.name}
+        房产:{$row.village.name}{$row.dong.name}{$row.danyuan.name}
         &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
         应缴金额:{$row.true_price}元
         &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
@@ -45,7 +50,7 @@
                             {elseif $vo.item_id eq '2'}
                                 电费
                             {elseif $vo.item_id eq '999999999'}
-                                车位费
+                                车位服务
                             {else}
                                 {if $vo.item.item eq '1'}
                                     物业费
@@ -90,8 +95,8 @@
         <tr >
             <td colspan="9">
 
-                <div style="float: right; margin-right: 20px">
-                    备注:{$row.mark}
+                <div style="width: 100px;margin-left: 250px;">
+                    实际账单期:
                 </div>
             </td>
         </tr>
@@ -123,6 +128,13 @@
     <input id="btnPrint" type="button" value="打印预览" onclick="preview(1)"/>
 </p>
 <script>
+    window.onload=function()//用window的onload事件,窗体加载完毕的时候
+    {
+        var oFrame = document.getElementById("layui-layer-iframe1");
+        oFrame.height = '200px';
+
+    }
+
     function preview(oper)
     {
         if (oper <10)
@@ -132,7 +144,7 @@
             eprnstr="<!--endprint-->"; //结束打印标识字符串
             prnhtml=bdhtml.substr(bdhtml.indexOf(sprnstr)+17); //从开始打印标识之后的内容
             prnhtml=prnhtml.substring(0,prnhtml.indexOf(eprnstr)); //截取开始标识和结束标识之间的内容
-
+            alert(prnhtml);
             window.document.body.innerHTML=prnhtml; //把需要打印的指定内容赋给body.innerHTML
             console.log(prnhtml);
             window.print(); //调用浏览器的打印功能打印指定区域

+ 1 - 1
application/admin/view/cost/cost_chaobiao/add.html

@@ -11,7 +11,7 @@
                     <option value="2" selected>电费</option>
                 {/if}
                 {if $type eq 'tingchefei'}
-                    <option value="999999999" selected>停车费</option>
+                    <option value="999999999" selected>停车位服务费</option>
                 {/if}
             </select>
         </div>

+ 2 - 2
application/admin/view/cost/cost_item/add.html

@@ -23,7 +23,7 @@
 <!--          //      <option value="0">请选择项目</option>-->
                 <option value="1">物业费</option>
                 <option value="2">垃圾处理费</option>
-                <option value="3">车位费</option>
+                <option value="3">车位服务费</option>
             </select>
 <!--            <input id="c-item" data-rule="required" class="form-control" name="row[item]"  type="text" value="">-->
         </div>
@@ -59,7 +59,7 @@
         <div class="col-xs-12 col-sm-8">
             <select  name="row[danwei]" data-rule="required"  class="form-control"  >
                 <option value="1">元/每平方/月(按建筑面积收费选择)</option>
-<!--                <option value="2">元/每户/年</option>-->
+                <option value="2">元/每户/年</option>
                 <option value="3">元/每户/月(按户收费选择)</option>
             </select>
 <!--            <input id="c-danwei" data-rule="required" class="form-control" name="row[danwei]" placeholder="请输入计量单位,如:月/平方  " type="text" value="">-->

+ 2 - 2
application/admin/view/cost/cost_item/edit.html

@@ -27,7 +27,7 @@
                 <!--          //      <option value="0">请选择项目</option>-->
                 <option value="1" {if $row.item ==1} selected {/if} >物业费</option>
                 <option value="2" {if $row.item ==2} selected {/if}>垃圾处理费</option>
-                <option value="2" {if $row.item ==3} selected {/if}>车费</option>
+                <option value="3" {if $row.item ==3} selected {/if}>车位服务费</option>
             </select>
         </div>
     </div>
@@ -60,7 +60,7 @@
         <div class="col-xs-12 col-sm-8">
             <select  name="row[danwei]" data-rule="required"  class="form-control"  >
                 <option value="1" {if $row.danwei ==1} selected {/if}>元/每平方/月(按建筑面积收费选择)</option>
-<!--                <option value="2" {if $row.danwei ==2} selected {/if}>元/每户/年</option>-->
+                <option value="2" {if $row.danwei ==2} selected {/if}>元/每户/年</option>
                 <option value="3" {if $row.danwei ==3} selected {/if}>元/每户/月(按户收费选择)</option>
             </select>
         </div>

+ 3 - 3
application/api/controller/Cost.php

@@ -63,7 +63,7 @@ class Cost extends Api
             }elseif($v['item']=='2'){
                 $get_item[$k]['item_name']='垃圾处理费';
             }elseif($v['item']=='3'){
-                $get_item[$k]['item_name']='车位费';
+                $get_item[$k]['item_name']='车位服务费';
             }else{
                 $get_item[$k]['item_name']='未知';
             }
@@ -252,14 +252,14 @@ class Cost extends Api
             }elseif($get_bill['item_id']=='2'){
                 $item_name='电费';
             }elseif($get_bill['item_id']=='999999999'){
-                $item_name='车位费';
+                $item_name='车位服务费';
             }else{
                 if ($get_bill['item']['item']=='1'){
                     $item_name='物业费';
                 }elseif($get_bill['item']['item']=='2'){
                     $item_name='垃圾处理费';
                 }elseif($get_bill['item']['item']=='3'){
-                    $item_name='车位费';
+                    $item_name='车位服务费';
                 }else{
                     $item_name='未知';
                 }

+ 2 - 2
public/assets/js/backend/cost/cost_b_ill_pay_list.js

@@ -35,7 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return '电费';
                                     }else{
                                         if (row.item_id=='999999999'){
-                                            return '车位费';
+                                            return '车位服务费';
                                         }else {
                                             if(row.item.item=='1'){
                                                 return '物业费';
@@ -44,7 +44,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '垃圾处理费';
                                             }
                                             if(row.item.item=='3'){
-                                                return '车位费';
+                                                return '车位服务费';
                                             }
                                         }
 

+ 1 - 1
public/assets/js/backend/cost/cost_bill.js

@@ -33,7 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id'),operate:false},
                       //  {field: 'item_id', title: __('Item_id')},
-                        {field: 'item.item', title: __('收费项目'), searchList: {"1":__('物业费'),"2":__('垃圾处理费'),"3":__('车位费')}, formatter: Table.api.formatter.normal,operate:false},
+                        {field: 'item.item', title: __('收费项目'), searchList: {"1":__('物业费'),"2":__('垃圾处理费'),"3":__('车位服务费')}, formatter: Table.api.formatter.normal,operate:false},
                         // {field: 'property_id', title: __('Property_id')},
 
 

+ 3 - 3
public/assets/js/backend/cost/cost_bill_dayin.js

@@ -35,7 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id'),operate:false},
                         //  {field: 'item_id', title: __('Item_id')},
-                        // {field: 'item.item', title: __('收费项目'), searchList: {"1":__('物业费'),"2":__('垃圾处理费'),"3":__('车位费')}, formatter: Table.api.formatter.normal,operate:false},
+                        // {field: 'item.item', title: __('收费项目'), searchList: {"1":__('物业费'),"2":__('垃圾处理费'),"3":__('车位服务费')}, formatter: Table.api.formatter.normal,operate:false},
                         // {field: 'property_id', title: __('Property_id')},
                         {field: 'item.item', title: __('收费项目'),   formatter: function (value, row, index) {
                                 //return row.village.name;
@@ -46,7 +46,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return '电费';
                                     }else{
                                         if (row.item_id=='999999999'){
-                                            return '车位费';
+                                            return '车位服务费';
                                         }else{
                                             if(row.item.item=='1'){
                                                 return '物业费';
@@ -55,7 +55,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '垃圾处理费';
                                             }
                                             if(row.item.item=='3'){
-                                                return '车位费';
+                                                return '车位服务费';
                                             }
                                         }
                                     }

+ 3 - 3
public/assets/js/backend/cost/cost_bill_hebing.js

@@ -31,7 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id'),operate:false},
                         //  {field: 'item_id', title: __('Item_id')},
-                        // {field: 'item.item', title: __('收费项目'), searchList: {"1":__('物业费'),"2":__('垃圾处理费'),"3":__('车位费')}, formatter: Table.api.formatter.normal,operate:false},
+                        // {field: 'item.item', title: __('收费项目'), searchList: {"1":__('物业费'),"2":__('垃圾处理费'),"3":__('车位服务费')}, formatter: Table.api.formatter.normal,operate:false},
                         // {field: 'property_id', title: __('Property_id')},
                         {field: 'item.item', title: __('收费项目'),   formatter: function (value, row, index) {
                                 //return row.village.name;
@@ -42,7 +42,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return '电费';
                                     }else{
                                         if (row.item_id=='999999999'){
-                                            return '车位费';
+                                            return '车位服务费';
                                         }else{
                                             if(row.item.item=='1'){
                                                 return '物业费';
@@ -51,7 +51,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '垃圾处理费';
                                             }
                                             if(row.item.item=='3'){
-                                                return '车位费';
+                                                return '车位服务费';
                                             }
                                         }
                                     }

+ 2 - 2
public/assets/js/backend/cost/cost_bill_mouth.js

@@ -43,7 +43,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return '电费';
                                     }else{
                                         if (row.item_id=='999999999'){
-                                            return '车位费';
+                                            return '车位服务费';
                                         }else{
                                             if(row.item.item=='1'){
                                                 return '物业费';
@@ -52,7 +52,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '垃圾处理费';
                                             }
                                             if(row.item.item=='3'){
-                                                return '车位费';
+                                                return '车位服务费';
                                             }
                                         }
                                     }

+ 3 - 3
public/assets/js/backend/cost/cost_bill_paid.js

@@ -43,7 +43,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return '电费';
                                     }else{
                                         if (row.item_id=='999999999'){
-                                            return '车位费';
+                                            return '车位服务费';
                                         }else {
                                             if(row.item.item=='1'){
                                                 return '物业费';
@@ -52,7 +52,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '垃圾处理费';
                                             }
                                             if(row.item.item=='3'){
-                                                return '车位费';
+                                                return '车位服务费';
                                             }
                                         }
 
@@ -61,7 +61,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
 
                             },
-                            searchList: {"1": __('水费'), "2": __('电费'), "999999999": __('车位费'), "10": __('物业费'), "20": __('垃圾处理费')}},
+                            searchList: {"1": __('水费'), "2": __('电费'), "999999999": __('车位服务费'), "10": __('物业费'), "20": __('垃圾处理费')}},
                         // {field: 'property_id', title: __('Property_id')},
 
 

+ 3 - 3
public/assets/js/backend/cost/cost_bill_shouyin.js

@@ -33,7 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id'),operate:false},
                         //  {field: 'item_id', title: __('Item_id')},
-                        // {field: 'item.item', title: __('收费项目'), searchList: {"1":__('物业费'),"2":__('垃圾处理费'),"3":__('车位费')}, formatter: Table.api.formatter.normal,operate:false},
+                        // {field: 'item.item', title: __('收费项目'), searchList: {"1":__('物业费'),"2":__('垃圾处理费'),"3":__('车位服务费')}, formatter: Table.api.formatter.normal,operate:false},
                         // {field: 'property_id', title: __('Property_id')},
                         {field: 'item.item', title: __('收费项目'),   formatter: function (value, row, index) {
                                 //return row.village.name;
@@ -44,7 +44,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return '电费';
                                     }else{
                                         if (row.item_id=='999999999'){
-                                            return '车位费';
+                                            return '车位服务费';
                                         }else{
                                             if(row.item.item=='1'){
                                                 return '物业费';
@@ -53,7 +53,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '垃圾处理费';
                                             }
                                             if(row.item.item=='3'){
-                                                return '车位费';
+                                                return '车位服务费';
                                             }
                                         }
                                     }

+ 2 - 2
public/assets/js/backend/cost/cost_bill_shouyini.js

@@ -35,7 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return '电费';
                                     }else{
                                         if (row.item_id=='999999999'){
-                                            return '车位费';
+                                            return '车位服务费';
                                         }else{
                                             if(row.item.item=='1'){
                                                 return '物业费';
@@ -44,7 +44,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '垃圾处理费';
                                             }
                                             if(row.item.item=='1'){
-                                                return '车位费';
+                                                return '车位服务费';
                                             }
                                         }
                                     }

+ 1 - 1
public/assets/js/backend/cost/cost_chaobiao.js

@@ -95,7 +95,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     }
                                 },{
                                     name: 'detail',
-                                    text: __('车位费账单'),
+                                    text: __('车位服务费账单'),
                                     title: '其他账单',
                                     classname: 'btn btn-xs btn-success btn-dialog',
                                     icon: 'fa fa-list',

+ 1 - 1
public/assets/js/backend/cost/cost_item.js

@@ -33,7 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'fang', title: __('所属主体')},
 
-                        {field: 'item', title: __('Item'), searchList: {"1":__('物业费'),"2":__('垃圾处理费'),"3":__('车位费')}, formatter: Table.api.formatter.normal},
+                        {field: 'item', title: __('Item'), searchList: {"1":__('物业费'),"2":__('垃圾处理费'),"3":__('车位服务费')}, formatter: Table.api.formatter.normal},
                         {field: 'method', title: __('Method'),searchList: {"1":__('按建筑面积'),"2":__('按户')}, formatter: Table.api.formatter.normal},
                         {field: 'month', title: __('Month'),searchList: {"1":__('1个月'),"3":__('3个月'),"6":__('6个月'),"12":__('1年')}, formatter: Table.api.formatter.normal},
 

+ 2 - 2
public/assets/js/backend/cost/cost_print.js

@@ -41,7 +41,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                         return '电费';
                                     }else{
                                         if (row.item_id=='999999999'){
-                                            return '车位费';
+                                            return '车位服务费';
                                         }else{
                                             if(row.item.item=='1'){
                                                 return '物业费';
@@ -50,7 +50,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '垃圾处理费';
                                             }
                                             if(row.item.item=='1'){
-                                                return '车位费';
+                                                return '车位服务费';
                                             }
                                         }
                                     }