'物业'

application/admin/controller/Ajax.php

@@ -310,6 +310,12 @@ class Ajax extends Backend
         $where = ['is_delete' => '0'];
 
         $list = null;
+
+        if ($this->auth->property_id){
+            $where['id']=$this->auth->property_id;
+            //  dump($where_and);
+        }
+
         $list = Db::name('Property')->where($where)->field('id  as value,p_name as name')->order('id asc')->select();
         $this->success('', null, $list);
 
@@ -343,6 +349,11 @@ class Ajax extends Backend
         $json = cache('village');
         if ($json===false){
             $where['is_delete'] =0;
+            if (!empty($this->auth->village)){
+                $where['id']=['in',$this->auth->village];
+                //  dump($where_and);
+            }
+
             $list = Db::name('village')->where($where)->field('id  ,v_name as name')->order('id asc')->select();
             $json = json($list);
             cache('source',$json);

application/admin/controller/cost/CostBill.php

@@ -3,10 +3,14 @@
 namespace app\admin\controller\cost;
 
 
+use app\admin\model\cost\CostPay;
+use app\admin\model\house\HuList;
 use app\common\controller\Backend;
 use think\Db;
 use think\exception\PDOException;
-
+use think\exception\ValidateException;
+use app\admin\model\Cost\CostItem;
+use app\admin\model\cost\CostEdit;
 /**
  * 物业账单
  *
@@ -52,6 +56,10 @@ class CostBill extends Backend
             $get=$this->request->get('filter');
             $where_and=['is_delete'=>'0'];
             $where_and['item_id']=['not in',['1','2']];
+            if (!empty($this->auth->village)){
+                $where_and['village_id']=['in',$this->auth->village];
+                //  dump($where_and);
+            }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
 
@@ -111,6 +119,113 @@ class CostBill extends Backend
         }
         return $this->view->fetch();
     }
+
+    /**
+     * 编辑
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids,['village','dong','danyuan','hu','item']);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds)) {
+            if (!in_array($row[$this->dataLimitField], $adminIds)) {
+                $this->error(__('You have no permission'));
+            }
+        }
+        if ($this->request->isPost()) {
+            $params = $this->request->post("row/a");
+            if ($params) {
+                $params = $this->preExcludeFields($params);
+
+
+
+                $result = false;
+                Db::startTrans();
+                try {
+                    //是否采用模型验证
+                    if ($this->modelValidate) {
+                        $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                        $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
+                        $row->validateFailException(true)->validate($validate);
+                    }
+
+                    if ($row['pay_status']=='0'){//未付款的情况
+                        if ($params['true_price'] !=$row['true_price']){//修改价格
+                            if ($params['pay_status']=='1'){
+                                $this->error(__('您好，修改物业费，需要上级同意之后方可付款', ''));
+                            }else{
+                                $insert['true_price_old']=$row['true_price'];
+                                $insert['true_price_new']=$params['true_price'];
+                                $insert['property_id']=$this->auth->property_id;
+                                $insert['bill_id']=$row['id'];
+                                $insert['status']='1';
+                                $insert['mark']=$params['mark'];
+                                $insert['createtime']=$insert['updatetime']=time();
+                                CostEdit::insert($insert);
+                                $params['true_price'] = $row['true_price'];
+                            }
+                        }elseif ($params['pay_status'] !=$row['pay_status']){//修改成已付款
+                            if ($params['pay_status']=='1'){
+                                $params['pay_time']=time();
+                                $order_number=time().rand('1000','9999');
+                                $params['order_number']=$order_number;
+                               HuList::where('id',$row['hu_id'])->update(['last_date'=>date('Y-m-d')]);
+                            }
+                        }
+                    }else{
+                        if ($params['true_price'] !=$row['true_price'] || $params['pay_status'] != $row['pay_status']){
+                            $this->error(__('您好，已付款的账单，不可以修改', ''));
+                        }
+                    }
+
+                    $result = $row->allowField(true)->save($params);
+                    Db::commit();
+                } catch (ValidateException $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                } catch (PDOException $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                } catch (Exception $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                }
+                if ($result !== false) {
+                    $this->success();
+                } else {
+                    $this->error(__('No rows were updated'));
+                }
+            }
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        if ($row['item_id']=='1'){
+            $row['item_name']='水费';
+        }elseif($row['item_id']=='2'){
+            $row['item_name']='电费';
+        }else{
+          //  $get_itme=CostItem::where('id',$row['item_id'])->field('item')->find();
+            if ($row['item']['item']=='1'){
+                $row['item_name']='物业费';
+            }elseif ($row['item']['item']=='2'){
+                $row['item_name']='垃圾处理费';
+            }elseif ($row['item']['item']=='3'){
+                $row['item_name']='停车费';
+            }else{
+                $row['item_name']='未知';
+            }
+        }
+        $row['house']=$row['village']['name']." ".$row['dong']['name']." ".$row['danyuan']['name']." ".$row['hu']['name'];
+//        $get_edit=CostEdit::where('bill_id',$row['id'])->where('is_delete','0')->select();
+//        $this->view->assign("get_edit", $get_edit);
+
+
+
+        $this->view->assign("row", $row);
+        return $this->view->fetch();
+    }
     /**
      * 删除
      */

application/admin/controller/cost/CostBillAuto.php

@@ -2,7 +2,9 @@
 
 namespace app\admin\controller\cost;
 
+use app\admin\model\cost\CostEdit;
 use app\admin\model\Cost\CostItem;
+use app\admin\model\house\HuList;
 use app\admin\model\village\VillageHu;
 use app\admin\model\cost\CostBill;
 use app\common\controller\Backend;
@@ -11,6 +13,7 @@ use PhpOffice\PhpSpreadsheet\Reader\Xls;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use think\Db;
 use think\exception\PDOException;
+use think\exception\ValidateException;
 
 /**
  * 物业账单
@@ -57,6 +60,10 @@ class CostBillAuto extends Backend
             $get=$this->request->get('filter');
             $where_and=['is_delete'=>'0'];
             $where_and['item_id']=['in',['1','2']];
+            if (!empty($this->auth->village)){
+                $where_and['village_id']=['in',$this->auth->village];
+                //  dump($where_and);
+            }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
 
@@ -117,6 +124,113 @@ class CostBillAuto extends Backend
         return $this->view->fetch();
     }
     /**
+     * 编辑
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids,['village','dong','danyuan','hu','item']);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds)) {
+            if (!in_array($row[$this->dataLimitField], $adminIds)) {
+                $this->error(__('You have no permission'));
+            }
+        }
+        if ($this->request->isPost()) {
+            $params = $this->request->post("row/a");
+            if ($params) {
+                $params = $this->preExcludeFields($params);
+
+
+
+                $result = false;
+                Db::startTrans();
+                try {
+                    //是否采用模型验证
+                    if ($this->modelValidate) {
+                        $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                        $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
+                        $row->validateFailException(true)->validate($validate);
+                    }
+
+                    if ($row['pay_status']=='0'){//未付款的情况
+                        if ($params['true_price'] !=$row['true_price']){//修改价格
+                            if ($params['pay_status']=='1'){
+                                $this->error(__('您好，修改物业费，需要上级同意之后方可付款', ''));
+                            }else{
+                                $insert['true_price_old']=$row['true_price'];
+                                $insert['true_price_new']=$params['true_price'];
+                                $insert['property_id']=$this->auth->property_id;
+                                $insert['bill_id']=$row['id'];
+                                $insert['status']='1';
+                                $insert['mark']=$params['mark'];
+                                $insert['createtime']=$insert['updatetime']=time();
+                                CostEdit::insert($insert);
+                                $params['true_price'] = $row['true_price'];
+                            }
+                        }elseif ($params['pay_status'] !=$row['pay_status']){//修改成已付款
+                            if ($params['pay_status']=='1'){
+                                $params['pay_time']=time();
+                                $order_number=time().rand('1000','9999');
+                                $params['order_number']=$order_number;
+                                HuList::where('id',$row['hu_id'])->update(['last_date'=>date('Y-m-d')]);
+                            }
+                        }
+                    }else{
+                        if ($params['true_price'] !=$row['true_price'] || $params['pay_status'] != $row['pay_status']){
+                            $this->error(__('您好，已付款的账单，不可以修改', ''));
+                        }
+                    }
+
+                    $result = $row->allowField(true)->save($params);
+                    Db::commit();
+                } catch (ValidateException $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                } catch (PDOException $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                } catch (Exception $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                }
+                if ($result !== false) {
+                    $this->success();
+                } else {
+                    $this->error(__('No rows were updated'));
+                }
+            }
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        if ($row['item_id']=='1'){
+            $row['item_name']='水费';
+        }elseif($row['item_id']=='2'){
+            $row['item_name']='电费';
+        }else{
+            //  $get_itme=CostItem::where('id',$row['item_id'])->field('item')->find();
+            if ($row['item']['item']=='1'){
+                $row['item_name']='物业费';
+            }elseif ($row['item']['item']=='2'){
+                $row['item_name']='垃圾处理费';
+            }elseif ($row['item']['item']=='3'){
+                $row['item_name']='停车费';
+            }else{
+                $row['item_name']='未知';
+            }
+        }
+        $row['house']=$row['village']['name']." ".$row['dong']['name']." ".$row['danyuan']['name']." ".$row['hu']['name'];
+//        $get_edit=CostEdit::where('bill_id',$row['id'])->where('is_delete','0')->select();
+//        $this->view->assign("get_edit", $get_edit);
+
+
+
+        $this->view->assign("row", $row);
+        return $this->view->fetch();
+    }
+
+    /**
      * 删除
      */
     public function del($ids = "")

application/admin/controller/cost/CostBillPaid.php

@@ -50,7 +50,10 @@ class CostBillPaid extends Backend
             }
             $get=$this->request->get('filter');
             $where_and=['is_delete'=>'0','pay_status'=>'1'];
