汇总单里的耗材和工时增删改查

assets/js/config.router.js

@@ -1432,7 +1432,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
 
             //管理事件>维修汇总单
             .state('app.incident.summaryDetail', {
-                url: '/summaryDetail/{id}/{incidentId}',
+                url: '/summaryDetail/{id}/{incidentId}/{dutyId}/{categoryId}',
                 templateUrl: "assets/views/inspect/summaryDetail.html",
                 resolve: loadSequence('jquery-nestable-plugin', 'ng-nestable', 'ui.select', 'angularBootstrapNavTree', 'multi.select.tree', 'ckeditor-plugin', 'ckeditor', 'angularFileUpload', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'summaryDetailCtrl'),
                 title: 'inspection.LIST',

assets/js/controllers/businessConfiguration/faultConsumablesCtrl.js

@@ -290,6 +290,8 @@ app.controller("faultConsumablesCtrl", [
                   }
                   selectItem(selectdata.category,$scope.select_treedata);
                   $scope.deptdata.category = selectdata.category;
+                  console.log($scope.deptdata, selectdata.category)
+                  console.log($scope.select_treedata)
                 } else {
                   SweetAlert.swal({
                     title: "系统错误!",

assets/js/controllers/inspect/summaryCtrl.js

@@ -48,6 +48,7 @@ app.controller("summaryCtrl", [
     $scope.chakan = false;
     $scope.shanchu = false;
     $scope.shenhe = false;
+    $scope.summary_recalculate = false;
     for (var i = 0; i < loginUser.menu.length; i++) {
       if (loginUser.menu[i].link == "summary_chakan") {
         $scope.chakan = true;
@@ -58,6 +59,9 @@ app.controller("summaryCtrl", [
       if (loginUser.menu[i].link == "summary_shenhe") {
         $scope.shenhe = true;
       }
+      if (loginUser.menu[i].link == "summary_recalculate") {
+        $scope.summary_recalculate = true;
+      }
     }
     var defaultFilterData = {
       idx: 0,
@@ -220,6 +224,7 @@ app.controller("summaryCtrl", [
           '<a ng-click="grid.appScope.seeFunction(row.entity)" ng-if="grid.appScope.chakan" class="bianjifont">查看</a>' +
           '<a ng-click="grid.appScope.removeData(row.entity)" ng-if="grid.appScope.shanchu" class="bianjifont">删除</a>' +
           '<a ng-click="grid.appScope.runFunction(row.entity)" ng-if="grid.appScope.shenhe && row.entity.state == 2" class="bianjifont">审核通过</a>' +
+          '<a ng-click="grid.appScope.recalculate(row.entity)" ng-if="grid.appScope.summary_recalculate && (row.entity.state == 1 || row.entity.state == 2)" class="bianjifont">重算</a>' +
           "</div>",
       },
       // { name: 'planTime2', displayName: '截止时间', width: 160, enableFiltering: false },
@@ -237,7 +242,9 @@ app.controller("summaryCtrl", [
     $scope.seeFunction = function (data) {
       console.log(data)
       $state.go("app.incident.summaryDetail", {
-        incidentId: data.incidentId,
+        incidentId: data.incidentId || '',
+        categoryId: data.incidentCategoryId || '',
+        dutyId: data.incidentDutyId || '',
         id: data.id,
       });
     };
@@ -274,7 +281,76 @@ app.controller("summaryCtrl", [
             function (response) {
               var myData = Restangular.stripRestangular(response);
               if (myData.status == 200) {
-                $scope.refreshData("expand-right", $scope.fileData);
+                SweetAlert.swal({
+                  title: "操作成功!",
+                  type: "success"
+                }, function() {
+                  $scope.refreshData("expand-right", $scope.fileData);
+                })
+              }else{
+                SweetAlert.swal({
+                  title: "操作失败!",
+                  text: myData.msg || '请求数据失败！',
+                  type: "error"
+                }, function() {
+                  $scope.refreshData("expand-right", $scope.fileData);
+                })
+              }
+            },
+            function () {
+              // $scope.ldloading[style.replace('-', '_')] = false;
+            }
+          );
+        }
+      });
+    };
+
+    //重算
+    $scope.recalculate = function (data) {
+      var modalInstance = $modal.open({
+        // templateUrl: 'assets/views/inspect/changRun.html',
+        templateUrl: "assets/views/delete.html",
+        // size: "sm",
+        controller: function ($scope, $modalInstance) {
+          $scope.isRunFunction = true;
+          var status = "";
+          $scope.title = "重算";
+          $scope.connect = "确定要重算？";
+
+          $scope.ok = function () {
+            $modalInstance.close(data);
+          };
+
+          $scope.cancel = function () {
+            $modalInstance.dismiss("cancel");
+          };
+        },
+        size: "sm",
+      });
+
+      modalInstance.result.then(function (result) {
+        if (result) {
+          var toData = {
+            repairSummary: { id: result.id },
+          };
+          api_bpm_data.updData("repairSummary", toData).then(
+            function (response) {
+              var myData = Restangular.stripRestangular(response);
+              if (myData.status == 200) {
+                SweetAlert.swal({
+                  title: "操作成功!",
+                  type: "success"
+                }, function() {
+                  $scope.refreshData("expand-right", $scope.fileData);
+                })
+              }else{
+                SweetAlert.swal({
+                  title: "操作失败!",
+                  text: myData.msg || '请求数据失败！',
+                  type: "error"
+                }, function() {
+                  $scope.refreshData("expand-right", $scope.fileData);
+                })
               }
             },
             function () {

assets/js/controllers/inspect/summaryDetailCtrl.js

@@ -44,6 +44,36 @@ app.controller("summaryDetailCtrl", [
 
     i18nService.setCurrentLang($scope.lang);
 
+    var loginUser = $rootScope.user;
+    $scope.summary_hc_add = false;
+    $scope.summary_hc_remove = false;
+    $scope.summary_hc_edit = false;
+
+    $scope.summary_gs_add = false;
+    $scope.summary_gs_remove = false;
+    $scope.summary_gs_edit = false;
+    for (var i = 0; i < loginUser.menu.length; i++) {
+      if (loginUser.menu[i].link == "summary_hc_add") {
+        $scope.summary_hc_add = true;
+      }
+      if (loginUser.menu[i].link == "summary_hc_remove") {
+        $scope.summary_hc_remove = true;
+      }
+      if (loginUser.menu[i].link == "summary_hc_edit") {
+        $scope.summary_hc_edit = true;
+      }
+
+      if (loginUser.menu[i].link == "summary_gs_add") {
+        $scope.summary_gs_add = true;
+      }
+      if (loginUser.menu[i].link == "summary_gs_remove") {
+        $scope.summary_gs_remove = true;
+      }
+      if (loginUser.menu[i].link == "summary_gs_edit") {
+        $scope.summary_gs_edit = true;
+      }
+    }
+
     // 获取信息
     $scope.consumableList = [];
     $scope.incidentDTO = {};
@@ -120,9 +150,356 @@ app.controller("summaryDetailCtrl", [
                 }
               ]
             }).then(
-              function (data) {
+              function (response) {
+                $rootScope.isMask = false;
+                if(response.status == 200){
+                  SweetAlert.swal({
+                    title: "撤销成功!",
+                    type: "success"
+                  }, function() {
+                      $scope.getInfo()
+                  })
+                } else {
+                  SweetAlert.swal({
+                      title: "撤销失败!",
+                      text: response.msg || '请求数据失败！',
+                      type: "error"
+                  }, function() {
+                      $scope.getInfo()
+                  })
+                }
+              },
+              function () {
+                $rootScope.isMask = false;
+              }
+            );
+          }
+        },
+        function () {}
+      );
+    }
+
+    const uniqBy = (arr, predicate) => {
+      const cb = typeof predicate === 'function' ? predicate : (o) => o[predicate];
+
+      return [...arr.reduce((map, item) => {
+        const key = (item === null || item === undefined) ?
+          item : cb(item);
+
+        map.has(key) || map.set(key, item);
+
+        return map;
+      }, new Map()).values()];
+    };
+
+    // 修改耗材
+    $scope.updateHc = function(consumable){
+      console.log(consumable)
+      var modalInstance = $modal.open({
+        templateUrl: 'assets/views/system/tpl/hcChange.html',
+        controller: function($scope, scope, $modalInstance, api_user_data, api_bpm) {
+            $scope.title = '耗材修改';
+            $scope.isAdd = false;
+            $scope.dataInfo = {
+              num: consumable.consumablesNum,
+              consumable: {id: consumable.consumableId, name: consumable.consumableName},
+            }
+
+            $scope.getHcList=function(keyword = ''){
+              // 查询故障耗材列表
+              var postData = {
+                  "idx": 0,
+                  "sum": 20,
+                  incidentCategoryConsumable: {
+                    duty: $stateParams.dutyId,
+                    category: { id: $stateParams.categoryId },
+                  }
+              };
+              api_user_data.fetchDataList('incidentCategoryConsumable',postData).then(function(res){
+                if(res.status == 200){
+                  let list = res.list || [];
+                  if(list.length){
+                    let arr = list.map(v => v.consumableDTOS).flat();
+                    $scope.hcList = uniqBy(arr, 'id');
+                  }else{
+                    // 查询耗材列表
+                    var postData = {
+                      "idx": 0,
+                      "sum": 20,
+                      consumable: {
+                        keyWord: keyword,
+                        dutyDTO: { id: $stateParams.dutyId },
+                        showZero: true,
+                      }
+                    };
+
+                    api_user_data.fetchDataList('consumable',postData).then(function(res){
+                      if(res.status == 200){
+                        $scope.hcList = res.list || [];
+                      }else{
+                        uni.showToast({
+                          icon: 'none',
+                          title: res.msg || '请求数据失败！'
+                        });
+                      }
+                    })
+                  }
+                }else{
+                  uni.showToast({
+                    icon: 'none',
+                    title: res.msg || '请求数据失败！'
+                  });
+                }
+              })
+            }
+            $scope.getHcList();
+            $scope.changeNum = function(val){
+              $scope.dataInfo.num = val?Math.abs(parseFloat(val.toFixed(2), 10)):val;
+            }
+            $scope.cancel = function() {
+                $modalInstance.dismiss('cancel');
+            };
+            $scope.savercode = function() {
+                if ($scope.dataInfo.num && $scope.dataInfo.consumable && $scope.dataInfo.consumable.id){
+                  $rootScope.isMask = true;
+                  let postData = {
+                    "consumableList": [
+                      {
+                        "consumablesId": $scope.dataInfo.consumable ? $scope.dataInfo.consumable.id : undefined,
+                        "consumablesNum": $scope.dataInfo.num
+                      }
+                    ],
+                    modifyNum: "edit",
+                    "summaryId": $stateParams.id,
+                  };
+                    api_bpm.addSummaryDoc(postData).then(function(response) {
+                        if (response) {
+                            if (response.status == 200) {
+                                SweetAlert.swal({
+                                    title: "修改成功!",
+                                    type: "success"
+                                }, function() {
+                                    scope.getInfo()
+                                })
+                            } else {
+                                SweetAlert.swal({
+                                    title: "修改失败!",
+                                    text: response.msg || '请求数据失败！',
+                                    type: "error"
+                                }, function() {
+                                    scope.getInfo()
+                                })
+                            }
+                            $modalInstance.close();
+                        }else{
+                            SweetAlert.swal({
+                                title: "修改失败!",
+                                text: response.msg || '请求数据失败！',
+                                type: "error"
+                            }, function() {
+                                scope.getInfo()
+                            })
+                        }
+                    })
+
+                }else{
+                    SweetAlert.swal({
+                        title: "新增失败!",
+                        text: "请填写必填项!",
+                        type: "error",
+                        confirmButtonColor: "#DD6B55"
+                    }, function () {
+
+                    });
+                }
+            }
+        },
+        resolve: {
+            scope: function() {
+                return $scope;
+            }
+        }
+      });
+    }
+
+    // 新增耗材
+    $scope.addHc = function(){
+      var modalInstance = $modal.open({
+        templateUrl: 'assets/views/system/tpl/hcChange.html',
+        controller: function($scope, scope, $modalInstance, api_user_data, api_bpm) {
+            $scope.title = '耗材新增';
+            $scope.isAdd = true;
+            $scope.dataInfo = {
+              num: 1,
+              consumable: null,
+            }
+
+            $scope.getHcList=function(keyword = ''){
+              // 查询故障耗材列表
+              var postData = {
+                  "idx": 0,
+                  "sum": 20,
+                  incidentCategoryConsumable: {
+                    duty: $stateParams.dutyId,
+                    category: { id: $stateParams.categoryId },
+                  }
+              };
+              api_user_data.fetchDataList('incidentCategoryConsumable',postData).then(function(res){
+                if(res.status == 200){
+                  let list = res.list || [];
+                  if(list.length){
+                    let arr = list.map(v => v.consumableDTOS).flat();
+                    $scope.hcList = uniqBy(arr, 'id');
+                  }else{
+                    // 查询耗材列表
+                    var postData = {
+                      "idx": 0,
+                      "sum": 20,
+                      consumable: {
+                        keyWord: keyword,
+                        dutyDTO: { id: $stateParams.dutyId },
+                        showZero: true,
+                      }
+                    };
+
+                    api_user_data.fetchDataList('consumable',postData).then(function(res){
+                      if(res.status == 200){
+                        $scope.hcList = res.list || [];
+                      }else{
+                        uni.showToast({
+                          icon: 'none',
+                          title: res.msg || '请求数据失败！'
+                        });
+                      }
+                    })
+                  }
+                }else{
+                  uni.showToast({
+                    icon: 'none',
+                    title: res.msg || '请求数据失败！'
+                  });
+                }
+              })
+            }
+            $scope.getHcList();
+            $scope.changeNum = function(val){
+              $scope.dataInfo.num = val?Math.abs(parseFloat(val.toFixed(2), 10)):val;
+            }
+            $scope.cancel = function() {
+                $modalInstance.dismiss('cancel');
+            };
+            $scope.savercode = function() {
+                if ($scope.dataInfo.num && $scope.dataInfo.consumable && $scope.dataInfo.consumable.id){
+                  $rootScope.isMask = true;
+                  let postData = {
+                    "consumableList": [
+                      {
+                        "consumablesId": $scope.dataInfo.consumable ? $scope.dataInfo.consumable.id : undefined,
+                        "consumablesNum": $scope.dataInfo.num
+                      }
+                    ],
+                    "summaryId": $stateParams.id,
+                  };
+                    api_bpm.addSummaryDoc(postData).then(function(response) {
+                        if (response) {
+                            if (response.status == 200) {
+                                SweetAlert.swal({
+                                    title: "新增成功!",
+                                    type: "success"
+                                }, function() {
+                                    scope.getInfo()
+                                })
+                            } else {
+                                SweetAlert.swal({
+                                    title: "新增失败!",
+                                    text: response.msg || '请求数据失败！',
+                                    type: "error"
+                                }, function() {
+                                    scope.getInfo()
+                                })
+                            }
+                            $modalInstance.close();
+                        }else{
+                            SweetAlert.swal({
+                                title: "新增失败!",
+                                text: response.msg || '请求数据失败！',
+                                type: "error"
+                            }, function() {
+                                scope.getInfo()
+                            })
+                        }
+                    })
+
+                }else{
+                    SweetAlert.swal({
+                        title: "新增失败!",
+                        text: "请填写必填项!",
+                        type: "error",
+                        confirmButtonColor: "#DD6B55"
+                    }, function () {
+
+                    });
+                }
+            }
+        },
+        resolve: {
+            scope: function() {
+                return $scope;
+            }
+        }
+      });
+    }
+
+    // 撤销工时
+    $scope.removeGs = function(workHourManagement){
+      var modalInstance = $modal.open({
+        templateUrl: "assets/views/delete.html",
+        controller: function ($scope, $modalInstance) {
+          $scope.title = "撤销";
+          $scope.connect = "您确认要撤销此条工时（"+ workHourManagement.workName + "【"+ workHourManagement.workHourNum2 +"】" +"）的使用吗？";
+          $scope.ok = function () {
+            $modalInstance.close("start");
+          };
+
+          $scope.cancel = function () {
+            $modalInstance.dismiss("cancel");
+          };
+        },
+        size: "sm",
+      });
+
+      modalInstance.result.then(
+        function (result) {
+          if(result == 'start'){
+            $rootScope.isMask = true;
+            api_bpm_data.removeHc({
+              summaryId: +$stateParams.id,
+              remove: 'remove',
+              workHourManagementList: [
+                {
+                  workHourId: workHourManagement.id,
+                  workHourNum: workHourManagement.workHourNum,
+                }
+              ]
+            }).then(
+              function (response) {
                 $rootScope.isMask = false;
-                $scope.getInfo();
+                if(response.status == 200){
+                  SweetAlert.swal({
+                    title: "撤销成功!",
+                    type: "success"
+                  }, function() {
+                      $scope.getInfo()
+                  })
+                } else {
+                  SweetAlert.swal({
+                      title: "撤销失败!",
+                      text: response.msg || '请求数据失败！',
+                      type: "error"
+                  }, function() {
+                      $scope.getInfo()
+                  })
+                }
               },
               function () {
                 $rootScope.isMask = false;
@@ -133,5 +510,399 @@ app.controller("summaryDetailCtrl", [
         function () {}
       );
     }
+
+    // 修改工时
+    $scope.updateGs = function(workHourManagement){
+      console.log(workHourManagement)
+      var modalInstance = $modal.open({
+        templateUrl: 'assets/views/system/tpl/gsChange.html',
+        controller: function($scope, scope, $modalInstance, api_user_data, api_bpm) {
+            $scope.title = '工时修改';
+            $scope.isAdd = false;
+            $scope.dataInfo = {
+              num: workHourManagement.workHourNum2,
+              workHourManagement: [{id: workHourManagement.id, name: workHourManagement.workName}],
+            }
+
+            // --------------------
+            $scope.select_treedata = [];
+            $rootScope.bala1 = $scope.getGsList = function (s, fn) {
+              if (s) {
+                var filterKeyword = s.filterKeyword;
+              }
+              var postData = {
+                idx: 0,
+                sum: 9999,
+              };
+              $scope.my_data = [];
+              $scope.doing_async = true;
+              api_bpm_data
+                .fetchDataList("workHourManagement", postData)
+                .then(function (response) {
+                  if (response.status == 200) {
+                    var data = response.list;
+                    if (filterKeyword) {
+                      data.forEach((e) => {
+                        e.isExpanded = true;
+                      });
+                      var li = transform(data).children;
+                      console.log(li);
+                      fn(li);
+                      return;
+                    } else {
+                      var objects = [];
+                      for (var i = 0; i < data.length; i++) {
+                        var object = {};
+                        object.id = data[i].id;
+                        object.parent = data[i].parent;
+                        object.workName = data[i].workName;
+                        object.isExpanded = true;
+                        objects.push(object);
+                      }
+                      $scope.my_data = convertParentToChildList(objects);
+                      $scope.select_treedata = angular.copy($scope.my_data);
+                      console.log($scope.select_treedata)
+                    }
+                    if ($scope.my_data.length > 0) {
+                      $scope.doing_async = false;
+                    }
+                    selectItem(workHourManagement,$scope.select_treedata);
+                    $scope.dataInfo.workHourManagement = workHourManagement;
+                  } else {
+                    SweetAlert.swal({
+                      title: "系统错误!",
+                      text: "请刷新重试!",
+                      type: "error",
+                    });
+                  }
+                });
+            };
+            $scope.getGsList();
+            // --------------------
+            $scope.changeNum = function(val){
+              $scope.dataInfo.num = val?Math.abs(parseFloat(val.toFixed(2), 10)):val;
+            }
+            $scope.cancel = function() {
+                $modalInstance.dismiss('cancel');
+            };
+            $scope.savercode = function() {
+                if ($scope.dataInfo.num && $scope.dataInfo.workHourManagement.length){
+                  $rootScope.isMask = true;
+                  let postData = {
+                    "workHourManagementList": $scope.dataInfo.workHourManagement.map(v => ({ workHourId: v.id, workHourNum: $scope.dataInfo.num })),
+                    "summaryId": $stateParams.id,
+                    modifyNum: "edit"
+                  };
+                    api_bpm.addSummaryDoc(postData).then(function(response) {
+                        if (response) {
+                            if (response.status == 200) {
+                                SweetAlert.swal({
+                                    title: "修改成功!",
+                                    type: "success"
+                                }, function() {
+                                    scope.getInfo()
+                                })
+                            } else {
+                                SweetAlert.swal({
+                                    title: "修改失败!",
+                                    text: response.msg || '请求数据失败！',
+                                    type: "error"
+                                }, function() {
+                                    scope.getInfo()
+                                })
+                            }
+                            $modalInstance.close();
+                        }else{
+                            SweetAlert.swal({
+                                title: "修改失败!",
+                                text: response.msg || '请求数据失败！',
+                                type: "error"
+                            }, function() {
+                                scope.getInfo()
+                            })
+                        }
+                    })
+
+                }else{
+                    SweetAlert.swal({
+                        title: "新增失败!",
+                        text: "请填写必填项!",
+                        type: "error",
+                        confirmButtonColor: "#DD6B55"
+                    }, function () {
+
+                    });
+                }
+            }
+        },
+        resolve: {
+            scope: function() {
+                return $scope;
+            }
+        }
+      });
+    }
+
+    // 新增工时
+    $scope.addGs = function(){
+      var modalInstance = $modal.open({
+        templateUrl: 'assets/views/system/tpl/gsChange.html',
+        controller: function($scope, scope, $modalInstance, api_user_data, api_bpm) {
+            $scope.title = '工时新增';
+            $scope.isAdd = true;
+            $scope.dataInfo = {
+              // num: 1,
+              workHourManagement: [],
+            }
+            // --------------------
+            $scope.select_treedata = [];
+            $rootScope.bala1 = $scope.getGsList = function (s, fn) {
+              if (s) {
+                var filterKeyword = s.filterKeyword;
+              }
+              var postData = {
+                idx: 0,
+                sum: 9999,
+              };
+              $scope.my_data = [];
+              $scope.doing_async = true;
+              api_bpm_data
+                .fetchDataList("workHourManagement", postData)
+                .then(function (response) {
+                  if (response.status == 200) {
+                    var data = response.list;
+                    if (filterKeyword) {
+                      data.forEach((e) => {
+                        e.isExpanded = true;
+                      });
+                      var li = transform(data).children;
+                      console.log(li);
+                      fn(li);
+                      return;
+                    } else {
+                      var objects = [];
+                      for (var i = 0; i < data.length; i++) {
+                        var object = {};
+                        object.id = data[i].id;
+                        object.parent = data[i].parent;
+                        object.workName = data[i].workName;
+                        object.isExpanded = true;
+                        objects.push(object);
+                      }
+                      $scope.my_data = convertParentToChildList(objects);
+                      $scope.select_treedata = angular.copy($scope.my_data);
+                      console.log($scope.select_treedata)
+                    }
+                    if ($scope.my_data.length > 0) {
+                      $scope.doing_async = false;
+                    }
+                    // selectItem(selectdata.workName,$scope.select_treedata);
+                    // $scope.deptdata.workName = selectdata.workName;
+                  } else {
+                    SweetAlert.swal({
+                      title: "系统错误!",
+                      text: "请刷新重试!",
+                      type: "error",
+                    });
+                  }
+                });
+            };
+            $scope.getGsList();
+            // --------------------
+            $scope.changeNum = function(val){
+              $scope.dataInfo.num = val?Math.abs(parseFloat(val.toFixed(2), 10)):val;
+            }
+            $scope.cancel = function() {
+                $modalInstance.dismiss('cancel');
+            };
+            $scope.savercode = function() {
+                console.log($scope.dataInfo);
+                // if ($scope.dataInfo.num && $scope.dataInfo.workHourManagement.length){
+                if ($scope.dataInfo.workHourManagement.length){
+                  $rootScope.isMask = true;
+                  let workHourManagementList = scope.workHourManagementList || []
+                  let postData = {
+                    "workHourManagementList": $scope.dataInfo.workHourManagement.concat(workHourManagementList).map(v => ({ workHourId: v.id, workHourNum: v.workHourNum2 || 1 })),
+                    "summaryId": $stateParams.id,
+                  };
+                    api_bpm.addSummaryDoc(postData).then(function(response) {
+                        if (response) {
+                            if (response.status == 200) {
+                                SweetAlert.swal({
+                                    title: "新增成功!",
+                                    type: "success"
+                                }, function() {
+                                    scope.getInfo()
+                                })
+                            } else {
+                                SweetAlert.swal({
+                                    title: "新增失败!",
+                                    text: response.msg || '请求数据失败！',
+                                    type: "error"
+                                }, function() {
+                                    scope.getInfo()
+                                })
+                            }
+                            $modalInstance.close();
+                        }else{
+                            SweetAlert.swal({
+                                title: "新增失败!",
+                                text: response.msg || '请求数据失败！',
+                                type: "error"
+                            }, function() {
+                                scope.getInfo()
+                            })
+                        }
+                    })
+
+                }else{
+                    SweetAlert.swal({
+                        title: "新增失败!",
+                        text: "请填写必填项!",
+                        type: "error",
+                        confirmButtonColor: "#DD6B55"
+                    }, function () {
+
+                    });
+                }
+            }
+        },
+        resolve: {
+            scope: function() {
+                return $scope;
+            }
+        }
+      });
+    }
+
+    function selectItem(pmodel, childrens) {
+      if (angular.isArray(pmodel)) {
+        angular.forEach(pmodel, function (index) {
+          if (index && index.id) {
+            angular.forEach(childrens, function (item) {
+              if (item.id == index.id) {
+                item.selected = true;
+              }
+              if (item && item.children) {
+                selectItem(pmodel, item.children);
+              }
+            });
+          }
+        });
+      } else {
+        if (pmodel && pmodel.id) {
+          angular.forEach(childrens, function (item, index) {
+            if (item.id == pmodel.id) {
+              item.selected = true;
+            }
+            if (item && item.children) {
+              selectItem(pmodel, item.children);
+            }
+          });
+        }
+      }
+    }
+
+    function convertParentToChildList(data) {
+      var treeMap = {};
+      var list = [];
+      convertListToTree(data, treeMap);
+      angular.forEach(treeMap, function (item) {
+          list.push(item);
+      });
+      return list;
+    }
+
+    function convertListToTree(data, treeMap) {
+      var idToNodeMap = {}; //Keeps track of nodes using id as key, for fast lookup
+      var root = null; //Initially set our loop to null
+      var parentNode = null;
+      //loop over data
+      for (var i = 0; i < data.length; i++) {
+          var datum = data[i];
+          //each node will have children, so let's give it a "children" poperty
+          datum.children = [];
+
+          //add an entry for this node to the map so that any future children can
+          //lookup the parent
+          idToNodeMap[datum.id] = datum;
+
+          //Does this node have a parent?
+          if (typeof datum.parent === "undefined" || datum.parent == null) {
+              //Doesn't look like it, so this node is the root of the tree
+              root = datum;
+              treeMap[datum.id] = root;
+          } else {
+              //This node has a parent, so let's look it up using the id
+              parentNode = idToNodeMap[datum.parent.id];
+
+              //We don't need this property, so let's delete it.
+              delete datum.parent;
+
+              //Let's add the current node as a child of the parent node.
+              parentNode.children.push(datum);
+          }
+      }
+      return root;
+    }
+
+    //树形图
+    // 将故障现象搜索结果返回的数据整理成children模式
+    function transform(nodes) {
+      var treeConverter = {
+          result: null, //转化后的结果，是根节点，所有节点都是从根节点长出来的
+          attributeName: 'id', //节点唯一标识符
+          needFind: true, //是否查询节点在result中已经存在，为了优化效率
+          transform: function (node) { //转化递归函数，参数：一个待插入节点
+
+              if (node.parent != null) { //该节点有父节点
+                  var newNode = this.transform(node.parent); //递归进入，返回值为一个节点，用作父节点，该父节点必然存在于result中，这点由下面的算法可以控制
+                  if (this.needFind) {
+                      for (var i = 0; i < newNode.children.length; i++) { //查找要插入的node子节点是否在newNode这个父节点中存在
+                          if (newNode.children[i][this.attributeName] === node[this.attributeName]) {
+                              return newNode.children[i]; //存在的话直接返回newNode父节点内的该子节点,该子节点必然存在于result中，作为返回值它将被用作上级递归的newNode，因此newNode必然存在于result中
+                          }
+                      }
+                  }
+                  this.needFind = false; //不存在的话，关闭之后递归的循环判断，因为待插入node节点不存在于result中，故而它的子节点一定不存在于result中，不用再循环判断
+                  //   delete node.parent; //删除该节点的parent属性，如果有的话
+                  node.children = []; //因为确定是要新插入的节点，没有children:[]属性，故给该节点增加children:[]属性
+
+                  newNode.children.push(node); //将该node节点push进newNode的子节点数组中
+                  return node; //return该新插入节点，作为递归返回值给上层，用作newNode父节点，node存在于result中故newNode存在于result中
+              } else if (node.parent == null) { //该叶节点没有父节点，即为根节点
+                  //   delete node.parent; //删除该节点的parent属性，如果有的话
+                  if (this.result == null) { //根节点不存在
+                      node.children = []; //给该节点增加children:[]属性
+                      return this.result = node; //该节点赋给result，并return根节点，作为返回值它将被用作上级递归的newNode，因此newNode必然存在于result中
+                  } else {
+                      node.children = [];
+                      // 顶级去重
+                      for (var i = 0; i < this.result.children.length; i++) {
+                          if (this.result.children[i][this.attributeName] === node[this.attributeName]) {
+                              return this.result.children[i];
+                          }
+                      }
+                      this.result.children.push(node)
+                      return node // 直接return根节点，作为返回值它将被用作上级递归的newNode，因此newNode必然存在于result中
+                  }
+              }
+          },
+          getWhole: function (nodes, attributeName) { //传入整个叶子节点数组，attributeName作为节点唯一标识符属性，返回整个转化结果
+              var _node = {};
+              _node.children = [];
+              this.result = _node; //重置根节点
+              this.attributeName = attributeName == null ? 'id' : attributeName; //唯一标识符默认为“id”
+              nodes = JSON.parse(JSON.stringify(nodes)); //复制出一个新的节点对象作为参数，保证不改变原有数据
+              nodes.forEach(item => { //循环调用转化方法
+                  this.needFind = true; //重置开启节点是否已存在判断，保证不插入重复节点
+                  this.transform(item);
+              })
+              return this.result; //返回根节点
+          }
+      }
+      var result = treeConverter.getWhole(nodes); //调用
+      return result;
+    }
   },
 ]);

assets/js/main.js

@@ -815,6 +815,10 @@ app.factory('api_bpm', ['BpmRestangular', function (BpmRestangular) {
     var InspectionProcessActual = BpmRestangular.all('InspectionProcessActual');
     return {
         //巡检列表批量指派
+        addSummaryDoc: function (data) {
+            return getData.customPOST(data, 'addSummaryDoc', {});
+        },
+        //巡检列表批量指派
         assign: function (data) {
             return InspectionProcessActual.customPOST(data, 'batchAssign', {});
         },

assets/views/change/list.html

@@ -9,7 +9,7 @@
         <div class="col-xs-12">
             <div style="float:left;display:inline;min-width:200px;">
                 <select ng-model="searchTypes" class="cs-select cs-skin-slide">
-		  		<option value="">请选择...</option>				
+		  		<option value="">请选择...</option>
 				<option value="todo" ng-attr-class="{searchTypes=='todo'?'cs-selected':''}">待我处理的变更</option>
 				<option value="create" ng-attr-class="{searchTypes=='create'?'cs-selected':''}">我创建的变更</option>
 				<option value="done" ng-attr-class="{searchTypes=='done'?'cs-selected':''}">我处理过的变更</option>
@@ -72,7 +72,7 @@
     }
 
     .ui-grid-row:nth-child(even) .ui-grid-cell {
-        background: #fafafa !important;
+        background: #fafafa;
     }
     div.ui-grid-row.ng-scope:hover{
         cursor:pointer;

assets/views/desk/chart.html

@@ -50,7 +50,7 @@
     border-bottom: none;
   }
   .ui-grid-row:nth-child(even) .ui-grid-cell {
-        background: #fafafa !important;
+        background: #fafafa;
         display: flex;
         justify-content: center;
         align-items: center;

assets/views/desk/jry_emergency.html

@@ -31,9 +31,9 @@
     }
 
     .ui-grid-row:nth-child(even) .ui-grid-cell {
-        background: #fafafa !important;
+        background: #fafafa;
     }
-    
+
     .wtBtn {
         width: 100px!important;
         height: 34px!important;

assets/views/incident/list.html

@@ -338,7 +338,7 @@
     }
 
     .ui-grid-row:nth-child(even) .ui-grid-cell {
-        background: #fafafa !important;
+        background: #fafafa;
         display: flex;
         justify-content: center;
         align-items: center;

assets/views/inspect/summary.html

@@ -153,7 +153,7 @@
     }
 
     .ui-grid-row:nth-child(even) .ui-grid-cell {
-        background: #fafafa !important;
+        background: #fafafa;
         display: flex;
         justify-content: center;
         align-items: center;

assets/views/inspect/summaryDetail.html

@@ -75,8 +75,8 @@
         font-size: 16px;
         color: #606367;
         border-radius: 8px 8px 0 0;
-        padding-left: 10px;
-        padding-right: 4px;
+        padding-left: 14px;
+        padding-right: 14px;
     }
 
     .mainDivLeft-span {
@@ -292,7 +292,7 @@
                     <div class="mainDiv-head">
                         <i style="font-size: 18px !important;" class="icon iconfont icon-quyu bluefont"></i>
                         <b>工时清单</b>
-                        <div class="mainDiv-head-right"></div>
+                        <div class="mainDiv-head-right"><div class="btn btn_search" style="margin-top: 0;" ng-click="addGs()" ng-if="summary_gs_add"><span>新增</span></div></div>
                     </div>
                     <div class="mainDiv-body fixHeight">
                         <div class="mainDiv-body-2" style="cursor: pointer;" ng-repeat="workHourManagement in workHourManagementList">
@@ -300,6 +300,8 @@
                                 <span>工时名称：{{workHourManagement.workName}}</span>
                                 <div class="mainDiv-head-right">
                                     <span>单价：<strong>{{workHourManagement.wage}}元</strong></span>
+                                    <div class="btn btn_search" style="margin-top: 0;margin-left: 8px;" ng-click="updateGs(workHourManagement)" ng-if="summary_gs_edit"><span>修改</span></div>
+                                    <div class="btn btn_search" style="margin-top: 0;margin-left: 8px;" ng-click="removeGs(workHourManagement)" ng-if="summary_gs_remove"><span>撤销</span></div>
                                 </div>
                             </div>
                             <div>
@@ -316,16 +318,17 @@
                     <div class="mainDiv-head">
                         <i style="font-size: 18px !important;" class="icon iconfont icon-quyu bluefont"></i>
                         <b style="cursor: pointer;" ng-click="clear()">耗材清单</b>
-                        <div class="mainDiv-head-right"></div>
+                        <div class="mainDiv-head-right"><div class="btn btn_search" style="margin-top: 0;" ng-click="addHc()" ng-if="summary_hc_add"><span>新增</span></div></div>
                     </div>
                     <div class="mainDiv-body">
                         <div class="mainDiv-body-2" style="cursor: pointer;" ng-repeat="consumable in consumableList">
                             <div>
                                 <div>
-                                    <span>耗材名称：{{consumable.consumableName}}{{consumable.consumableBrandModel}}</span>
+                                    <span>耗材名称：{{consumable.consumableName}}（{{consumable.consumableBrandModel}}）</span>
                                     <div class="mainDiv-head-right">
                                         <span>单价：<strong>{{consumable.consumableEndPrice}}元</strong></span>
-                                        <div class="btn btn_search" style="margin-top: 0;margin-left: 8px;" ng-click="removeHc(consumable)"><span>撤销</span></div>
+                                        <div class="btn btn_search" style="margin-top: 0;margin-left: 8px;" ng-click="updateHc(consumable)" ng-if="summary_hc_edit"><span>修改</span></div>
+                                        <div class="btn btn_search" style="margin-top: 0;margin-left: 8px;" ng-click="removeHc(consumable)" ng-if="summary_hc_remove"><span>撤销</span></div>
                                     </div>
                                 </div>
                                 <div>

assets/views/means/cmdbauditlist.html

@@ -167,34 +167,34 @@
     .selectzise {
         width: 160px;
     }
-    
+
     .wt_width {
         width: 17%;
         /* margin-right: 16px; */
     }
-    
+
     .wt_width1 {
         width: 160px;
     }
-    
+
     .wt_margin-top {
         margin-top: 35px !important;
     }
-    
+
     .form-inline .form-control {
         border-radius: 2px;
     }
-    
+
     .wt_width3 {
         width: 130px;
         height: 28px!important;
         border-radius: 2px !important;
     }
-    
+
     .wt_width4 {
         width: 20%;
     }
-    
+
     .wt_width5 {
         width: 160px;
         border-color: #dedede;
@@ -202,7 +202,7 @@
         height: 28px;
         border-radius: 2px !important;
     }
-    
+
     .wt_width6 {
         display: inline-block;
         padding-top: 0px;
@@ -212,36 +212,36 @@
         /* width: 8.2%; */
         text-align: center;
     }
-    
+
     .ui-select-bootstrap .ui-select-toggle {
         height: 28px;
         padding: 3px 4px;
     }
-    /* 
+    /*
         .wt_width {
             width: 20%;
             margin-right: 1%;
             padding: 0px;
         }
-    
+
         .wt_width1 {
             width: 100% !important;
             padding: 0px;
         } */
-    
+
     .wt_width2 {
         width: 50% !important;
     }
-    
+
     .wt_pad {
         padding: 0px;
     }
-    
+
     .wt_btns {
         display: inline-block;
         margin-right: 8px;
     }
-    
+
     .wt_btn1 {
         width: 80px;
         height: 28px !important;
@@ -251,62 +251,62 @@
         padding: 0px!important;
         font-size: 14px!important;
     }
-    
+
     .btn.steelbutton.wt_btn1 {
         padding: 0px!important;
     }
-    
+
     .wt_btnColor {
         background: #4A90E2 !important;
     }
     /* .btn{
             padding: 0px!important;
         } */
-    
+
     .wt_btnColor:hover {
         background: #fff !important;
         color: #2B5EB8 !important;
         border: 1px solid #2B5EB8;
     }
-    
+
     .wt_btnColor2:hover {
         background: #fff !important;
         color: #2B5EB8 !important;
         border: 1px solid #2B5EB8;
     }
-    
+
     .wt_btn2 {
         width: 100px;
         height: 34px!important;
         border-radius: 2px !important;
     }
-    
+
     .wt_list {
         padding: 15px;
         background: #F9F9F9;
     }
-    
+
     .ui-grid-render-container:hover {
         background: #fff !important;
     }
-    
+
     .wt_btnColor1 {
         background: #fff !important;
         color: #2B5EB8 !important;
         border: 1px solid #2B5EB8;
     }
-    
+
     .wt_btnColor1:hover {
         background: #4A90E2 !important;
         color: #fff !important;
         border: 1px solid #4A90E2 !important;
     }
-    
+
     div.ui-grid-row.ng-scope:hover {
         cursor: pointer;
         background: #fff !important;
     }
-    
+
     .wt_searchlistback {
         margin-top: 1px;
         margin-bottom: 8px;
@@ -316,9 +316,9 @@
         border-bottom-left-radius: 8px !important;
         border-bottom-right-radius: 8px !important;
     }
-    
+
     .ui-grid-row:nth-child(even) .ui-grid-cell {
-        background: #fafafa !important;
+        background: #fafafa;
     }
     .searchBtnBox{
         padding-top: 14px;

assets/views/release/list.html

@@ -23,7 +23,7 @@
         background-color: #f9fbff!important;
         position: relative;
     }
-    
+
     .searchlistback .tit {
         font-size: 14px;
         font-weight: bold;
@@ -31,7 +31,7 @@
         margin-bottom: 7px
     }
     /* 左边搜索条件盒子 */
-    
+
     .searchlistback .left {
         float: left;
         /* width: 600px; */
@@ -39,7 +39,7 @@
         margin-top: 10px
     }
     /* 资产分类下拉框 */
-    
+
     .left .tree-control .tree-input {
         padding-left: 4px;
         font-size: 12px;
@@ -47,7 +47,7 @@
         color: rgb(198, 198, 200)!important;
     }
     /* 搜索按钮 */
-    
+
     #jry_searchBtn {
         width: 60px;
         height: 34px!important;
@@ -55,12 +55,12 @@
         background-color: #005395;
         padding: 6px 0px!important
     }
-    
+
     #jry_searchBtn:hover {
         background-color: #004279!important
     }
     /* 重置按钮 */
-    
+
     .jry_reset {
         width: 60px;
         height: 34px;
@@ -70,18 +70,18 @@
         border-radius: 2px!important;
         padding: 0 6px!important;
     }
-    
+
     .jry_reset:hover {
         border: 1px #999999 solid;
         background-color: #ffffff!important;
         color: #999999!important;
     }
     /* tab点击颜色 */
-    
+
     .statecolor {
         background-color: #005395!important
     }
-    
+
     .jry_bj {
         display: inline-block;
         margin-top: 5px
@@ -105,7 +105,7 @@
     }
 
     .ui-grid-row:nth-child(even) .ui-grid-cell {
-        background: #fafafa !important;
+        background: #fafafa;
     }
     div.ui-grid-row.ng-scope:hover{
         cursor:pointer;

assets/views/system/tpl/gsChange.html

@@ -0,0 +1,137 @@
+<style>
+    .btn-plus-div{
+        text-align: left;
+        margin-top: 15px;
+    }
+    .btn-plus-div .btn-plus{
+        line-height: 1.5;
+        position: relative;
+        display: inline-block;
+        font-weight: 400;
+        white-space: nowrap;
+        text-align: center;
+        background-image: none;
+        border: 1px dashed #d9d9d9;
+        -webkit-box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        -webkit-transition: .3s cubic-bezier(.645,.045,.355,1);
+        transition: all .3s cubic-bezier(.645,.045,.355,1);
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+        -ms-touch-action: manipulation;
+        touch-action: manipulation;
+        height: 32px;
+        padding: 0 15px;
+        font-size: 14px;
+        border-radius: 4px;
+        cursor: pointer;
+        color: rgba(0,0,0,.65);
+        background-color: #fff;
+    }
+    .btn-plus-div .btn-plus .icon-tianjia{
+        font-size: 12px;
+        margin-right: 8px;
+    }
+    .btn-plus-div .btn-plus{
+        line-height: 1.5;
+        position: relative;
+        display: inline-block;
+        font-weight: 400;
+        white-space: nowrap;
+        text-align: center;
+        background-image: none;
+        border: 1px dashed #d9d9d9;
+        -webkit-box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        -webkit-transition: .3s cubic-bezier(.645,.045,.355,1);
+        transition: all .3s cubic-bezier(.645,.045,.355,1);
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+        -ms-touch-action: manipulation;
+        touch-action: manipulation;
+        height: 32px;
+        padding: 0 15px;
+        font-size: 14px;
+        border-radius: 4px;
+        cursor: pointer;
+        color: rgba(0,0,0,.65);
+        background-color: #fff;
+    }
+    .btn-plus-div .btn-plus[disabled]{
+        color: rgba(0,0,0,.25);
+        background-color: #f5f5f5;
+        border-color: #d9d9d9;
+        text-shadow: none;
+        -webkit-box-shadow: none;
+        box-shadow: none;
+        background: #f5f5f5;
+        cursor: not-allowed;
+        border: 1px solid rgba(0,0,0,.25);
+    }
+    .btn-plus-div .btn-plus[disabled] .icon-tianjia{
+        color: inherit;
+    }
+    .btn-plus-input{
+        text-align: left;
+        display: flex;
+        align-items: center;
+        margin-bottom: 16px;
+    }
+    .btn-plus-input .form-control{
+        width: 90%;
+    }
+    .btn-plus-input .icon-shanchu3{
+        cursor: pointer;
+        margin-left: 8px;
+        font-size: 18px;
+    }
+    .fault .muti-com {
+        text-align: left;
+    }
+    .fault .muti-com .tree-view {
+        width: 338px;
+    }
+</style>
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">{{title}}<button type="button" class="close pull-right" ng-click="cancel()">×</button></div>
+</div>
+<div class="modal-body margin-top-15 margin-left-15 margin-bottom-15 margin-right-15 addrequster">
+    <form role="form" class="row">
+        <div class="margin-left-30 margin-right-30 margin-top-20">
+            <div class="margin-bottom-15 anline">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">工时:</div>
+                <div class="pull-right openaddinput fault">
+                    <multi-select-tree
+                        data-default-label="请选择工时"
+                        class="muti-com"
+                        ng-model="cifilter_classic"
+                        data-input-model="select_treedata"
+                        data-output-model="dataInfo.workHourManagement"
+                        theme="bootstrap"
+                        multi-select="true"
+                        data-callback="onFilterCallback(item)"
+                        data-select-only-leafs="true"
+                        reset-search-input="false"
+                        data-trans-label="workName"
+                        data-switch-view="false"
+                    >
+                    </multi-select-tree>
+                </div>
+            </div>
+            <div class="margin-bottom-15 anline" ng-show="!isAdd">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14"><span class="red">*</span>数量:</div>
+                <div class="pull-right openaddinput">
+                    <input style="width: 100%;" type="number" ng-model="dataInfo.num" ng-change="changeNum(dataInfo.num)" step="1" min="1">
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <a ng-click="savercode()" data-dismiss="modal" class="btn btn-primary">保存</a>
+    <button class="btn btn-primary btn-o" ng-click="cancel()" translate="modal.button.CANCEL">取消</button>
+</div>

assets/views/system/tpl/hcChange.html

@@ -0,0 +1,124 @@
+<style>
+    .btn-plus-div{
+        text-align: left;
+        margin-top: 15px;
+    }
+    .btn-plus-div .btn-plus{
+        line-height: 1.5;
+        position: relative;
+        display: inline-block;
+        font-weight: 400;
+        white-space: nowrap;
+        text-align: center;
+        background-image: none;
+        border: 1px dashed #d9d9d9;
+        -webkit-box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        -webkit-transition: .3s cubic-bezier(.645,.045,.355,1);
+        transition: all .3s cubic-bezier(.645,.045,.355,1);
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+        -ms-touch-action: manipulation;
+        touch-action: manipulation;
+        height: 32px;
+        padding: 0 15px;
+        font-size: 14px;
+        border-radius: 4px;
+        cursor: pointer;
+        color: rgba(0,0,0,.65);
+        background-color: #fff;
+    }
+    .btn-plus-div .btn-plus .icon-tianjia{
+        font-size: 12px;
+        margin-right: 8px;
+    }
+    .btn-plus-div .btn-plus{
+        line-height: 1.5;
+        position: relative;
+        display: inline-block;
+        font-weight: 400;
+        white-space: nowrap;
+        text-align: center;
+        background-image: none;
+        border: 1px dashed #d9d9d9;
+        -webkit-box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        box-shadow: 0 2px 0 rgba(0,0,0,.015);
+        -webkit-transition: .3s cubic-bezier(.645,.045,.355,1);
+        transition: all .3s cubic-bezier(.645,.045,.355,1);
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+        -ms-touch-action: manipulation;
+        touch-action: manipulation;
+        height: 32px;
+        padding: 0 15px;
+        font-size: 14px;
+        border-radius: 4px;
+        cursor: pointer;
+        color: rgba(0,0,0,.65);
+        background-color: #fff;
+    }
+    .btn-plus-div .btn-plus[disabled]{
+        color: rgba(0,0,0,.25);
+        background-color: #f5f5f5;
+        border-color: #d9d9d9;
+        text-shadow: none;
+        -webkit-box-shadow: none;
+        box-shadow: none;
+        background: #f5f5f5;
+        cursor: not-allowed;
+        border: 1px solid rgba(0,0,0,.25);
+    }
+    .btn-plus-div .btn-plus[disabled] .icon-tianjia{
+        color: inherit;
+    }
+    .btn-plus-input{
+        text-align: left;
+        display: flex;
+        align-items: center;
+        margin-bottom: 16px;
+    }
+    .btn-plus-input .form-control{
+        width: 90%;
+    }
+    .btn-plus-input .icon-shanchu3{
+        cursor: pointer;
+        margin-left: 8px;
+        font-size: 18px;
+    }
+</style>
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">{{title}}<button type="button" class="close pull-right" ng-click="cancel()">×</button></div>
+</div>
+<div class="modal-body margin-top-15 margin-left-15 margin-bottom-15 margin-right-15 addrequster">
+    <form role="form" class="row">
+        <div class="margin-left-30 margin-right-30 margin-top-20">
+            <div class="margin-bottom-15 anline">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">耗材:</div>
+                <div class="pull-right openaddinput">
+                    <ui-select ng-model="dataInfo.consumable" theme="bootstrap" ng-disabled={{!isAdd}}>
+                        <ui-select-match placeholder="请选择耗材">
+                            {{$select.selected.name}}
+                        </ui-select-match>
+                        <ui-select-choices repeat="item in hcList" refresh="getHcList($select.search)">
+                            <div ng-bind-html="item.name + '('+ item.brandModel +')' + '('+ item.unit +')' | highlight: $select.search"></div>
+                        </ui-select-choices>
+                    </ui-select>
+                </div>
+            </div>
+            <div class="margin-bottom-15 anline">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14"><span class="red">*</span>数量:</div>
+                <div class="pull-right openaddinput">
+                    <input style="width: 100%;" type="number" ng-model="dataInfo.num" ng-change="changeNum(dataInfo.num)" step="1" min="1">
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <a ng-click="savercode()" data-dismiss="modal" class="btn btn-primary">保存</a>
+    <button class="btn btn-primary btn-o" ng-click="cancel()" translate="modal.button.CANCEL">取消</button>
+</div>

assets/views/working/list.html

@@ -145,7 +145,7 @@
     height: 28px;
   }
 
-  /* 
+  /*
     .wt_width {
         width: 20%;
         margin-right: 1%;
@@ -247,7 +247,7 @@
   }
 
   .ui-grid-row:nth-child(even) .ui-grid-cell {
-    background: #fafafa !important;
+    background: #fafafa;
   }
 
   .searchBtnBox>.wt_btns {