Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -9,7 +9,6 @@
 		<groupId>com.uas.platform</groupId>
 		<artifactId>platform</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../platform</relativePath>
 	</parent>
 	<profiles>
 		<profile>
@@ -350,12 +349,10 @@
 					</execution>
 				</executions>
 				<configuration>
-					<configuration>
-						<format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
-						<items>
-							<item>timestamp</item>
-						</items>
-					</configuration>
+					<format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
+					<items>
+						<item>timestamp</item>
+					</items>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -449,7 +446,7 @@
 								<sourceInclude>resources/tpl/**/*.html</sourceInclude>
 								<sourceInclude>WEB-INF/views/**/*.html</sourceInclude>
 							</sourceIncludes>
-							http://static.ubtob.com/css/index.css?_v=1450321871828
+							<!--http://static.ubtob.com/css/index.css?_v=1450321871828-->
 							<versionSuffix>
 								<suffix>?_v=${timestamp}</suffix>
 								<exclude>*/require.js,*.min.js,*.min.css</exclude>

src/main/java/com/uas/platform/b2b/controller/BaseInfoController.java

@@ -216,7 +216,7 @@ public class BaseInfoController {
 	 */
 	@RequestMapping(value = "/edit/delete", method = RequestMethod.POST)
 	@ResponseBody
-	public ModelMap deleteById(Long id) throws Exception {
+	public ModelMap deleteById(@RequestBody Long id) throws Exception {
 		ModelMap map = new ModelMap();
 		try {
 			baseInfoService.deleteById(id);

src/main/java/com/uas/platform/b2b/v2/controller/EnterpriseController.java

@@ -80,26 +80,25 @@ public class EnterpriseController {
 	@RequestMapping(value = "/renewUserSpace", method = RequestMethod.POST)
 	@ResponseBody
 	public String renewUserSpace(UserSpaceDetail userSpaceDetail) throws Exception {
-	    return null;
-//		Enterprise enterprise = null;
-//		if(userSpaceDetail.getUu() != null) {
-//			enterprise = enterService.findByEnUU(userSpaceDetail.getUu());
-//		}
-//		if (enterprise != null) {
-//			enterprise.setEnName(userSpaceDetail.getName());
-//			enterprise.setEnShortname(userSpaceDetail.getShortName());
-//			enterprise.setEnAddress(userSpaceDetail.getAddress());
-//			enterprise.setEnBussinessCode(userSpaceDetail.getBusinessCode());
-//			try {
-//				enterpriseService.save(enterprise);
-//				return "success";
-//			} catch (Exception e) {
-//				e.printStackTrace();
-//				return "error";
-//			}
-//		} else {
-//			return "未找到相关的企业信息";
-//		}
+		Enterprise enterprise = null;
+		if(userSpaceDetail.getUu() != null) {
+			enterprise = enterService.findByEnUU(userSpaceDetail.getUu());
+		}
+		if (enterprise != null) {
+			enterprise.setEnName(userSpaceDetail.getName());
+			enterprise.setEnShortname(userSpaceDetail.getShortName());
+			enterprise.setEnAddress(userSpaceDetail.getAddress());
+			enterprise.setEnBussinessCode(userSpaceDetail.getBusinessCode());
+			try {
+				enterpriseService.save(enterprise);
+				return "success";
+			} catch (Exception e) {
+				e.printStackTrace();
+				return "error";
+			}
+		} else {
+			return "未找到相关的企业信息";
+		}
 	}
 
 }

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

@@ -2042,7 +2042,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             VendorService.exportXls.get({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/vendor/customer/xls?keyword='+ ($scope.keywordXls || '');
+                    window.location.href = window.location.origin + window.location.pathname + 'vendor/customer/xls?keyword='+ ($scope.keywordXls || '');
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -2845,7 +2845,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.exportXls = function () {
                 PurcOrders.exportXls({}, {}, function (data) {
                     if (data.success){
-                        window.location.href = window.location.origin + '/sale/orders/purc/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                        window.location.href = window.location.origin + window.location.pathname + '/sale/orders/purc/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                     }
                 }, function (response) {
                     toaster.pop('error', '数据加载失败', response.data);
@@ -3273,7 +3273,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcOrderItem.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/orders/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -3559,7 +3560,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcChange.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/changes/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/changes/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -3945,7 +3946,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcInquiry.exportXls({}, {}, function (data) {
                 if (data.success) {
-                    window.location.href = window.location.origin + '/sale/inquiry/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -4917,7 +4918,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurchaseInquiry.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/purc/inquiry/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/purc/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -5742,7 +5743,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcInquiryMould.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/mould/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/mould/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -6077,7 +6078,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             Quotation.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/quotation/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/quotation/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -6819,7 +6820,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcNotice.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/notice/xls?_state='+$scope.active+
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/notice/xls?_state='+$scope.active+
                         '&keyword='+($scope.keywordXls || '')+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
@@ -7051,7 +7052,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             SaleSend.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/notice/sends/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || '')+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/notice/sends/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || '')+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -7790,7 +7791,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcSample.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/sample/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/sample/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -7959,7 +7960,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcApproval.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/sample/approval/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/sample/approval/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8160,7 +8161,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcAccept.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/accept/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/accept/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8306,7 +8307,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcReturn.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/return/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/return/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8445,7 +8446,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcBadIn.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/badIn/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/badIn/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8558,7 +8559,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcBadOut.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/badOut/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/badOut/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8667,7 +8668,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcMRB.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/MRB/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/MRB/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -9348,7 +9349,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             FaApBill.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/apBill/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/apBill/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -9697,7 +9698,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             FaApCheck.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/sale/apCheck/xls/list?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/apCheck/xls/list?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -11795,7 +11796,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.exportXls = function () {
                 MakeOrder.exportXls({}, {}, function (data) {
                     if (data.success){
-                        window.location.href = window.location.origin + '/make/orders/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                        window.location.href = window.location.origin + window.location.pathname + '/make/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                     }
                 }, function (response) {
                     toaster.pop('error', '数据加载失败', response.data);
@@ -12000,7 +12001,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             MakeAccept.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/make/accept/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+                    window.location.href = window.location.origin + window.location.pathname + '/make/accept/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -12121,7 +12122,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             MakeReturn.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/make/return/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+                    window.location.href = window.location.origin + window.location.pathname + '/make/return/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -12264,7 +12265,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             MakeChange.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/make/changes/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/make/changes/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -12439,7 +12440,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             MakeOutOrder.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/make/outorders/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/make/outorders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -12803,7 +12804,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         //删除
         $scope.deleteById = function (id) {
-            GetProductInfo.deleteById({id: id}, function (data) {
+            GetProductInfo.deleteById({}, id, function (data) {
                 if (data.error) {
                     toaster.pop("error", "提示", data.error);
                 } else {
@@ -12926,7 +12927,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             GetProductInfo.exportXls({},{}, function (data) {
                 if (data.success) {
-                    window.location.href = window.location.origin + '/product/baseInfo/xls?_state='+$scope.active+'&keyword='+ ($scope.keywordXls || "");
+                    window.location.href = window.location.origin + window.location.pathname + '/product/baseInfo/xls?_state='+$scope.active+'&keyword='+ ($scope.keywordXls || "");
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -13224,7 +13225,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         //删除
         $scope.deleteById = function (id) {
-            GetProductInfo.deleteById({id: id}, function (data) {
+            GetProductInfo.deleteById({}, id, function (data) {
                 if (data.error) {
                     toaster.pop("error", "提示", data.error);
                 } else {
@@ -16268,6 +16269,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
      */
     app.controller('NewDeputyOrderCtrl', ['$scope', 'toaster', '$modal', 'DeputyOrder', '$filter', 'ngTableParams', 'BaseService', 'DecimalNumber', function ($scope, toaster, $modal, DeputyOrder, $filter, ngTableParams, BaseService, DecimalNumber) {
         BaseService.scrollBackToTop();
+        //默认采购单号不重复
+        $scope.orderCodeEnable = true;
         $scope.deOrder = {
             code: 'DC' + $filter('date')(new Date(), 'yyMMddHHmmss_sss'),
             entrydate: new Date(),
@@ -16794,7 +16797,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         };
         loadData();
-
+        //默认采购单号不重复
+        $scope.orderCodeEnable = true;
         // 查询历史供应商
         DeputyOrder.hisvendors({}, function (data) {
             $scope.hisvendors = data;
@@ -21318,7 +21322,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         //删除
         $scope.deleteById = function (id) {
-            GetProductInfo.deletePurcById({id: id}, function (data) {
+            GetProductInfo.deletePurcById({}, id, function (data) {
                 if (data.error) {
                     toaster.pop("error", "提示", data.error);
                 } else {
@@ -21434,7 +21438,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcProduct.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + '/purcProduct/xls?_state='+$scope.active+'&keyword='+ ($scope.keywordXls || "");
+                    window.location.href = window.location.origin + window.location.pathname + '/purcProduct/xls?_state='+$scope.active+'&keyword='+ ($scope.keywordXls || "");
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -21878,7 +21882,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         //删除
         $scope.deleteById = function (id) {
-            GetProductInfo.deletePurcById({id: id}, function (data) {
+            GetProductInfo.deletePurcById({}, id, function (data) {
                 if (data.error) {
                     toaster.pop("error", "提示", data.error);
                 } else {

src/main/webapp/resources/js/index/services/Product.js

@@ -154,11 +154,11 @@ define([ 'ngResource'], function() {
 				method: 'POST'
 			},
 			matchbytype: {
-				url: '/purcProduct/edit/matchbytype/:type',
+				url: 'purcProduct/edit/matchbytype/:type',
 				method: 'POST'
 			},
 			exportXls: {
-				url: '/purcProduct/xls/permission',
+				url: 'purcProduct/xls/permission',
 				method: 'GET'
 			}
 		})

src/main/webapp/resources/js/index/services/Purc.js

@@ -225,7 +225,7 @@ define([ 'ngResource'], function() {
 				method: 'GET'
 			},
 			exportXls: {
-				url: '/sale/orders/purc/xls/permission',
+				url: 'sale/orders/purc/xls/permission',
 				method: 'GET'
 			}
 		});

src/main/webapp/resources/tpl/index/fa/apcheck_customer.html

@@ -47,7 +47,7 @@
 			<div class="col-md-2 col-sm-2"></div>
 			<div class="col-md-8 col-sm-8">
 				<input type="text" class="form-control input-sm"
-					required placeholder="输入供应商名称关键字查询" autofocus ng-model="keyword" ng-search="onSearch(keyword)">
+					required placeholder="输入客户名称关键字查询" autofocus ng-model="keyword" ng-search="onSearch(keyword)">
 				<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>
@@ -57,7 +57,7 @@
 		<thead>
 			<tr class="header">
 				<th>UU</th>
-				<th>供应商名称</th>
+				<th>客户名称</th>
 				<th>地址</th>
 				<td>启用对账</td>
 				<th>操作</th>