供应商列表增加分页功能，修改状态新增取消和删除功能，新增状态新增取消状态

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

@@ -12,17 +12,45 @@ define([ 'app/app' ], function(app) {
 				toaster.pop('error', '品牌详情数据加载失败', res.data);
 			});
 		};
+		getBrand();
 
         // 获取供应商信息
-        var loadSupplier = function () {
-            Supplier.getPage({uuid : $stateParams.uuid}, function(data){
-                $scope.countList = data.content;
-            })
-        };
-
-		getBrand();
+		var loadSupplier = function () {
+			$scope.supplierTableParams = new ngTableParams({
+				page : 1,
+				count : 5,
+				sorting : {
+					updatetime : 'DESC'
+				}
+			}, {
+				total : 0,
+				getData : function($defer, params) {
+					$scope.loading = true;
+					var param = BaseService.parseParams(params.url());
+					param.uuid = $stateParams.uuid;
+					Supplier.getPage(param, function(data){
+						$defer.resolve(data.content);
+						params.total(data.totalElements);
+					})
+				}
+			});
+		};
         loadSupplier();
 
+		// 删除供应商信息
+		$scope.deleteSupplier = function(flag, supplier) {
+			SupplierSubmit.delete({id : flag}, function(){
+				toaster.pop('info', '提示', "删除申请已提交待审核");
+			})
+			supplier.edit = false;
+		}
+
+		// 取消修改供应商信息
+		$scope.cancelSupplier = function (supplier) {
+			toaster.pop('info', '提示', "取消修改");
+			supplier.edit = false;
+		};
+
 		// 下载模板
 		$scope.download = function () {
 			Loading.show();
@@ -48,6 +76,12 @@ define([ 'app/app' ], function(app) {
 			});
 		};
 
