修复品牌供应商后台管理维护的Bug

src/main/webapp/resources/js/admin/app.js

@@ -310,6 +310,24 @@
 			templateUrl : 'static/view/admin/brand_maintenance_detail.html',
 			controller : 'BrandMaintenanceDetailCtrl',
 			controllerUrl : 'app/controllers/BrandMaintenanceDetailCtrl'
+		})).state('suppliermaintenance', angularAMD.route({
+			// 供应商维护
+			url: '/suppliermaintenance/:uuid',
+			templateUrl : 'static/view/admin/supplier_maintenance.html',
+			controller : 'supplierMaintenanceCtrl',
+			controllerUrl : 'app/controllers/supplierMaintenanceCtrl'
+		})).state('supplierSubmitList', angularAMD.route({
+			// 供应商申请列表
+			url: '/supplierSubmitList',
+			templateUrl : 'static/view/admin/supplier_submit_list.html',
+			controller : 'SupplierSubmitListCtrl',
+			controllerUrl : 'app/controllers/SupplierSubmitListCtrl'
+		})).state('supplierSubmitDetail', angularAMD.route({
+			// 供应商申请详情
+			url: '/supplierSubmit/:id',
+			templateUrl : 'static/view/admin/supplier_submit_detail.html',
+			controller : 'SupplierSubmitDetailCtrl',
+			controllerUrl : 'app/controllers/SupplierSubmitDetailCtrl'
 		})).state('mgr', angularAMD.route({
 			// 类目审批
 			url: '/audit/kind',
@@ -395,12 +413,12 @@
 			controller: 'AuditBankInfoCtrl',
 			controllerUrl: 'app/controllers/bankInfo/AuditBankInfoCtrl'
 		})).state('audit_realAuth', angularAMD.route({
-      // 实名认证审核
-      url: '/audit/realAuth',
-      templateUrl: 'static/view/admin/audit_realAuth.html',
-      controller: 'AuditRealAuthCtrl',
-      controllerUrl: 'app/controllers/AuditRealAuthCtrl'
-    })).state('uploadComponentCrawl', angularAMD.route({
+			// 实名认证审核
+			url: '/audit/realAuth',
+			templateUrl: 'static/view/admin/audit_realAuth.html',
+			controller: 'AuditRealAuthCtrl',
+			controllerUrl: 'app/controllers/AuditRealAuthCtrl'
+		})).state('uploadComponentCrawl', angularAMD.route({
 			// 上传爬取数据页面
 			url: '/product/componentCrawl/upload',
 			templateUrl : 'static/view/admin/product/uploadComponentCrawl.html',
@@ -597,19 +615,26 @@
 			controllerUrl: 'app/controllers/product/KindAdviceCtrl',
 			title: '轮播图片管理'
 		})).state('logUsage', angularAMD.route({
-      //用户操作日志
-      url: '/logUsage',
-      templateUrl: 'static/view/admin/logUsage.html',
-      controller: 'LogUsageCtrl',
-      controllerUrl: 'app/controllers/LogUsageCtrl',
-      title: '用户操作日志'
-    })).state('keyWord', angularAMD.route({
-      url: '/keyWord',
-      templateUrl: 'static/view/admin/keyword.html',
-      controller: 'KeyWordCtrl',
-      controllerUrl: 'app/controllers/KeyWordCtrl',
-      title: '非法关键词维护'
-    })).state('slideImage', angularAMD.route({
+			//用户操作日志
+			url: '/logUsage',
+			templateUrl: 'static/view/admin/logUsage.html',
+			controller: 'LogUsageCtrl',
+			controllerUrl: 'app/controllers/LogUsageCtrl',
+			title: '用户操作日志'
+		})).state('seekQualityBuyer', angularAMD.route({
+			//用户操作日志
+			url: '/seekQualityBuyer',
+			templateUrl: 'static/view/admin/seekQualityBuyer.html',
+			controller: 'SeekQualityBuyerCtrl',
+			controllerUrl: 'app/controllers/SeekQualityBuyerCtrl',
+			title: '用户操作日志'
+    	})).state('keyWord', angularAMD.route({
+			url: '/keyWord',
+			templateUrl: 'static/view/admin/keyword.html',
+			controller: 'KeyWordCtrl',
+			controllerUrl: 'app/controllers/KeyWordCtrl',
+			title: '非法关键词维护'
+    	})).state('slideImage', angularAMD.route({
 			// 首页展示（轮播图片管理）
 			url: '/operation/slideImage',
 			templateUrl: 'static/view/admin/operation/slideImage.html',
@@ -617,13 +642,13 @@
 			controllerUrl: 'app/controllers/operation/SlideImageCtrl',
 			title: '轮播图片管理'
 		})).state('secQuestion', angularAMD.route({
-      // 密保问题维护
-      url: '/secQuestion',
-      templateUrl: 'static/view/admin/sec_question.html',
-      controller: 'SecQuestionCtrl',
-      controllerUrl: 'app/controllers/SecQuestionCtrl',
-      title: '密保问题维护'
-    })).state('logisticsCompany', angularAMD.route({
+			// 密保问题维护
+			url: '/secQuestion',
+			templateUrl: 'static/view/admin/sec_question.html',
+			controller: 'SecQuestionCtrl',
+			controllerUrl: 'app/controllers/SecQuestionCtrl',
+			title: '密保问题维护'
+    	})).state('logisticsCompany', angularAMD.route({
 			// 首页展示（快递公司管理）
 			url: '/logistics/company',
 			templateUrl: 'static/view/admin/logistics/logistics_company.html',
@@ -755,7 +780,14 @@
 			controller: 'internalMessageListCtrl',
 			controllerUrl: 'app/controllers/common/message/internalMessageListCtrl',
 			title: '消息列表'
-		}));
+		})).state('loanApplyList', angularAMD.route({
+            // 消息列表
+            url: '/fa/loanApply',
+            templateUrl: 'static/view/admin/fa/loanApplyList.html',
+            controller: 'LoanApplyListCtrl',
+            controllerUrl: 'app/controllers/fa/LoanApplyListCtrl',
+            title: '贷款申请列表'
+        }));
 		
 		$httpProvider.interceptors.push(['Loading', '$q', function(Loading, $q) {
 			return {

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

@@ -80,7 +80,10 @@ define([ 'app/app' ], function(app) {
 			supplier.img = supplier.editImg;
 			supplier.branduuid = $stateParams.uuid;
 			supplier.storeuuid = supplier.storeIn == null ? null : supplier.storeIn.uuid;
-			console.log(supplier);
+            if (!supplier.vendorName) {
+                toaster.pop('error', '代理商名称不能为空');
+                return;
+            }
 			SupplierSubmit.submit({},supplier,function(data){
 				toaster.pop('success', '提示', "申请成功");
 				data.isSubmited = '2';
@@ -117,8 +120,12 @@ define([ 'app/app' ], function(app) {
 
 		// 保存更改后的供应商信息
 		$scope.updateSupplier = function(supplier){
-			inverseSupplier(supplier)
-			SupplierSubmit.updateSupplier({}, supplier, function(data){
+			var updateSupplier = inverseSupplier(supplier)
+			if (!updateSupplier.vendorName) {
+				toaster.pop('error', '代理商名称不能为空');
+				return;
+			}
+			SupplierSubmit.updateSupplier({}, updateSupplier, function(data){
 				toaster.pop('success', '供应商信息申请成功');
 				supplier.edit = false;
 				$scope.supplierTableParams.page(1);
@@ -133,17 +140,19 @@ define([ 'app/app' ], function(app) {
          * @param supplier 供应商信息
          */
 		var inverseSupplier = function (supplier) {
-			supplier.img = supplier.editImg;
-			supplier.vendorName = supplier.editVendorName;
-			supplier.license = supplier.editLicense;
-			supplier.detailAddress = supplier.editDetailAddress;
-			supplier.tel = supplier.editTel;
-			supplier.fax = supplier.editFax;
-			supplier.website = supplier.editWebsite;
-			supplier.email = supplier.editEmail;
-			supplier.vendorid = supplier.id != null ? supplier.id : null;
-			supplier.branduuid = $stateParams.uuid;
-			supplier.storeuuid = supplier.storeIn == null ? null : supplier.storeIn.uuid;
+			var a = {};
+            a.img = supplier.editImg;
+            a.vendorName = supplier.editVendorName;
+            a.license = supplier.editLicense;
+            a.detailAddress = supplier.editDetailAddress;
+            a.tel = supplier.editTel;
+            a.fax = supplier.editFax;
+            a.website = supplier.editWebsite;
+            a.email = supplier.editEmail;
+            a.vendorid = supplier.id != null ? supplier.id : null;
+            a.branduuid = $stateParams.uuid;
+            a.storeuuid = supplier.storeIn == null ? null : supplier.storeIn.uuid;
+            return a;
 		};
 
 		/**

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

@@ -564,8 +564,8 @@
 				</div>
 				<div class="form-group">
 					<span>Logo：</span>
-					<span>
-						<img ng-src="{{brand.logoUrl}}" alt="">
+					<span class="thumbnail" style="width: 200px; height: 150px; vertical-align: middle; display: table-cell;">
+						<img ng-src="{{brand.logoUrl}}" alt="" style="max-width: 200px; max-height: 150px;">
 					</span>
 				</div>
 				<div class="form-group">
@@ -634,28 +634,28 @@
 									</div>
 								</td>
 								<td>
-									<span ng-bind="supplier.vendorName"></span>
+									<span ng-bind="supplier.vendorName" title="{{supplier.vendorName}}"></span>
 								</td>
 								<td>
-									<span ng-bind="supplier.license">000000567</span>
+									<span ng-bind="supplier.license" title="{{supplier.license}}">000000567</span>
 								</td>
 								<td>
-									<span ng-bind="supplier.detailAddress">深圳市南山区科技园科技南五路英唐大厦一楼</span>
+									<span ng-bind="supplier.detailAddress" title="{{supplier.detailAddress}}">深圳市南山区科技园科技南五路英唐大厦一楼</span>
 								</td>
 								<td>
-									<span ng-bind="supplier.tel">0755-12345678</span>
+									<span ng-bind="supplier.tel" title="{{supplier.tel}}">0755-12345678</span>
 								</td>
 								<td>
-									<span ng-bind="supplier.fax">0755-12345678</span>
+									<span ng-bind="supplier.fax" title="{{supplier.fax}}">0755-12345678</span>
 								</td>
 								<td>
-									<span ng-bind="supplier.website">http://www.wordshine.net.com</span>
+									<span ng-bind="supplier.website" title="{{supplier.website}}">http://www.wordshine.net.com</span>
 								</td>
 								<td>
 									<button ng-click="storeAssociated(supplier)" ng-bind="supplier.storeIn.storeName">选择关联企业 <i class="fa fa-angle-down"></i></button>
 								</td>
 								<td>
-									<span ng-bind="supplier.email" class="emails">12345678@qq.com</span>
+									<span ng-bind="supplier.email" class="emails" title="{{supplier.email}}">12345678@qq.com</span>
 								</td>
 								<td>
 									<span class="operate" ng-if="supplier.isSubmited==0" ng-click="changeSupplier(supplier)">修改</span>

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

@@ -444,8 +444,8 @@
 				</div>
 				<div class="form-group">
 					<span>Logo：</span>
-					<span>
-						<img ng-src="{{brand.logoUrl}}" alt="">
+					<span class="thumbnail" style="width: 200px; height: 150px; vertical-align: middle; display: table-cell;">
+						<img ng-src="{{brand.logoUrl}}" alt="" style="max-width: 200px; max-height: 150px;">
 					</span>
 				</div>
 				<div class="form-group">
@@ -497,10 +497,6 @@
 									<div class="agency">
 										<div class="uploadImg">
 											<img ng-src="{{supplier.img || 'static/img/store/common/default.png'}}" alt=""/>
-											<div class="hover-show hover-shows" ng-if="supplier.img || 'static/img/store/common/default.png'">
-												<span class="delete" title="删除" ng-click="deleteImage(supplier)"><i class="fa fa-trash"></i></span>
-												<span class="update"><input type="file" ng-src="{{supplier.img || 'static/img/store/common/default.png'}}" image-upload on-success="onUploadImage($data, supplier)" title="" non-preview="true"/><span><i class="fa fa-refresh"></i> 更新</span></span>
-											</div>
 										</div>
 									</div>
 								</td>