-
+            if (!empty($this->auth->village)){
+                $where_and['village_id']=['in',$this->auth->village];
+                //  dump($where_and);
+            }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
 

application/admin/controller/cost/CostEdit.php

@@ -0,0 +1,215 @@
+<?php
+
+namespace app\admin\controller\cost;
+
+use app\common\controller\Backend;
+use think\Db;
+use think\exception\PDOException;
+use think\exception\ValidateException;
+use app\admin\model\Cost\CostBill;
+/**
+ * 物业账单修改记录
+ *
+ * @icon fa fa-circle-o
+ */
+class CostEdit extends Backend
+{
+    
+    /**
+     * CostEdit模型对象
+     * @var \app\admin\model\cost\CostEdit
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\cost\CostEdit;
+
+    }
+    
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+            $where_and=['is_delete'=>'0'];
+            $total = $this->model
+                ->where($where)
+                ->where($where_and)
+                ->order($sort, $order)
+                ->count();
+
+            $list = $this->model
+                ->where($where)
+                ->where($where_and)
+                //->with(['bill'])
+                ->order($sort, $order)
+                ->limit($offset, $limit)
+                ->select();
+
+            $list = collection($list)->toArray();
+            foreach ($list as $k=>$v){
+                $get_house=CostBill::where('id',$v['bill_id'])
+                    ->with(['village','dong','danyuan','hu','item','village.property'])
+                    ->find();
+                $list[$k]['house']=$get_house['village']['property']['p_name']." ".$get_house['village']['name']." ".$get_house['dong']['name']." ".$get_house['danyuan']['name']." ".$get_house['hu']['name'];
+                if ($get_house['item_id']=='1'){
+                    $list[$k]['item_name']='水费';
+                }elseif($get_house['item_id']=='2'){
+                    $list[$k]['item_name']='电费';
+                }else{
+                    //  $get_itme=CostItem::where('id',$row['item_id'])->field('item')->find();
+                    if ($get_house['item']['item']=='1'){
+                        $list[$k]['item_name']='物业费';
+                    }elseif ($get_house['item']['item']=='2'){
+                        $list[$k]['item_name']='垃圾处理费';
+                    }elseif ($get_house['item']['item']=='3'){
+                        $list[$k]['item_name']='停车费';
+                    }else{
+                        $list[$k]['item_name']='未知';
+                    }
+                }
+            }
+         //   dump($list);
+            $result = array("total" => $total, "rows" => $list);
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
+
+
+    /**
+     * 编辑
+     */
+    public function edit($ids = null)
+    {
+        $row = $this->model->get($ids);
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds)) {
+            if (!in_array($row[$this->dataLimitField], $adminIds)) {
+                $this->error(__('You have no permission'));
+            }
+        }
+        if ($this->request->isPost()) {
+            $params = $this->request->post("row/a");
+            if ($params) {
+                $params = $this->preExcludeFields($params);
+                $result = false;
+                if ($row['status']=='2'){
+                    $this->error(__('已经同意的账单，不可以修改', ''));
+                }
+                Db::startTrans();
+                try {
+                    //是否采用模型验证
+                    if ($this->modelValidate) {
+                        $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                        $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
+                        $row->validateFailException(true)->validate($validate);
+                    }
+                    if ($params['status']=='2' && $params['status'] !=$row['status']){
+                        CostBill::where('id',$row['bill_id'])->update(['true_price'=>$params['true_price_new']]);
+
+                    }
+                    $result = $row->allowField(true)->save($params);
+                    Db::commit();
+                } catch (ValidateException $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                } catch (PDOException $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                } catch (Exception $e) {
+                    Db::rollback();
+                    $this->error($e->getMessage());
+                }
+                if ($result !== false) {
+                    $this->success();
+                } else {
+                    $this->error(__('No rows were updated'));
+                }
+            }
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+
+        $get_house=CostBill::where('id',$row['bill_id'])
+            ->with(['village','dong','danyuan','hu','item','village.property'])
+            ->find();
+        $row['house']=$get_house['village']['property']['p_name']." ".$get_house['village']['name']." ".$get_house['dong']['name']." ".$get_house['danyuan']['name']." ".$get_house['hu']['name'];
+        if ($get_house['item_id']=='1'){
+            $row['item_name']='水费';
+        }elseif($get_house['item_id']=='2'){
+            $row['item_name']='电费';
+        }else{
+            //  $get_itme=CostItem::where('id',$row['item_id'])->field('item')->find();
+            if ($get_house['item']['item']=='1'){
+                $row['item_name']='物业费';
+            }elseif ($get_house['item']['item']=='2'){
+                $row['item_name']='垃圾处理费';
+            }elseif ($get_house['item']['item']=='3'){
+                $row['item_name']='停车费';
+            }else{
+                $row['item_name']='未知';
+            }
+        }
+        $this->view->assign("row", $row);
+        return $this->view->fetch();
+    }
+
+    /**
+     * 删除
+     */
+    public function del($ids = "")
+    {
+        if ($ids) {
+            $pk = $this->model->getPk();
+            $adminIds = $this->getDataLimitAdminIds();
+            if (is_array($adminIds)) {
+                $this->model->where($this->dataLimitField, 'in', $adminIds);
+            }
+            $list = $this->model->where($pk, 'in', $ids)->select();
+
+            $count = 0;
+            Db::startTrans();
+            try {
+                foreach ($list as $k => $v) {
+                    $count += $v->save(['is_delete'=>1]);
+                }
+                Db::commit();
+            } catch (PDOException $e) {
+                Db::rollback();
+                $this->error($e->getMessage());
+            } catch (Exception $e) {
+                Db::rollback();
+                $this->error($e->getMessage());
+            }
+            if ($count) {
+                $this->success();
+            } else {
+                $this->error(__('No rows were deleted'));
+            }
+        }
+        $this->error(__('Parameter %s can not be empty', 'ids'));
+    }
+
+}

