Просмотр исходного кода

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 лет назад
Родитель
Сommit
3ff277ea2f

+ 196 - 76
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_back_goods.ftl

@@ -20,8 +20,15 @@
         .table-bg th{background-color: #e2f6ff;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 20px;background-color: #32a3d8;color: #fff;}
+
+        .clearfix:after{content:"\20";display:block;height:0;clear:both;visibility:hidden}.clearfix{zoom:1}
+        .tabBar {border-bottom: 2px solid #222}
+        .tabBar span {background-color: #e8e8e8;cursor: pointer;display: inline-block;float: left;font-weight: bold;height: 30px;line-height: 30px;padding: 0 15px}
+        .tabBar span.current{background-color: #222;color: #fff}
+        .tabCon {display: none}
     </style>
     <title></title>
+
 </head>
 <body>
 <article class="cl pd-20">
@@ -35,36 +42,94 @@
                 <span id="backGoodsSchedule" class="c-red"></span>
             </div>
         </div>
-        <input type="hidden" id="customerId" name="customerId" value="${customerId!''}">
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>产品寄回</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10 skin-minimal">
-                <div class="radio-box">
-                    <input type="radio" id="tel-3" name="backGoodsBackStatus" value="1">
-                    <label for="tel-3">未寄回</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-4" name="backGoodsBackStatus" value="2">
-                    <label for="tel-4">已寄回</label>
+        <div id="tab_demo" class="HuiTab">
+            <div class="tabBar clearfix"><span>寄回信息</span><span>邮费信息</span><span>工厂检查信息</span><span>工厂返修进度</span></div>
+
+         <div class="tabCon">
+
+        <#--<input type="hidden" id="customerId" name="customerId" value="${customerId!''}">-->
+        <#--<div class="row cl">-->
+            <#--<div class="formControls col-2 col-sm-2 text-r">-->
+                <#--<strong>产品寄回</strong>-->
+            <#--</div>-->
+            <#--<div class="formControls col-10 col-sm-10 skin-minimal">-->
+                <#--<div class="radio-box">-->
+                    <#--<input type="radio" id="tel-3" name="backGoodsBackStatus" value="1" seleType="send">-->
+                    <#--<label for="tel-3">未寄回</label>-->
+                <#--</div>-->
+                <#--<div class="radio-box">-->
+                    <#--<input type="radio" id="tel-4" name="backGoodsBackStatus" value="2" seleType="send">-->
+                    <#--<label for="tel-4">已寄回</label>-->
+                <#--</div>-->
+                <#--<div class="radio-box">-->
+                    <#--<input type="radio" id="tel-5" name="backGoodsBackStatus" value="3" seleType="send">-->
+                    <#--<label for="tel-5">已收货</label>-->
+                <#--</div>-->
+            <#--</div>-->
+        <#--</div>-->
+        <#--<div class="row cl" id="backLogisticsInfo" style="display: none">-->
+            <#--<div class="formControls col-2 col-sm-2 text-r">-->
+                <#--<strong>寄回信息</strong>-->
+            <#--</div>-->
+            <#--<div class="formControls col-10 col-sm-10">-->
+                <#--<div style="width: 120px;display: inline-block;margin-right: 10px;">-->
+			<#--<span class="select-box">-->
+				<#--<select name="backGoodsBackLogisticsCompany" id="backGoodsBackLogisticsCompany" class="select" seleType="send">-->
+					<#--<option value="">物流公司</option>-->
+                    <#--<option value="sto">申通快递</option>-->
+                    <#--<option value="yto">圆通快递</option>-->
+                    <#--<option value="sf">顺丰快递</option>-->
+                    <#--<option value="ems">邮政EMS</option>-->
+                    <#--<option value="zto">中通快递</option>-->
+                    <#--<option value="zjs">宅急送</option>-->
+                    <#--<option value="yunda">韵达快递</option>-->
+                    <#--<option value="cces">cces快递</option>-->
+                    <#--<option value="pick">上门提货</option>-->
+                    <#--<option value="htky">汇通快递</option>-->
+                    <#--<option value="ttkdex">天天快递</option>-->
+                    <#--<option value="stars">星晨急便</option>-->
+                    <#--<option value="jd">京东快递</option>-->
+                    <#--<option value="01">其他</option>-->
+                    <#--<option value="02">上门送货</option>-->
+				<#--</select>-->
+			<#--</span>-->
+                <#--</div>-->
+                <#--<input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="backGoodsBackLogisticsNo" name="backGoodsBackLogisticsNo" seleType="send">-->
+              <#--<!--  <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="backGoodsBackPostage" name="backGoodsBackPostage">-->
+                <#--<input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay">&ndash;&gt;-->
+            <#--</div>-->
+        <#--</div>-->
+
+            <div class="row cl">
+                <div class="formControls col-2 col-sm-2 text-r">
+                    <strong>产品寄回</strong>
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-5" name="backGoodsBackStatus" value="3">
-                    <label for="tel-5">已收货</label>
+                <div class="formControls col-10 col-sm-10 skin-minimal">
+                    <div class="radio-box">
+                        <input type="radio" id="tel-3" name="backGoodsBackStatus" value="1" seleType="send">
+                        <label for="tel-3">未寄回</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-4" name="backGoodsBackStatus" value="2" seleType="send">
+                        <label for="tel-4">已寄回</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-5" name="backGoodsBackStatus" value="3" seleType="send">
+                        <label for="tel-5">已收货</label>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="row cl" id="backLogisticsInfo" style="display: none">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>寄回信息</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <div style="width: 120px;display: inline-block;margin-right: 10px;">
+
+            <div class="row cl" id="backLogisticsInfo" style="display: none">
+                <div class="formControls col-2 col-sm-2 text-r">
+                    <strong>寄回信息</strong>
+                </div>
+                <div class="formControls col-10 col-sm-10">
+                    <div style="width: 120px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
-				<select name="backGoodsBackLogisticsCompany" id="backGoodsBackLogisticsCompany" class="select">
-					<option value="">物流公司</option>
-                    <option value="sto">申通快递</option>
+				<select name="renewedBackLogisticsCompany" id="renewedBackLogisticsCompany" class="select" seleType="send">
+                    <option value="">物流公司</option>
+					<option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>
@@ -81,83 +146,125 @@
                     <option value="02">上门送货</option>
 				</select>
 			</span>
+                    </div>
+                    <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="renewedBackLogisticsNo" name="renewedBackLogisticsNo" seleType="send">
+                <#--<input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage">
+                <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay">-->
                 </div>
-                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="backGoodsBackLogisticsNo" name="backGoodsBackLogisticsNo">
-                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="backGoodsBackPostage" name="backGoodsBackPostage">
-                <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay">
             </div>
-        </div>
+
+            <div class="row cl" style="position: relative;display: none;" id="backUserInfo">
+                <div class="formControls col-2 col-sm-2 text-r">
+                    <strong>寄件信息</strong>
+                </div>
+                <div class="formControls col-5 col-sm-5">
+                    <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="renewedBackName" name="renewedBackName" seleType="send">
+                </div>
+                <div class="formControls col-5 col-sm-5">
+                    <input type="text" class="input-text" value="" placeholder="寄件人电话" id="renewedBackTel" name="renewedBackTel" seleType="send">
+                </div>
+            </div>
+
+            <div class="row cl">
+                <div class="formControls col-2 col-sm-2">
+                </div>
+                <div class="formControls col-8 col-sm-8 text-c">
+                    <button onClick="update_back_goods();" class="btn btn-primary" type="button">确认提交</button>
+                </div>
+            </div>
+         </div>
+
+             <#--<div class="row cl">-->
+                 <#--<div class="formControls col-2 col-sm-2">-->
+                 <#--</div>-->
+                 <#--<div class="formControls col-8 col-sm-8 text-c">-->
+                     <#--<button onClick="update_back_goods();" class="btn btn-primary" type="button">确认提交</button>-->
+                 <#--</div>-->
+             <#--</div>-->
+
+       <div class="tabCon">
+
         <div class="row cl" id="backTransferInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>邮费处理</strong>
             </div>
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
-                    <input type="radio" id="tel-6" name="backGoodsIsTransfer" value="0">
+                    <input type="radio" id="tel-6" name="backGoodsIsTransfer" value="0" seleType="postage">
                     <label for="tel-6">不需要转账</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="tel-7" name="backGoodsIsTransfer" value="1">
+                    <input type="radio" id="tel-7" name="backGoodsIsTransfer" value="1" seleType="postage">
                     <label for="tel-7">已转账</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2">
+                    <input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2" seleType="postage">
                     <label for="tel-8">待转账</label>
                 </div>
             </div>
         </div>
+
+                <div class="row cl" id="postageInformation">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>邮费信息</strong>
+                    </div>
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="backGoodsBackPostage" name="backGoodsBackPostage" seleType="postage">
+                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay" seleType="postage">
+                    </div>
+                </div>
         <div class="row cl" style="display: none;" id="backUserInfo">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄件信息</strong>
             </div>
             <div class="formControls col-5 col-sm-5">
-                <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="backGoodsBackName" name="backGoodsBackName">
+                <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="backGoodsBackName" name="backGoodsBackName" seleType="send">
             </div>
             <div class="formControls col-5 col-sm-5">
-                <input type="text" style="width: 190px;margin:0 10px;" class="input-text" value="" placeholder="寄件人电话" id="backGoodsBackTel" name="backGoodsBackTel">
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>寄回产品</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <div id="backGoodsProduct" class="update-parts" style="float: left;width: 514px;"></div>
-                <input type="hidden" id="closed_products" name="closed_products" />
-                <input type="hidden" id="closed_fittings" name="closed_fittings" />
-                <div style="float: left;">
-                    <button type="button" style="cursor:pointer;height: 30px;" class="my-btn-search" onclick="showProductList();">修改产品</button>
-                </div>
-            </div>
-        </div>
-        <div class="cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-            </div>
-            <div class="formControls col-10 col-sm-10" id="produceSelect" style="padding-top: 10px;display: none;">
-                <div>
-                    <input type="text" oninput="showUpdateSendProduct();" onpropertychange="showUpdateSendProduct();" class="input-text" style="width: 100%" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
-                </div>
-                <table class="table table-border table-bg table-bordered">
-                    <thead>
-                    <tr class="text-c">
-                        <th style="text-align: center;" width="60">产品名称</th>
-                        <th style="text-align: center;" width="60">产品颜色</th>
-                        <th style="text-align: center;" width="60">产品配件</th>
-                    </tr>
-                    </thead>
-                    <tbody id="addProduct">
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>备注信息</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <textarea name="backGoodsDesc" id="backGoodsDesc" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>
+                <input type="text" style="width: 190px;margin:0 10px;" class="input-text" value="" placeholder="寄件人电话" id="backGoodsBackTel" name="backGoodsBackTel" seleType="send">
             </div>
         </div>
+        <#--<div class="row cl">-->
+            <#--<div class="formControls col-2 col-sm-2 text-r">-->
+                <#--<strong>寄回产品</strong>-->
+            <#--</div>-->
+            <#--<div class="formControls col-10 col-sm-10">-->
+                <#--<div id="backGoodsProduct" class="update-parts" style="float: left;width: 514px;"></div>-->
+                <#--<input type="hidden" id="closed_products" name="closed_products" />-->
+                <#--<input type="hidden" id="closed_fittings" name="closed_fittings" />-->
+                <#--<div style="float: left;">-->
+                    <#--<button type="button" style="cursor:pointer;height: 30px;" class="my-btn-search" onclick="showProductList();">修改产品</button>-->
+                <#--</div>-->
+            <#--</div>-->
+        <#--</div>-->
+        <#--<div class="cl">-->
+            <#--<div class="formControls col-2 col-sm-2 text-r">-->
+            <#--</div>-->
+            <#--<div class="formControls col-10 col-sm-10" id="produceSelect" style="padding-top: 10px;display: none;">-->
+                <#--<div>-->
+                    <#--<input type="text" oninput="showUpdateSendProduct();" onpropertychange="showUpdateSendProduct();" class="input-text" style="width: 100%" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">-->
+                <#--</div>-->
+                <#--<table class="table table-border table-bg table-bordered">-->
+                    <#--<thead>-->
+                    <#--<tr class="text-c">-->
+                        <#--<th style="text-align: center;" width="60">产品名称</th>-->
+                        <#--<th style="text-align: center;" width="60">产品颜色</th>-->
+                        <#--<th style="text-align: center;" width="60">产品配件</th>-->
+                    <#--</tr>-->
+                    <#--</thead>-->
+                    <#--<tbody id="addProduct">-->
+                    <#--</tbody>-->
+                <#--</table>-->
+            <#--</div>-->
+        <#--</div>-->
+        <#--<div class="row cl">-->
+            <#--<div class="formControls col-2 col-sm-2 text-r">-->
+                <#--<strong>备注信息</strong>-->
+            <#--</div>-->
+            <#--<div class="formControls col-10 col-sm-10">-->
+                <#--<textarea name="backGoodsDesc" id="backGoodsDesc" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>-->
+            <#--</div>-->
+        <#--</div>-->
         <div class="row cl">
             <div class="formControls col-2 col-sm-2">
             </div>
@@ -165,6 +272,7 @@
                 <button onClick="update_back_goods();" class="btn btn-primary" type="button">确认提交</button>
             </div>
         </div>
+           </div>
     </form>
     </div>
 </article>
@@ -173,6 +281,13 @@
 
 <script type="text/javascript">
 
+    $(function(){
+        $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","0")});
+    // #tab_demo 父级id
+    // #tab_demo .tabBar span 控制条
+    // #tab_demo .tabCon 内容区
+    // click 事件 点击切换,可以换成mousemove 移动鼠标切换
+    // 1	默认第2个tab为当前状态(从0开始)
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
     var uname = /^[\u4e00-\u9fa5a-zA-Z]{1,12}$/; //中文英文
     var money = /^(0{1}|([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
@@ -190,6 +305,11 @@
         $("input[name='backGoodsBackStatus']").change(function (){
             initBackInfo($(this).val());
         })
+
+        /* 监听邮费状态按钮 */
+        $("input[name='backGoodsIsTransfer']").change(function (){
+            initPostageInfo($(this).val());
+        })
     });
 
     /*初始化寄回信息*/

+ 28 - 2
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_reissue.ftl

@@ -18,6 +18,12 @@
         .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
         .table-bg th{background-color: #e2f6ff;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+
+        .clearfix:after{content:"\20";display:block;height:0;clear:both;visibility:hidden}.clearfix{zoom:1}
+        .tabBar {border-bottom: 2px solid #222}
+        .tabBar span {background-color: #e8e8e8;cursor: pointer;display: inline-block;float: left;font-weight: bold;height: 30px;line-height: 30px;padding: 0 15px}
+        .tabBar span.current{background-color: #222;color: #fff}
+        .tabCon {display: none}
     </style>
     <title></title>
 </head>
@@ -34,6 +40,11 @@
             </div>
         </div>
         <input type="hidden" id="customerId" name="customerId" value="${customerId!''}">
+
+        <div class="tabBar clearfix"><span>寄回信息</span><span>补发信息</span><span>工厂检查信息</span><span>工厂返修进度</span></div>
+
+        <div class="tabCon">
+
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>产品寄回</strong>
@@ -55,6 +66,10 @@
             </div>
         </div>
 
+        </div>
+
+        <div class="tabCon">
+
         <div class="row cl" id="sendUserInfo" style="display: none;">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>用户信息</strong>
@@ -159,6 +174,8 @@
                 <button onClick="update_reissue_info();" class="btn btn-primary" type="button">确认修改</button>
             </div>
         </div>
+
+        </div>
     </form>
     </div>
 </article>
@@ -170,6 +187,14 @@
 <script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
+    $(function(){
+        $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","0")});
+    // #tab_demo 父级id
+    // #tab_demo .tabBar span 控制条
+    // #tab_demo .tabCon 内容区
+    // click 事件 点击切换,可以换成mousemove 移动鼠标切换
+    // 1	默认第2个tab为当前状态(从0开始)
+
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
     var uname = /^[\u4e00-\u9fa5a-zA-Z]{1,12}$/; //中文英文
     var money = /^(0{1}|([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
@@ -182,10 +207,11 @@
         });
         get_reissue_info();
 
-        /* 监听寄状态按钮 */
+        /* 监听寄状态按钮 */
         $("input[name='reissueSendStatus']").change(function (){
-            initSendInfo($(this).val());
+            initBackInfo($(this).val());
         })
+
     });
 
     /*初始化寄出信息*/