feat: 补单

assets/js/controllers/mainCtrl.js

@@ -4874,6 +4874,456 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
               },
             });
           }
+          // 补单
+          $scope.supplement = function(){
+            if(!$scope.categorySelectId){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "请选择故障现象!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            if(!$scope.selectedDuty){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "故障现象【"+ $scope.categorySelect.category +"】没有设置责任科室!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            if(!$scope.incidentModel.department){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "请选择报修科室!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            if(!$scope.incidentModel.contactsInformation){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "请填写联系电话!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            if(!$scope.incidentModel.priority){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "请选择优先级!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            if(!$scope.incidentModel.description){
+              SweetAlert.swal({
+                  title: "提示",
+                  text: "请选择故障描述!",
+                  type: "error",
+                  confirmButtonColor: "#DD6B55"
+              });
+              return;
+            }
+            $modal.open({
+              templateUrl: "assets/views/newOrderSupplement.html",
+              controller: function ($scope,scope,$state, $modalInstance, SweetAlert,api_bpm) {
+                $scope.categorySelect = scope.categorySelect;
+                console.log($scope.categorySelect)
+                $scope.incidentModel = {
+                  handlerMsg:'',//处理方案
+                  closecode:'',//处理结果
+                  acceptDate:'',//登记时间
+                  responseHandleTime:'',//接单时间
+                  handleTime:'',//解决时间
+                  handlingPersonnelUser:'',//处理人
+                };
+                // 处理人模糊搜索
+                $scope.jry_userSearch = function (key = "") {
+                  var userData = {
+                    idx: 0,
+                    sum: 1000,
+                    user: {
+                      duty: scope.selectedDuty || undefined,
+                      roledata: {rolecode: "first-line support"},
+                      selectDetails:'1',
+                      simple:true,
+                      name: key,
+                      selectType: "pinyin_qs",
+                      engineer: 1,
+                    },
+                  };
+                  api_user_data.fetchDataList("user", userData).then(function (data) {
+                    $scope.jry_userData = data.list;
+                  });
+                };
+                $scope.jry_userSearch();
+                // 处理结果
+                $scope.closecodeArray = [];
+                $scope.jry_closecodeSearch = function () {
+                  api_wechatfile
+                    .getDictionary({ type: "list", key: "incident_closecode" })
+                    .then(function (data) {
+                      $scope.closecodeArray = data;
+                    });
+                };
+                $scope.jry_closecodeSearch();
+                // 确定
+                $scope.ok = function () {
+                  if($scope.categorySelect.hasSimple != 1 && !$scope.incidentModel.handlerMsg){
+                    SweetAlert.swal({
+                        title: "提示",
+                        text: "请填写处理方案!",
+                        type: "error",
+                        confirmButtonColor: "#DD6B55"
+                    });
+                    return;
+                  }
+                  if(!$scope.incidentModel.closecode.id){
+                    SweetAlert.swal({
+                        title: "提示",
+                        text: "请选择处理结果!",
+                        type: "error",
+                        confirmButtonColor: "#DD6B55"
+                    });
+                    return;
+                  }
+                  if(!$scope.incidentModel.acceptDate){
+                    SweetAlert.swal({
+                        title: "提示",
+                        text: "请选择登记时间!",
+                        type: "error",
+                        confirmButtonColor: "#DD6B55"
+                    });
+                    return;
+                  }
+                  if(!$scope.incidentModel.responseHandleTime){
+                    SweetAlert.swal({
+                        title: "提示",
+                        text: "请选择接单时间!",
+                        type: "error",
+                        confirmButtonColor: "#DD6B55"
+                    });
+                    return;
+                  }
+                  if(!$scope.incidentModel.handleTime){
+                    SweetAlert.swal({
+                        title: "提示",
+                        text: "请选择解决时间!",
+                        type: "error",
+                        confirmButtonColor: "#DD6B55"
+                    });
+                    return;
+                  }
+                  if(!$scope.incidentModel.handlingPersonnelUser){
+                    SweetAlert.swal({
+                        title: "提示",
+                        text: "请选择处理人!",
+                        type: "error",
+                        confirmButtonColor: "#DD6B55"
+                    });
+                    return;
+                  }
+
+                  // -------新建事件，积分机制，补单-------
+                  var integralMechanism = sessionStorage.getItem('integralMechanism');
+                  if(integralMechanism == 1 || (integralMechanism == 2 && $rootScope.user.userType.value == 2)){
+                    $modal.open({
+                      templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
+                      controller: function ($scope, $modalInstance, incidentData,categorySelect, currentUserId, Alert, api_wechatfile,scope,api_bpm_data) {
+                          console.log(incidentData,currentUserId,categorySelect);
+                          $scope.complexityConfirm = {complexity:null,updateReason:''};
+                          $scope.complexityFn = function(category){
+                            if(category.complexity){
+                              return category.complexity.value;
+                            }else if(category.parent){
+                              return $scope.complexityFn(category.parent);
+                            }else{
+                              return $scope.list[0]?$scope.list[0].value:1;
+                            }
+                          }
+                          $scope.list = [];
+                          api_wechatfile.getDictionary({"key":"incident_complexity","type":"list"}).then(function(res){
+                            $scope.list = res;
+                            if(categorySelect && categorySelect.id){
+                              api_bpm_data.fetchData("incidentCategory",categorySelect.id).then(function(result){
+                                if(result.status == 200){
+                                  $scope.complexity = $scope.complexityFn(result.data);
+                                  $scope.complexityConfirm.complexity = $scope.list.find(v=>v.value == $scope.complexity);
+                                }
+                              })
+                            }
+                          })
+                          $scope.onChangeComplexity = function(item){
+
+                          }
+                          $scope.ok = function () {
+                              if (!$scope.complexityConfirm.complexity){
+                                  Alert.swal({
+                                      title: "操作失败",
+                                      text: "请选择工时!",
+                                      type: "error"
+                                  });
+                                  return;
+                              }
+                              if ($scope.complexityConfirm.complexity.value != $scope.complexity&&!$scope.complexityConfirm.updateReason.trim()){
+                                  Alert.swal({
+                                      title: "操作失败",
+                                      text: "请填写升级原因!",
+                                      type: "error"
+                                  });
+                                  return;
+                              }
+                              $modalInstance.close('success');
+                              handlerStart();
+                              scope.complexity = $scope.complexity;
+                              scope.complexityConfirm = $scope.complexityConfirm;
+                              // 暂存--后面直接处理后调用积分接口
+                          }
+                          $scope.cancel = function () {
+                              if (localStorage.getItem('fenjiNumber')) {
+                                $rootScope.jry_shixian();
+                              }
+                              $modalInstance.dismiss('cancel');
+                          }
+                      },
+                      size: 'sm',
+                      resolve: {
+                          scope: function () {
+                              return $scope;
+                          },
+                          api_bpm: function () {
+                              return api_bpm;
+                          },
+                          incidentData: function () {
+                              return scope.incidentModel;
+                          },
+                          categorySelect: function () {
+                              return scope.categorySelect;
+                          },
+                          currentUserId: function () {
+                              return $rootScope.user.id;
+                          },
+                          Alert: function () {
+                              return SweetAlert;
+                          },
+                          api_user_data: function () {
+                              return api_user_data;
+                          },
+                          api_wechatfile: function () {
+                              return api_wechatfile;
+                          }
+                      }
+                    });
+                  }else{
+                    handlerStart();
+                  }
+                  // -------新建事件，积分机制，补单-------
+                };
+                // 补单，新建事件
+                async function handlerStart(){
+                  $rootScope.isMask = true;
+                  console.log(scope.incidentModel,$scope.incidentModel);
+                  var repair_main = JSON.parse(sessionStorage.getItem('repair_main'));
+                  var postData = {
+                    "incident": {
+                      "id": scope.incidentModel.id || undefined,
+                      "deleteFlag": 0,
+                      "duty":scope.selectedDuty?scope.selectedDuty:undefined,
+                      "requester":scope.incidentModel.requester||undefined,
+                      "alarmType": false,
+                      "department": scope.incidentModel.department||undefined,
+                      "contactsInformation": scope.incidentModel.contactsInformation,
+                      "contacts": scope.incidentModel.contacts,
+                      "branch": scope.incidentModel.branch?scope.incidentModel.branch.id:undefined,
+                      "area": scope.incidentModel.area||undefined,
+                      "place": scope.incidentModel.place||undefined,
+                      "houseNumber": scope.incidentModel.address,
+                      "category": scope.categorySelect||undefined,
+                      "priority": scope.incidentModel.priority||undefined,
+                      "source": scope.incidentModel.source||undefined,
+                      "title": scope.categorySelect.category,
+                      "description": scope.incidentModel.description,
+                      "directProcess": 1,
+                      "handleDescription": $scope.incidentModel.handlerMsg,
+                      "handlingPersonnelUser":{id:$scope.incidentModel.handlingPersonnelUser.id},
+                      "yyTime": scope.incidentModel.yyTime ? moment(scope.incidentModel.yyTime).format('YYYY-MM-DD HH:mm:ss') : undefined,
+                      "acceptDate": $scope.incidentModel.acceptDate ? moment($scope.incidentModel.acceptDate).format('YYYY-MM-DD HH:mm:ss') : undefined,
+                      "responseHandleTime": $scope.incidentModel.responseHandleTime ? moment($scope.incidentModel.responseHandleTime).format('YYYY-MM-DD HH:mm:ss') : undefined,
+                      "handleTime": $scope.incidentModel.handleTime ? moment($scope.incidentModel.handleTime).format('YYYY-MM-DD HH:mm:ss') : undefined,
+                      "closecode": $scope.incidentModel.closecode||undefined,
+                      "repairType": repair_main?repair_main.valueconfig:undefined,
+                      "acceptUser": $scope.incidentModel.handlingPersonnelUser||undefined,
+                      "callID": scope.incidentModel.callID||undefined,
+                      "incomingPhone": scope.incidentModel.incomingPhone||undefined,
+                    },
+                  };
+                  scope.modelData && (postData.incident = Object.assign({}, scope.modelData.incident, postData.incident));
+                  // if(scope.modelData){
+                  //   // 微信报修转事件
+                  //   postData.flow = scope.modelData.flow;
+                  // }
+                  if(!postData.incident.incidentsign){
+                    let res1 = await api_bpm_domain.workernumber('sj');
+                    postData.incident.incidentsign = res1.data;
+                  }
+
+                  // api_bpm_domain.workernumber('sj').then(res1=>{
+                  //   postData.incident.incidentsign = res1.data;
+                    api_flow.accept("patchOrder", postData).then(function (resData) {
+                      if (scope.uploader != null) {
+                        // 有图片
+                          scope.uploader.onBeforeUploadItem = function(item) {
+                              angular.extend(item.headers, $rootScope.getSession());
+                              item.url = api_bpm_domain.uploadAttachmentJryModel("wechatRequesterIncident", resData.data.id).getRequestedUrl();
+                              item.formData.push({ 'fileName': item.file.name });
+                          };
+                          scope.uploader.uploadAll();
+                      }
+                      var integralMechanism = sessionStorage.getItem('integralMechanism');
+                      if(integralMechanism == 1 || (integralMechanism == 2 && $rootScope.user.userType.value == 2)){
+                        api_wechatfile.getDictionary({"key":"incident_integral_state","type":"list"}).then(function(res){
+                          var auditState = res.find(v=>v.value == 0);
+                          var postData = {
+                            incidentIntegral: {
+                              incidentId:resData.bussId,
+                              auditState:auditState,
+                              handlerUser:$rootScope.user.id,
+                              handlerUserName:$rootScope.user.name,
+                              sourceScore:$scope.complexity,
+                              currentScore:$scope.complexityConfirm.complexity.value,
+                              updateReason:$scope.complexityConfirm.updateReason.trim() || undefined,
+                            }
+                          }
+                          console.log(postData)
+                          api_bpm_data.addData('incidentIntegral', postData).then(function (response) {
+                              console.log(response)
+                              $rootScope.isMask = false;
+                              if (response.status == 200) {
+                                SweetAlert.swal(
+                                  {
+                                    title: "保存成功!",
+                                    type: "success",
+                                    confirmButtonColor: "#007AFF",
+                                  },
+                                  function (isConfirm) {
+                                    if(isConfirm){
+                                      $modalInstance.dismiss("cancel");
+                                      // 是否连续建单
+                                      if(scope.btns.isBuildOrderAgagin){
+                                        scope.categorySelect = "";
+                                        scope.categorySelectId = 0;
+                                        scope.incidentModel.assign = 1;
+                                        scope.incidentModel.user = "";
+                                        scope.incidentModel.group = "";
+                                      }else{
+                                        if (localStorage.getItem('fenjiNumber')) {
+                                          $rootScope.jry_shixian();
+                                        }
+                                        scope.cancel();
+                                      }
+                                      $rootScope.newOrderShowOpen = false;
+                                      if($state.current.name === 'app.incident.list'){
+                                        $state.reload();
+                                      }else{
+                                        $state.go("app.incident.list");
+                                      }
+                                    }
+                                  }
+                                );
+                              } else {
+                                  Alert.swal({
+                                      title: "操作失败",
+                                      text: "操作失败, 请稍后再试!",
+                                      type: "error"
+                                  });
+                              }
+                          });
+                        })
+                      }else{
+                        SweetAlert.swal(
+                          {
+                            title: "提交成功!",
+                            type: "success",
+                            confirmButtonColor: "#007AFF",
+                          },
+                          function (isConfirm) {
+                            if(isConfirm){
+                              if (localStorage.getItem('fenjiNumber')) {
+                                $rootScope.jry_shixian();
+                              }
+                              scope.cancel();
+                              $modalInstance.dismiss("cancel");
+                              $rootScope.newOrderShowOpen = false;
+                              if($state.current.name === 'app.incident.list'){
+                                $state.reload();
+                              }else{
+                                $state.go("app.incident.list");
+                              }
+                            }
+                          }
+                        );
+                      }
+                      // -------------------------------------------
+                      $rootScope.isMask = false;
+                      SweetAlert.swal(
+                        {
+                          title: "保存成功!",
+                          type: "success",
+                          confirmButtonColor: "#007AFF",
+                        },
+                        function (isConfirm) {
+                          if(isConfirm){
+                            $modalInstance.dismiss("cancel");
+                            // 是否连续建单
+                            if(scope.btns.isBuildOrderAgagin){
+                              scope.categorySelect = "";
+                              scope.categorySelectId = 0;
+                              scope.incidentModel.assign = 1;
+                              scope.incidentModel.user = "";
+                              scope.incidentModel.group = "";
+                            }else{
+                              if (localStorage.getItem('fenjiNumber')) {
+                                $rootScope.jry_shixian();
+                              }
+                              scope.cancel();
+                            }
+                            $rootScope.newOrderShowOpen = false;
+                            if($state.current.name === 'app.incident.list'){
+                              $state.reload();
+                            }else{
+                              $state.go("app.incident.list");
+                            }
+                          }
+                        }
+                      );
+                    });
+                  // })
+                }
+                // 取消
+                $scope.cancel = function () {
+                  if (localStorage.getItem('fenjiNumber')) {
+                    $rootScope.jry_shixian();
+                  }
+                  $modalInstance.dismiss("cancel");
+                };
+              },
+              size:'lg',
+              resolve: {
+                SweetAlert: function () {
+                  return SweetAlert;
+                },
+                scope: function(){
+                  return $scope;
+                }
+              },
+            });
+          }
           // 处理顶部责任科室数据
           $scope.handlerDuty = function(){
             if(!$scope.categorySelect){

assets/views/newOrderSeimin.html

@@ -516,6 +516,7 @@
       <button class="btn btn-primary" ng-click="build()">直接解决</button>
       <button class="btn btn-primary" ng-click="buildAndAssign()">建单并派单</button>
       <button class="btn btn-primary" ng-click="temporaryStorage()">暂存</button>
+      <button class="btn btn-primary" ng-click="supplement()">补单</button>
     </ng-container>
     <ng-container ng-if="newOrderType === 'edit'">
       <button class="btn btn-primary" ng-click="editSave()">保存</button>

assets/views/newOrderSupplement.html

@@ -0,0 +1,434 @@
+<div>
+    <div class="modal-header" draggable class="modal-dialog">
+      <div class="modal-title fontcolor-two fontsizes-14">
+        补单<button
+          type="button"
+          class="close pull-right"
+          ng-click="cancel()"
+        >
+          ×
+        </button>
+      </div>
+    </div>
+    <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">
+            <label><span class="colorRed">*</span>处理方案：</label>
+            <textarea
+              class="c_item_value"
+              ng-model="incidentModel.handlerMsg"
+              placeholder="请填写处理方案"
+            ></textarea>
+          </div>
+          <div class="c_item clearfix">
+            <label><span class="colorRed">*</span>处理结果：</label>
+            <ui-select
+              class="c_item_value"
+              ng-model="incidentModel.closecode"
+              theme="bootstrap"
+            >
+              <ui-select-match placeholder="请选择处理结果">
+                <span ng-bind="$select.selected.name"> </span>
+              </ui-select-match>
+              <ui-select-choices
+                repeat="item in (closecodeArray | filter:$select.search) track by item.id"
+              >
+                <span ng-bind="item.name"></span>
+              </ui-select-choices>
+            </ui-select>
+          </div>
+          <div class="c_item clearfix">
+            <label><span class="colorRed">*</span>登记时间：</label>
+            <span class="input-icon" style="float: left">
+              <input
+                type="text"
+                class="c_item_value underline"
+                style="width: 175px"
+                ng-click="endOpen = !endOpen"
+                datepicker-popup="yyyy-MM-dd HH:mm:ss"
+                ng-model="incidentModel.acceptDate"
+                is-open="endOpen"
+                close-on-date-selection="false"
+                ng-init="endOpen = false"
+                close-text="关闭"
+                current-text="今天"
+                clear-text="清空"
+                save-text="确定"
+                show-weeks="false"
+              />
+              <i class="ti-calendar"></i>
+            </span>
+          </div>
+          <div class="c_item clearfix">
+            <label><span class="colorRed">*</span>接单时间：</label>
+            <span class="input-icon" style="float: left">
+              <input
+                type="text"
+                class="c_item_value underline"
+                style="width: 175px"
+                ng-click="endOpen1 = !endOpen1"
+                datepicker-popup="yyyy-MM-dd HH:mm:ss"
+                ng-model="incidentModel.responseHandleTime"
+                is-open="endOpen1"
+                close-on-date-selection="false"
+                ng-init="endOpen1 = false"
+                close-text="关闭"
+                current-text="今天"
+                clear-text="清空"
+                save-text="确定"
+                show-weeks="false"
+              />
+              <i class="ti-calendar"></i>
+            </span>
+          </div>
+          <div class="c_item clearfix">
+            <label><span class="colorRed">*</span>解决时间：</label>
+            <span class="input-icon" style="float: left">
+              <input
+                type="text"
+                class="c_item_value underline"
+                style="width: 175px"
+                ng-click="endOpen2 = !endOpen2"
+                datepicker-popup="yyyy-MM-dd HH:mm:ss"
+                ng-model="incidentModel.handleTime"
+                is-open="endOpen2"
+                close-on-date-selection="false"
+                ng-init="endOpen2 = false"
+                close-text="关闭"
+                current-text="今天"
+                clear-text="清空"
+                save-text="确定"
+                show-weeks="false"
+              />
+              <i class="ti-calendar"></i>
+            </span>
+          </div>
+          <div class="c_item clearfix">
+            <label><span class="colorRed">*</span>处理人：</label>
+            <ui-select
+              class="c_item_value"
+              style="min-width: 300px"
+              ng-model="incidentModel.handlingPersonnelUser"
+              theme="bootstrap"
+              ng-required="true"
+              reset-search-input="false"
+            >
+              <ui-select-match placeholder="请选择处理人">
+                <span ng-bind="$select.selected.name"></span>
+              </ui-select-match>
+              <ui-select-choices
+                repeat="item in jry_userData| filter:{$:$select.search}"
+                refresh="jry_userSearch($select.search)"
+              >
+                <div
+                  ng-bind-html="item.name | highlight: $select.search"
+                ></div>
+              </ui-select-choices>
+            </ui-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="modal-footer">
+      <button class="btn btn-primary" ng-click="ok()">确定</button>
+      <button class="btn btn-primary btn-o" ng-click="cancel()">取消</button>
+    </div>
+  </div>
+  <style>
+    @media (min-width: 768px) {
+      .modal-dialog {
+        width: 1300px;
+        margin: 30px auto;
+        height: 100%;
+      }
+    }
+    .newOrder_content input::-webkit-input-placeholder {
+      /* Chrome/Opera/Safari */
+      color: #c2c2c5;
+    }
+    .newOrder_content input:-ms-input-placeholder {
+      /* IE 10+ */
+      color: #c2c2c5;
+    }
+    .newOrder_content input:-moz-placeholder {
+      /* Firefox 18- */
+      color: #c2c2c5;
+      opacity: 1;
+    }
+    .newOrder_content input::-moz-placeholder {
+      /* Firefox 19+ */
+      color: #c2c2c5;
+      opacity: 1;
+    }
+
+    .newOrder_content textarea::-webkit-input-placeholder {
+      /* Chrome/Opera/Safari */
+      color: #c2c2c5;
+    }
+    .newOrder_content textarea:-ms-input-placeholder {
+      /* IE 10+ */
+      color: #c2c2c5;
+    }
+    .newOrder_content textarea:-moz-placeholder {
+      /* Firefox 18- */
+      color: #c2c2c5;
+      opacity: 1;
+    }
+    .newOrder_content textarea::-moz-placeholder {
+      /* Firefox 19+ */
+      color: #c2c2c5;
+      opacity: 1;
+    }
+
+    .newOrder_content .colorRed {
+      color: red;
+    }
+    .newOrder_content .imgsBox {
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 10px;
+      background: #f9f9f9;
+    }
+    .newOrder_content .fileupload {
+      width: 64px;
+      height: 64px;
+      border: 1px dotted #ccc;
+      display: inline-block;
+      background: #fff;
+      border-radius: 5px;
+      color: #d8d8d8;
+    }
+
+    .newOrder_content .fileupload-icon {
+      font-size: 32px;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+    }
+    .newOrder_content .close {
+      position: absolute;
+      top: -5px;
+      right: -6px;
+      font-size: 16px;
+      display: inline-block;
+      width: 14px;
+      height: 14px;
+      color: #fff;
+      background: #bd2535;
+      line-height: 8px;
+      text-align: center;
+      border-radius: 9px;
+      border: 1px solid #bd2535;
+      opacity: 1;
+      overflow: hidden;
+    }
+
+    .newOrder_content .close:hover {
+      opacity: 0.8;
+    }
+    .newOrder_content .category {
+      margin-right: 8px;
+    }
+    .newOrder_content .newOrder_body {
+      height: 652px;
+      overflow-y: auto;
+    }
+    .newOrder_content .newOrder_category li {
+      font-size: 14px;
+      color: #606367;
+      padding: 8px;
+      border-bottom: 1px dashed #d3d3d3;
+    }
+    .newOrder_content .newOrder_l li {
+      cursor: pointer;
+    }
+    .newOrder_content .newOrder_l li.active {
+      background-color: #d3d3d3;
+    }
+    .newOrder_content .newOrder_l li:hover {
+      background-color: #d3d3d3;
+    }
+    .newOrder_content .newOrder_r_item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 4px 0;
+    }
+    .newOrder_content .newOrder_r_item .ll {
+      flex: 1;
+      text-align: left;
+    }
+    .newOrder_content .newOrder_r_item .rr {
+      flex: 1;
+      text-align: right;
+    }
+
+    .jry_positionFather .describe {
+      width: 430px;
+    }
+
+    .jry_positionChild {
+      position: absolute;
+      height: 20px;
+      margin-top: -10px;
+      right: 14px;
+      top: 50%;
+    }
+
+    .jry_positionFather {
+      position: relative;
+      width: 100%;
+    }
+
+    .jry_item {
+      display: inline-block;
+      margin-left: 5px;
+    }
+
+    .jry_icon {
+      position: absolute;
+      right: 0;
+      top: 0;
+      display: inline-block;
+      width: 20px;
+      height: 30px;
+      text-align: center;
+      line-height: 30px;
+      border: 1px rgb(211, 211, 211) solid;
+      background-color: white;
+      border-radius: 0 4px 4px 0;
+    }
+
+    .DingW {
+      position: relative;
+      display: flex;
+      justify-content: center;
+      height: 36px;
+      line-height: 36px;
+      border-bottom: 1px solid #d3d3d3;
+    }
+    .DingW .ui-select-match {
+      line-height: normal;
+    }
+    .DingW .tab_name {
+      flex: 1;
+      text-align: center;
+      cursor: pointer;
+      border-right: 1px solid #d3d3d3;
+    }
+    .DingW .tab_name:last-of-type {
+      border-right: none;
+    }
+    .DingW .tab_name.active {
+      color: #fff;
+      background-color: #006bc0;
+    }
+
+    .SJFL_ipt {
+      width: 100%;
+      height: 30px;
+      border-radius: 4px 0 0 4px !important;
+    }
+
+    .radio_left {
+      width: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    .list {
+      padding: 10px 0;
+      border-bottom: 1px rgb(211, 211, 211) solid;
+      border-top: 1px rgb(211, 211, 211) solid;
+      display: flex;
+    }
+
+    .noData {
+      display: flex;
+      width: 100%;
+      height: 100%;
+      justify-content: center;
+      align-items: center;
+      border-bottom: none !important;
+      padding-top: 30px !important;
+    }
+
+    .noData img {
+      width: 120px;
+    }
+
+    .newOrder_content {
+      display: flex;
+    }
+
+    .leftList {
+      width: 280px;
+      background-color: rgb(245, 245, 245);
+      height: 700px;
+      margin: 4px;
+      border: 1px rgb(211, 211, 211) solid;
+      border-radius: 4px;
+      padding: 5px;
+    }
+
+    .centerList {
+      /* width: 778px; */
+      flex: 1;
+      background-color: rgb(245, 245, 245);
+      height: 700px;
+      margin: 4px;
+      border: 1px rgb(211, 211, 211) solid;
+      border-radius: 4px;
+      padding: 5px;
+    }
+    .centerList .c_item {
+      height: 30px;
+      margin-top: 16px;
+      margin-right: 8px;
+      float: left;
+    }
+    .centerList .c_item .c_item_value {
+      min-width: 165px;
+      height: 30px;
+      float: left;
+    }
+    .centerList .c_item input[type="text"].c_item_value {
+      width: 165px;
+    }
+    .centerList .c_item_value_textarea {
+      width: 100%;
+      height: 100px;
+      display: flex;
+    }
+    .centerList .c_item_value_textarea .c_item_value {
+      flex: 1;
+      height: 100px;
+      resize: none;
+    }
+    .centerList .c_item label {
+      float: left;
+      line-height: 30px;
+      margin: 0;
+    }
+
+    .rightList {
+      width: 280px;
+      background-color: rgb(245, 245, 245);
+      height: 700px;
+      margin: 4px;
+      border: 1px rgb(211, 211, 211) solid;
+      border-radius: 4px;
+      padding: 5px;
+    }
+
+    .head {
+      color: #005395;
+      font-size: 12px;
+      height: 30px;
+      line-height: 30px;
+      border-bottom: 1px rgb(211, 211, 211) solid;
+    }
+  </style>

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

@@ -2020,9 +2020,18 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
                 if(scope.$parent.model){
                     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){
+                }else if(scope.$parent.incidentModel && scope.$parent.incidentModel.yyTime){
                     scope.hours = scope.$parent.incidentModel.yyTime.getHours();
                     scope.minutes = 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();
+                }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();
+                }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.incrementHours = function() {
                     addMinutes(1 * 60);
@@ -2030,17 +2039,29 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
                 scope.save = function(hours, minutes) {
                     if(scope.$parent.model){
                         scope.$parent.model[scope.$parent.options.key] = moment((new Date(Date.parse(scope.$parent.model[scope.$parent.options.key]))).setHours(hours, minutes)).format('YYYY-MM-DD HH:mm:ss');
-                    }else if(scope.$parent.incidentModel){
-                        scope.$parent.incidentModel.yyTime = moment((new Date(Date.parse(scope.$parent.model[scope.$parent.options.key]))).setHours(hours, minutes)).format('YYYY-MM-DD HH:mm:ss');
+                    }else if(scope.$parent.incidentModel && scope.$parent.incidentModel.yyTime){
+                        scope.$parent.incidentModel.yyTime = moment((new Date(Date.parse(scope.$parent.incidentModel.yyTime))).setHours(hours, minutes)).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(Date.parse(scope.$parent.incidentModel.acceptDate))).setHours(hours, minutes)).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(Date.parse(scope.$parent.incidentModel.responseHandleTime))).setHours(hours, minutes)).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(Date.parse(scope.$parent.incidentModel.handleTime))).setHours(hours, minutes)).format('YYYY-MM-DD HH:mm:ss');
                     }
                     scope.isOpen = false;
                 };
                 scope.updateHours = function(dates) { //手动填写时
                     //  scope.hours =(new Date(new Date(new Date(Date.parse(scope.$parent.model[scope.$parent.options.key]))).setHours( minutes))).getHours();
                     if(scope.$parent.model){
-                        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 = moment(new Date(dates)).format('YYYY-MM-DD HH:mm:ss');
+                        scope.$parent.model[scope.$parent.options.key] = moment(new Date(dates)).startOf('minute').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');
+                    }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');
+                    }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');
+                    }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');
                     }
                 }
             }
@@ -4104,7 +4125,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.position', 'ui.bootstrap
                 //we need to propagate user's query so we can higlight matches
                 scope.query = undefined;
 
-                //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later 
+                //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later
                 var timeoutPromise;
 
                 var scheduleSearchWithTimeout = function(inputValue) {