application/admin/controller/cost/CostItem.php

@@ -46,6 +46,10 @@ class CostItem extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $where_and=['is_delete'=>'0'];
+            if (!empty($this->auth->village)){
+                $where_and['village_id']=['in',$this->auth->village];
+                //  dump($where_and);
+            }
             $total = $this->model
                 ->where($where)
                 ->where($where_and)

application/admin/controller/cost/HuListAuto.php

@@ -42,6 +42,10 @@ class HuListAuto extends Backend
             }
 
             $where_and=['status'=>1,'is_delete'=>'0'];
+            if (!empty($this->auth->village)){
+                $where_and['village_id']=['in',$this->auth->village];
+                //  dump($where_and);
+            }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $total = $this->model
                 ->where($where)

application/admin/controller/house/HuList.php

@@ -57,6 +57,12 @@ class HuList extends Backend
             }
 
             $where_and=['status'=>1,'is_delete'=>'0'];
+            if (!empty($this->auth->village)){
+             //  dump($this->auth->village);
+                $where_and['village_id']=['in',$this->auth->village];
+                //  dump($where_and);
+            }
+
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $total = $this->model
                 ->where($where)

application/admin/controller/house/MemberHouse.php

@@ -47,8 +47,18 @@ class MemberHouse extends Backend
 
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $where_anmd=[];
-            if (!empty($mid)){
-                $where_anmd['mid']=$mid;
+
+
+            if (!empty($mid) || !empty($this->auth->village)){
+
+
+                if (!empty($this->auth->village)){
+                    $where_anmd['village_id']=['in',$this->auth->village];
+                    //  dump($where_and);
+                }
+                if (!empty($mid)){
+                    $where_anmd['mid']=$mid;
+                }
                 $total = $this->model
                     ->where($where)
                     ->where($where_anmd)
@@ -64,6 +74,7 @@ class MemberHouse extends Backend
                     ->select();
 
             }else{
+
                 $total = $this->model
                     ->where($where)
 //                    ->where($where_anmd)

application/admin/controller/submit/SubmitEdit.php

@@ -47,6 +47,11 @@ class SubmitEdit extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $where_and=['is_delete'=>'0','type'=>'0'];
+            if (!empty($this->auth->village)){
+                $where_and['village_id']=['in',$this->auth->village];
+                //  dump($where_and);
+            }
+
             $total = $this->model
                 ->where($where)
                 ->where($where_and)

application/admin/controller/village/Village.php

@@ -36,20 +36,28 @@ class Village extends Backend
         $this->request->filter(['strip_tags']);
 
 
+
         if ($this->request->isAjax()) {
             //如果发送的来源是Selectpage，则转发到Selectpage
             if ($this->request->request('keyField')) {
                 return $this->selectpage();
             }
 
-
+           // dump( $this->auth->village);
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $where_and['is_delete']=['eq','0'];
 
             if (!empty($property_id)){
                 $where_and['property_id']=['eq',$property_id];
             }
-            //  dump($where_add);
+
+            if (!empty($this->auth->village)){
+
+
+                $where_and['id']=['in',$this->auth->village];
+              //  dump($where_and);
+            }
+
             $total = $this->model
                 ->where($where)
                 ->where($where_and)

application/admin/controller/village/VillageDong.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller\village;
 
+use app\admin\model\house\MemberHouse;
 use app\common\controller\Backend;
 use think\Db;
 use think\exception\PDOException;
@@ -181,6 +182,7 @@ class VillageDong extends Backend
                 foreach ($list as $k => $v) {
                     VillageDanyuan::where('dong_id',$v['id'])->delete();
                     VillageHu::where('dong_id',$v['id'])->delete();
+                    MemberHouse::where('dong_id',$v['id'])->delete();
                     $count += $v->delete();
                 }
                 Db::commit();

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

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'Id'             => 'ID',
+    'Property_id'    => '所属物业',
+    'Bill_id'        => '账单id',
+    'True_price_old' => '原来实付金额',
+    'True_price_new' => '现在实付金额',
+    'Createtime'     => '创建时间',
+    'Updatetime'     => '更新时间',
+    'Status'         => '提交,2审核通过,3驳回',
+    'Is_delete'      => '是否删除'
+];

application/admin/model/cost/CostBill.php

@@ -73,7 +73,7 @@ class CostBill extends Model
     }
 
     public function village(){
-        return $this->belongsTo('app\admin\model\village\Village','village_id','id')->field('id,v_name as name');
+        return $this->belongsTo('app\admin\model\village\Village','village_id','id')->field('id,v_name as name,property_id');
     }
 
     public function dong(){

application/admin/model/cost/CostBillAuto.php

@@ -94,4 +94,8 @@ class CostBillAuto extends Model
     public function member(){
         return $this->belongsTo('app\admin\model\Member','mid','id')->field('id,avatar,nickname');
     }
+
+    public function item(){
+        return $this->belongsTo('app\admin\model\cost\CostItem','item_id','id')->field('id,item');
+    }
 }

application/admin/model/cost/CostEdit.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace app\admin\model\cost;
+
+use think\Model;
+
+
+class CostEdit extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'cost_edit';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+
+    public function bill(){
+        return $this->belongsTo('app\admin\model\cost\CostBill','bill_id','id')->field('id,village_id,item_id');
+    }
+    
+
+
+
+
+
+
+
+}

