1

www/protected/controllers/HouseKeepingController.php

@@ -64,7 +64,10 @@ class HouseKeepingController extends AdminController
         $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));
+        $skill = Yii::app()->request->getParam('skill_options');
+        foreach ($skill as $value) {
+            $skill[] = intval($value);
+        }
         $age = intval(Yii::app()->request->getParam('age', 0));
         $tech = (Yii::app()->request->getParam('tech', ''));
         $desc = (Yii::app()->request->getParam('desc', ''));
@@ -134,7 +137,7 @@ class HouseKeepingController extends AdminController
         $h->address = '1dsfafsdf';
         $h->server_start_time = time();
         $h->server_end_time = time();
-        $h->skill = 1;
+        $h->skill = array(1,2,3);
         $h->yc_time = time();
         $h->age = 18;
         $h->desc = 'fasdf1';

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

@@ -68,7 +68,7 @@ class HouseKeepingController extends JBaseController
         $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', ''));
+        $skill = 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', ''));
@@ -131,7 +131,10 @@ class HouseKeepingController extends JBaseController
         $user_id = (Yii::app()->request->getParam('user_id', ''));
         $type = intval(Yii::app()->request->getParam('type', 1));
         $cart = intval(Yii::app()->request->getParam('cart', 1));
-        $skill = intval(Yii::app()->request->getParam('skill', 1));
+        $skill = json_decode(Yii::app()->request->getParam('skill'));
+        foreach ($skill as $v) {
+            $skill[] = intval($v);
+        }
         $age = intval(Yii::app()->request->getParam('age', 1));
         $address = Yii::app()->request->getParam('address', '');
         $tech = (Yii::app()->request->getParam('tech', ''));

www/protected/modules/o2o/models/HouseKeeping.php

@@ -110,7 +110,10 @@
          $newRow['contract_str'] = self::$contract_option[intval($newRow['contract'])];
          $newRow['type_str'] = self::$type_option[intval($newRow['type'])];
          $newRow['cart_str'] = self::$cart_options[intval($newRow['cart'])];
-         $newRow['skill_str'] = self::$skill_options[intval($newRow['skill'])];
+         foreach ($newRow['skill'] as $k => $v) {
+             $newRow['skill_str'][] = self::$skill_options[intval($v)];
+         }
+
          $newRow['desc'] = CommonFn::get_val_if_isset($row,'desc','');
          $newRow['status'] = CommonFn::get_val_if_isset($row,'status');
          $newRow['status_str'] = self::$status_option[intval($newRow['status'])];

www/protected/views/houseKeeping/index.php

@@ -123,8 +123,17 @@
                     <div class="f_label">
                       <span>技能:</span>
                     </div>
-                    <div class="box_flex f_content">
-                      <input id="skill" name="skill" />
+                    <div class="box_flex f_content" id="skill">
+                          <?php foreach ($skill_options as $key => $value): ?>
+                              <?php if (($key-1) % 4 == 0 && $key != 1): ?>
+                              <br>
+                              <?php endif ?>
+                              <?php if ($key != 0): ?>
+                            <span class="service_type_list">
+                                                    <input type="checkbox" value="<?=$key?>" name="skill_options[]" /><?=$value['text']?>
+                                                </span>
+                              <?php endif ?>
+                          <?php endforeach ?>
                     </div>
                   </div>
                 </li>
@@ -407,11 +416,6 @@
           editable: false,
           data: cart_options
     });
-    jq_skill.combobox({
-          editable: false,
-          data: skill_options
-    });
-
 
     jq_dg_content.datagrid({
       url: module_router + '/list',
@@ -517,7 +521,15 @@
         $('#tech').val(data.tech);
         $('#desc').val(data.desc);
         jq_content_form.form('load', data);
-        $('#admins_edit_info').html('');
+        $('#skill').children().each(function (index, element) {
+          var val = parseInt($(this).find('input').val());
+          if ($.inArray(val, data.skill) != -1) {
+            $(this).find('input').prop('checked', true);
+          } else {
+            $(this).find('input').prop('checked', false);
+          }
+        });
+        $('#admins_edit_info').html(``);
         if (data['action_user'] != ''){
           jq_action_info.html('信息已被编辑: ' + data['action_user'] + ' ' + data['action_time']);
         } else {