+		// 取消保存新增供应商
+		$scope.cancelAddSupplier = function () {
+			toaster.pop('info', '提示', "取消新增");
+			$scope.addedSupplier = false;
+		}
+
 		// 更改供应商信息
 		$scope.changeSupplier = function (supplier) {
 			supplier.edit = true;

src/main/webapp/resources/js/common/query/supplier.js

@@ -22,6 +22,15 @@ define([ 'ngResource' ], function() {
 				url: rootPath + '/produce/vendorSubmit/:id',
 				method: 'GET'
 			},
+
+			/*
+			 * 删除品牌供应商申请信息
+			 */
+			delete: {
+				url: rootPath + '/produce/vendorSubmit/:id',
+				method: 'DELETE'
+			},
+
 			/*
 			 * 分页获取品牌供应商申请信息
 			 */

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

@@ -115,7 +115,7 @@
 	.box-bottom table td .agency .uploadImg .hover-show .delete{
 		float: right;
 		position: absolute;
-		top: -12px;
+		top: 0;
 		right: 0;
 		padding: 0;
 		width: 20px;
@@ -190,7 +190,7 @@
 	}
 	.box-bottom table tbody.edit tr td .agency .uploadImg span{
 		position: absolute;
-		top: 0;
+		top: 10px;
 		right: 34%;
 		width: auto;
 		font-size: 12px;
@@ -591,7 +591,7 @@
 					</div>
 				</div>
 				<div class="box-bottom">
-					<table>
+					<table ng-table="supplierTableParams">
 						<thead>
 						<tr>
 							<th width="10%"></th>
@@ -606,119 +606,8 @@
 							<th width="5%"></th>
 						</tr>
 						</thead>
-						<tbody ng-if="addedSupplier">
-							<!--新增供应商-->
-							<tr>
-								<td>
-									<div class="agency">
-										<div class="uploadImg">
-											<!--<input type="file" ng-if="!supplier.editImg" image-upload on-success="onUploadImage(supplier)" non-preview="true" />-->
-											<img ng-src="{{supplier.editImg || 'static/img/store/common/default.png'}}" alt=""/>
-											<div class="hover-show hover-shows" ng-if="supplier.editImg || 'static/img/store/common/default.png'">
-												<span class="delete" title="删除" ng-click="deleteImage(supplier)"><i class="fa fa-trash"></i></span>
-												<!--<span class="update" ng-click="showImg(supplier.editImg, $index); refreshImg()"><i class="fa fa-refresh"></i> 查看</span>-->
-												<span class="update"><input type="file" ng-src="{{supplier.editImg || '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>
-								<td>
-									<input type="text" class="comName" ng-model="supplier.vendorName" required/>
-								</td>
-								<td>
-									<input type="text" class="license" ng-model="supplier.license"/>
-								</td>
-								<td>
-									<input type="text" class="address" ng-model="supplier.detailAddress" required/>
-								</td>
-								<td>
-									<input type="text" class="phone" ng-model="supplier.tel"/>
-								</td>
-								<td>
-									<input type="text" class="fax" ng-model="supplier.fax"/>
-								</td>
-								<td>
-									<input type="text" class="network" ng-model="supplier.website"/>
-								</td>
-								<td style="position: relative ">
-									<button ng-click="storeAssociated(supplier)" ng-bind="supplier.storeIn.storeName ? supplier.storeIn.storeName : '选择关联店铺'"> <i class="fa fa-angle-down"></i></button>
-									<div class="choose" ng-if="supplier.chooseStoreAssociated">
-										<div class="top">
-											<span>类型选择</span>
-											<label>
-												<input type="checkbox" class="fl">
-												<span class="fl">代理商</span>
-											</label>
-											<label>
-												<input type="checkbox" class="fl">
-												<span class="fl">经销商</span>
-											</label>
-											<div class="form-search">
-												<input type="text">
-												<button><i class="fa fa-search"></i></button>
-											</div>
-										</div>
-										<table ng-table="storeTableParams">
-											<thead>
-												<tr>
-													<th width="30"></th>
-													<th width="70">店铺编号</th>
-													<th width="170">公司名称</th>
-													<th width="60">类型</th>
-												</tr>
-											</thead>
-											<tbody>
-												<tr ng-repeat="store in $data" >
-													<td><input type="checkbox" ng-click="chooseStore(supplier, store)"></td>
-													<td ng-bind="store.id | storeId">000000501</td>
-													<td ng-bind="store.enterprise &amp;&amp; store.enterprise.enName &amp;&amp; store.enterprise.enName !== '' ? store.enterprise.enName : '暂无公司名称'" >深圳市萨科微科技有限公司</td>
-													<td ng-bind="store.type | storeType" >代理商</td>
-												</tr>
-											</tbody>
-										</table>
-										<div ng-table-pagination="params" template-url="templates.pagination" class="ng-scope ng-isolate-scope">
-											<div ng-include="templateUrl" class="ng-scope">
-												<div class="ng-table-pager ng-scope" ng-if="params.data.length">
-													<ul ng-if="pages.length" class="pagination ng-table-pagination ng-scope" style="float:right;margin-left:20px;">
-														<li><input type="number" class="page-number ng-pristine ng-untouched ng-valid" ng-model="page.redirectPage"></li>
-														<li><a href="" class="page-a" ng-click="params.page(page.redirectPage)">GO</a></li>
-													</ul>
-													<ul ng-if="pages.length" class="pagination ng-table-pagination ng-scope" style="float: right;">
-														<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope disabled">
-															<a ng-switch-when="prev" ng-click="params.page(page.number)" href="" class="ng-scope">«</a>
-														</li>
-														<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope active">
-															<a ng-switch-when="first" ng-click="params.page(page.number)" href="" class="ng-scope"><span ng-bind="page.number" class="ng-binding">1</span></a>
-														</li>
-														<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope">
-															<a ng-switch-when="page" ng-click="params.page(page.number)" href="" class="ng-scope"><span ng-bind="page.number" class="ng-binding">2</span></a>
-														</li>
-														<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope">
-															<a ng-switch-when="page" ng-click="params.page(page.number)" href="" class="ng-scope"><span ng-bind="page.number" class="ng-binding">3</span></a>
-														</li>
-														<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope">
-															<a ng-switch-when="page" ng-click="params.page(page.number)" href="" class="ng-scope"><span ng-bind="page.number" class="ng-binding">4</span></a>
-														</li>
-														<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope">
-															<a ng-switch-when="page" ng-click="params.page(page.number)" href="" class="ng-scope"><span ng-bind="page.number" class="ng-binding">5</span></a>
-														</li>
-														<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope">
-															<a ng-switch-when="next" ng-click="params.page(page.number)" href="" class="ng-scope">»</a>
-														</li>
-													</ul>
-												</div>
-											</div>
-										</div>
-									</div>
-								</td>
-								<td>
-									<input type="text" class="mail" ng-model="supplier.addEmail"/>
-								</td>
-								<td><span class="operate" ng-click="sure(supplier)">确认</span></td>
-							</tr>
-						</tbody>
-						<tbody class="edit" ng-repeat="supplier in countList">
-                        <!--非修改状态-->
+						<tbody class="edit" ng-repeat="supplier in $data">
+                        	<!--非修改状态-->
 							<tr ng-if="!supplier.edit">
 								<td>
 									<div class="agency">
@@ -828,10 +717,127 @@
 								<td>
 									<input type="text" class="mail" ng-model="supplier.editEmail"/>
 								</td>
-								<td><span class="operate" ng-click="updateSupplier(supplier)">确认</span></td>
+								<td>
+									<span class="operate" ng-click="updateSupplier(supplier)">确认</span>
+									<span class="operate" ng-click="deleteSupplier(supplier.id, supplier)">删除</span>
+									<span class="operate" ng-click="cancelSupplier(supplier)">取消</span>
+								</td>
 							</tr>
 						</tbody>
-
+						<!--新增供应商-->
+						<tbody ng-if="addedSupplier">
+						<tr>
+							<td>
+								<div class="agency">
+									<div class="uploadImg">
+										<!--<input type="file" ng-if="!supplier.editImg" image-upload on-success="onUploadImage(supplier)" non-preview="true" />-->
+										<img ng-src="{{supplier.editImg || 'static/img/store/common/default.png'}}" alt=""/>
+										<div class="hover-show hover-shows" ng-if="supplier.editImg || 'static/img/store/common/default.png'">
+											<span class="delete" title="删除" ng-click="deleteImage(supplier)"><i class="fa fa-trash"></i></span>
+											<!--<span class="update" ng-click="showImg(supplier.editImg, $index); refreshImg()"><i class="fa fa-refresh"></i> 查看</span>-->
+											<span class="update"><input type="file" ng-src="{{supplier.editImg || '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>
+							<td>
+								<input type="text" class="comName" ng-model="supplier.vendorName" required/>
+							</td>
+							<td>
+								<input type="text" class="license" ng-model="supplier.license"/>
+							</td>
+							<td>
+								<input type="text" class="address" ng-model="supplier.detailAddress" required/>
+							</td>
+							<td>
+								<input type="text" class="phone" ng-model="supplier.tel"/>
+							</td>
+							<td>
+								<input type="text" class="fax" ng-model="supplier.fax"/>
+							</td>
+							<td>
+								<input type="text" class="network" ng-model="supplier.website"/>
+							</td>
+							<td style="position: relative ">
+								<button ng-click="storeAssociated(supplier)" ng-bind="supplier.storeIn.storeName ? supplier.storeIn.storeName : '选择关联店铺'"> <i class="fa fa-angle-down"></i></button>
+								<div class="choose" ng-if="supplier.chooseStoreAssociated">
+									<div class="top">
+										<span>类型选择</span>
+										<label>
+											<input type="checkbox" class="fl">
+											<span class="fl">代理商</span>
+										</label>
+										<label>
+											<input type="checkbox" class="fl">
+											<span class="fl">经销商</span>
+										</label>
+										<div class="form-search">
+											<input type="text">
+											<button><i class="fa fa-search"></i></button>
+										</div>
+									</div>
+									<table ng-table="storeTableParams">
+										<thead>
+										<tr>
+											<th width="30"></th>
+											<th width="70">店铺编号</th>
+											<th width="170">公司名称</th>
+											<th width="60">类型</th>
+										</tr>
+										</thead>
+										<tbody>
+										<tr ng-repeat="store in $data" >
+											<td><input type="checkbox" ng-click="chooseStore(supplier, store)"></td>
+											<td ng-bind="store.id | storeId">000000501</td>
+											<td ng-bind="store.enterprise &amp;&amp; store.enterprise.enName &amp;&amp; store.enterprise.enName !== '' ? store.enterprise.enName : '暂无公司名称'" >深圳市萨科微科技有限公司</td>
+											<td ng-bind="store.type | storeType" >代理商</td>
+										</tr>
+										</tbody>
+									</table>
+									<div ng-table-pagination="params" template-url="templates.pagination" class="ng-scope ng-isolate-scope">
+										<div ng-include="templateUrl" class="ng-scope">
+											<div class="ng-table-pager ng-scope" ng-if="params.data.length">
+												<ul ng-if="pages.length" class="pagination ng-table-pagination ng-scope" style="float:right;margin-left:20px;">
+													<li><input type="number" class="page-number ng-pristine ng-untouched ng-valid" ng-model="page.redirectPage"></li>
+													<li><a href="" class="page-a" ng-click="params.page(page.redirectPage)">GO</a></li>
+												</ul>
+												<ul ng-if="pages.length" class="pagination ng-table-pagination ng-scope" style="float: right;">
+													<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope disabled">
+														<a ng-switch-when="prev" ng-click="params.page(page.number)" href="" class="ng-scope">«</a>
+													</li>
+													<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope active">
+														<a ng-switch-when="first" ng-click="params.page(page.number)" href="" class="ng-scope"><span ng-bind="page.number" class="ng-binding">1</span></a>
+													</li>
+													<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope">
+														<a ng-switch-when="page" ng-click="params.page(page.number)" href="" class="ng-scope"><span ng-bind="page.number" class="ng-binding">2</span></a>
+													</li>
+													<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope">
+														<a ng-switch-when="page" ng-click="params.page(page.number)" href="" class="ng-scope"><span ng-bind="page.number" class="ng-binding">3</span></a>
+													</li>
+													<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope">
+														<a ng-switch-when="page" ng-click="params.page(page.number)" href="" class="ng-scope"><span ng-bind="page.number" class="ng-binding">4</span></a>
+													</li>
+													<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope">
+														<a ng-switch-when="page" ng-click="params.page(page.number)" href="" class="ng-scope"><span ng-bind="page.number" class="ng-binding">5</span></a>
+													</li>
+													<li ng-class="{'disabled': !page.active &amp;&amp; !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type" class="ng-scope">
+														<a ng-switch-when="next" ng-click="params.page(page.number)" href="" class="ng-scope">»</a>
+													</li>
+												</ul>
+											</div>
+										</div>
+									</div>
+								</div>
+							</td>
+							<td>
+								<input type="text" class="mail" ng-model="supplier.addEmail"/>
+							</td>
+							<td>
+								<span class="operate" ng-click="sure(supplier)">确认</span>
+								<span class="operate" ng-click="cancelAddSupplier()">取消</span>
+							</td>
+						</tr>
+						</tbody>
 						<tbody class="add-supply">
 						<tr>
 							<td colspan="10">