application/admin/validate/cost/CostEdit.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate\cost;
+
+use think\Validate;
+
+class CostEdit extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

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

@@ -3,49 +3,20 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Item_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-item_id" data-rule="required" data-source="item/index" class="form-control selectpage" name="row[item_id]" type="text" value="{$row.item_id|htmlentities}">
+            <input class="form-control "  type="text"  disabled="disabled" value="{$row.item_name|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Property_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('房产')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-property_id" data-rule="required" data-source="property/index" class="form-control selectpage" name="row[property_id]" type="text" value="{$row.property_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Village_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-village_id" data-rule="required" data-source="village/index" class="form-control selectpage" name="row[village_id]" type="text" value="{$row.village_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Dong_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-dong_id" data-rule="required" data-source="dong/index" class="form-control selectpage" name="row[dong_id]" type="text" value="{$row.dong_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Danyuan_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-danyuan_id" data-rule="required" data-source="danyuan/index" class="form-control selectpage" name="row[danyuan_id]" type="text" value="{$row.danyuan_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Hu_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-hu_id" data-rule="required" data-source="hu/index" class="form-control selectpage" name="row[hu_id]" type="text" value="{$row.hu_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Mid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-mid" data-rule="required" class="form-control" name="row[mid]" type="number" value="{$row.mid|htmlentities}">
+            <input   data-rule="required"  class="form-control" disabled="disabled" type="text" value="{$row.house|htmlentities}">
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
+            <input disabled="disabled"  class="form-control" step="0.01"  type="number" value="{$row.price|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -57,33 +28,37 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[start_time]" type="text" value="{:$row.start_time?datetime($row.start_time):''}">
+            <input  class="form-control datetimepicker" disabled="disabled"   data-date-format="YYYY-MM-DD" data-use-current="true"  type="text" value="{:$row.start_time?datetime($row.start_time):''}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('End_time')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[end_time]" type="text" value="{:$row.end_time?datetime($row.end_time):''}">
+            <input id="c-end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" disabled="disabled"  type="text" value="{:$row.end_time?datetime($row.end_time):''}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_time')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('支付状态')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[pay_time]" type="text" value="{:$row.pay_time?datetime($row.pay_time):''}">
+            <div class="col-xs-12 col-sm-8">
+                {:build_radios('row[pay_status]', ['0'=>__('未付款'),'1'=>__('已付款')],$row['pay_status'])}
+            </div>
+<!--           // <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">-->
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_time')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
+            <input id="c-pay_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[pay_time]" type="text" value="{:$row.pay_time?datetime($row.pay_time):''}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_delete')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('备注')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-is_delete" data-rule="required" class="form-control" name="row[is_delete]" type="number" value="{$row.is_delete|htmlentities}">
+            <input id="c-mark" class="form-control" name="row[mark]" type="text" value="{$row.mark|htmlentities}">
         </div>
     </div>
