bug fixes

src/main/java/com/caimei/modules/weisha/web/CmOrganizeBuyerController.java

@@ -69,7 +69,7 @@ public class CmOrganizeBuyerController extends BaseController {
         }
         //判断该采购员手机号是否唯一
         CmOrganizeBuyer buyer = cmOrganizeBuyerService.findByMobileOnly(cmOrganizeBuyer.getMobile());
-        if (buyer != null && StringUtils.isNotBlank(cmOrganizeBuyer.getId()) && !cmOrganizeBuyer.getId().equals(buyer.getId())) {
+        if (buyer != null && !cmOrganizeBuyer.getId().equals(buyer.getId())) {
             addMessage(model, "手机号重复，请更换手机号");
             return form(cmOrganizeBuyer, model);
         }

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptForm.jsp

@@ -282,7 +282,7 @@
 						</div>
 						<div class="receipt-order-row3">
 							<span><label>订单类型：</label><c:if test="${orderInfo.orderType == 0}">协销订单</c:if>
-									<c:if test="${orderInfo.orderType == 1}">普通订单</c:if></span>
+									<c:if test="${orderInfo.orderType == 1}">自主订单</c:if></span>
                 <span><label>下单日期：</label>${orderInfo.orderTime}</span>
             </div>
             <div class="receipt-order-row4">

src/main/webapp/WEB-INF/views/modules/order/newCmFinanceChargeList.jsp

@@ -58,7 +58,7 @@
         <form:select path="orderType" class="input-medium required" style="width:100px">
             <form:option value="" label="请选择"/>
             <form:option value="0" label="协销订单"/>
-            <form:option value="1" label="普通订单"/>
+            <form:option value="1" label="自主订单"/>
         </form:select>
         &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
         <div class="clearfix"></div>
@@ -111,7 +111,7 @@
                     协销订单
                 </c:if>
                 <c:if test="${cmFinanceCharge.orderType eq 1}">
-                    普通订单
+                    自主订单
                 </c:if>
             </td>
             <td>

src/main/webapp/WEB-INF/views/modules/order/newCmFinanceReceiptsList.jsp

@@ -53,7 +53,7 @@
 			<form:select path="orderType" class="input-medium required" style="width:80px">
 				<form:option value="" label="请选择"/>
 				<form:option value="0" label="协销订单"/>
-				<form:option value="1" label="普通订单"/>
+				<form:option value="1" label="自主订单"/>
 			</form:select>
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 			<div class="clearfix"></div>
@@ -100,7 +100,7 @@
 						协销订单
 					</c:if>
 					<c:if test="${newCmFinanceReceipts.orderType eq 1}">
-						普通订单
+						自主订单
 					</c:if>
 				</td>
 				<td>

src/main/webapp/WEB-INF/views/modules/order/newReceiptList.jsp

@@ -187,7 +187,7 @@
         <form:select path="orderTypeSys" class="input-medium required" style="width:80px">
             <form:option value="" label="请选择"/>
             <form:option value="0" label="协销订单"/>
-            <form:option value="1" label="普通订单"/>
+            <form:option value="1" label="自主订单"/>
         </form:select>
     &nbsp;&nbsp;<form:input id="btnSubmit" class="btn btn-primary" type="submit"  path="searchflag" value="搜索" ></form:input>
     &nbsp;&nbsp;<form:input id="btnSubmit" class="btn btn-primary" type="submit"  path="searchflag" value="导出筛选结果"></form:input>
@@ -256,7 +256,7 @@
                     协销订单
                 </c:if>
                 <c:if test="${pageReceiptList.orderTypeSys eq 1}">
-                    普通订单
+                    自主订单
                 </c:if>
             </td>
             <td>

src/main/webapp/WEB-INF/views/modules/order/newShouldPayList.jsp

@@ -163,7 +163,7 @@
 						协销订单
 					</c:if>
 					<c:if test="${newShouldPay.orderTypeSys eq 1}">
-						普通订单
+						自主订单
 					</c:if>
 				</td>
 				<td>

src/main/webapp/WEB-INF/views/modules/order/splitPage.jsp

@@ -130,7 +130,7 @@
                 <c:if test="${order.rebateOrder ne '0'}">是</c:if></td>
         </tr>
         <tr>
-            <td>订单类型: <c:if test="${order.orderType == 1}">普通订单</c:if><c:if test="${order.orderType == 0}">协销订单</c:if></td>
+            <td>订单类型: <c:if test="${order.orderType == 1}">自主订单</c:if><c:if test="${order.orderType == 0}">协销订单</c:if></td>
             <td>订单来源: ${fns:getDictLabel(order.orderSource,"bp_orderSource","" )}</td>
             <td>订单状态:
                 <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||

src/main/webapp/WEB-INF/views/modules/weisha/cmMallOrganizeForm.jsp

@@ -61,7 +61,7 @@
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>手机号：</label>
 			<div class="controls">
-				<form:input path="mobile" htmlEscape="false" maxlength="20" class="input-xlarge required" id="contractMobile" onchange="mobileVerification(this)"/>
+				<form:input path="mobile" htmlEscape="false" maxlength="11" class="input-xlarge required" id="contractMobile" onchange="mobileVerification(this)"/>
 			</div>
 		</div>
 		<div class="control-group">