审批系统问题修改

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/storeInfoMapper.xml

@@ -46,6 +46,9 @@
       <if test="companyId != null">
         and company_id = #{companyId}
       </if>
+      <if test="storeName != null">
+        and store_name LIKE CONCAT('%',#{storeName},'%')
+      </if>
     </where>
   </select>
 

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -107,11 +107,18 @@
                         </select>
 				    </span>
                     </div>
-                    <div class="formControls col-2 col-sm-2">
+                    <#--<div class="formControls col-2 col-sm-2">
                     <span class="select-box">
                         <select  class="select init_store"  name="salesStoreId" id="">
                         </select>
                     </span>
+                    </div>-->
+                    <div class="formControls col-2 col-sm-2">
+                        <input id="store_1" name="maktMaktx" class="input-text" list="datalist_1" value="" placeholder="输入店铺关键字或双击" datatype="*1-20" errormsg="请选择销售店铺！" />
+                            <datalist class="select init_store" id="datalist_1">
+
+                            </datalist>
+                            <input type="hidden" id="salesStoreId" name="salesStoreId">
                     </div>
                 </div>
 
@@ -278,9 +285,20 @@
         increaseArea: '20%'
     });
     var ulc = initAddress($(".address_info"));
-    var sc = initSalesChannel($(".sales_channel"));
-
-
+    var sc = $(".sales_channel").initSalesChannel();
+
+    $("#store_1").on("input",function(){
+        var $options=$("#datalist_1").children();
+        for(var i=0;i<$options.length;i++){
+            if($options.eq(i).val().trim()==$("#store_1").val().trim()){
+                /*alert($options.eq(i).attr("data-id"));*/
+                $("#salesStoreId").val($options.eq(i).attr("data-id"));
+                break;
+            }else{
+                $("#salesStoreId").val("");
+            }
+        }
+    });
 </script>
 
 

watero-rst-web/src/main/webapp/common/js/common/salesChannel.js

@@ -43,7 +43,7 @@
                 if (result.returnCode == 200) {
                     $storeNode.empty();    //清空下拉框
                     $(result.returnMsg.storeInfoList).each(function (){
-                        $storeNode.append("<option value='"+ this.storeId +"'>"+ this.storeName +"</option>");
+                        $storeNode.append("<option  data-id='"+this.storeId+"' value='"+ this.storeName +"'>"+ this.storeName +"</option>");
                     })
                     if(!isEmpty(salesChannel.storeId)){
                         salesChannel.storeId = result.returnMsg.storeInfoList[0].storeId;