Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/modules/j/controllers/HouseKeepingController.php

@@ -34,11 +34,11 @@ class HouseKeepingController extends JBaseController
 
     public function actionEdit()
     {
-        $status = intval(Yii::app()->request->getParam('status', 100));
-        $contract = intval(Yii::app()->request->getParam('contract', 100));
-        $type = intval(Yii::app()->request->getParam('type', 100));
-        $cart = intval(Yii::app()->request->getParam('cart', 100));
-        $skill = intval(Yii::app()->request->getParam('skill', 100));
+        $status = intval(Yii::app()->request->getParam('status', ''));
+        $contract = intval(Yii::app()->request->getParam('contract', ''));
+        $type = intval(Yii::app()->request->getParam('type', ''));
+        $cart = intval(Yii::app()->request->getParam('cart', ''));
+        $skill = intval(Yii::app()->request->getParam('skill', ''));
         $age = intval(Yii::app()->request->getParam('age', 0));
         $tech = (Yii::app()->request->getParam('tech', ''));
         $desc = (Yii::app()->request->getParam('desc', ''));

www/protected/views/houseKeeping/index.php

@@ -444,14 +444,22 @@
         {field:'ck',checkbox:true}
       ]],
       columns:[[
+        {field:'time', title:'创建时间', width:70,sortable:true,formatter: function(value, row){
+          var now=new Date(value*1000);
+
+          var   month=now.getMonth()+1;
+          var   date=now.getDate();
+          var   hour = now.getHours();
+          return   month+"月"+date+"日"+hour+":00";
+        }
+        },
         {field:'user_name', title:'姓名', width:25,sortable:false},
         {field:'mobile', title:'联系方式', width:50, sortable: true},
-        {field:'address', title:'地址', width:50, sortable: false},
-        {field:'status_str', title:'预约状态', width:50, sortable: true},
-        {field:'contract_str', title:'签约状态', width:50, sortable: true},
         {field:'type_str', title:'服务类型', width:50, sortable: true},
         {field:'cart_str', title:'服务形式', width:50, sortable: true},
-        {field:'skill_str', title:'技能', width:50, sortable: true},
+        {field:'status_str', title:'预约状态', width:50, sortable: true},
+
+        /*{field:'skill_str', title:'技能', width:50, sortable: true},
         {field:'age', title:'年龄', width:50, sortable: true},
         {field:'desc', title:'备注', width:50, sortable: true},
         {field:'tech', title:'服务人员', width:50, sortable: true},
@@ -472,16 +480,8 @@
           var   hour = now.getHours();
           return   month+"月"+date+"日"+hour+":00";
         }
-        },
-        {field:'time', title:'创建时间', width:70,sortable:true,formatter: function(value, row){
-          var now=new Date(value*1000);
+        },*/
 
-          var   month=now.getMonth()+1;
-          var   date=now.getDate();
-          var   hour = now.getHours();
-          return   month+"月"+date+"日"+hour+":00";
-        }
-        },
         {field:'status_time', title:'预约时间', width:70,sortable:true,formatter: function(value, row){
           var now=new Date(value*1000);
 
@@ -491,7 +491,7 @@
           return   month+"月"+date+"日"+hour+":00";
         }
         },
-        {field:'yc_time', title:'预产期', width:70,sortable:true,formatter: function(value, row){
+       /* {field:'yc_time', title:'预产期', width:70,sortable:true,formatter: function(value, row){
           var now=new Date(value*1000);
 
           var   month=now.getMonth()+1;
@@ -499,7 +499,7 @@
           var   hour = now.getHours();
           return   month+"月"+date+"日"+hour+":00";
         }
-        },
+        },*/
       ]],
 
       onSelect: function(index, row){