|
@@ -115,7 +115,7 @@ app.controller('hc_consumablesCtrl', ["$scope", "$http", "i18nService", "$rootSc
|
115
|
115
|
}
|
116
|
116
|
api_wechatfile.getDictionary(dat).then(function (data) {
|
117
|
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
|
978
|
$rootScope.hc_eject_name_caozuo = $scope.item.name; //耗材名称
|
979
|
979
|
$rootScope.hc_eject_brandModel_caozuo = $scope.item.brandModel; //耗材品牌型号
|
980
|
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
|
982
|
$rootScope.hc_eject_startPrice_caozuo = $scope.item.startPrice; //费用区间开始
|
983
|
983
|
$rootScope.hc_eject_endPrice_caozuo = $scope.item.endPrice; //费用区间结束
|
984
|
984
|
$rootScope.hc_eject_isWarehousing_caozuo = $scope.item.isInventory || 0; //是否库存
|