ソースを参照

Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl
wangxiang 7 年 前
コミット
75c3840a9c

+ 34 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_list.ftl

@@ -78,7 +78,36 @@
                     <option value ="1" <#if salesOrder.isDeliverGoods??><#if salesOrder.isDeliverGoods == "1" >selected="selected"</#if></#if>>是</option>
                     <option value ="0" <#if salesOrder.isDeliverGoods??><#if salesOrder.isDeliverGoods == "2" >selected="selected"</#if></#if>>否</option>
                 </select>
-                <input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.storeName!}" placeholder="店铺" name="storeName" id="storeName">
+                <#--<input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.storeName!}" placeholder="店铺" name="storeName" id="storeName">-->
+                <select name="efastStoreName" id="efastStoreName" class="select" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;"">
+                    <option value="">店铺</option>
+                    <option value="4" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "4" >selected="selected"</#if></#if>>微商/代理商</option>
+                    <option value="11" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "11" >selected="selected"</#if></#if>>微信平台商</option>
+                    <option value="13" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "13" >selected="selected"</#if></#if>>上海零售</option>
+                    <option value="15" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "15" >selected="selected"</#if></#if>>小小包 </option>
+                    <option value="16" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "16" >selected="selected"</#if></#if>>伊姐团购</option>
+                    <option value="17" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "17" >selected="selected"</#if></#if>>物道团购</option>
+                    <option value="18" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "18" >selected="selected"</#if></#if>>年糕妈妈</option>
+                    <option value="19" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "19" >selected="selected"</#if></#if>>快抱团</option>
+                    <option value="20" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "20" >selected="selected"</#if></#if>>北京北斗</option>
+                    <option value="21" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "21" >selected="selected"</#if></#if>>凯叔</option>
+                    <option value="22" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "22" >selected="selected"</#if></#if>>上海-崔玉涛育学园</option>
+                    <option value="23" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "23" >selected="selected"</#if></#if>>简二家</option>
+                    <option value="24" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "24" >selected="selected"</#if></#if>>科学育儿</option>
+                    <option value="25" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "25" >selected="selected"</#if></#if>>美康辰</option>
+                    <option value="26" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "26" >selected="selected"</#if></#if>>北京悦祺</option>
+                    <option value="27" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "27" >selected="selected"</#if></#if>>上海淘宝</option>
+                    <option value="28" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "28" >selected="selected"</#if></#if>>蓝极风</option>
+                    <option value="29" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "29" >selected="selected"</#if></#if>>小莉团购</option>
+                    <option value="30" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "30" >selected="selected"</#if></#if>>超级妈咪团</option>
+                    <option value="31" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "31" >selected="selected"</#if></#if>>艾德叔叔</option>
+                    <option value="32" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "32" >selected="selected"</#if></#if>>钱儿频道</option>
+                    <option value="33" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "33" >selected="selected"</#if></#if>>尹建莉</option>
+                    <option value="34" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "34" >selected="selected"</#if></#if>>老虎工作室</option>
+                    <option value="35" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "35" >selected="selected"</#if></#if>>有赞</option>
+                    <option value="37" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "37" >selected="selected"</#if></#if>>深圳鑫之鹏</option>
+                    <option value="38" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "38" >selected="selected"</#if></#if>>东西儿童教育</option>
+                </select>
                <#-- <label class="form-label col-3 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>是否已发货:</label>
                 <div class="formControls col-4 col-sm-4"style="padding: 0 0;width: 383px;">
                 <span class="select-box">
@@ -231,6 +260,10 @@
     function sales_order_detail(orderSaleId) {
         window.location.href= "${path}/admin/salesOrder/select_sales_order?salesId="+orderSaleId;
     }
+    /*$(function () {
+        /!*初始化店铺*!/
+        initEfastStoreName();
+    });*/
     $(function() {
         //重新实例化一个编辑器,防止在上面的editor编辑器中显示上传的图片或者文件
         _editor = UE.getEditor('upload_ue',{