修改BUG

assets/js/controllers/consumables/consumablesCtrl.js

@@ -100,8 +100,10 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
         //     };
         //     $scope.refreshData('expand-right', $scope.memoryfilterData);
         // }
-        $scope.fileData.consumable["name"]=val.name;
-        $scope.refreshData('expand-right', $scope.fileData);
+        if(val){
+            $scope.fileData.consumable["name"]=val.name;
+            $scope.refreshData('expand-right', $scope.fileData);
+        }
     })
     $scope.new_data = function() {
         $scope.myData = [];

assets/js/controllers/system/organizationdesign/hc_flwhCtrl.js

@@ -75,7 +75,8 @@
          // 耗材名称分类
         $scope.refreshDat_name = function () {
             var dat = {
-                "key":"haocaifenlei"
+                "key":"haocaifenlei",
+                "type":"list"
             }
             api_cmdb4.fetchDataList(dat).then(function (data) {
                 $scope.names=data;

assets/js/main.js

@@ -1436,7 +1436,7 @@ app.factory('api_cmdb4', ['CMDBRestangular4', function (CMDBRestangular) {
     return {
         // 耗材查询分类
         fetchDataList: function (data) {
-            return hcService.customPOST(data, 'getDictionaryForList', {})
+            return hcService.customPOST(data, 'getDictionary', {})
         },
         // 耗材分类新增
         addDictionary: function (data) {

assets/views/consumables/list.html

@@ -295,7 +295,7 @@
                     <div class="div">
                         <span>品牌/型号：</span><br>
                         <ui-select class="pull-left selectzise xiala" ng-model="select_updata_pinpai.updata_pinpai"
-                            theme="bootstrap">
+                            theme="bootstrap" ng-disabled="true">
                             <ui-select-match placeholder="{{hc_eject_brandModel}}">
                                 {{select_updata_pinpai.updata_pinpai.name}}
                             </ui-select-match>
@@ -307,7 +307,7 @@
                     <div class="div">
                         <span>规格：</span><br>
                         <ui-select class="pull-left selectzise xiala" ng-model="select_updata_guige.updata_guige"
-                            theme="bootstrap">
+                            theme="bootstrap" ng-disabled="true">
                             <ui-select-match placeholder="{{hc_eject_specification}}">
                                 {{select_updata_guige.updata_guige.name}}
                             </ui-select-match>