物料编辑问题的处理

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

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

@@ -1,5 +1,23 @@
 package com.uas.platform.b2b.controller;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.FileUpload;
@@ -14,6 +32,7 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.temporary.model.InquiryMessage;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -23,19 +42,6 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * 卖家对询价单的操作
@@ -195,34 +201,6 @@ public class SaleInquiryController {
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryItemIds(keyword, pageParams);
 	}
-//
-//	/**
-//	 * 作为卖家，收到的采购询价（已作废）
-//	 *
-//	 * @param params
-//	 */
-//	@RequestMapping(params = RequestState.INVALID, method = RequestMethod.GET)
-//	@ResponseBody
-//	public SPage<PurchaseInquiryItem> getInvalidInquiries(PageParams params, String keyword) {
-//		logger.log("客户询价单", "查看收到的客户询价单列表（已作废）");
-//		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-//		// 当前登录企业作为供应商
-//		pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
-//		SearchFilter filter = userService.distribute();
-//		if (filter != null && filter.getDistribute() == null) {
-//			return null;
-//		}
-//		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			list.addAll(filter.getDistribute());
-//			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
-//		}
-//		pageParams.getFilters().put("id_status", Status.DISABLED.value());
-//		List<Sort> sortList = new ArrayList<>();
-//		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
-//		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-//		return searchService.searchPurchaseInquiryItemIds(keyword, pageParams);
-//	}
 
 	/**
 	 * 作为卖家，收到的采购询价（已失效）
@@ -325,6 +303,196 @@ public class SaleInquiryController {
 		return searchService.searchPurchaseInquiryItemIds(keyword, pageParams);
 	}
 
+	/**
+	 * 作为卖家，收到的采购询价（全部）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/info", method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseInquiryItem> getPurchaseInquiries(PageParams params, String searchFilter) {
+		logger.log("客户询价单", "查看收到的客户询价单列表（全部）");
+		PageInfo pageInfo = new PageInfo(params);
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filters = userService.distribute();
+		if (filters != null && filters.getDistribute() == null) {
+			return null;
+		}
+		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
+		return purchaseInquiryService.findByPageInfo(pageInfo, null, filter);
+	}
+
+	/**
+	 * 作为卖家，收到的采购询价（待报价）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/info", params = RequestState.TODO, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseInquiryItem> getPurchaseInquiriesTodo(PageParams params, String searchFilter) {
+		logger.log("客户询价单", "查看收到的客户询价单列表（待报价）");
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("status", Status.NOT_REPLY.value());
+		pageInfo.filter("overdue", Constant.NO);
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filters = userService.distribute();
+		if (filters != null && filters.getDistribute() == null) {
+			return null;
+		}
+		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
+		return purchaseInquiryService.findByPageInfo(pageInfo, null, filter);
+	}
+
+	/**
+	 * 作为卖家，收到的采购询价（已过期）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/info", params = RequestState.END, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseInquiryItem> getPurchaseInquiriesEnd(PageParams params, String searchFilter) {
+		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("overdue", Constant.YES);
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filters = userService.distribute();
+		if (filters != null && filters.getDistribute() == null) {
+			return null;
+		}
+		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
+		return purchaseInquiryService.findByPageInfo(pageInfo, null, filter);
+	}
+
+	/**
+	 * 作为卖家，收到的采购询价（已回复）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/info", params = RequestState.DONE, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseInquiryItem> getPurchaseInquiriesDone(PageParams params, String searchFilter) {
+		logger.log("客户询价单", "查看收到的客户询价单列表（已回复）");
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("overdue", Constant.NO);
+		pageInfo.filter("status", Status.REPLIED.value());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filters = userService.distribute();
+		if (filters != null && filters.getDistribute() == null) {
+			return null;
+		}
+		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
+		return purchaseInquiryService.findByPageInfo(pageInfo, null, filter);
+	}
+
+	/**
+	 * 作为卖家，收到的采购询价（已过期）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/info", params = RequestState.INVALID, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseInquiryItem> getPurchaseInquiriesInvalid(PageParams params, String searchFilter) {
+		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("overdue", Constant.YES);
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filters = userService.distribute();
+		if (filters != null && filters.getDistribute() == null) {
+			return null;
+		}
+		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
+		return purchaseInquiryService.findByPageInfo(pageInfo, null, filter);
+	}
+
+	/**
+	 * 作为卖家，收到的采购询价（已过期）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/info", params = RequestState.REFUSED, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseInquiryItem> getPurchaseInquiriesRefused(PageParams params, String searchFilter) {
+		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("overdue", Constant.YES);
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filters = userService.distribute();
+		if (filters != null && filters.getDistribute() == null) {
+			return null;
+		}
+		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
+		return purchaseInquiryService.findByPageInfo(pageInfo, null, filter);
+	}
+
+	/**
+	 * 作为卖家，收到的采购询价（已过期）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/info", params = RequestState.AGREED, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseInquiryItem> getPurchaseInquiriesAgreed(PageParams params, String searchFilter) {
+		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("overdue", Constant.YES);
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filters = userService.distribute();
+		if (filters != null && filters.getDistribute() == null) {
+			return null;
+		}
+		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
+		return purchaseInquiryService.findByPageInfo(pageInfo, null, filter);
+	}
+
 	/**
 	 * 作为卖家，收到的采购询价明细
 	 * 

src/main/java/com/uas/platform/b2b/erp/controller/DeputyOrderDownController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.dao.DeputyOrderDao;
 import com.uas.platform.b2b.dao.DeputyOrdersLogDao;
 import com.uas.platform.b2b.dao.DeputyPaymentCompanyDao;
@@ -193,4 +194,18 @@ public class DeputyOrderDownController {
 			}
 		}
 	}
+
+	/**
+	 * ERP审核不通过的单据传回来更新状态
+	 * 
+	 * @param data
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/back", method = RequestMethod.POST)
+	@ResponseBody
+	public void refreshStatus(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		String codeStr = URLDecoder.decode(data, "UTF-8");
+		List<DeputyOrder> orders = JSONObject.parseArray(codeStr, DeputyOrder.class);
+
+	}
 }

src/main/java/com/uas/platform/b2b/service/PurchaseInquiryService.java

@@ -1,5 +1,11 @@
 package com.uas.platform.b2b.service;
 
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.data.domain.Page;
+import org.springframework.ui.ModelMap;
+
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.model.Attach;
@@ -8,11 +14,7 @@ import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.temporary.model.InquiryMessage;
 import com.uas.platform.core.model.PageInfo;
-import org.springframework.data.domain.Page;
-import org.springframework.ui.ModelMap;
-
-import java.util.Date;
-import java.util.List;
+import com.uas.search.b2b.model.SPage;
 
 public interface PurchaseInquiryService {
 
@@ -42,6 +44,16 @@ public interface PurchaseInquiryService {
 	 */
 	public Page<PurchaseInquiryItem> findAllByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter);
 
