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

www/index.php

@@ -15,6 +15,7 @@
     }
 	
     if (trim($env) == 'develop'){
+        ini_set('mongo.long_as_object',1);
         define('DB_CONNETC', 'mongodb://127.0.0.1:27017');
         $config=dirname(__FILE__).'/protected/config/develop.php';
         $environment = 'develop';

www/protected/controllers/ROrderController.php

@@ -159,7 +159,8 @@ class ROrderController extends AdminController{
         $technician_ids = array();
         $technician_names = array();
         $technicians = array();
-        for($i=0;$i<10;$i++) {
+        $nums = Yii::app()->request->getParam('tech_nums');
+        for($i=0;$i<$nums;$i++) {
             if(Yii::app()->request->getParam('extra_add_info_'.$i)) {
                 $technician_ids[] = $i;
                 $technician_names[] = Yii::app()->request->getParam('extra_add_info_'.$i);
@@ -636,7 +637,8 @@ class ROrderController extends AdminController{
         $technicians = array();
         $technician_ids = array();
         $technician_names = array();
-        for($i=0;$i<10;$i++) {
+        $nums = Yii::app()->request->getParam('tech_nums');
+        for($i=0;$i<$nums;$i++) {
             if(Yii::app()->request->getParam('reset_extra_add_info_'.$i)) {
                 $technician_ids[] = $i;
                 $technician_names[] =  Yii::app()->request->getParam('reset_extra_add_info_'.$i);
@@ -680,7 +682,7 @@ class ROrderController extends AdminController{
         $orderid = new MongoId($id);
         $order = ROrder::model()->get($orderid);
         $toTech = isset($order->technicians)  ? true : false;
-        $fromTechs[] = technician_names;
+        $fromTechs = $technician_names;
         //$order->technician = $technician_id;
         //$order->technician_name = $technician_name;
         $order->technicians = $technicians;

www/protected/views/rOrder/index.php

@@ -238,6 +238,7 @@
                                             </div>
                                             <input name="technician_name" style="width: 250px;" id="setTechnician_content"/>
                                             <input name="technician" type="hidden" id="technician_id" value="0" />
+                                            <input name="tech_nums" type="hidden" id="tech_nums" value="0">
                                             <a class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="add_extra();return false;">添加保洁师</a><br/>
                                             </div>
                                     </div>
@@ -995,11 +996,15 @@
             $('#admins_edit_info').html('');
             var technicians = data['technicians'];
             var tmp = '';
+            var value = 0;
             for (var j in technicians) {
-                tmp +='<div id="extra_add_info_'+technicians[j]['technician_id']+'" style="height:4px">'+technicians[j]['technician_name']+','+technicians[j]['technician_id'];
+                tmp +='<div id="extra_add_info_'+technicians[j]['technician_id']+'" style="height:4px">'+technicians[j]['technician_name'];
                 /*tmp += '<a href="" onclick="delete_extra('+technicians[j]['technician_id']+');return false;">删除</a></div><br/>';*/
                 tmp += '<input type="hidden" id="extra_add_info_hidden_'+technicians[j]['technician_id']+'" name="extra_add_info_'+technicians[j]['technician_id']+'" value='+technicians[j]['technician_name']+'/></div><br/>';
+                value += 1;
             }
+            $('#tech_nums').val(value);
+
             var address_contact = '省:'+data['address']['province']+'<br />'+'市:'+data['address']['city']+'<br />'+'区:'+data['address']['area']+'<br />'+'地址:'+data['address']['poi']['name']+' '+data['address']['detail']+'<br />'+'姓名:'+data['address']['name']+'<br />'+'手机号:'+data['address']['mobile']+'<br />'+'<a href="javascript:void();" lat='+data['address']['position'][1]+' lng='+data['address']['position'][0]+' id="view_position">查看坐标</a>';
             $('#address_contact').html(address_contact);
             $('#extra_add_info').html(tmp);
@@ -1524,11 +1529,17 @@ function add_extra(){
     if ($('#setTechnician_content').val()){
         setTechnician_content = $('#setTechnician_content').val();
         setTechnician_id =  $('#technician_id').val();
-        $output = "<div id='extra_add_info_"+setTechnician_id+"' style='height: 4px'>"+setTechnician_content+","+setTechnician_id;
+        $output = "<div id='extra_add_info_"+setTechnician_id+"' style='height: 4px'>"+setTechnician_content;
         $output +="<a href ='' onclick='delete_extra("+setTechnician_id+");return false;'>删除</a></div><br/>";
         $output +="<input type='hidden' id='extra_add_info_hidden_"+setTechnician_id+"' name='extra_add_info_"+setTechnician_id+"' value='"+setTechnician_content+"' /></div>";
+        $('#setTechnician_content').val('');
+
+        var value = $('#tech_nums').val()+1;
+
+        $('#tech_nums').val(value);
 
         $("#extra_add_info").append($output);
+
     }
 
 }
@@ -1539,14 +1550,18 @@ function reset_delete_extra(msg){
 }
 function reset_add_extra(){
     if ($('#resetTec').val()) {
+
+
         resetTec = $('#resetTec').val();
         resetTecName = $('#resetTecName').val();
 
-        $output = "<div id='reset_extra_add_info_"+resetTec+"' style='height: 4px'>"+resetTecName+","+resetTec;
+        $output = "<div id='reset_extra_add_info_"+resetTec+"' style='height: 4px'>"+resetTecName;
         $output +="<a href ='' onclick='reset_delete_extra("+resetTec+");return false;'>删除</a></div><br/>";
         $output +="<input type='hidden' id='reset_extra_add_info_hidden_"+resetTec+"' name='reset_extra_add_info_"+resetTec+"' value='"+resetTecName+"' /></div>";
         $output += "<input type='hidden' id='reset_add' name='reset_add' value='1'>";
+
         $("#reset_extra_add_info").append($output);
+        $('#resetTecName').val('');
     }
 }
 </script>