rel: 处理BUG

src/main/webapp/resources/js/admin/controllers/StoreQualificationCtrl.js

@@ -52,6 +52,26 @@ define([ 'app/app' ], function(app) {
 			type: ''
 		};
         $scope.resourceNodUrl = '';// 原来图片进行保存
+		// // 原厂初始化数据
+		// $scope.Original_Factory_Default = [
+		// 	{key: 'certificate', default: '大陆商标注册证'},
+		// 	{key: 'status', default: '正常'},
+		// 	{key: 'registrant', default: ''},
+		// 	{key: 'number', default: ''},
+		// 	{key: 'address', default: ''},
+		// 	{key: 'registrationDate', default: ''},
+		// 	{key: 'effectiveDate', default: ''},
+		// 	{key: 'approvalUnit', default: ''}
+		// ];
+		// // 代理初始化数据
+        // $scope.Agency_Default = [
+        //     {key: 'authorizedDate', default: ''},
+        //     {key: 'authorizedStatus', default: '正常'},
+        //     {key: 'authorizedFrom', default: ''},
+        //     {key: 'authorizedProduct', default: ''},
+        //     {key: 'authorizedArea', default: ''},
+        //     {key: 'authorizedReason', default: ''}
+        // ];
 
 		activate();
 
@@ -414,7 +434,6 @@ define([ 'app/app' ], function(app) {
 					return ;
 				}
 			}
-
 			var apply = {};
 			var qualifications = [];
 			if($scope.newImg.resourceUrl) {

src/main/webapp/resources/view/admin/store_qualification_maintenance.html

@@ -596,11 +596,11 @@
 							<div class="col-sm-2">品牌证明文件</div>
 							<div class="col-sm-3">
 								<select class="form-control" title="certificate" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.certificate">
-									<option value="大陆商标注册证" ng-if="application.type === 'ORIGINAL_FACTORY'">大陆商标注册证</option>
-									<option value="香港注册证明书" ng-if="application.type === 'ORIGINAL_FACTORY'">香港注册证明书</option>
-									<option value="Logo/商标授权书" ng-if="application.type === 'ORIGINAL_FACTORY'">Logo/商标授权书</option>
-									<option value="代理证明书" ng-if="application.type === 'AGENCY'">代理证明书</option>
-									<option value="代理授权书" ng-if="application.type === 'AGENCY'">代理授权书</option>
+									<option value="大陆商标注册证" ng-if="storeType === 'ORIGINAL_FACTORY'">大陆商标注册证</option>
+									<option value="香港注册证明书" ng-if="storeType === 'ORIGINAL_FACTORY'">香港注册证明书</option>
+									<option value="Logo/商标授权书" ng-if="storeType === 'ORIGINAL_FACTORY'">Logo/商标授权书</option>
+									<option value="代理证明书" ng-if="storeType === 'AGENCY'">代理证明书</option>
+									<option value="代理授权书" ng-if="storeType === 'AGENCY'">代理授权书</option>
 								</select>
 							</div>
 							<div class="col-sm-2" style="width:80px;">品牌状态</div>