'cheweifei'

application/admin/controller/Ajax.php

@@ -471,7 +471,7 @@ class Ajax extends Backend
             if ($v['name']=='1'){
                 $list[$k]['name']=$dong.'物业费';
             }elseif ($v['name']=='2'){
-                $list[$k]['name']=$dong.'垃圾处理费';
+                $list[$k]['name']=$dong.'生活垃圾处理费';
             }elseif ($v['name']=='3'){
                 $list[$k]['name']=$dong.'车位服务费';
             }

application/admin/controller/cost/CostAdd.php

@@ -105,7 +105,7 @@ class CostAdd extends Backend
                         $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'){//如果是物业和垃圾处理费
+                   if ($get_item['item']=='1' || $get_item['item']=='2'  || $get_item['item']=='3'){//如果是物业和生活垃圾处理费
 //                        <option value="1">元/每平方/月</option>
 //                        <option value="2">元/每户/年</option>
 //                        <option value="3">元/每户/月</option>

application/admin/controller/cost/CostBill.php

@@ -212,7 +212,7 @@ class CostBill extends Backend
             if ($row['item']['item']=='1'){
                 $row['item_name']='物业费';
             }elseif ($row['item']['item']=='2'){
-                $row['item_name']='垃圾处理费';
+                $row['item_name']='生活垃圾处理费';
             }elseif ($row['item']['item']=='3'){
                 $row['item_name']='车位服务费';
             }else{

application/admin/controller/cost/CostBillAuto.php

@@ -215,7 +215,7 @@ class CostBillAuto extends Backend
             if ($row['item']['item']=='1'){
                 $row['item_name']='物业费';
             }elseif ($row['item']['item']=='2'){
-                $row['item_name']='垃圾处理费';
+                $row['item_name']='生活垃圾处理费';
             }elseif ($row['item']['item']=='3'){
                 $row['item_name']='车位服务费';
             }else{

application/admin/controller/cost/CostBillMouth.php

@@ -149,7 +149,7 @@ class CostBillMouth extends Backend
             if ($v['item']=='1'){
                 $get_item[$k]['name']='物业费';
             }elseif($v['item']=='2'){
-                $get_item[$k]['name']='垃圾处理费';
+                $get_item[$k]['name']='生活垃圾处理费';
             }elseif($v['item']=='3'){
                 $get_item[$k]['name']='车位服务费';
             }else{
@@ -225,7 +225,7 @@ class CostBillMouth extends Backend
                 if ($v['item']['item']=='1'){
                     $list[$k]['item_name']='物业费';
                 }elseif ($v['item']['item']=='2'){
-                    $list[$k]['item_name']='垃圾处理费';
+                    $list[$k]['item_name']='生活垃圾处理费';
                 }elseif ($v['item']['item']=='3'){
                     $list[$k]['item_name']='车位服务费';
                 }else{

application/admin/controller/cost/CostBillPaid.php

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

application/admin/controller/cost/CostBillPrint.php

@@ -50,6 +50,7 @@ class CostBillPrint extends Backend
         $list = CostBillPay::where('id',$pay_id)
             ->with(['village','dong','danyuan','hu'])
             ->find();
+      //  dump($list);
         $list['true_price_zhongwen']=$this->to_upcase_chinese($list['true_price']);
         $list['pay_date']=date('Y-m-d H:i:s',$list['pay_time']);
         $list['time']=date('Y-m-d H:i:s',time());

application/admin/controller/cost/CostBillShouyin.php

@@ -208,7 +208,7 @@ class CostBillShouyin extends Backend
             if ($row['item']['item']=='1'){
                 $row['item_name']='物业费';
             }elseif ($row['item']['item']=='2'){
-                $row['item_name']='垃圾处理费';
+                $row['item_name']='生活垃圾处理费';
             }elseif ($row['item']['item']=='3'){
                 $row['item_name']='车位服务费';
             }else{

application/admin/controller/cost/CostEdit.php

@@ -82,7 +82,7 @@ class CostEdit extends Backend
                     if ($get_house['item']['item']=='1'){
                         $list[$k]['item_name']='物业费';
                     }elseif ($get_house['item']['item']=='2'){
-                        $list[$k]['item_name']='垃圾处理费';
+                        $list[$k]['item_name']='生活垃圾处理费';
                     }elseif ($get_house['item']['item']=='3'){
                         $list[$k]['item_name']='车位服务费';
                     }else{
@@ -176,7 +176,7 @@ class CostEdit extends Backend
             if ($get_house['item']['item']=='1'){
                 $row['item_name']='物业费';
             }elseif ($get_house['item']['item']=='2'){
-                $row['item_name']='垃圾处理费';
+                $row['item_name']='生活垃圾处理费';
             }elseif ($get_house['item']['item']=='3'){
                 $row['item_name']='车位服务费';
             }else{

application/admin/lang/zh-cn/cost/cost_item.php

@@ -4,7 +4,7 @@ return [
     'Id'          => 'ID',
     'Property_id' => '所属物业',
     'Village_id'  => '所属小区',
-    'Item'        => '费用名称',// 1物业费,2垃圾处理费
+    'Item'        => '费用名称',// 1物业费,2生活垃圾处理费
     'Method'      => '计费方式',// 1	按建筑面积,2按住户
     'Month'       => '账单周期',
     'Danwei'      => '计量单位 ',

application/admin/view/cost/cost_bill_print/index_p.html

@@ -33,7 +33,7 @@
         vertical-align: inherit;
         border-color: inherit;
     }
-    .table-bordered   tbody   tr   td, .table-bordered  tfoot   tr  td {
+     td {
         border: 1px solid #f4f4f4;
     }
     /*//table tr td{padding: 3px !important; background-color: #FD482C  !important;font-size: 10px;}*/
@@ -41,7 +41,7 @@
 
 
 
-<div class="widget-body no-padding" style="border: 1px; ">
+<div class="widget-body no-padding" style=" width: 95%; ">
     <!--startprint-->
     <div class="toolbar" style=" font-size: 15px;text-align: center">
        收费凭证
@@ -52,15 +52,15 @@
         &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.village.name}{$row.hu.name}
         &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
         应缴金额：{$row.true_price}元
         &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
         <span style="float: right">凭证编号：{$row.order_number}</span>
 
     </div>
-    <table id="table" class=" table-striped table-bordered table-hover table-nowrap" width="100%"  style="border: 1px; border-color: #0d0d0d ">
-                <tr>
+    <table id="table"   border="1" cellspacing="0" cellpadding="0" class=" table-striped table-bordered table-hover " width="95%"  style="border: 1px solid #C0C0C0">
+                <tr style=" font-size: 14px;">
                     <td>序号</td>
                     <td>项目</td>
                     <td>交费周期</td>
@@ -72,7 +72,7 @@
                     <td>实收</td>
                 </tr>
                 {foreach $get as $k=>$vo}
-                    <tr>
+                    <tr style=" font-size: 12px;">
                         <td>{$k+1}</td>
                         <td>
                             {if $vo.item_id eq '1'}
@@ -85,7 +85,7 @@
                                 {if $vo.item.item eq '1'}
                                     物业费
                                 {else}
-                                    垃圾处理费
+                                    生活垃圾处理费
                                 {/if}
                             {/if}
                          </td>
@@ -125,15 +125,15 @@
         <tr >
             <td colspan="9">
 
-                <div style="width: 100px;margin-left: 250px;">
-                    实际账单期：
+                <div style="width: 100%; text-align:center;font-size: 12px;" >
+                    实际账单期：{$row.mark}
                 </div>
             </td>
         </tr>
-                <tr >
+                <tr style="font-size: 14px;" >
                     <td colspan="9">
                         <div style=" float:left;margin-left: 20px">
-                        合计（大写）：{$row.true_price_zhongwen}
+                        合计（大写）：{$row.true_price_zhongwen}整
                         </div>
                         <div style="float: right; margin-right: 20px">
                         ￥{$row.true_price}元 &nbsp;&nbsp;&nbsp;&nbsp;{$row.pay_type}

application/admin/view/cost/cost_item/add.html

@@ -22,7 +22,7 @@
             <select  name="row[item]" data-rule="required"  class="form-control"  >
 <!--          //      <option value="0">请选择项目</option>-->
                 <option value="1">物业费</option>
-                <option value="2">垃圾处理费</option>
+                <option value="2">生活垃圾处理费</option>
                 <option value="3">车位服务费</option>
             </select>
 <!--            <input id="c-item" data-rule="required" class="form-control" name="row[item]"  type="text" value="">-->

application/admin/view/cost/cost_item/edit.html

@@ -26,7 +26,7 @@
             <select  name="row[item]" data-rule="required"  class="form-control"  >
                 <!--          //      <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 ==2} selected {/if}>生活垃圾处理费</option>
                 <option value="3" {if $row.item ==3} selected {/if}>车位服务费</option>
             </select>
         </div>

application/admin/view/cost/cost_item/index.html

@@ -8,7 +8,7 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('cost/cost_item/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <span style="color: red">注意：垃圾处理费是按照“元/每户/月” ，物业费是“元/每平方/月”，规则如果需要修改，联系程序人员</span>
+                        <span style="color: red">注意：生活垃圾处理费是按照“元/每户/月” ，物业费是“元/每平方/月”，规则如果需要修改，联系程序人员</span>
 <!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('cost/cost_item/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
 <!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('cost/cost_item/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
 <!--                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('cost/cost_item/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->

application/api/controller/Cost.php

@@ -61,7 +61,7 @@ class Cost extends Api
             if ($v['item']=='1'){
                 $get_item[$k]['item_name']='物业费';
             }elseif($v['item']=='2'){
-                $get_item[$k]['item_name']='垃圾处理费';
+                $get_item[$k]['item_name']='生活垃圾处理费';
             }elseif($v['item']=='3'){
                 $get_item[$k]['item_name']='车位服务费';
             }else{
@@ -257,7 +257,7 @@ class Cost extends Api
                 if ($get_bill['item']['item']=='1'){
                     $item_name='物业费';
                 }elseif($get_bill['item']['item']=='2'){
-                    $item_name='垃圾处理费';
+                    $item_name='生活垃圾处理费';
                 }elseif($get_bill['item']['item']=='3'){
                     $item_name='车位服务费';
                 }else{

public/assets/js/backend/cost/cost_b_ill_pay_list.js

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

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')},
 
 

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;
@@ -52,7 +52,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '物业费';
                                             }
                                             if(row.item.item=='2'){
-                                                return '垃圾处理费';
+                                                return '生活垃圾处理费';
                                             }
                                             if(row.item.item=='3'){
                                                 return '车位服务费';

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;
@@ -48,7 +48,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '物业费';
                                             }
                                             if(row.item.item=='2'){
-                                                return '垃圾处理费';
+                                                return '生活垃圾处理费';
                                             }
                                             if(row.item.item=='3'){
                                                 return '车位服务费';

public/assets/js/backend/cost/cost_bill_mouth.js

@@ -49,7 +49,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '物业费';
                                             }
                                             if(row.item.item=='2'){
-                                                return '垃圾处理费';
+                                                return '生活垃圾处理费';
                                             }
                                             if(row.item.item=='3'){
                                                 return '车位服务费';

public/assets/js/backend/cost/cost_bill_paid.js

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

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;
@@ -50,7 +50,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                                 return '物业费';
                                             }
                                             if(row.item.item=='2'){
-                                                return '垃圾处理费';
+                                                return '生活垃圾处理费';
                                             }
                                             if(row.item.item=='3'){
                                                 return '车位服务费';

public/assets/js/backend/cost/cost_bill_shouyini.js

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

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},
 

public/assets/js/backend/cost/cost_print.js

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