Browse Source

修改BUG

seimin 3 years ago
parent
commit
218f1709ae

+ 4 - 2
assets/js/controllers/consumables/consumablesCtrl.js

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

+ 2 - 1
assets/js/controllers/system/organizationdesign/hc_flwhCtrl.js

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

+ 1 - 1
assets/js/main.js

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

+ 2 - 2
assets/views/consumables/list.html

@@ -295,7 +295,7 @@
295
                     <div class="div">
295
                     <div class="div">
296
                         <span>品牌/型号:</span><br>
296
                         <span>品牌/型号:</span><br>
297
                         <ui-select class="pull-left selectzise xiala" ng-model="select_updata_pinpai.updata_pinpai"
297
                         <ui-select class="pull-left selectzise xiala" ng-model="select_updata_pinpai.updata_pinpai"
298
-                            theme="bootstrap">
298
+                            theme="bootstrap" ng-disabled="true">
299
                             <ui-select-match placeholder="{{hc_eject_brandModel}}">
299
                             <ui-select-match placeholder="{{hc_eject_brandModel}}">
300
                                 {{select_updata_pinpai.updata_pinpai.name}}
300
                                 {{select_updata_pinpai.updata_pinpai.name}}
301
                             </ui-select-match>
301
                             </ui-select-match>
@@ -307,7 +307,7 @@
307
                     <div class="div">
307
                     <div class="div">
308
                         <span>规格:</span><br>
308
                         <span>规格:</span><br>
309
                         <ui-select class="pull-left selectzise xiala" ng-model="select_updata_guige.updata_guige"
309
                         <ui-select class="pull-left selectzise xiala" ng-model="select_updata_guige.updata_guige"
310
-                            theme="bootstrap">
310
+                            theme="bootstrap" ng-disabled="true">
311
                             <ui-select-match placeholder="{{hc_eject_specification}}">
311
                             <ui-select-match placeholder="{{hc_eject_specification}}">
312
                                 {{select_updata_guige.updata_guige.name}}
312
                                 {{select_updata_guige.updata_guige.name}}
313
                             </ui-select-match>
313
                             </ui-select-match>