Merge remote-tracking branch 'origin/developer' into developerD

src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

@@ -160,7 +160,7 @@
                 AND a.receiptStatus = #{receiptStatus}
             </if>
             <if test="orderNo != null and orderNo != ''">
-                AND ((cr.orderNo like concat('%',#{orderNo},'%')) OR (cso.shopOrderNo like concat('%',#{orderNo},'%')))
+                AND (cr.orderNo like concat('%',#{orderNo},'%'))
             </if>
             <if test="orderID != null and orderID != ''">
                 AND (cr.orderID = #{orderID} )

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

@@ -32,7 +32,7 @@
 
         #btnSubmit {
             width: 128px;
-            margin-left: 200px;
+            margin-left: 10px;
         }
 
         .select-ele {
@@ -132,10 +132,11 @@
                         onchange="onlynum(this)"/>
             <label>子订单编号：</label>
             <form:input path="shopOrderNo" htmlEscape="false" maxlength="50" class="input-medium"/>
-            <label>机构名称：</label>
-            <form:input path="userName" htmlEscape="false" maxlength="25" class="input-medium"/>
-            <label>收款方：</label>
-            <form:input path="paYee" htmlEscape="false" maxlength="20" class="input-medium"/>
+            <label>订单ID：</label>
+            <form:input path="orderID" id="orderID" htmlEscape="false" maxlength="30" class="input-medium"/>
+            <label>订单编号：</label>
+            <form:input path="orderNo" htmlEscape="false" maxlength="30" class="input-medium"/>
+
         </div>
         <div>
             <label>收款方式：</label>
@@ -174,6 +175,8 @@
                               htmlEscape="false"/>
                 <%--                </c:forEach>--%>
             </form:select>
+            <label>机构名称：</label>
+            <form:input path="userName" htmlEscape="false" maxlength="25" class="input-medium"/>
         </div>
         <div>
                 <%--            <label>收款进度：</label>--%>
@@ -196,13 +199,15 @@
             </form:select>
 
             <label>组织：</label>
-            <form:select path="organizeID" class="input-medium">
+            <form:select path="organizeID" class="select-ele input-medium">
                 <form:option value="" label="请选择"/>
                 <form:option value="0" label="采美"/>
                 <form:option value="9999" label="呵呵商城"/>
                 <form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
                               htmlEscape="false"/>
             </form:select>
+            <label>收款方：</label>
+            <form:input path="paYee" htmlEscape="false" maxlength="20" class="input-medium"/>
             <div class="clearfix"></div>
         </div>
         <div class="check-btn-wrapper">