主动报价交期不能填负数；新的合作伙伴排序修改；

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

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

@@ -219,6 +219,12 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setVendUserName(record.getVendUserName());
 					partner.setVendUserTel(record.getVendUserTel());
 					partner.setMethod(Constant.YES);
+					partner.setNeedAgreed(Constant.NO);
+					if (record.getStatusCode() == 311) {
+						partner.setIsTodo(Constant.YES);
+					} else {
+						partner.setIsTodo(Constant.NO);
+					}
 					partner.setStatusCode(record.getStatusCode());
 					partner.setCustUserName(record.getCustUserName());
 					partner.setCustUserTel(record.getCustUserTel());
@@ -256,6 +262,13 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 					partner.setVendUserTel(record.getVendUserTel());
 					partner.setMethod(Constant.NO);
 					partner.setStatusCode(record.getStatusCode());
+					if (record.getStatusCode() == 311) {
+						partner.setIsTodo(Constant.YES);
+						partner.setNeedAgreed(Constant.YES);
+					} else {
+						partner.setIsTodo(Constant.NO);
+						partner.setNeedAgreed(Constant.NO);
+					}
 					partner.setCustUserName(record.getCustUserName());
 					partner.setCustUserTel(record.getCustUserTel());
 					partner.setReason(record.getReason());

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

@@ -48,11 +48,13 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 
 	@Override
 	public ModelMap invite(InvitationRecord record) {
+		ModelMap map = new ModelMap();
 		List<Enterprise> enterprises = enterpriseDao.findByEnName(record.getVendname());
 		if (!CollectionUtils.isEmpty(enterprises)) {
-			throw new IllegalAccessError("该企业已注册！");
+//			throw new IllegalAccessError("该企业已注册！");
+			map.put("error", "该企业已注册！");
+			return map;
 		}
-		ModelMap map = new ModelMap();
 		Long useruu = SystemSession.getUser().getUserUU();
 		Long enuu = SystemSession.getUser().getEnterprise().getUu();
 		Map<String, Object> model = new HashMap<String, Object>();

src/main/java/com/uas/platform/b2b/temporary/model/BasePartnersInfo.java

@@ -74,6 +74,21 @@ public class BasePartnersInfo implements Serializable {
 	 */
 	private Short method;
 
+	/**
+	 * 是否需要操作<br>
+	 * 1（收到的申请且状态为待回复）<br>
+	 * 0 不需要操作
+	 */
+	private Short needAgreed;
+
+	/**
+	 * 状态吗是否为311（待回复或待操作）<br>
+	 * 1是<br>
+	 * 0 不是
+	 */
+	private Short isTodo;
+
+
 	/**
 	 * 状态
 	 */
@@ -292,15 +307,49 @@ public class BasePartnersInfo implements Serializable {
 		this.custId = custId;
 	}
 
+	public Short getNeedAgreed() {
+		return needAgreed;
+	}
+
+	public void setNeedAgreed(Short needAgreed) {
+		this.needAgreed = needAgreed;
+	}
+
 	@Override
 	public String toString() {
-		return "BasePartnersInfo [id=" + id + ", appId=" + appId + ", requestDate=" + requestDate + ", vendName="
-				+ vendName + ", vendUID=" + vendUID + ", vendUserName=" + vendUserName + ", vendUserTel=" + vendUserTel
-				+ ", vendUserEmail=" + vendUserEmail + ", vendUserCode=" + vendUserCode + ", operateDate=" + operateDate
-				+ ", method=" + method + ", statusCode=" + statusCode + ", custUserName=" + custUserName
-				+ ", custUserTel=" + custUserTel + ", reason=" + reason + ", vendor=" + vendor + ", customer="
-				+ customer + ", vendorId=" + vendorId + ", vendswitch=" + vendswitch + ", custswitch=" + custswitch
-				+ ", custId=" + custId + "]";
+		return "BasePartnersInfo{" +
+				"id=" + id +
+				", appId='" + appId + '\'' +
+				", requestDate=" + requestDate +
+				", vendName='" + vendName + '\'' +
+				", vendUID='" + vendUID + '\'' +
+				", vendUserName='" + vendUserName + '\'' +
+				", vendUserTel='" + vendUserTel + '\'' +
+				", vendUserEmail='" + vendUserEmail + '\'' +
+				", vendUserCode='" + vendUserCode + '\'' +
+				", operateDate=" + operateDate +
+				", method=" + method +
+				", needAgreed=" + needAgreed +
+				", isTodo=" + isTodo +
+				", statusCode=" + statusCode +
+				", custUserName='" + custUserName + '\'' +
+				", custUserTel='" + custUserTel + '\'' +
+				", reason='" + reason + '\'' +
+				", vendor=" + vendor +
+				", customer=" + customer +
+				", vendorId=" + vendorId +
+				", custId=" + custId +
+				", vendswitch=" + vendswitch +
+				", custswitch=" + custswitch +
+				'}';
+	}
+
+	public Short getIsTodo() {
+		return isTodo;
+	}
+
+	public void setIsTodo(Short isTodo) {
+		this.isTodo = isTodo;
 	}
 
 }

src/main/webapp/resources/tpl/index/baseInfo/newPartner.html

@@ -382,7 +382,7 @@
         </div>
     </div>
     <table class="order-table block" ng-table="tableParams">
-        <tbody ng-repeat="request in $data | orderBy : '-needAgreed'" class="company-list">
+        <tbody ng-repeat="request in $data | orderBy : [ '-isTodo','-needAgreed']" class="company-list">
         <tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
             <td colspan="4" style="position: relative;"><span ng-bind="request.vendName" class="margin-left20"></span><b class="new-dot" ng-if="request.statusCode==311 && request.method==0"></b><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
             <td width="140" class="text-center">

src/main/webapp/resources/tpl/index/sale/quotation_new.html

@@ -232,8 +232,8 @@
 		<div class="form-group form-group-sm">
 			<label for="leadtime" class="col-sm-2 control-label">交货周期(天)：</label>
 			<div class="col-sm-4">
-				<input ng-model="item.leadtime" type="number" class="form-control" id="leadtime" 
-					placeholder="只可以为整数" ng-readonly="!item.$editing" ng-required="true" ng-disabled="isDisabled()">
+				<input ng-model="item.leadtime" type="number" class="form-control" id="leadtime" ng-pattern="/^[0-9]*[1-9][0-9]*$/"
+					placeholder="只可以为正整数" ng-readonly="!item.$editing" ng-required="true" ng-disabled="isDisabled()">
 				<span class="text-inverse text-bold">* </span>
 			</div>
 			<label class="col-sm-2 control-label">价格有效日期：</label>