页面样式修改

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

@@ -437,7 +437,8 @@
 
             </div>
             <div class="row cl">
-                <label class="form-label col-1 col-sm-1">处理描述：</label>
+                <#--处理描述-->
+                <label class="form-label col-1 col-sm-1">客诉备注：</label>
                 <div class="formControls col-5 col-sm-5">
                     <script id="describeHandleDescText" type="text/plain" style="width:983px;height:250px;"></script>
                     </script>
@@ -2194,7 +2195,7 @@
             } else if (hours > 14 && visitTimeSelect == 2) {
                 vailErrorMsg($("#datemin"),"该时间已超过当前时间，请重新选择回访时间!");
                 return false;
-            } else if (hours > 16 && visitTimeSelect == 3) {
+            } else if (hours > 18 && visitTimeSelect == 3) {
                 vailErrorMsg($("#datemin"),"该时间已超过当前时间，请重新选择回访时间!");
                 return false;
             }

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

@@ -39,20 +39,20 @@
             </div>
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
-                    <input type="radio" name="renewedBackStatus" value="1">
+                    <input type="radio" id="tel-3" name="renewedBackStatus" value="1">
                     <label for="tel-3">未寄回</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="renewedBackStatus" value="2">
+                    <input type="radio" id="tel-4" name="renewedBackStatus" value="2">
                     <label for="tel-4">已寄回</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="renewedBackStatus" value="3">
-                    <label for="tel-4">已收货</label>
+                    <input type="radio" id="tel-5" name="renewedBackStatus" value="3">
+                    <label for="tel-5">已收货</label>
                 </div>
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="backLogisticsInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄回信息</strong>
             </div>
@@ -84,26 +84,26 @@
                 <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay">
             </div>
         </div>
-        <div class="row cl">
+        <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" name="renewedIsTransfer" value="0">
+                    <input type="radio" id="tel-6" name="renewedIsTransfer" value="0">
                     <label for="tel-6">不需要转账</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="renewedIsTransfer" value="1">
+                    <input type="radio" id="tel-7" name="renewedIsTransfer" value="1">
                     <label for="tel-7">已转账</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="renewedIsTransfer" value="2">
+                    <input type="radio" id="tel-8" name="renewedIsTransfer" value="2">
                     <label for="tel-8">待转账</label>
                 </div>
             </div>
         </div>
-        <div class="row cl" style="position: relative;">
+        <div class="row cl" style="position: relative;display: none;" id="backUserInfo">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄件信息</strong>
             </div>
@@ -153,21 +153,21 @@
             </div>
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
-                    <input type="radio" name="renewedSendStatus" value="1">
+                    <input type="radio" id="tel-10" name="renewedSendStatus" value="1">
                     <label for="tel-10">未寄出</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="renewedSendStatus" value="2">
-                    <label for="tel-10">已寄出</label>
+                    <input type="radio" id="tel-11" name="renewedSendStatus" value="2">
+                    <label for="tel-11">已寄出</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="renewedSendStatus" value="3">
-                    <label for="tel-10">已收货</label>
+                    <input type="radio" id="tel-12" name="renewedSendStatus" value="3">
+                    <label for="tel-12">已收货</label>
                 </div>
                 Efast订单号<input style="width: 231px;margin-left:20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="renewedBackEfastOrderId" name="renewedBackEfastOrderId">
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="sendUserInfo" style="display: none;">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>用户信息</strong>
             </div>
@@ -178,7 +178,7 @@
                 <input type="text" class="input-text" placeholder="填写收件人手机号" id="renewedSendTel" name="renewedSendTel">
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="sendAddressInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
 
             </div>
@@ -201,13 +201,13 @@
                 </div>
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="sendaddressDescInfo" style="display: none">
             <label class="form-label col-2 col-sm-2"></label>
             <div class="formControls col-10 col-sm-10">
                 <input type="text" class="input-text" placeholder="请填写详细地址" id="renewedSendAddress" name="renewedSendAddress">
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl"  id="sendLogisticsInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄出信息</strong>
             </div>
@@ -237,7 +237,7 @@
                 <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="renewedSendLogisticsNo" name="renewedSendLogisticsNo">
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="sendDescInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄出备注</strong>
             </div>
