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

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

@@ -298,9 +298,15 @@ class POrderController extends AdminController
     }
 
     public function actionImportExcel()
-    {
-        $excelFile = __DIR__.'/1.xlsx';//获取文件名
-        Yii::$enableIncludePath = false;
+    {   $back = Yii::app()->request->urlReferrer;
+        $url = Yii::app()->request->getParam('url','');
+        $file = file_get_contents($url);
+        $tmp = __DIR__.'/'.time().'.xlsx';
+        $examp = fopen($tmp,'w+');
+        @fwrite($examp,$file);
+        @fclose($examp);
+        $excelFile  = $tmp;
+        date_default_timezone_set('Asia/Shanghai');
         Yii::import('application.extensions.PHPExcel.PHPExcel', 1);
         $phpexcel = new PHPExcel;
         $excelReader = PHPExcel_IOFactory::createReader('Excel2007');
@@ -312,15 +318,23 @@ class POrderController extends AdminController
         for ($row = 2; $row <= $total_line; $row++) {
             $data = array();
             for ($column = 'A'; $column <= $total_column; $column++) {
-                $data[] = trim($phpexcel->getCell($column . $row)->getValue());
+                if ($column == 'A') {
+                    $tmp = trim($phpexcel->getCell($column . $row)->getValue());
+                    $tmp = explode(":",$tmp);
+                    $tmp = strtotime($tmp[0].'-'.$tmp[1].'-'.$tmp[2].' '.$tmp[3].':'.$tmp[4]);
+                    $data[] = $tmp;
+                } else {
+                    $data[] = trim($phpexcel->getCell($column . $row)->getValue());
+                }
+
+
             }
-            var_dump($data);
-            echo '<br/>';
+
             $order = new POrder();
 
             $criteria = new EMongoCriteria();
 
-            $criteria->user_name('==',$service_employer);
+            $criteria->user_name('==',$data[4]);
             $userInfo = Employe::model()->find($criteria);
             //获取服务人员信息
             if ($userInfo) {
@@ -329,18 +343,18 @@ class POrderController extends AdminController
                 CommonFn::requestAjax(false, '服务人员信息不存在');exit;
             }
 
-            $order->order_time = intval($order_time);//服务日期
-            $order->address['floor'] = $floor;//楼号
-            $order->address['room'] = $room;//房号
-            $order->service_standards = $package;//服务标准
+            $order->order_time = intval($data[0]);//服务日期
+            $order->address['floor'] = $data[1];//楼号
+            $order->address['room'] = $data[2];//房号
+            $order->service_standards = $data[3];//服务标准
             $order->status = 0;//已派单
             $order->in_room_time = 0;
             $order->out_room_time = 0;
 
             $result = $order->save();
         }
-
-
+        unlink($excelFile);
+        $this->redirect($back);
     }
 
 }

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

@@ -31,6 +31,11 @@
         <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="box_flex f_content" id="upload_pics">
+        <a href="#" iconCls="icon-add" id="qiniu_uploader" class="easyui-linkbutton" plain="true">
+          上传文件
+        </a>
+      </div>
 
 
       <div class="tb_line">
@@ -298,6 +303,7 @@
     <div style="text-align:center;"><span id="refund_tip"></span></div>
   </div>
 </div>
+<script type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/qiniu_upload_single.js?v=20200901"></script>
 <script language="javascript" type="text/javascript" src="<?php echo Yii::app()->request->baseUrl; ?>/js/coolautosuggest/jquery.coolautosuggest.js"></script>
 <link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/js/coolautosuggest/jquery.coolautosuggest.css" />
 <script type="text/javascript">
@@ -574,6 +580,24 @@ var buttons4 = $.extend([], $.fn.datebox.defaults.buttons);
         jq_set_precedence.combobox('setValue', 0);
       }
     });
+    $.fn.qiniu_upload_single('init',{
+      bucket:'icons',
+      button:"#qiniu_uploader",
+      before_upload:function(){
+        return true;
+      },
+      success_callback:function(result){
+
+        var url = result.url;
+        console.log(url)
+        window.location.href = module_router+'/importExcel&url='+url;
+
+      },
+      fail_callback:function(){
+        $.messager.alert('提示', '上传失败2，请稍后再试', 'warning');
+        return false;
+      }
+    });
 
     jq_dg_content.datagrid({
       url: module_router + '/list',