+
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
@@ -92,3 +67,5 @@
         </div>
     </div>
 </form>
+
+

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

@@ -1,57 +1,22 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Order_number')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-order_number" data-rule="required" class="form-control" name="row[order_number]" type="text" value="{$row.order_number|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Item_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-item_id" data-rule="required" data-source="item/index" class="form-control selectpage" name="row[item_id]" type="text" value="{$row.item_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Property_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-property_id" data-rule="required" data-source="property/index" class="form-control selectpage" name="row[property_id]" type="text" value="{$row.property_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Village_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-village_id" data-rule="required" data-source="village/index" class="form-control selectpage" name="row[village_id]" type="text" value="{$row.village_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Dong_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-dong_id" data-rule="required" data-source="dong/index" class="form-control selectpage" name="row[dong_id]" type="text" value="{$row.dong_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Danyuan_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-danyuan_id" data-rule="required" data-source="danyuan/index" class="form-control selectpage" name="row[danyuan_id]" type="text" value="{$row.danyuan_id|htmlentities}">
+            <input class="form-control "  type="text"  disabled="disabled" value="{$row.item_name|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Hu_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('房产')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-hu_id" data-rule="required" data-source="hu/index" class="form-control selectpage" name="row[hu_id]" type="text" value="{$row.hu_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Mid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-mid" data-rule="required" class="form-control" name="row[mid]" type="number" value="{$row.mid|htmlentities}">
+            <input   data-rule="required"  class="form-control" disabled="disabled" type="text" value="{$row.house|htmlentities}">
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
+            <input disabled="disabled"  class="form-control" step="0.01"  type="number" value="{$row.price|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -63,39 +28,37 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[start_time]" type="text" value="{:$row.start_time?datetime($row.start_time):''}">
+            <input  class="form-control datetimepicker" disabled="disabled"   data-date-format="YYYY-MM-DD" data-use-current="true"  type="text" value="{:$row.start_time?datetime($row.start_time):''}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('End_time')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[end_time]" type="text" value="{:$row.end_time?datetime($row.end_time):''}">
+            <input id="c-end_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" disabled="disabled"  type="text" value="{:$row.end_time?datetime($row.end_time):''}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_time')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('支付状态')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[pay_time]" type="text" value="{:$row.pay_time?datetime($row.pay_time):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-pay_status" class="form-control" name="row[pay_status]" type="number" value="{$row.pay_status|htmlentities}">
+            <div class="col-xs-12 col-sm-8">
+                {:build_radios('row[pay_status]', ['0'=>__('未付款'),'1'=>__('已付款')],$row['pay_status'])}
+            </div>
+            <!--           // <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">-->
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pay_time')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
+            <input id="c-pay_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[pay_time]" type="text" value="{:$row.pay_time?datetime($row.pay_time):''}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_delete')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('备注')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-is_delete" data-rule="required" class="form-control" name="row[is_delete]" type="number" value="{$row.is_delete|htmlentities}">
+            <input id="c-mark" class="form-control" name="row[mark]" type="text" value="{$row.mark|htmlentities}">
         </div>
     </div>