@@ -336,8 +336,52 @@
         });
         get_renewed_info();
         showUpdateSendProduct();
+
+        /* 监听寄回状态按钮 */
+        $("input[name='renewedBackStatus']").change(function (){
+            var renewedBackStatusCode = $(this).val();
+            /*初始化寄回信息*/
+            initRenewedBackInfo(renewedBackStatusCode);
+        })
+
+        /* 监听寄出状态按钮 */
+        $("input[name='renewedSendStatus']").change(function (){
+            var renewedSendStatusCode = $(this).val();
+            /*初始化寄出信息*/
+            initRenewedSendInfo(renewedSendStatusCode);
+        })
     });
 
+    /*初始化寄回信息*/
+    function initRenewedBackInfo(renewedBackStatusCode){
+        if(renewedBackStatusCode == 1){
+            $("#backLogisticsInfo").hide();
+            $("#backTransferInfo").hide();
+            $("#backUserInfo").hide();
+        }else{
+            $("#backLogisticsInfo").show();
+            $("#backTransferInfo").show();
+            $("#backUserInfo").show();
+        }
+    }
+
+    /*初始化寄出信息*/
+    function initRenewedSendInfo(renewedSendStatusCode){
+        if(renewedSendStatusCode == 1){
+            $("#sendUserInfo").hide();
+            $("#sendAddressInfo").hide();
+            $("#sendaddressDescInfo").hide();
+            $("#sendLogisticsInfo").hide();
+            $("#sendDescInfo").hide();
+        }else{
+            $("#sendUserInfo").show();
+            $("#sendAddressInfo").show();
+            $("#sendaddressDescInfo").show();
+            $("#sendLogisticsInfo").show();
+            $("#sendDescInfo").show();
+        }
+    }
+
     /*显示所有产品及配件信息*/
     function showUpdateSendProduct() {
         var productList = getProduct() ; //所有产品
@@ -546,6 +590,12 @@
                             $(this).iCheck('check');
                         }
                     });
+
+                    /*初始化寄回信息*/
+                    initRenewedBackInfo(renewed.renewedBackStatus);
+                    /*初始化寄出信息*/
+                    initRenewedSendInfo(renewed.renewedSendStatus);
+
                     $('#renewedSchedule').html(renewedSchedule);
                     $("#renewedBackLogisticsCompany option[value='" + renewed.renewedBackLogisticsCompany + "']").attr("selected","true");
                     $("#renewedSendLogisticsCompany option[value='" + renewed.renewedSendLogisticsCompany + "']").attr("selected","true");
