修改

www/protected/modules/moonclub/controllers/EmployeController.php

@@ -306,7 +306,11 @@ class EmployeController extends MoonClubBaseController {
         $criteria = new EMongoCriteria();
         $criteria->service_employer('==',new MongoId($id));
 
-      $criteria->status('==',$status);
+        $criteria->status('==',$status);
+        if (intval($status) == 2) {
+            $criteria->sort('out_room_time',EMongoCriteria::SORT_DESC);
+        }
+
 
         $porder = POrder::model()->findAll($criteria);
 

www/protected/modules/moonclub/controllers/POrderController.php

@@ -180,7 +180,7 @@ class POrderController extends AdminController
         }
         $porder = POrder::get(new MongoId($order_id));
         $complaints = new Complaints();
-        $complaints->com_time = $porder->order_time;
+        $complaints->com_time = time();
         $complaints->address = $porder->address;
         $complaints->user_name = $user_name;
         $complaints->p_id = $order_id;
@@ -199,9 +199,15 @@ class POrderController extends AdminController
 
     public function actionOutputExcel()
     {
-        $beginYesterday=mktime(0,0,0,date('m')-1,1,date('Y'));
-        $endYesterday=mktime(0,0,0,date('m'),1,date('Y'))-1;
-        $name=date("Y-m",strtotime("-1 months",time())).'月考勤明细汇总';
+        //$beginYesterday=mktime(0,0,0,date('m')-1,1,date('Y'));
+        //$endYesterday=mktime(0,0,0,date('m'),1,date('Y'))-1;
+
+
+        $beginYesterday = Yii::app()->request->getParam('export_start_book').' 00:00:00';
+        $endYesterday = Yii::app()->request->getParam('export_end_book').' 23:59:59';
+        $name="$beginYesterday-$endYesterday 出房记录汇总  ";
+        $beginYesterday = strtotime($beginYesterday);
+        $endYesterday = strtotime($endYesterday);
         $criteria = new EMongoCriteria();
         //$criteria->booking_time('>=',$beginYesterday);//开始时间
         //$criteria->booking_time('<=',$endYesterday);//结束时间
@@ -241,9 +247,12 @@ class POrderController extends AdminController
     }
     public function actionOutputExcel1()
     {
-        $beginYesterday=mktime(0,0,0,date('m')-1,1,date('Y'));
-        $endYesterday=mktime(0,0,0,date('m'),1,date('Y'))-1;
-        $name=date("Y-m",strtotime("-1 months",time())).'月服务明细汇总';
+        $beginYesterday = Yii::app()->request->getParam('export_start_book').' 00:00:00';
+        $endYesterday = Yii::app()->request->getParam('export_end_book').' 23:59:59';
+        $name="$beginYesterday-$endYesterday 服务明细汇总";
+        $beginYesterday = Yii::app()->request->getParam('export_start_book').' 00:00:00';
+        $endYesterday = Yii::app()->request->getParam('export_end_book').' 23:59:59';
+
 
         $criteria = new EMongoCriteria();
         $criteria->order_time('>=',$beginYesterday);//开始时间

www/protected/modules/moonclub/views/pOrder/index.php

@@ -20,12 +20,19 @@
         <input id="filter_status" />
       </div>
       <div class="tb_line">
-        <a href="#" class='easyui-linkbutton' iconCls="icon-add" plain="true" onclick="export_order();return false;">导出月考勤明细汇总</a>
+        <span class="tb_label">导出时间</span>
+        <span class="tb_label">开始</span>
+        <input type="text" id="export_start_book" style="width:100px;"/>
+        <span class="tb_label">结束</span>
+        <input type="text" id="export_end_book" style="width:100px;"/>
+
       </div>
       <div class="tb_line">
+        <a href="#" class='easyui-linkbutton' iconCls="icon-add" plain="true" onclick="export_order();return false;">导出月出房记录汇总</a>
         <a href="#" class='easyui-linkbutton' iconCls="icon-add" plain="true" onclick="export_order1();return false;">导出月服务明细汇总</a>
       </div>
 
+
       <div class="tb_line">
         <span class="tb_label">楼号: </span>
         <input id="floor" name="floor"/>
@@ -39,8 +46,8 @@
         <span class="tb_label">派单</span>
         <span class="tb_label">开始</span>
         <input type="text" id="date_start_book" style="width:100px;"/>
-        <span class="tb_label">结束</span>
-        <input type="text" id="date_end_book" style="width:100px;"/>
+        <!--<span class="tb_label">结束</span>
+        <input type="text" id="date_end_book" style="width:100px;"/>-->
       </div>
 
 
@@ -190,7 +197,7 @@
                 <li class="f_item">
                   <div class="box">
                     <div class="f_label">
-                      <span>投诉信息: </span>
+                      <span>投诉内容: </span>
                     </div>
                     <div class="box_flex f_content">
                       <input name="c_info" id="c_info" />
@@ -306,7 +313,7 @@
   var w_width = $(window).width();
   var w_height = $(window).height();
   var jq_date_start_book = $('#date_start_book');
-  var jq_date_end_book = $('#date_end_book');
+  //var jq_date_end_book = $('#date_end_book');
   var jq_ss = $('#ss');
   var jq_add_dialog = $('#add_dialog');
   var jq_add_form = $('#add_form');
@@ -326,7 +333,9 @@
       }
     });
     jq_date_start_book.datebox({});