+
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

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

@@ -0,0 +1,46 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Property_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-property_id" data-rule="required" data-source="property/index" class="form-control selectpage" name="row[property_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bill_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bill_id" data-rule="required" data-source="bill/index" class="form-control selectpage" name="row[bill_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('True_price_old')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-true_price_old" data-rule="required" class="form-control" step="0.01" name="row[true_price_old]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('True_price_new')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-true_price_new" data-rule="required" class="form-control" step="0.01" name="row[true_price_new]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="1">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_delete')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-is_delete" data-rule="required" class="form-control" name="row[is_delete]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

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

@@ -0,0 +1,59 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('房产')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input disabled="disabled" class="form-control"  type="text" value="{$row.house|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('缴费类型')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input disabled="disabled" class="form-control"  type="text" value="{$row.item_name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('True_price_old')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input disabled="disabled" class="form-control" step="0.01"  type="number" value="{$row.true_price_old|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('True_price_new')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-true_price_new" data-rule="required" class="form-control" step="0.01" name="row[true_price_new]" type="number" value="{$row.true_price_new|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('状态')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[status]', ['1'=>__('未处理'),'2'=>__('已处理'), '3'=>__('已驳回')],$row['status'])}
+            <span style="color:red">注意：点击“已处理”后不可修改</span>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('备注')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input disabled="disabled"  class="form-control"  type="text" value="{$row.mark|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('回复')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input name="row[remark]" class="form-control"  type="text" value="{$row.remark|htmlentities}">
+        </div>
+    </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Is_delete')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <input id="c-is_delete" data-rule="required" class="form-control" name="row[is_delete]" type="number" value="{$row.is_delete|htmlentities}">-->
+<!--        </div>-->
+<!--    </div>-->
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

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

@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <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_edit/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('cost/cost_edit/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_edit/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_edit/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>-->
+
+<!--                        <div class="dropdown btn-group {:$auth->check('cost/cost_edit/multi')?'':'hide'}">-->
+<!--                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+<!--                            <ul class="dropdown-menu text-left" role="menu">-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
+<!--                            </ul>-->
+<!--                        </div>-->
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('cost/cost_edit/edit')}" 
+                           data-operate-del="{:$auth->check('cost/cost_edit/del')}" 
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/admin/view/house/hu_list/index.html

@@ -6,7 +6,7 @@
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <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-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
 <!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('house/hu_list/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
 <!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('house/hu_list/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('house/hu_list/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->

application/admin/view/submit/submit_tou/add.html

@@ -20,17 +20,17 @@
 <!--        </div>-->
 
 <!--    </div>-->
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Village_id')}:</label>
-        <div class="col-xs-12 col-sm-8"  data-toggle="cxselect" data-selects="first,second,three,four">
-            <select class="first form-control"  data-rule="required"  style="width:48%;" name="row[village_id]" data-url="ajax/village"></select>
-            <select class="second form-control"   style="width: 48%;" name="row[dong_id]" data-url="ajax/dong" data-query-name="pid"></select>
-            <select class="three form-control"   style="width:48%;" name="row[danyuan_id]" data-url="ajax/danyuan" data-query-name="pid"></select>
-            <select class="four form-control"    style="width: 48%;" name="row[hu_id]" data-url="ajax/hu" data-query-name="pid"></select>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Village_id')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8"  data-toggle="cxselect" data-selects="first,second,three,four">-->
+<!--            <select class="first form-control"  data-rule="required"  style="width:48%;" name="row[village_id]" data-url="ajax/village"></select>-->
+<!--            <select class="second form-control"   style="width: 48%;" name="row[dong_id]" data-url="ajax/dong" data-query-name="pid"></select>-->
+<!--            <select class="three form-control"   style="width:48%;" name="row[danyuan_id]" data-url="ajax/danyuan" data-query-name="pid"></select>-->
+<!--            <select class="four form-control"    style="width: 48%;" name="row[hu_id]" data-url="ajax/hu" data-query-name="pid"></select>-->
 
-            <!--          <input id="c-village_id" data-rule="required" data-source="village/index" class="form-control selectpage" name="row[village_id]" type="text" value="">-->
-        </div>
-    </div>
+<!--            &lt;!&ndash;          <input id="c-village_id" data-rule="required" data-source="village/index" class="form-control selectpage" name="row[village_id]" type="text" value="">&ndash;&gt;-->
+<!--        </div>-->
+<!--    </div>-->
 <!--    <div class="form-group">-->
 <!--        <label class="control-label col-xs-12 col-sm-2">{:__('Danyuan_id')}:</label>-->
 <!--        <div class="col-xs-12 col-sm-8">-->

application/admin/view/submit/submit_tou/edit.html

@@ -8,15 +8,15 @@
             <!--           <input id="c-mid" data-rule="required" class="form-control" name="row[mid]" type="number" value="0">-->
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Village_id')}:</label>
-        <div class="col-xs-12 col-sm-8"  data-toggle="cxselect" data-selects="first,second,three,four">
-            <select class="first form-control"  data-rule="required"  style="width:48%;" data-value="{$row.village_id}" name="row[village_id]" data-url="ajax/village"></select>
-            <select class="second form-control"  data-rule="required"  style="width: 48%;"  data-value="{$row.dong_id}" name="row[dong_id]" data-url="ajax/dong" data-query-name="pid"></select>
-            <select class="three form-control"  data-rule="required"  style="width:48%;" data-value="{$row.danyuan_id}" name="row[danyuan_id]" data-url="ajax/danyuan" data-query-name="pid"></select>
-            <select class="four form-control"  data-rule="required"  style="width: 48%;" data-value="{$row.hu_id}" name="row[hu_id]" data-url="ajax/hu" data-query-name="pid"></select>
-        </div>
-    </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Village_id')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8"  data-toggle="cxselect" data-selects="first,second,three,four">-->
+<!--            <select class="first form-control"  data-rule="required"  style="width:48%;" data-value="{$row.village_id}" name="row[village_id]" data-url="ajax/village"></select>-->
+<!--            <select class="second form-control"  data-rule="required"  style="width: 48%;"  data-value="{$row.dong_id}" name="row[dong_id]" data-url="ajax/dong" data-query-name="pid"></select>-->
+<!--            <select class="three form-control"  data-rule="required"  style="width:48%;" data-value="{$row.danyuan_id}" name="row[danyuan_id]" data-url="ajax/danyuan" data-query-name="pid"></select>-->
+<!--            <select class="four form-control"  data-rule="required"  style="width: 48%;" data-value="{$row.hu_id}" name="row[hu_id]" data-url="ajax/hu" data-query-name="pid"></select>-->
+<!--        </div>-->
+<!--    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('投诉主体')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/village/village_dong/add.html

@@ -1,5 +1,7 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
+
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2"><span style="color: red">*</span>{:__('楼幢名称')}:</label>
         <div class="col-xs-12 col-sm-8">

application/api/controller/Member.php

@@ -218,6 +218,7 @@ class Member extends Api
             $info = [
                 'avatar' => $default['default_avatar'],
                 'nickname' => substr_replace($mobile,'****',3,4),//$default['default_nickname'],
+                'name' => substr_replace($mobile,'****',3,4),
                 'mobile' => $mobile,
                 'rands' =>createSalt(),
                 'password'=>md5(trim($password)),
@@ -438,7 +439,7 @@ class Member extends Api
         }
         $update=[];
         if (!empty($nickname)){
-            $update['nickname']=preg_replace('/[\xf0-\xf7].{3}/', '', trim($nickname));
+            $update['name']=$update['nickname']=preg_replace('/[\xf0-\xf7].{3}/', '', trim($nickname));
         }
         if (!empty($avatar)){
             $update['avatar']=$avatar;

application/common/controller/Backend.php

@@ -3,6 +3,8 @@
 namespace app\common\controller;
 
 use app\admin\library\Auth;
+use app\admin\model\village\Village;
+use app\admin\model\village\VillageHu;
 use think\Config;
 use think\Controller;
 use think\Hook;
@@ -150,9 +152,15 @@ class Backend extends Controller
             // 判断是否需要验证权限
             if (!$this->auth->match($this->noNeedRight)) {
                 // 判断控制器和方法判断是否有对应权限
-                if (!$this->auth->check($path)) {
-                    Hook::listen('admin_nopermission', $this);
-                    $this->error(__('You have no permission'), '');
+               // echo $path;
+                if ($path=='member/index'){
+
+                }else{
+                    if (!$this->auth->check($path)) {
+                        Hook::listen('admin_nopermission', $this);
+                        $this->error(__('You have no permission'), '');
+                    }
+
                 }
             }
         }
@@ -216,6 +224,21 @@ class Backend extends Controller
         $this->assign('site', $site);
         //渲染配置信息
         $this->assign('config', $config);
+
+//        $gourp=$this->auth->getGroups() ;
+//        if ($gourp['0']['group_id']=='5'){
+//            echo $this->auth->property_id;
+//        }
+        $this->auth->village=[];
+        if ($this->auth->property_id){
+
+
+            $get_v=Village::where('property_id',$this->auth->property_id)->where('is_delete','0')->field('id')->select();
+            $village=array_column($get_v, 'id');
+            $this->auth->village=$village;
+            //  dump($where_and);
+        }
+
         //渲染权限对象
         $this->assign('auth', $this->auth);
         //渲染管理员对象
@@ -391,9 +414,12 @@ class Backend extends Controller
     protected function getDataLimitAdminIds()
     {
         if (!$this->dataLimit) {
+
             return null;
         }
         if ($this->auth->isSuperAdmin()) {
+
+
             return null;
         }
         $adminIds = [];

application/config.php

@@ -262,7 +262,7 @@ return [
         //会员注册验证码类型email/mobile/wechat/text/false
         'user_register_captcha' => 'text',
         //登录验证码
-        'login_captcha'         => true,
+        'login_captcha'         => false,
         //登录失败超过10次则1天后重试
         'login_failure_retry'   => true,
         //是否同一账号同一时间只能在一个地方登录

public/assets/js/backend/cost/cost_bill.js

@@ -51,7 +51,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
                         {field: 'danyuan.name', title: __('单元'),operate:false},
                         {field: 'hu.name', title: __('房产'),operate:false},
-                        {field: 'hu.usesr_name', title: __('业主')},
+                        {field: 'hu.usesr_name', title: __('业主'),operate:'LIKE'},
                         // {field: 'mid', title: __('Mid')},
                         {field: 'price', title: __('Price'), operate:false},
                         {field: 'true_price', title: __('True_price'), operate:false},

public/assets/js/backend/cost/cost_bill_auto.js

@@ -52,7 +52,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
                         {field: 'danyuan.name', title: __('单元'),operate:false},
                         {field: 'hu.name', title: __('房产'),operate:false},
-                        {field: 'hu.usesr_name', title: __('业主')},
+                        {field: 'hu.usesr_name', title: __('业主'),operate:'LIKE'},
                         // {field: 'mid', title: __('Mid')},
                         {field: 'price', title: __('Price'), operate:false},
                         {field: 'true_price', title: __('True_price'), operate:false},

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

@@ -7,8 +7,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 extend: {
                     index_url: 'cost/cost_bill_paid/index' + location.search,
                     add_url: 'cost/cost_bill_paid/add',
-                    edit_url: 'cost/cost_bill_paid/edit',
-                    del_url: 'cost/cost_bill_paid/del',
+                   // edit_url: 'cost/cost_bill_paid/edit',
+                   // del_url: 'cost/cost_bill_paid/del',
                     multi_url: 'cost/cost_bill_paid/multi',
                     table: 'cost_bill',
                 }
@@ -71,7 +71,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
                         {field: 'danyuan.name', title: __('单元'),operate:false},
                         {field: 'hu.name', title: __('房产'),operate:false},
-                        {field: 'hu.usesr_name', title: __('业主')},
+                        {field: 'hu.usesr_name', title: __('业主'),operate:'LIKE'},
                         // {field: 'mid', title: __('Mid')},
                         {field: 'price', title: __('Price'), operate:false},
                         {field: 'true_price', title: __('True_price'), operate:false},

public/assets/js/backend/cost/cost_edit.js

@@ -0,0 +1,63 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'cost/cost_edit/index' + location.search,
+                    add_url: 'cost/cost_edit/add',
+                    edit_url: 'cost/cost_edit/edit',
+                    del_url: 'cost/cost_edit/del',
+                    multi_url: 'cost/cost_edit/multi',
+                    table: 'cost_edit',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                search:false,
+                showToggle: false,
+                showColumns: false,
+                visible: false,
+                showExport: false,
+                commonSearch: false,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'house', title: __('房产')},
+                        {field: 'item_name', title: __('费用')},
+                        {field: 'true_price_old', title: __('True_price_old'), operate:'BETWEEN'},
+                        {field: 'true_price_new', title: __('True_price_new'), operate:'BETWEEN'},
+                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                       // {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                        {field: 'status', title: __('Status')},
+                     //   {field: 'is_delete', title: __('Is_delete')},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});

public/assets/js/backend/cost/cost_pay.js

@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 showColumns: false,
                 visible: false,
                 showExport: false,
+
                 commonSearch: false,
                 columns: [
                     [