bug

assets/views/newOrderSupplement.html

@@ -13,7 +13,7 @@
     <div class="newOrder_content" style="width: 100%">
       <div class="centerList" style="height: 250px;">
         <div class="body clearfix">
-          <div class="c_item c_item_value_textarea clearfix">
+          <div class="c_item c_item_value_textarea clearfix" ng-if="categorySelect.hasSimple != 1">
             <label><span class="colorRed">*</span>处理方案：</label>
             <textarea
               class="c_item_value"

bower_components/angular-bootstrap/ui-bootstrap-tpls.js

@@ -2021,17 +2021,17 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
                     scope.hours = (new Date(Date.parse(scope.$parent.model[scope.$parent.options.key]))).getHours();
                     scope.minutes = (new Date(Date.parse(scope.$parent.model[scope.$parent.options.key]))).getMinutes();
                 }else if(scope.$parent.incidentModel && scope.$parent.incidentModel.yyTime){
-                    scope.hours = scope.$parent.incidentModel.yyTime.getHours();
-                    scope.minutes = scope.$parent.incidentModel.yyTime.getMinutes();
+                    scope.hours = (new Date(Date.parse(scope.$parent.incidentModel.yyTime))).getHours();
+                    scope.minutes = (new Date(Date.parse(scope.$parent.incidentModel.yyTime))).getMinutes();
                 }else if(scope.$parent.incidentModel && scope.$parent.incidentModel.acceptDate && scope.$parent.endOpen){
-                    scope.hours = scope.$parent.incidentModel.acceptDate.getHours();
-                    scope.minutes = scope.$parent.incidentModel.acceptDate.getMinutes();
+                    scope.hours = (new Date(Date.parse(scope.$parent.incidentModel.acceptDate))).getHours();
+                    scope.minutes = (new Date(Date.parse(scope.$parent.incidentModel.acceptDate))).getMinutes();
                 }else if(scope.$parent.incidentModel && scope.$parent.incidentModel.responseHandleTime && scope.$parent.endOpen1){
-                    scope.hours = scope.$parent.incidentModel.responseHandleTime.getHours();
-                    scope.minutes = scope.$parent.incidentModel.responseHandleTime.getMinutes();
+                    scope.hours = (new Date(Date.parse(scope.$parent.incidentModel.responseHandleTime))).getHours();
+                    scope.minutes = (new Date(Date.parse(scope.$parent.incidentModel.responseHandleTime))).getMinutes();
                 }else if(scope.$parent.incidentModel && scope.$parent.incidentModel.handleTime && scope.$parent.endOpen2){
-                    scope.hours = scope.$parent.incidentModel.handleTime.getHours();
-                    scope.minutes = scope.$parent.incidentModel.handleTime.getMinutes();
+                    scope.hours = (new Date(Date.parse(scope.$parent.incidentModel.handleTime))).getHours();
+                    scope.minutes = (new Date(Date.parse(scope.$parent.incidentModel.handleTime))).getMinutes();
                 }
                 scope.incrementHours = function() {
                     addMinutes(1 * 60);
@@ -2052,16 +2052,18 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
                 };
                 scope.updateHours = function(dates) { //手动填写时
                     //  scope.hours =(new Date(new Date(new Date(Date.parse(scope.$parent.model[scope.$parent.options.key]))).setHours( minutes))).getHours();
+                    var hours = scope.hours = (new Date(Date.parse(dates))).getHours();
+                    var minutes = scope.minutes = (new Date(Date.parse(dates))).getMinutes();
                     if(scope.$parent.model){
-                        scope.$parent.model[scope.$parent.options.key] = moment(new Date(dates)).startOf('minute').format('YYYY-MM-DD HH:mm:ss');
+                        scope.$parent.model[scope.$parent.options.key] = moment(new Date(dates)).format('YYYY-MM-DD HH:mm:ss');
                     }else if(scope.$parent.incidentModel && scope.$parent.incidentModel.yyTime){
-                        scope.$parent.incidentModel.yyTime = moment(new Date(dates)).startOf('minute').format('YYYY-MM-DD HH:mm:ss');
+                        scope.$parent.incidentModel.yyTime = moment((new Date(Date.parse(scope.$parent.incidentModel.yyTime))).setHours(hours, minutes)).startOf('minute').format('YYYY-MM-DD HH:mm:ss');
                     }else if(scope.$parent.incidentModel && scope.$parent.incidentModel.acceptDate && scope.$parent.endOpen){
-                        scope.$parent.incidentModel.acceptDate = moment(new Date(dates)).startOf('minute').format('YYYY-MM-DD HH:mm:ss');
+                        scope.$parent.incidentModel.acceptDate = moment((new Date(Date.parse(scope.$parent.incidentModel.acceptDate))).setHours(hours, minutes)).startOf('minute').format('YYYY-MM-DD HH:mm:ss');
                     }else if(scope.$parent.incidentModel && scope.$parent.incidentModel.responseHandleTime && scope.$parent.endOpen1){
-                        scope.$parent.incidentModel.responseHandleTime = moment(new Date(dates)).startOf('minute').format('YYYY-MM-DD HH:mm:ss');
+                        scope.$parent.incidentModel.responseHandleTime = moment((new Date(Date.parse(scope.$parent.incidentModel.responseHandleTime))).setHours(hours, minutes)).startOf('minute').format('YYYY-MM-DD HH:mm:ss');
                     }else if(scope.$parent.incidentModel && scope.$parent.incidentModel.handleTime && scope.$parent.endOpen2){
-                        scope.$parent.incidentModel.handleTime = moment(new Date(dates)).startOf('minute').format('YYYY-MM-DD HH:mm:ss');
+                        scope.$parent.incidentModel.handleTime = moment((new Date(Date.parse(scope.$parent.incidentModel.handleTime))).setHours(hours, minutes)).startOf('minute').format('YYYY-MM-DD HH:mm:ss');
                     }
                 }
             }