故障耗材

assets/js/controllers/businessConfiguration/faultConsumablesCtrl.js

@@ -82,15 +82,15 @@ app.controller("faultConsumablesCtrl", [
         enableFiltering: false,
       },
       {
-        name: "content",
-        displayName: "别名",
-        width: "30%",
+        name: "category.mutiCategory",
+        displayName: "故障现象",
+        width: "20%",
         enableFiltering: false,
       },
       {
-        name: "category.category",
-        displayName: "故障现象",
-        width: "30%",
+        name: "consumableDTOSName",
+        displayName: "耗材信息",
+        width: "40%",
         enableFiltering: false,
       },
       {
@@ -111,6 +111,64 @@ app.controller("faultConsumablesCtrl", [
         return "无";
       }
     };
+    //树形图
+    // 将故障现象搜索结果返回的数据整理成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;
+  }
     function selectItem(pmodel, childrens) {
       if (angular.isArray(pmodel)) {
         angular.forEach(pmodel, function (index) {
@@ -141,31 +199,56 @@ app.controller("faultConsumablesCtrl", [
     $scope.saveData = function (selectdata) {
       console.log(selectdata);
       var modalInstance = $modal.open({
-        templateUrl: "assets/views/system/tpl/commonFaultSymptomschange.html",
-        controller: function ($scope, scope, $modalInstance, api_user_data,api_bpm_data) {
+        templateUrl: "assets/views/system/tpl/faultConsumableschange.html",
+        controller: function ($rootScope, $scope, scope, $modalInstance, api_user_data,api_bpm_data) {
           selectdata.category.selected = true;
           $scope.deptdata = {
             id: selectdata.id,
-            content: selectdata.content,
+            consumableIds: selectdata.consumableDTOS || [],
             category: selectdata.category
           };
           $scope.categoryList = [];
-          $scope.title = "常用故障现象修改";
+          $scope.title = "故障耗材修改";
+
+          // 耗材列表模糊搜索
+          $scope.searchConsumable = function (key = "") {
+            var deptData = {
+              idx: 0,
+              sum: 10,
+              consumable: {
+                keyWord: key,
+              },
+            };
+            api_user_data
+              .fetchDataList("consumable", deptData)
+              .then(function (data) {
+                var ids = $scope.deptdata.consumableIds.map(v=>v.id);
+                $scope.consumableList = data.list.filter(v=>!ids.includes(v.id));
+              });
+          };
           // --------------------
           $scope.select_treedata = [];
-          $scope.try_async_load = function (s, fn) {
+          $rootScope.bala1 = $scope.try_async_load = function (s, fn) {
             if (s) {
               var filterKeyword = s.filterKeyword;
             }
             var postData = {
               idx: 0,
-              sum: 1000,
+              sum: 9999,
+              incidentcategory: {
+                selectType: "pinyin_qs",
+                "hierarchyQuery":"two",
+                "categoryConsumable":1,
+              }
             };
             if (filterKeyword) {
-              postData.incidentcategory = {
-                selectType: "pinyin_qs",
-                category: filterKeyword,
-              };
+              postData.incidentcategory.category = filterKeyword;
+            }
+            // 当前所属院区或责任科室
+            if($rootScope.user.duty){
+              postData.incidentcategory.duty = $rootScope.user.duty.id;
+            }else if($rootScope.user.branch){
+                postData.incidentcategory.branch = $rootScope.user.branch.id;
             }
             $scope.my_data = [];
             $scope.doing_async = true;
@@ -218,19 +301,20 @@ app.controller("faultConsumablesCtrl", [
           $scope.savercode = function (deptdata) {
             if (
               deptdata &&
-              deptdata.content &&
+              deptdata.consumableIds &&
               deptdata.category
             ) {
               var fildata = {
-                incidentCategoryContent: {
+                incidentCategoryConsumable: {
                   id: deptdata.id,
                   deleteFlag: 0,
-                  content: deptdata.content,
+                  consumableIds: deptdata.consumableIds.map(v => v.id).toString(),
                   category: deptdata.category,
                 },
               };
+              fildata.incidentCategoryConsumable = Object.assign({}, selectdata, fildata.incidentCategoryConsumable)
               api_user_data
-                .updData("incidentCategoryContent", fildata)
+                .addData("incidentCategoryConsumable", fildata)
                 .then(function (response) {
                   if (response) {
                     if (response.status == 200) {
@@ -243,17 +327,6 @@ app.controller("faultConsumablesCtrl", [
                           scope.refreshData("expand-right", scope.fileData);
                         }
                       );
-                    } else if (response.status == 500) {
-                      SweetAlert.swal(
-                        {
-                          title: "修改失败!",
-                          text: "该故障现象已存在",
-                          type: "error",
-                        },
-                        function () {
-                          scope.refreshData("expand-right", scope.fileData);
-                        }
-                      );
                     } else {
                       SweetAlert.swal(
                         {
@@ -341,16 +414,32 @@ app.controller("faultConsumablesCtrl", [
     }
     $scope.addData = function () {
       var modalInstance = $modal.open({
-        templateUrl: "assets/views/system/tpl/commonFaultSymptomschange.html",
-        controller: function ($scope, $modalInstance, api_user_data,api_bpm_data) {
+        templateUrl: "assets/views/system/tpl/faultConsumableschange.html",
+        controller: function ($rootScope, $scope, $modalInstance, api_user_data,api_bpm_data) {
           $scope.deptdata = {
-            content: "",
+            consumableIds: [],
             category: "",
           };
-          $scope.title = "常用故障现象新增";
+          $scope.title = "故障耗材新增";
+          // 耗材列表模糊搜索
+          $scope.searchConsumable = function (key = "") {
+            var deptData = {
+              idx: 0,
+              sum: 10,
+              consumable: {
+                keyWord: key,
+              },
+            };
+            api_user_data
+              .fetchDataList("consumable", deptData)
+              .then(function (data) {
+                var ids = $scope.deptdata.consumableIds.map(v=>v.id);
+                $scope.consumableList = data.list.filter(v=>!ids.includes(v.id));
+              });
+          };
           // --------------------
           $scope.select_treedata = [];
-          $scope.try_async_load = function (s, fn) {
+          $rootScope.bala1 = $scope.try_async_load = function (s, fn) {
             if (s) {
               var filterKeyword = s.filterKeyword;
             }
@@ -359,11 +448,19 @@ app.controller("faultConsumablesCtrl", [
               sum: 9999,
               incidentcategory: {
                 selectType: "pinyin_qs",
+                "hierarchyQuery":"two",
+                "categoryConsumable":1,
               }
             };
             if (filterKeyword) {
               postData.incidentcategory.category = filterKeyword;
             }
+            // 当前所属院区或责任科室
+            if($rootScope.user.duty){
+              postData.incidentcategory.duty = $rootScope.user.duty.id;
+            }else if($rootScope.user.branch){
+                postData.incidentcategory.branch = $rootScope.user.branch.id;
+            }
             $scope.my_data = [];
             $scope.doing_async = true;
             api_bpm_data
@@ -413,10 +510,58 @@ app.controller("faultConsumablesCtrl", [
           $scope.savercode = function (deptdata) {
             if (
               deptdata &&
-              deptdata.content &&
+              deptdata.consumableIds &&
               deptdata.category
             ) {
-              $modalInstance.close(deptdata);
+              var selectedItem = deptdata;
+              if (selectedItem.consumableIds && selectedItem.category) {
+                var fildata = {
+                  incidentCategoryConsumable: {
+                    consumableIds: selectedItem.consumableIds.map(v => v.id).toString(),
+                    category: selectedItem.category,
+                  },
+                };
+                // 当前所属院区或责任科室
+                if($rootScope.user.duty){
+                  fildata.incidentCategoryConsumable.duty = $rootScope.user.duty.id;
+                }else if($rootScope.user.branch){
+                  fildata.incidentCategoryConsumable.branch = $rootScope.user.branch.id;
+                }
+                api_user_data
+                  .addData("incidentCategoryConsumable", fildata)
+                  .then(function (response) {
+                    if (response) {
+                      if (response.status == 200) {
+                        $modalInstance.close();
+                        SweetAlert.swal(
+                          {
+                            title: "新增成功!",
+                            type: "success",
+                          },
+                          function () {
+                            $scope.refreshData("expand-right", $scope.fileData);
+                          }
+                        );
+                      } else {
+                        SweetAlert.swal({
+                          title: "新增失败!",
+                          text: response.msg,
+                          type: "error",
+                        });
+                      }
+                    }
+                  });
+              } else {
+                SweetAlert.swal(
+                  {
+                    title: "新增失败!",
+                    text: "请填写必填项!",
+                    type: "error",
+                    confirmButtonColor: "#DD6B55",
+                  },
+                  function () {}
+                );
+              }
             } else {
               SweetAlert.swal(
                 {
@@ -431,49 +576,55 @@ app.controller("faultConsumablesCtrl", [
           };
         },
       });
-      modalInstance.result.then(function (selectedItem) {
-        if (selectedItem.content && selectedItem.category) {
-          var fildata = {
-            incidentCategoryContent: {
-              content: selectedItem.content,
-              category: selectedItem.category,
-            },
-          };
-          api_user_data
-            .addData("incidentCategoryContent", fildata)
-            .then(function (response) {
-              if (response) {
-                if (response.status == 200) {
-                  SweetAlert.swal(
-                    {
-                      title: "新增成功!",
-                      type: "success",
-                    },
-                    function () {
-                      $scope.refreshData("expand-right", $scope.fileData);
-                    }
-                  );
-                } else {
-                  SweetAlert.swal({
-                    title: "新增失败!",
-                    text: response.msg,
-                    type: "error",
-                  });
-                }
-              }
-            });
-        } else {
-          SweetAlert.swal(
-            {
-              title: "新增失败!",
-              text: "请填写必填项!",
-              type: "error",
-              confirmButtonColor: "#DD6B55",
-            },
-            function () {}
-          );
-        }
-      });
+      // modalInstance.result.then(function (selectedItem) {
+      //   if (selectedItem.consumableIds && selectedItem.category) {
+      //     var fildata = {
+      //       incidentCategoryConsumable: {
+      //         consumableIds: selectedItem.consumableIds.map(v => v.id).toString(),
+      //         category: selectedItem.category,
+      //       },
+      //     };
+      //     // 当前所属院区或责任科室
+      //     if($rootScope.user.duty){
+      //       fildata.incidentCategoryConsumable.duty = $rootScope.user.duty.id;
+      //     }else if($rootScope.user.branch){
+      //       fildata.incidentCategoryConsumable.branch = $rootScope.user.branch.id;
+      //     }
+      //     api_user_data
+      //       .addData("incidentCategoryConsumable", fildata)
+      //       .then(function (response) {
+      //         if (response) {
+      //           if (response.status == 200) {
+      //             SweetAlert.swal(
+      //               {
+      //                 title: "新增成功!",
+      //                 type: "success",
+      //               },
+      //               function () {
+      //                 $scope.refreshData("expand-right", $scope.fileData);
+      //               }
+      //             );
+      //           } else {
+      //             SweetAlert.swal({
+      //               title: "新增失败!",
+      //               text: response.msg,
+      //               type: "error",
+      //             });
+      //           }
+      //         }
+      //       });
+      //   } else {
+      //     SweetAlert.swal(
+      //       {
+      //         title: "新增失败!",
+      //         text: "请填写必填项!",
+      //         type: "error",
+      //         confirmButtonColor: "#DD6B55",
+      //       },
+      //       function () {}
+      //     );
+      //   }
+      // });
     };
 
     $scope.removeData = function () {
@@ -482,8 +633,8 @@ app.controller("faultConsumablesCtrl", [
         templateUrl: "assets/views/incident/tpl/acceptTask.tpl.html",
         controller: function ($scope, scope, $modalInstance, api_bpm_data) {
           var rmvList = [];
-          $scope.title = "故障现象删除";
-          $scope.connect = "确定要删除此故障现象？";
+          $scope.title = "故障耗材删除";
+          $scope.connect = "确定要删除此故障耗材？";
           rmvList.push(scope.selected.items);
           $scope.ok = function () {
             $modalInstance.close(rmvList);
@@ -504,48 +655,37 @@ app.controller("faultConsumablesCtrl", [
         if (selectedItem) {
           if (selectedItem.length > 0) {
             console.log(selectedItem);
-            if (
-              selectedItem[0].children &&
-              selectedItem[0].children.length > 0
-            ) {
-              SweetAlert.swal({
-                title: "该部门存在子类部门",
-                text: "请先删除该部门子类部门！",
-                type: "error",
+            api_user_data
+              .rmvData("incidentCategoryConsumable", [selectedItem[0].id])
+              .then(function (response) {
+                if (response.status == 200) {
+                  SweetAlert.swal(
+                    {
+                      title: "删除成功!",
+                      type: "success",
+                      confirmButtonColor: "#007AFF",
+                    },
+                    function () {
+                      $scope.myData = _.reject($scope.myData, function (o) {
+                        return _.includes(selectedItem, o.id);
+                      });
+                      $scope.selected = {
+                        items: [],
+                      };
+                      $scope.gridOptions.totalItems =
+                        $scope.gridOptions.totalItems - selectedItem.length;
+                      $scope.gridApi.grid.selection.selectedCount = 0;
+                      $scope.refreshData("expand-right", $scope.fileData);
+                    }
+                  );
+                } else {
+                  SweetAlert.swal({
+                    title: "操作异常!",
+                    text: "系统异常，请稍后重试，或者联系管理员！",
+                    type: "error",
+                  });
+                }
               });
-            } else {
-              api_user_data
-                .rmvData("incidentCategoryContent", [selectedItem[0].id])
-                .then(function (response) {
-                  if (response.status == 200) {
-                    SweetAlert.swal(
-                      {
-                        title: "删除成功!",
-                        type: "success",
-                        confirmButtonColor: "#007AFF",
-                      },
-                      function () {
-                        $scope.myData = _.reject($scope.myData, function (o) {
-                          return _.includes(selectedItem, o.id);
-                        });
-                        $scope.selected = {
-                          items: [],
-                        };
-                        $scope.gridOptions.totalItems =
-                          $scope.gridOptions.totalItems - selectedItem.length;
-                        $scope.gridApi.grid.selection.selectedCount = 0;
-                        $scope.refreshData("expand-right", $scope.fileData);
-                      }
-                    );
-                  } else {
-                    SweetAlert.swal({
-                      title: "操作异常!",
-                      text: "系统异常，请稍后重试，或者联系管理员！",
-                      type: "error",
-                    });
-                  }
-                });
-            }
           }
         }
       });
@@ -584,16 +724,18 @@ app.controller("faultConsumablesCtrl", [
     var defaultFilterData = {
       idx: 0,
       sum: 10,
+      incidentCategoryConsumable: {},
     };
 
     $scope.memoryfilterData = {
       idx: 0,
       sum: 10,
+      incidentCategoryConsumable: {},
     };
     $scope.fileData = {
       idx: 0,
       sum: 10,
-      incidentCategoryContent: {},
+      incidentCategoryConsumable: {},
     };
     $scope.ldloading = {};
     $scope.refreshData = function (style, filterData) {
@@ -608,14 +750,20 @@ app.controller("faultConsumablesCtrl", [
       if ($scope.gridApi) {
         $scope.gridApi.grid.selection.selectedCount = 0;
       }
-      filterData = angular.copy(filterData);
-      api_user_data.fetchDataList("incidentCategoryContent", filterData).then(
+      // 当前所属院区或责任科室
+      if($rootScope.user.duty){
+        filterData.incidentCategoryConsumable.duty = $rootScope.user.duty.id;
+      }else if($rootScope.user.branch){
+        filterData.incidentCategoryConsumable.branch = $rootScope.user.branch.id;
+      }
+      api_user_data.fetchDataList("incidentCategoryConsumable", filterData).then(
         function (data) {
           var myData = Restangular.stripRestangular(data);
           $scope.gridOptions.totalItems = myData.totalNum;
           $scope.myData = myData.list;
           for (var i = 0; i < $scope.myData.length; i++) {
             $scope.myData[i]["item"] = i + 1 + filterData.idx * filterData.sum;
+            $scope.myData[i]["consumableDTOSName"] = $scope.myData[i]["consumableDTOS"].map(v => v.name).join('，');
           }
           $scope.ldloading[style.replace("-", "_")] = false;
         },
@@ -637,17 +785,20 @@ app.controller("faultConsumablesCtrl", [
         $scope.gridApi.grid.selection.selectedCount = 0;
       }
       filterData = angular.copy(filterData);
-      if (filterData.incidentCategoryContent.category) {
-        filterData.incidentCategoryContent.category =
-          filterData.incidentCategoryContent.category.id;
+      // 当前所属院区或责任科室
+      if($rootScope.user.duty){
+        filterData.incidentCategoryConsumable.duty = $rootScope.user.duty.id;
+      }else if($rootScope.user.branch){
+        filterData.incidentCategoryConsumable.branch = $rootScope.user.branch.id;
       }
-      api_user_data.fetchDataList("incidentCategoryContent", filterData).then(
+      api_user_data.fetchDataList("incidentCategoryConsumable", filterData).then(
         function (data) {
           var myData = Restangular.stripRestangular(data);
           $scope.gridOptions.totalItems = myData.totalNum;
           $scope.myData = myData.list;
           for (var i = 0; i < $scope.myData.length; i++) {
             $scope.myData[i]["item"] = i + 1 + filterData.idx * filterData.sum;
+            $scope.myData[i]["consumableDTOSName"] = $scope.myData[i]["consumableDTOS"].map(v => v.name).join('，');
           }
           $scope.ldloading[style.replace("-", "_")] = false;
         },
@@ -662,27 +813,36 @@ app.controller("faultConsumablesCtrl", [
     };
     // 清空
     $scope.clean = function () {
-      delete $scope.fileData.incidentCategoryContent.content;
-      delete $scope.fileData.incidentCategoryContent.category;
+      delete $scope.fileData.incidentCategoryConsumable.consumableIds;
+      delete $scope.fileData.incidentCategoryConsumable.category;
       $scope.getCategoryData();
       $scope.refreshData("expand-right", $scope.fileData);
     };
     // 获取院区下拉
     $scope.model = {};
-    $scope.categoryData = [];
-    $scope.getCategoryData = function (s, fn) {
+    // --------------------
+    $scope.select_treedata = [];
+    $rootScope.bala1 = $scope.try_async_load = function (s, fn) {
       if (s) {
         var filterKeyword = s.filterKeyword;
       }
       var postData = {
         idx: 0,
-        sum: 1000,
+        sum: 9999,
+        incidentcategory: {
+          selectType: "pinyin_qs",
+          "hierarchyQuery":"two",
+          "categoryConsumable":1,
+        }
       };
       if (filterKeyword) {
-        postData.incidentcategory = {
-          selectType: "pinyin_qs",
-          category: filterKeyword,
-        };
+        postData.incidentcategory.category = filterKeyword;
+      }
+      // 当前所属院区或责任科室
+      if($rootScope.user.duty){
+        postData.incidentcategory.duty = $rootScope.user.duty.id;
+      }else if($rootScope.user.branch){
+          postData.incidentcategory.branch = $rootScope.user.branch.id;
       }
       $scope.my_data = [];
       $scope.doing_async = true;
@@ -710,7 +870,7 @@ app.controller("faultConsumablesCtrl", [
                 objects.push(object);
               }
               $scope.my_data = convertParentToChildList(objects);
-              $scope.categoryData = angular.copy($scope.my_data);
+              $scope.select_treedata = angular.copy($scope.my_data);
             }
             if ($scope.my_data.length > 0) {
               $scope.doing_async = false;
@@ -724,7 +884,8 @@ app.controller("faultConsumablesCtrl", [
           }
         });
     };
-    $scope.getCategoryData();
+    // $scope.try_async_load();
+    // --------------------
     $scope.refreshData("expand-right", $scope.fileData);
     $scope.timer = $interval(function () {
       $scope.refreshData2("expand-right", $scope.fileData);

assets/views/businessConfiguration/faultConsumables.html

@@ -48,7 +48,7 @@
     <div class="row" style="padding-right: 0px !important">
       <form class="col-xs-12 form-inline">
         <div class="col-xs-10">
-          <div class="form-group incidentsearch">
+          <!-- <div class="form-group incidentsearch">
             <div>
               <div class="control-label pull-left" style="padding-top: 4px">
                 别名:
@@ -68,25 +68,24 @@
               data-default-label="请选择故障现象"
               class="pull-right iptSize muti-com"
               ng-model="cifilter_classic"
-              data-input-model="categoryData"
+              data-input-model="select_treedata"
               data-output-model="fileData.incidentCategoryContent.category"
               theme="bootstrap"
-              data-select-only-leafs="true"
+              data-select-only-leafs="false"
               multi-select="false"
               data-callback="onFilterCallback(item)"
-              data-select-only-leafs="false"
               reset-search-input="false"
               data-trans-label="category"
               data-switch-view="false"
             >
             </multi-select-tree>
-          </div>
+          </div> -->
         </div>
         <div class="col-xs-2 searchBtnBox">
-          <div type="button" class="btn btn_search" ng-click="searchData()">
+          <!-- <div type="button" class="btn btn_search" ng-click="searchData()">
             搜索
           </div>
-          <div class="btn btn_clean" ng-click="clean()">重置</div>
+          <div class="btn btn_clean" ng-click="clean()">重置</div> -->
           <div
             type="button"
             class="btn btn_search"

assets/views/system/tpl/faultConsumableschange.html

@@ -14,14 +14,28 @@
         <div
           class="pull-left openaddlable control-label fontcolor-two fontsizes-14"
         >
-          别名<span class="red">*</span>:
+          耗材信息<span class="red">*</span>:
         </div>
         <div class="pull-right openaddinput">
-          <input
-            class="form-control"
-            ng-model="deptdata.content"
-            placeholder="别名"
-          />
+          <ui-select
+            multiple
+            class="c_item_value"
+            style="height: auto;text-align:left;"
+            ng-model="deptdata.consumableIds"
+            theme="bootstrap"
+            ng-required="true"
+            reset-search-input="false"
+          >
+            <ui-select-match placeholder="请选择耗材信息">
+              <span ng-bind="$item.name"></span>
+            </ui-select-match>
+            <ui-select-choices
+              repeat="item in consumableList"
+              refresh="searchConsumable($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">
@@ -37,8 +51,7 @@
             ng-model="cifilter_classic"
             data-input-model="select_treedata"
             data-output-model="deptdata.category"
-            theme="bootstrap" 
-            data-select-only-leafs="true"
+            theme="bootstrap"
             multi-select="false"
             data-callback="onFilterCallback(item)"
             data-select-only-leafs="false"

bower_components/angular-ui-grid/ui-grid.css

@@ -1,6 +1,6 @@
 /*!
  * ui-grid - v3.0.6 - 2015-09-08
- * Copyright (c) 2015 ; License: MIT 
+ * Copyright (c) 2015 ; License: MIT
  */
 
 #ui-grid-twbs #ui-grid-twbs .form-horizontal .form-group:before,
@@ -941,7 +941,7 @@ fieldset[disabled] .ui-grid-menu .ui-grid-menu-inner .ui-grid-menu-close-button.
     line-height: .9em;
     /* border: 1px solid #bbbbbb; */
     border-radius: 2px;
-    font-size: 60%;
+    /* font-size: 60%; */
 }
 
 .ui-grid-icon-blank::before {