+	/**
+	 * 分页查找询价单
+	 * 
+	 * @param pageInfo
+	 * @param keyword
+	 * @param filter
+	 * @return
+	 */
+	public SPage<PurchaseInquiryItem> findByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter);
+
 	/**
 	 * 用询价单ID查找询价单
 	 * 

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -1,13 +1,52 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.ThreadUtils;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.AttachDao;
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.ProductDao;
+import com.uas.platform.b2b.dao.PurcInquiryItemDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryReplyDao;
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.erp.model.QuotationDownDetail;
-import com.uas.platform.b2b.event.*;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.event.PurchaseInquiryItemDecideReleaseEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemInvalidReleaseEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemReplyReleaseEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemSaveEvent;
+import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.model.PurcInquiryItem;
+import com.uas.platform.b2b.model.PurchaseInquiry;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
+import com.uas.platform.b2b.model.PurchaseInquiryReply;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.UserBaseInfo;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
@@ -22,20 +61,7 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.*;
+import com.uas.search.b2b.model.SPage;
 
 
 @Service
@@ -231,9 +257,11 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 	}
 
 	@Override
-	public Page<PurchaseInquiryItem> findAllByPageInfo(final PageInfo pageInfo, final String keyword, final SearchFilter filter) {
-		return purchaseInquiryItemDao.findAll(new Specification<PurchaseInquiryItem>() {
-
+	public SPage<PurchaseInquiryItem> findByPageInfo(final PageInfo pageInfo, final String keyword,
+			final SearchFilter filter) {
+		SPage<PurchaseInquiryItem> items = new SPage<PurchaseInquiryItem>();
+		Page<PurchaseInquiryItem> inquiryitems = purchaseInquiryItemDao
+				.findAll(new Specification<PurchaseInquiryItem>() {
 			public Predicate toPredicate(Root<PurchaseInquiryItem> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				if (filter != null) {
 					if (!CollectionUtils.isEmpty(filter.getDistribute()))
@@ -253,7 +281,43 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 						lists.add(list.getId());
 					}
 					pageInfo.expression(PredicateUtils.in("id", lists, false));
-					System.out.println(lists);
+				}
+				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
+			}
+		}, pageInfo);
+		items.setContent(inquiryitems.getContent());
+		items.setPage(inquiryitems.getNumber());
+		items.setSize(inquiryitems.getSize());
+		items.setTotalElement(inquiryitems.getTotalElements());
+		items.setTotalPage(inquiryitems.getTotalPages());
+		return items;
+	}
+
+	@Override
+	public Page<PurchaseInquiryItem> findAllByPageInfo(final PageInfo pageInfo, final String keyword,
+			final SearchFilter filter) {
+		return purchaseInquiryItemDao.findAll(new Specification<PurchaseInquiryItem>() {
+			public Predicate toPredicate(Root<PurchaseInquiryItem> root, CriteriaQuery<?> query,
+					CriteriaBuilder builder) {
+				if (filter != null) {
+					if (!CollectionUtils.isEmpty(filter.getDistribute()))
+						pageInfo.expression(PredicateUtils.in("inquiry.enUU", filter.getDistribute(), false));
+					if (filter.getFromDate() != null)
+						pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
+					if (filter.getEndDate() != null)
+						pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
+				}
+				if (StringUtils.hasText(keyword)) {
+					List<Object> lists = new ArrayList<>();
+					PageParams pageParams = new PageParams();
+					ModelMap map = new ModelMap();
+					map.put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
+					pageParams.setFilters(map);
+					for (PurchaseInquiryItem list : searchService.searchPurchaseInquiryItemIds(keyword, pageParams)
+							.getContent()) {
+						lists.add(list.getId());
+					}
+					pageInfo.expression(PredicateUtils.in("id", lists, false));
 				}
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
@@ -330,8 +394,9 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 			pageInfo.filter("productId", item.getProductId());
 			pageInfo.filter("status", (short) Status.REPLIED.value());
 			pageInfo.sorting("inquiry.date", Direction.DESC);
-			Page<PurchaseInquiryItem> page = findAllByPageInfo(pageInfo, null, null);
-			return page.getContent();
+			// Page<PurchaseInquiryItem> page = findAllByPageInfo(pageInfo,
+			// null, null);
+			// return page.getContent();
 		}
 		return null;
 	}

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

@@ -2931,7 +2931,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	}]);
 	
 	//采购询价
-	app.controller('SaleInquiryCtrl', ['$scope', '$filter', 'PurcInquiry', 'ngTableParams', 'toaster', 'BaseService', 'PurcInquiryHis', '$upload', '$rootScope', function($scope, $filter, PurcInquiry, ngTableParams, toaster, BaseService, PurcInquiryHis, $upload, $rootScope){
+	app.controller('SaleInquiryCtrl', ['$scope', '$filter', 'PurcInquiry', 'ngTableParams', 'toaster', 'BaseService', 'PurcInquiryInfo', '$upload', '$rootScope', function($scope, $filter, PurcInquiry, ngTableParams, toaster, BaseService, PurcInquiryInfo, $upload, $rootScope){
 		BaseService.scrollBackToTop();
 		if($rootScope.active) {
 			$scope.active = $rootScope.active;
@@ -2981,8 +2981,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		}, function(response) {
 			
 		});
+		
+		$scope.SearchMethod = false;
 		var getService = function() {
-			return $scope.condition.dateZone ? PurcInquiry : PurcInquiryHis;
+			return $scope.SearchMethod ? PurcInquiry : PurcInquiryInfo;
 		};
 		$scope.tableParams = new ngTableParams({
 			page : 1, 
@@ -3153,6 +3155,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		}
 		// 搜索框回车
 		$scope.onSearch = function() {
+			$scope.SearchMethod = true;
 			$scope.tableParams.page(1);
 			$scope.tableParams.reload();
 		};
@@ -17933,6 +17936,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		});
 		$scope.time = $filter('date')(new Date, 'yyyy-MM-dd HH:mm');
 		
+		$scope.editstatus = false;
 		var loadData = function() {
 			GetProductInfo.getOne({id: $stateParams.id}, function(data) {
 				if(data.attach) {
@@ -17952,6 +17956,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 					})
 				}
 				$scope.prodInfo = data;
+				if($scope.prodInfo.isbusiness == 0) {
+					$scope.editstatus = true;
+				}
 				if($scope.prodInfo.standard != 1 ) {// 非标准的先进行匹配
 					Products.matchone({id: $scope.prodInfo.id}, {}, function(data) {
 						$scope.matchresults = data;

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

@@ -216,6 +216,42 @@ define([ 'ngResource'], function() {
             	method: 'GET'
             }
         });
+    }]).factory('PurcInquiryInfo', ['$resource', function($resource) {
+        return $resource('sale/inquiry/info', {}, {
+            getAll: {
+                isArray: true
+            },
+            getTodo: {
+                params: {
+                    _state: 'todo'
+                }
+            },
+            getDone: {
+                params: {
+                    _state: 'done'
+                }
+            },
+            getEnd: {
+                params: {
+                    _state: 'end'
+                }
+            },
+            getAgreed: {
+            	params: {
+                    _state: 'agreed'
+                }
+            },
+            getRefused: {
+            	params: {
+                    _state: 'refused'
+                }
+            },
+            getInvalid: {
+                params: {
+                    _state: 'invalid'
+                }
+            }
+        });
     }]).factory('PurcTender', ['$resource', function($resource) {
     	return $resource('tender', {}, {
             getMyAll: {

src/main/webapp/resources/tpl/index/purc/productDetail.html

@@ -186,7 +186,7 @@
                 <div class="col-md-4">有效</div>
             </div>
             <div class="com_title01 sty01" style="margin-bottom: 15px;" ng-if="prodInfo.isbusiness == 1"><span>标准信息</span></div>
-            <div class="pro-list-tab row">
+            <div class="pro-list-tab row" ng-if="prodInfo.isbusiness == 1">
                 <div class="col-md-2" style="padding-right: 0;">标准产品名称（类目）:</div>
                 <div class="col-md-4"> 
                 	<input type="text"  ng-model="prodInfo.kind" style="cursor: pointer;" required="true"