1

www/protected/controllers/HouseKeepingController.php

@@ -95,9 +95,6 @@ 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;
         }
@@ -118,6 +115,11 @@ class HouseKeepingController extends AdminController
         }
         if (!empty($status)) {
             $h->status = $status;
+            if ($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,7 +30,7 @@
      public $time;//创建时间
      public $store_id;//store id
      public $flag;//默认为读
-     public $cancel_cause = '';//取消原因 status = 4 时填写
+     public $cancel_cause;//取消原因 status = 4 时填写
 
 
      //服务形式

www/protected/views/houseKeeping/index.php

@@ -570,7 +570,6 @@
         $('#cancel_cause').html(data.cancel_cause);
         $('#flag_str').val(data.flag_str);
         jq_setStatus.combobox('setValue', data.status);
-        console.log(data.flag_str)
         jq_setContract.combobox('setValue', data.contract);
         $('#user_name').html(data.user_name);
         $('#server_start_time').datetimebox('setValue', parse_time(data,'server_start_time'));$('#status_time').datetimebox('setValue', parse_time(data,'status_time'));
@@ -584,7 +583,6 @@
         $('#desc').val(data.desc);
         $('#skill').children().each(function (index, element) {
           var val = parseInt($(this).find('input').val());
-          console.log(data.skill,val)
           if ($.inArray(val, data.skill) != -1) {
             $(this).find('input').prop('checked', true);
           } else {