-    jq_date_end_book.datebox({});
+    $('#export_start_book').datebox({});
+    $('#export_end_book').datebox({});
+   // jq_date_end_book.datebox({});
 
     var buttons1 = $.extend([], $.fn.datebox.defaults.buttons);
     buttons1[0].text = '确定';
@@ -610,6 +619,11 @@ var buttons4 = $.extend([], $.fn.datebox.defaults.buttons);
 
           return value.floor +'楼'+value.room+'号';
         }},
+        {field:'service_employer_name', title:'姓名', width:25,sortable:false},
+        {field:'service_standards', title:'服务标准', width:25,sortable:true,formatter: function(value, row){
+
+          return package[parseInt(value)+1].text;
+        }},
         {field:'in_room_time', title:'进房时间', width:25, sortable: true,formatter: function(value, row){
           if (value) {
             return value;
@@ -626,11 +640,8 @@ var buttons4 = $.extend([], $.fn.datebox.defaults.buttons);
         }},
         {field:'status', title:'状态', width:25,sortable:true,formatter: function(value, row){
           return status_data[parseInt(value)+1].text;
-        }},
-        {field:'service_standards', title:'服务标准', width:25,sortable:true,formatter: function(value, row){
-
-          return package[parseInt(value)+1].text;
         }}
+
       ]],
 
       onSelect: function(index, row){
@@ -866,8 +877,13 @@ var buttons4 = $.extend([], $.fn.datebox.defaults.buttons);
     jq_content_form.submit();
   }
   function save_order_content(){
-    $.messager.progress();
-    jq_order_content_form.submit();
+    $.messager.confirm('Warning','确定修改派单信息?',function(r){
+      if (r){
+        $.messager.progress();
+        jq_order_content_form.submit();
+      }
+    });
+
   }
 
   function add_content(){
@@ -887,8 +903,9 @@ var buttons4 = $.extend([], $.fn.datebox.defaults.buttons);
     var room =  $('#room').val();
     var status =  jq_filter_status.combobox('getValue');
     var date_start_book = jq_date_start_book.datebox('getValue');
-    var date_end_book = jq_date_end_book.datebox('getValue');
-
+    //var date_end_book = jq_date_end_book.datebox('getValue');
+    var date_end_book = date_start_book + ' 23:59:59';
+    date_start_book = date_start_book + ' 00:00:00';
     console.log(floor)
     console.log(room)
     console.log(date_start_book)
@@ -907,10 +924,14 @@ var buttons4 = $.extend([], $.fn.datebox.defaults.buttons);
     });
   };
   function export_order() {
-    window.location.href = module_router+'/OutputExcel';
+    var start_time = $('#export_start_book').datebox('getValue');
+    var end_time = $('#export_end_book').datebox('getValue');
+    window.location.href = module_router+'/OutputExcel&export_start_book='+start_time+'&export+end_book='+end_time;
   }
   function export_order1() {
-    window.location.href = module_router+'/OutputExcel1';
+    var start_time = $('#export_start_book').datebox('getValue');
+    var end_time = $('#export_end_book').datebox('getValue');
+    window.location.href = module_router+'/OutputExcel1&export_start_book='+start_time+'&export+end_book='+end_time;
   }
   function parse_time(data,attr){
     if(data[attr]){

www/protected/views/rOrder/index.php

@@ -567,7 +567,6 @@
   </div>
 
 </div>
-
 <div style="display:none;">
   <div id="refund_tip_dialog" style="padding: 30px 0;">
     <div style="text-align:center;"><span id="refund_tip"></span></div>