1

www/protected/controllers/HouseKeepingController.php

@@ -85,6 +85,7 @@ class HouseKeepingController extends AdminController
         $server_end_time = intval(Yii::app()->request->getParam('server_end_time', ''));
         $store_id = (Yii::app()->request->getParam('store_id', ''));
         $id = Yii::app()->request->getParam('id');
+        $cancel_cause = Yii::app()->request->getParam('cancel_cause','');
 
         if (!CommonFn::isMongoId($id)) {
             CommonFn::requestAjax(false, '修改失败', array());
@@ -94,6 +95,9 @@ class HouseKeepingController extends AdminController
         if (!empty($contract)) {
             $h->contract = $contract;
         }
+        if (!empty($cancel_cause)) {
+            $h->cancel_cause = $cancel_cause;
+        }
         if (!empty($store_id)) {
             $h->store_id = $store_id;
         }

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

@@ -88,6 +88,7 @@ class HouseKeepingController extends JBaseController
         $status_time = intval(Yii::app()->request->getParam('status_time', ''));
         $server_end_time = intval(Yii::app()->request->getParam('server_end_time', ''));
         $id = Yii::app()->request->getParam('id');
+        $cancel_cause = Yii::app()->request->getParam('cancel_cause','');
         if (!CommonFn::isMongoId($id)) {
             CommonFn::requestAjax(false, '修改失败', array());
         }
@@ -96,6 +97,7 @@ class HouseKeepingController extends JBaseController
         if (!empty($contract)) {
             $h->contract = $contract;
         }
+
         if (!empty($type)) {
             $h->type = $type;
         }
@@ -113,6 +115,11 @@ class HouseKeepingController extends JBaseController
         }
         if (!empty($status)) {
             $h->status = $status;
+            if (intval($status) == 4) {
+                if (!empty($cancel_cause)) {
+                    $h->cancel_cause = $cancel_cause;
+                }
+            }
         }
         if (!empty($status_time)) {
             $h->status_time = $status_time;

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

@@ -30,6 +30,7 @@
      public $time;//创建时间
      public $store_id;//store id
      public $flag;//默认为读
+     public $cancel_cause = '';//取消原因 status = 4 时填写
 
 
      //服务形式
@@ -58,6 +59,7 @@
          1 => '预约中',
          2 => '已预约',
          3 => '已面试',
+         4 => '已取消',
      );
      //签约状态
      public static $contract_option = array(
@@ -114,6 +116,7 @@
          $newRow['type_str'] = self::$type_option[intval($newRow['type'])];
          $newRow['cart_str'] = self::$cart_options[intval($newRow['cart'])];
          $newRow['flag'] = CommonFn::get_val_if_isset($row,'flag',0);
+         $newRow['cancel_cause'] = CommonFn::get_val_if_isset($row,'cancel_cause','');
          $newRow['flag_str'] = $newRow['flag']?'已读':'未读';
          foreach ($newRow['skill'] as $k => $v) {
              $newRow['skill_str'][] = self::$skill_options[intval($v)];

www/protected/views/houseKeeping/index.php

@@ -191,6 +191,7 @@
                     </div>
                   </div>
                 </li>
+
                 <li class="f_item">
                   <div class="box">
                     <div class="f_label">
@@ -202,6 +203,16 @@
                     </div>
                   </div>
                 </li>
+                <li class="f_item" style="border-bottom:1px solid grey;margin-bottom: 20px;">
+                  <div class="box">
+                    <div class="f_label">
+                      <span>取消原因:</span>
+                    </div>
+                    <area class="box_flex f_content">
+                    <textarea id="cancel_cause" name="cancel_cause"></textarea>
+
+                  </div>
+                </li>
                 <li class="f_item">
                   <div class="box">
                     <div class="f_label">
@@ -556,6 +567,7 @@
         var data = $.extend({}, row);
         $('#id_str').html(data.id);
         $('#id').html(data.id);
+        $('#cancel_cause').html(data.cancel_cause);
         $('#flag_str').val(data.flag_str);
         jq_setStatus.combobox('setValue', data.status);
         console.log(data.flag_str)