新增俩个产品

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -601,7 +601,7 @@
                     <div id="m-msg" style="color: #e00"></div>
                 </div>
             </div>
-
+        <div id="tdsId" style="display: none">
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">
                      <div class="tit-2">TDS收集</div>
@@ -655,6 +655,7 @@
                       &nbsp;&nbsp;&nbsp;&nbsp;<span id="DTS-in"></span>&nbsp;&nbsp;  <span id="DTS-out"></span>
                   </div>-->
               </div>
+        </div>
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">
                     <div class="tit-2">备注信息</div>

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

@@ -262,11 +262,13 @@
                                 </#if>
                             </#if>
                         <#else>
-                            <#if order.isDevelop == 1>
-                                <a style="text-decoration:none" href="javascript:;" title="查看售后信息"
-                                   onclick="getAfterrulesInfo(${order.salesId!''});">
-                                    <i class="Hui-iconfont">&#xe63c;</i>
-                                </a>
+                            <#if order.isDevelop??>
+                                <#if order.isDevelop == 1>
+                                    <a style="text-decoration:none" href="javascript:;" title="查看售后信息"
+                                       onclick="getAfterrulesInfo(${order.salesId!''});">
+                                        <i class="Hui-iconfont">&#xe63c;</i>
+                                    </a>
+                                </#if>
                             </#if>
                         </#if>
                     </td>

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

@@ -380,24 +380,41 @@ function initProduceType(){
                 $("#companyId").val(typeCompany);
                 setStore(typeCompany,$("#selectStore"));       //获取店铺
                 var isOrder = 1;
+                var isShowTDS = 2;//是否展示tds 1是 2否
                 switch (typeId){    //1:Soodo电动牙刷   6:WaterO净水机    7：Aiberle净水机    9 ：YULIA净水机
                     case 1:
                         isOrder = 2;
                         break;
                     case 6:
                         isOrder = 1;
+                        isShowTDS = 1;
                         break;
                     case 7:
                         isOrder = 1;
+                        isShowTDS = 1;
                         break;
                     case 9:
                         isOrder = 1;
+                        isShowTDS = 1;
+                        break;
+                    case 16:
+                        isOrder = 1;
+                        isShowTDS = 1;
+                        break;
+                    case 17:
+                        isOrder = 1;
+                        isShowTDS = 1;
                         break;
                     default:
                         break;
                 }
                 isNeedSelectOrder = isOrder ;
                 initProcessResult(allProcMethodIsBack,allProcMethodIsSend);
+                if(isShowTDS == 1){
+                    $("#tdsId").show();
+                }else{
+                    $("#tdsId").hide();
+                }
             })
             /*当前第一个默认选中上朵电动牙刷  isNeedSelectOrder = 2  默认不需要选择订单*/
             // isNeedSelectOrder = 2 ;