页面所有操作“确认并保存”统一改为确认。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8347 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/tpl/index/account/add_userInfo.html

@@ -49,6 +49,6 @@
 <div class="modal-footer">
 	<span class="pull-left text-muted"><i
 		class="fa fa-fw fa-warning"></i>点击企业选中或取消</span>
-	<button class="btn btn-primary" ng-click="close(true)">确认并保存</button>
+	<button class="btn btn-primary" ng-click="close(true)">确认</button>
 	<button class="btn btn-default" ng-click="close(false)" type="button">取消</button>
 </div>

src/main/webapp/resources/tpl/index/account/add_vendor.html

@@ -29,6 +29,6 @@
 <div class="modal-footer">
 	<span class="pull-left text-muted"><i
 		class="fa fa-fw fa-warning"></i>点击企业选中或取消</span>
-	<button class="btn btn-primary" ng-click="close(true)">确认并保存</button>
+	<button class="btn btn-primary" ng-click="close(true)">确认</button>
 	<button class="btn btn-default" ng-click="close(false)" type="button">取消</button>
 </div>

src/main/webapp/resources/tpl/index/account/role_detail.html

@@ -60,7 +60,7 @@
 			<i class="fa fa-fw fa-warning"></i>默认角色不允许删除，只能修改权限分配
 		</p>
 		<button class="btn btn-primary" type="submit"
-			ng-disabled="roleForm.$invalid || !isChanged(role)">确认并保存</button>
+			ng-disabled="roleForm.$invalid || !isChanged(role)">确认</button>
 		<button class="btn btn-default" type="button"
 			ng-show="role.id && role.isdefault == 0" ng-click="del()">删除角色</button>
 		<button class="btn btn-default" ng-click="cancel()" type="button">取消</button>

src/main/webapp/resources/tpl/index/account/user_role.html

@@ -20,6 +20,6 @@
 <div class="modal-footer">
 	<span class="pull-left text-muted"><i
 		class="fa fa-fw fa-warning"></i>点击角色选中或取消</span>
-	<button class="btn btn-primary" ng-disabled="!isChanged()" ng-click="close(true)">确认并保存</button>
+	<button class="btn btn-primary" ng-disabled="!isChanged()" ng-click="close(true)">确认</button>
 	<button class="btn btn-default" ng-click="close(false)" type="button">取消</button>
 </div>

src/main/webapp/resources/tpl/index/approvalFlow/role_detail.html

@@ -60,7 +60,7 @@
 			<i class="fa fa-fw fa-warning"></i>默认角色不允许删除，只能修改权限分配
 		</p>
 		<button class="btn btn-primary" type="submit"
-			ng-disabled="roleForm.$invalid || !isChanged(role)">确认并保存</button>
+			ng-disabled="roleForm.$invalid || !isChanged(role)">确认</button>
 		<button class="btn btn-default" type="button"
 			ng-show="role.id && role.isdefault == 0" ng-click="del()">删除角色</button>
 		<button class="btn btn-default" ng-click="cancel()" type="button">取消</button>

src/main/webapp/resources/tpl/index/approvalFlow/user_role.html

@@ -37,6 +37,6 @@
 <div class="modal-footer">
 	<span class="pull-left text-muted"><i
 		class="fa fa-fw fa-warning"></i>点击角色选中或取消</span>
-	<button class="btn btn-primary" ng-disabled="!isChanged()" ng-click="close(true)">确认并保存</button>
+	<button class="btn btn-primary" ng-disabled="!isChanged()" ng-click="close(true)">确认</button>
 	<button class="btn btn-default" ng-click="close(false)" type="button">取消</button>
 </div>