seimin 3 年之前
父节点
当前提交
003c1a42a8

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

@@ -537,7 +537,7 @@ app.controller('hc_flwhCtrl', ["$rootScope", "$scope", "$http", "$state", "$time
537
             api_user_data.fetchDataList('dictionaryTree', dat2).then(function (data) {
537
             api_user_data.fetchDataList('dictionaryTree', dat2).then(function (data) {
538
                 if(data.status == 200){
538
                 if(data.status == 200){
539
                     if(data.status == 200){
539
                     if(data.status == 200){
540
-                        $scope.guiges = data;
540
+                        $scope.guiges = data.list;
541
                     }
541
                     }
542
                 }
542
                 }
543
             });
543
             });
@@ -570,7 +570,7 @@ app.controller('hc_flwhCtrl', ["$rootScope", "$scope", "$http", "$state", "$time
570
                     }
570
                     }
571
                     api_user_data.fetchDataList('dictionaryTree', dat2).then(function (data) {
571
                     api_user_data.fetchDataList('dictionaryTree', dat2).then(function (data) {
572
                         if(data.status == 200){
572
                         if(data.status == 200){
573
-                            $scope.guiges = data;
573
+                            $scope.guiges = data.list;
574
                         }
574
                         }
575
                     });
575
                     });
576
                 });
576
                 });

+ 3 - 3
assets/views/system/organization/hc_flwh.html

@@ -240,7 +240,7 @@
240
                 </div>
240
                 </div>
241
                 <div class="mainDiv-body-2" ng-repeat="name in names" ng-click="clickname(name,$index)">
241
                 <div class="mainDiv-body-2" ng-repeat="name in names" ng-click="clickname(name,$index)">
242
                     <div class="" ng-show="index!=$index||!name_show">
242
                     <div class="" ng-show="index!=$index||!name_show">
243
-                        <span class="shouxing">{{ (name.name || '添加名称') | uppercase }}</span>
243
+                        <span class="shouxing">{{ name.name }}</span>
244
                         <div class="mainDiv-head-right">
244
                         <div class="mainDiv-head-right">
245
                             <span class="mainDivLeft-span-1 span-1 pointfont bluefont" ng-click="name_edit()">
245
                             <span class="mainDivLeft-span-1 span-1 pointfont bluefont" ng-click="name_edit()">
246
                                 <i style="font-size: 14px !important;margin-right: 4px;" class="icon iconfont icon-xiugai1 bluefont"></i>编辑
246
                                 <i style="font-size: 14px !important;margin-right: 4px;" class="icon iconfont icon-xiugai1 bluefont"></i>编辑
@@ -284,7 +284,7 @@
284
                 <div class="mainDiv-body-3" ng-repeat="xinghao in xinghaos" ng-if="ids!=undefined&&ids!=''">
284
                 <div class="mainDiv-body-3" ng-repeat="xinghao in xinghaos" ng-if="ids!=undefined&&ids!=''">
285
                     <div class="" ng-show="pinpai_index!=$index||!pinpai_show">
285
                     <div class="" ng-show="pinpai_index!=$index||!pinpai_show">
286
                         <!-- <i style="font-size: 18px !important; margin-right: 10px;" class="icon iconfont icon-icon32209"></i> -->
286
                         <!-- <i style="font-size: 18px !important; margin-right: 10px;" class="icon iconfont icon-icon32209"></i> -->
287
-                        <span class="shouxing">{{ (xinghao.name || '添加地点') | uppercase }}</span>
287
+                        <span class="shouxing">{{ xinghao.name }}</span>
288
                         <div class="mainDiv-head-right">
288
                         <div class="mainDiv-head-right">
289
                             <span class="mainDivLeft-span-1 span-1 pointfont bluefont" ng-click="pinpai_edit(xinghao,$index)">
289
                             <span class="mainDivLeft-span-1 span-1 pointfont bluefont" ng-click="pinpai_edit(xinghao,$index)">
290
                             <i style="font-size: 14px !important;margin-right: 4px;" class="icon iconfont icon-xiugai1 bluefont"></i>编辑
290
                             <i style="font-size: 14px !important;margin-right: 4px;" class="icon iconfont icon-xiugai1 bluefont"></i>编辑
@@ -328,7 +328,7 @@
328
                 <div class="mainDiv-body-3" ng-repeat="guige in guiges" ng-if="ids!=undefined&&ids!=''">
328
                 <div class="mainDiv-body-3" ng-repeat="guige in guiges" ng-if="ids!=undefined&&ids!=''">
329
                     <div class="" ng-show="guige_index!=$index||!guige_show">
329
                     <div class="" ng-show="guige_index!=$index||!guige_show">
330
                         <!-- <i style="font-size: 18px !important; margin-right: 10px;" class="icon iconfont icon-icon32209"></i> -->
330
                         <!-- <i style="font-size: 18px !important; margin-right: 10px;" class="icon iconfont icon-icon32209"></i> -->
331
-                        <span class="shouxing">{{ (guige.name || '添加地点') | uppercase }}</span>
331
+                        <span class="shouxing">{{ guige.name }}</span>
332
                         <div class="mainDiv-head-right">
332
                         <div class="mainDiv-head-right">
333
                             <span class="mainDivLeft-span-1 span-1 pointfont bluefont" ng-click="guige_edit(guige,$index)">
333
                             <span class="mainDivLeft-span-1 span-1 pointfont bluefont" ng-click="guige_edit(guige,$index)">
334
                             <i style="font-size: 14px !important;margin-right: 4px;" class="icon iconfont icon-xiugai1 bluefont"></i>编辑
334
                             <i style="font-size: 14px !important;margin-right: 4px;" class="icon iconfont icon-xiugai1 bluefont"></i>编辑