rel: 处理BUG

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

@@ -11,6 +11,13 @@ define([ 'app/app' ], function(app) {
 			businessLicense: 'BUSINESS_LICENSE'
 		};
 
+        // 店铺类型
+        $scope.storeObj = {
+            ORIGINAL_FACTORY: '原厂',
+            AGENCY: '代理',
+            DISTRIBUTION: '经销'
+        };
+
 		//------------------------------------------------- 变量
 
 		// 资质信息
@@ -82,6 +89,7 @@ define([ 'app/app' ], function(app) {
             $scope.editImg = false;
         	if(!type) {
                 $scope.qualifications[$scope.qType.businessLicense].resourceUrl = $scope.resourceNodUrl;
+                $scope.newImg.resourceUrl = $scope.resourceNodUrl;
 			} else {
                 $scope.newImg.resourceUrl = $scope.qualifications[$scope.qType.businessLicense].resourceUrl;
                 toaster.pop('success', "图片修改完成，请提交后进行更新！");
@@ -409,8 +417,10 @@ define([ 'app/app' ], function(app) {
 
 			var apply = {};
 			var qualifications = [];
-            qualifications.push($scope.newImg)
-			apply.enType = $scope.tab;
+            console.log($scope.newImg);
+            qualifications.push($scope.newImg);
+            console.log(qualifications);
+            apply.enType = $scope.tab;
 			apply.type = $scope.storeType;
 			apply.qualifications = qualifications;
 			apply.enQualification = $scope.enQualification;

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

@@ -373,7 +373,8 @@
 		<div class="qualification-list01">
 			<div class="row">
 				<div class="col-sm-2">店铺类型</div>
-				<div class="col-sm-10 radio-block">
+				<div class="col-sm-10 radio-block" ng-if="application.status !== 'PREPARE' && application.status !== 'CHECK'" ng-bind="storeObj[application.type]"></div>
+				<div class="col-sm-10 radio-block" ng-if="application.status === 'PREPARE' || application.status === 'CHECK'">
 					<label class="com-check-radio" style="margin-right:20px;font-weight: normal;color:#666;">
 						<input type="radio" id="ORIGINAL_FACTORY" name="date" ng-click="setFilters('ORIGINAL_FACTORY')" ng-checked="storeType == 'ORIGINAL_FACTORY'" ng-disabled="storeDefaultType == 'DISTRIBUTION'">
 						<label for="ORIGINAL_FACTORY"></label>
@@ -584,7 +585,7 @@
 			<!-- 香港资质信息 End -->
 		</div>
 		<!-- 品牌列表 Start -->
-		<div class="qualification-list01" style="margin-top: 40px;" ng-repeat="brand in brands" ng-if="application.type === 'ORIGINAL_FACTORY'">
+		<div class="qualification-list01" style="margin-top: 40px;" ng-repeat="brand in brands" ng-if="storeType === 'ORIGINAL_FACTORY'">
 			<div class="row">
 				<div class="col-sm-2">品牌{{$index + 1}}</div>
 			</div>
@@ -594,7 +595,7 @@
 						<div class="row">
 							<div class="col-sm-2">品牌证明文件</div>
 							<div class="col-sm-3">
-								<select class="form-control" title="certificate" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.certificate">
+								<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>
@@ -604,7 +605,7 @@
 							</div>
 							<div class="col-sm-2" style="width:80px;">品牌状态</div>
 							<div class="col-sm-3">
-								<select class="form-control" title="status" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.status">
+								<select class="form-control" title="status" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.status">
 									<option value="正常">正常</option>
 									<option value="商标不存在">商标不存在</option>
 									<option value="商标注册人不符">商标注册人不符</option>
@@ -615,32 +616,32 @@
 						</div>
 						<div class="row">
 							<div class="col-sm-2">注册人</div>
-							<div class="col-sm-9"><input type="text" class="form-control" title="registrant" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.registrant" /></div>
+							<div class="col-sm-9"><input type="text" class="form-control" title="registrant" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.registrant" /></div>
 						</div>
 						<div class="row">
 							<div class="col-sm-2">注册编号</div>
-							<div class="col-sm-9"><input type="text" class="form-control" title="number" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.number"/></div>
+							<div class="col-sm-9"><input type="text" class="form-control" title="number" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.number"/></div>
 						</div>
 						<div class="row">
 							<div class="col-sm-2">注册地址</div>
-							<div class="col-sm-9"><input type="text" class="form-control" title="address" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.address"/></div>
+							<div class="col-sm-9"><input type="text" class="form-control" title="address" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.address"/></div>
 						</div>
 						<div class="row">
 							<div class="col-sm-2">注册日期</div>
-							<div class="col-sm-9"><input type="text" class="form-control" title="registrationDate" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.registrationDate"/></div>
+							<div class="col-sm-9"><input type="text" class="form-control" title="registrationDate" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.registrationDate"/></div>
 						</div>
 						<div class="row">
 							<div class="col-sm-2">有效日期</div>
-							<div class="col-sm-9"><input type="text" class="form-control" title="effectiveDate" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.effectiveDate"/></div>
+							<div class="col-sm-9"><input type="text" class="form-control" title="effectiveDate" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.effectiveDate"/></div>
 						</div>
 						<div class="row">
 							<div class="col-sm-2">批准单位</div>
-							<div class="col-sm-9"><input type="text" class="form-control" title="approvalUnit" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.approvalUnit"/></div>
+							<div class="col-sm-9"><input type="text" class="form-control" title="approvalUnit" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.approvalUnit"/></div>
 						</div>
 					</div>
 					<div class="col-sm-6">
 						<div class="row" ng-if="brand.status === '其他'">
-							<div class="col-sm-12"><input type="text" class="form-control" placeholder="请填写原因" style="max-width: 676px;" title="reason" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.reason"/></div>
+							<div class="col-sm-12"><input type="text" class="form-control" placeholder="请填写原因" style="max-width: 676px;" title="reason" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.reason"/></div>
 						</div>
 						<div class="store-list-img row">
 							<div class="col-sm-4" style="width: 160px;" ng-if="brand.isPdf">
@@ -700,7 +701,7 @@
 		</div>
 		<!-- 品牌列表 End -->
 		<!-- 授权列表 Start -->
-		<div class="qualification-list01" style="margin-top: 40px;" ng-repeat="brand in brands" ng-if=" application.type === 'AGENCY'">
+		<div class="qualification-list01" style="margin-top: 40px;" ng-repeat="brand in brands" ng-if="storeType === 'AGENCY'">
 			<div class="row">
 				<div class="col-sm-2">授权书{{$index + 1}}</div>
 			</div>
@@ -710,11 +711,11 @@
 						<div class="row">
 							<div class="col-sm-2">授权期限</div>
 							<div class="col-sm-3">
-								<input type="text" class="form-control" title="authorizedDate" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.authorizedDate" />
+								<input type="text" class="form-control" title="authorizedDate" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.authorizedDate" />
 							</div>
 							<div class="col-sm-2" style="width:80px;">授权状态</div>
 							<div class="col-sm-3">
-								<select class="form-control" title="authorizedStatus" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.authorizedStatus" >
+								<select class="form-control" title="authorizedStatus" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.authorizedStatus" >
 									<option value="正常">正常</option>
 									<option value="过期">过期</option>
 									<option value="其他">其他</option>
@@ -723,15 +724,15 @@
 						</div>
 						<div class="row">
 							<div class="col-sm-2">授权方</div>
-							<div class="col-sm-9"><input type="text" class="form-control" title="authorizedFrom" ng-disabled="application.status !== 'PREPARE' && !updateState"  ng-model="brand.authorizedFrom" /></div>
+							<div class="col-sm-9"><input type="text" class="form-control" title="authorizedFrom" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState"  ng-model="brand.authorizedFrom" /></div>
 						</div>
 						<div class="row">
 							<div class="col-sm-2">授权产品</div>
-							<div class="col-sm-9"><input type="text" class="form-control" title="authorizedProduct" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.authorizedProduct"/></div>
+							<div class="col-sm-9"><input type="text" class="form-control" title="authorizedProduct" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.authorizedProduct"/></div>
 						</div>
 						<div class="row">
 							<div class="col-sm-2">授权区域</div>
-							<div class="col-sm-9"><input type="text" class="form-control" title="authorizedArea" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="brand.authorizedArea"/></div>
+							<div class="col-sm-9"><input type="text" class="form-control" title="authorizedArea" ng-disabled="application.status !== 'PREPARE' && application.status !== 'CHECK' && !updateState" ng-model="brand.authorizedArea"/></div>
 						</div>
 
 					</div>