seimin 1 vuosi sitten
vanhempi
commit
4ee44eebe6

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

@@ -115,7 +115,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
115
             }
115
             }
116
             api_wechatfile.getDictionary(dat).then(function (data) {
116
             api_wechatfile.getDictionary(dat).then(function (data) {
117
                 data = data || [];
117
                 data = data || [];
118
-                $scope.select_updata_name.updata_name = data.find(v=>v.name == val);
118
+                $scope.select_updata_name.updata_name = data.find(v=>v.name == val) || {name:''};
119
             });
119
             });
120
         }
120
         }
121
     })
121
     })
@@ -978,7 +978,7 @@ app.controller('hc_caozuoCtrl', ['$rootScope', '$http', '$scope', '$modal', '$st
978
         $rootScope.hc_eject_name_caozuo = $scope.item.name; //耗材名称
978
         $rootScope.hc_eject_name_caozuo = $scope.item.name; //耗材名称
979
         $rootScope.hc_eject_brandModel_caozuo = $scope.item.brandModel; //耗材品牌型号
979
         $rootScope.hc_eject_brandModel_caozuo = $scope.item.brandModel; //耗材品牌型号
980
         $rootScope.hc_eject_specification_caozuo = $scope.item.specification; //耗材规格
980
         $rootScope.hc_eject_specification_caozuo = $scope.item.specification; //耗材规格
981
-        $rootScope.hc_eject_companyIds_caozuo = $scope.item.companyIds.split(','); //供货公司
981
+        $rootScope.hc_eject_companyIds_caozuo = $scope.item.companyIds ? $scope.item.companyIds.split(',') : []; //供货公司
982
         $rootScope.hc_eject_startPrice_caozuo = $scope.item.startPrice; //费用区间开始
982
         $rootScope.hc_eject_startPrice_caozuo = $scope.item.startPrice; //费用区间开始
983
         $rootScope.hc_eject_endPrice_caozuo = $scope.item.endPrice; //费用区间结束
983
         $rootScope.hc_eject_endPrice_caozuo = $scope.item.endPrice; //费用区间结束
984
         $rootScope.hc_eject_isWarehousing_caozuo = $scope.item.isInventory || 0; //是否库存
984
         $rootScope.hc_eject_isWarehousing_caozuo = $scope.item.isInventory || 0; //是否库存

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

@@ -333,7 +333,7 @@
333
                         <span>耗材名称:</span><br>
333
                         <span>耗材名称:</span><br>
334
                         <ui-select class="pull-left selectzise xiala" ng-model="select_updata_name.updata_name"
334
                         <ui-select class="pull-left selectzise xiala" ng-model="select_updata_name.updata_name"
335
                             theme="bootstrap">
335
                             theme="bootstrap">
336
-                            <ui-select-match placeholder="{{hc_eject_name}}">
336
+                            <ui-select-match placeholder="请选择">
337
                                 {{select_updata_name.updata_name.name}}
337
                                 {{select_updata_name.updata_name.name}}
338
                             </ui-select-match>
338
                             </ui-select-match>
339
                             <ui-select-choices repeat="n in updata_name">
339
                             <ui-select-choices repeat="n in updata_name">

+ 1 - 1
assets/views/inspect/summaryDetail.html

@@ -331,7 +331,7 @@
331
                                 <div>
331
                                 <div>
332
                                     <span>&emsp;</span>
332
                                     <span>&emsp;</span>
333
                                     <div class="mainDiv-head-right hc">
333
                                     <div class="mainDiv-head-right hc">
334
-                                        <strong class="hc_left">x{{consumable.consumablesNum}}</strong><strong class="hc_right">总价:{{consumable.consumableEndPrice * consumable.consumablesNum}}元</strong>
334
+                                        <strong class="hc_left">x{{consumable.consumablesNum}}<span v-if="consumable.consumablesUnit">({{consumable.consumablesUnit}})</span></strong><strong class="hc_right">总价:{{consumable.consumableEndPrice * consumable.consumablesNum}}元</strong>
335
                                     </div>
335
                                     </div>
336
                                 </div>
336
                                 </div>
337
                             </div>
337
                             </div>