@@ -622,6 +672,7 @@
 
     /*校验换新填写信息*/
     function checkRenewed() {
+        debugger;
         var renewed_flag = true;
         var renewedBackStatus = $('input[name="renewedBackStatus"]:checked').val();//寄回状态
         var renewedBackLogisticsNo = $('#renewedBackLogisticsNo').val().trim();//物流单号
@@ -630,31 +681,31 @@
         var renewedBackName = $('#renewedBackName').val();
         var renewedBackTel = $('#renewedBackTel').val();
         if (renewedBackStatus == 1) {
-            if (renewedBackLogisticsNo != null && renewedBackLogisticsNo != '') {
-                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
-            }
-            if (renewedBackPostage != null && renewedBackPostage != '') {
-                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
-            }
-            if (renewedBackLogisticsCompany != null && renewedBackLogisticsCompany != '') {
-                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
-            }
-            if (renewedBackName != null && renewedBackName != '') {
-                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
-            }
-            if (renewedBackTel != null && renewedBackTel != '') {
-                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
-            }
+//            if (renewedBackLogisticsNo != null && renewedBackLogisticsNo != '') {
+//                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:1000});
+//                renewed_flag = false;
+//                return renewed_flag;
+//            }
+//            if (renewedBackPostage != null && renewedBackPostage != '' && renewedBackPostage != 0) {
+//                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:1000});
+//                renewed_flag = false;
+//                return renewed_flag;
+//            }
+//            if (renewedBackLogisticsCompany != null && renewedBackLogisticsCompany != '') {
+//                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:1000});
+//                renewed_flag = false;
+//                return renewed_flag;
+//            }
+//            if (renewedBackName != null && renewedBackName != '') {
+//                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:1000});
+//                renewed_flag = false;
+//                return renewed_flag;
+//            }
+//            if (renewedBackTel != null && renewedBackTel != '') {
+//                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:1000});
+//                renewed_flag = false;
+//                return renewed_flag;
+//            }
         } else if (renewedBackStatus == 2 || renewedBackStatus == 3) {
             if (renewedBackLogisticsNo == null || renewedBackLogisticsNo == '') {
                 layer.msg("物流信息不能为空!",{icon: 5,time:1000});
@@ -703,18 +754,19 @@
         var renewedSendStatus = $('input[name="renewedSendStatus"]:checked').val();//寄回状态
         var renewedSendLogisticsCompany = $('#renewedSendLogisticsCompany').val();//寄出物流公司
         var renewedSendLogisticsNo = $('#renewedSendLogisticsNo').val();//寄出物流单号
-        if (renewedSendLogisticsCompany == 1) {
-            if (renewedSendLogisticsCompany != null && renewedSendLogisticsCompany != '') {
-                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
-            }
-            if (renewedSendLogisticsNo != null && renewedSendLogisticsNo != '') {
-                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
-            }
-        } else if (renewedSendLogisticsCompany == 2 || renewedSendLogisticsCompany == 3) {
+
+        if (renewedSendStatus == 1) {
+//            if (renewedSendLogisticsCompany != null && renewedSendLogisticsCompany != '') {
+//                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
+//                renewed_flag = false;
+//                return renewed_flag;
+//            }
+//            if (renewedSendLogisticsNo != null && renewedSendLogisticsNo != '') {
+//                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:1000});
+//                renewed_flag = false;
+//                return renewed_flag;
+//            }
+        } else if (renewedSendStatus == 2 || renewedSendStatus == 3) {
             if (renewedSendLogisticsCompany == null || renewedSendLogisticsCompany == '') {
                 layer.msg("请选择寄回物流公司!",{icon: 5,time:1000});
                 renewed_flag = false;

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

@@ -39,20 +39,20 @@
             </div>
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
-                    <input type="radio" name="repairBackStatus" value="1">
+                    <input type="radio" id="tel-3" name="repairBackStatus" value="1">
                     <label for="tel-3">未寄回</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="repairBackStatus" value="2">
+                    <input type="radio" id="tel-4" name="repairBackStatus" value="2">
                     <label for="tel-4">已寄回</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="repairBackStatus" value="3">
-                    <label for="tel-4">已收货</label>
+                    <input type="radio" id="tel-5" name="repairBackStatus" value="3">
+                    <label for="tel-5">已收货</label>
                 </div>
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="backLogisticsInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄回信息</strong>
             </div>
@@ -84,7 +84,7 @@
                 <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay">
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="backTransferInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>邮费处理</strong>
             </div>
@@ -103,7 +103,7 @@
                 </div>
             </div>
         </div>
-        <div class="row cl" style="position: relative;">
+        <div class="row cl" style="position: relative;display: none;" id="backUserInfo">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄件信息</strong>
             </div>
@@ -153,21 +153,21 @@
             </div>
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
-                    <input type="radio" name="repairSendStatus" value="1">
+                    <input type="radio" id="tel-19" name="repairSendStatus" value="1">
                     <label for="tel-19">未寄出</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="repairSendStatus" value="2">
-                    <label for="tel-10">已寄出</label>
+                    <input type="radio" id="tel-20" name="repairSendStatus" value="2">
+                    <label for="tel-20">已寄出</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="repairSendStatus" value="3">
-                    <label for="tel-10">已收货</label>
+                    <input type="radio" id="tel-21" name="repairSendStatus" value="3">
+                    <label for="tel-21">已收货</label>
                 </div>
                 Efast订单号<input style="width: 231px;margin-left:20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="repairBackEfastOrderId" name="repairBackEfastOrderId">
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="sendUserInfo" style="display: none;">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>用户信息</strong>
             </div>
@@ -178,7 +178,7 @@
                 <input type="text" class="input-text" placeholder="填写收件人手机号" id="repairSendTel" name="repairSendTel">
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="sendAddressInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
 
             </div>
@@ -201,13 +201,13 @@
                 </div>
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="sendaddressDescInfo" style="display: none">
             <label class="form-label col-2 col-sm-2"></label>
             <div class="formControls col-10 col-sm-10">
                 <input type="text" class="input-text" placeholder="请填写详细地址" id="repairSendAddress" name="repairSendAddress">
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="sendLogisticsInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄出信息</strong>
             </div>
@@ -237,7 +237,7 @@
                 <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="repairSendLogisticsNo" name="repairSendLogisticsNo">
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="sendDescInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄出备注</strong>
             </div>
@@ -335,8 +335,52 @@
         });
         get_repair_info();
         showUpdateSendProduct();
+
+        /* 监听寄回状态按钮 */
+        $("input[name='repairBackStatus']").change(function (){
+            var repairBackStatusCode = $(this).val();
+            /*初始化寄回信息*/
+            initRepairBackInfo(repairBackStatusCode);
+        })
+
+        /* 监听寄出状态按钮 */
+        $("input[name='renewedSendStatus']").change(function (){
+            var renewedSendStatusCode = $(this).val();
+            /*初始化寄出信息*/
+            initRenewedSendInfo(renewedSendStatusCode);
+        })
     });
 
+    /*初始化寄回信息*/
+    function initRepairBackInfo(repairBackStatusCode){
+        if(repairBackStatusCode == 1){
+            $("#backLogisticsInfo").hide();
+            $("#backTransferInfo").hide();
+            $("#backUserInfo").hide();
+        }else{
+            $("#backLogisticsInfo").show();
+            $("#backTransferInfo").show();
+            $("#backUserInfo").show();
+        }
+    }
+
+    /*初始化寄出信息*/
+    function initRenewedSendInfo(renewedSendStatusCode){
+        if(renewedSendStatusCode == 1){
+            $("#sendUserInfo").hide();
+            $("#sendAddressInfo").hide();
+            $("#sendaddressDescInfo").hide();
+            $("#sendLogisticsInfo").hide();
+            $("#sendDescInfo").hide();
+        }else{
+            $("#sendUserInfo").show();
+            $("#sendAddressInfo").show();
+            $("#sendaddressDescInfo").show();
+            $("#sendLogisticsInfo").show();
+            $("#sendDescInfo").show();
+        }
+    }
+
     /*显示所有产品及配件信息*/
     function showUpdateSendProduct() {
         var productList = getProduct() ; //所有产品

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/add_detect.ftl

@@ -157,19 +157,15 @@
 <script type="text/javascript">
     /*初始化单选框样式*/
         $(function(){
+            $('input[name="productId"]').on('ifChecked', function(event){
+                alert($(this).val());
+            });
+
             $('.skin-minimal input').iCheck({
                 checkboxClass: 'icheckbox-blue',
                 radioClass: 'iradio-blue',
                 increaseArea: '20%'
             });
-            alert($("input[name='productId']").html());
-            $("input[name='productId']").change(function (){
-                $("input[name='productId']").each(function () {
-                    var type = $(this).val();
-                    $("#maintenanceEquipmentNumber"+type).val("");
-                });
-            });
-
         });
 
    /* function emptyingNumber() {

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/complete_signclosed.ftl

@@ -179,11 +179,11 @@
                 <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.5%">
                     <div class="radio-box">
                         <input type="radio" id="tel-12" name="signclosedObjectsState" value="1" datatype="*" checked  >
-                        <label for="tel-8">正常签收</label>
+                        <label for="tel-12">正常签收</label>
                     </div>
                     <div class="radio-box">
                         <input type="radio" id="tel-13" name="signclosedObjectsState" value="2" datatype="*">
-                        <label for="tel-9">物件不对</label>
+                        <label for="tel-13">物件不对</label>
                     </div>
                 </div>
             </div>

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

@@ -174,7 +174,7 @@ function keyFun(node,maxNumber,minNumber){
  * 用于展示错误信息，并让该节点得到焦点
  */
 function vailErrorMsg(node,msg){
-    layer.msg(msg, {icon: 5, time: 3000});
+    layer.msg(msg, {icon: 5, time: 5000});
     node.select();
     window.setTimeout(function(){
         node.focus();