无理由退货

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/BackGoods.java

@@ -234,4 +234,12 @@ public class BackGoods  implements Serializable {
     public void setBackGoodsUpdateTime(Date backGoodsUpdateTime) {
         this.backGoodsUpdateTime = backGoodsUpdateTime;
     }
+
+    public String getBackGoodsAlipayName() {
+        return backGoodsAlipayName;
+    }
+
+    public void setBackGoodsAlipayName(String backGoodsAlipayName) {
+        this.backGoodsAlipayName = backGoodsAlipayName;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/BackGoodsServiceImpl.java

@@ -30,9 +30,9 @@ public class BackGoodsServiceImpl implements BackGoodsService {
 
     @Override
     public Integer updateBackGoods(BackGoods record, String closedProducts, String closedFittings) {
-        int productNum = 1;
-        int fittingNum = 1;
-        List<ClosedProdcue> produceList = new ArrayList<ClosedProdcue>();
+//        int productNum = 1;
+//        int fittingNum = 1;
+        /*List<ClosedProdcue> produceList = new ArrayList<ClosedProdcue>();
         List<ClosedFitting> fittingList = new ArrayList<ClosedFitting>();
         if (StringUtils.isNotEmpty(closedProducts)) {
             ClosedProdcue closedProdcue = new ClosedProdcue();
@@ -76,9 +76,9 @@ public class BackGoodsServiceImpl implements BackGoodsService {
             }
             //批量添加寄回配件
             fittingNum = closedFittingMapper.insert(fittingList);
-        }
+        }*/
         int num = backGoodsMapper.updateBackGoods(record);
-        if (num > 0 && productNum > 0 && fittingNum > 0) {
+        if (num > 0) {
             return 1;
         } else {
             return 0;

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/NoreasonBackServiceImpl.java

@@ -29,7 +29,7 @@ public class NoreasonBackServiceImpl implements NoreasonBackService {
 
     @Override
     public Integer updateNoreasonBack(NoreasonBack record, String closedProducts, String closedFittings) {
-        int productNum = 1;
+        /*int productNum = 1;
         int fittingNum = 1;
         List<ClosedProdcue> produceList = new ArrayList<ClosedProdcue>();
         List<ClosedFitting> fittingList = new ArrayList<ClosedFitting>();
@@ -75,9 +75,9 @@ public class NoreasonBackServiceImpl implements NoreasonBackService {
             }
             //批量添加寄回配件
             fittingNum = closedFittingMapper.insert(fittingList);
-        }
+        }*/
         int num = noreasonBackMapper.updateNoreasonBack(record);
-        if (num > 0 && productNum > 0 && fittingNum > 0) {
+        if (num > 0) {
             return 1;
         } else {
             return 0;

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

@@ -25,7 +25,7 @@
     back_goods_id, customer_id, order_id, signclosed_id, back_goods_back_status, back_goods_back_name, 
     back_goods_back_tel, back_goods_back_logistics_company, back_goods_back_logistics_no, 
     back_goods_back_postage, back_goods_back_machine_no, back_goods_desc, back_goods_state, 
-    back_goods_alipay, back_goods_is_transfer, back_goods_create_time, back_goods_update_time,back_goods_alipay_name
+    back_goods_alipay, back_goods_alipay_name, back_goods_is_transfer, back_goods_create_time, back_goods_update_time
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -98,10 +98,10 @@
     <result column="back_goods_desc" property="backGoodsDesc"/>
     <result column="back_goods_state" property="backGoodsState"/>
     <result column="back_goods_alipay" property="backGoodsAlipay"/>
+    <result column="back_goods_alipay_name" property="backGoodsAlipayName"/>
     <result column="back_goods_is_transfer" property="backGoodsIsTransfer"/>
     <result column="back_goods_create_time" property="backGoodsCreateTime"/>
     <result column="back_goods_update_time" property="backGoodsUpdateTime"/>
-    <result column="back_goods_alipay_name" property="backGoodsAlipayName"/>
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 
@@ -143,14 +143,14 @@
       back_goods_back_tel, back_goods_back_logistics_company, 
       back_goods_back_logistics_no, back_goods_back_postage, 
       back_goods_back_machine_no, back_goods_desc, 
-      back_goods_state, back_goods_alipay, back_goods_is_transfer
+      back_goods_state, back_goods_alipay, back_goods_alipay_name, back_goods_is_transfer
       )
     values ( #{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
       #{signclosedId,jdbcType=INTEGER}, #{backGoodsBackStatus,jdbcType=BIT}, #{backGoodsBackName,jdbcType=VARCHAR}, 
       #{backGoodsBackTel,jdbcType=CHAR}, #{backGoodsBackLogisticsCompany,jdbcType=VARCHAR}, 
       #{backGoodsBackLogisticsNo,jdbcType=VARCHAR}, #{backGoodsBackPostage,jdbcType=INTEGER}, 
       #{backGoodsBackMachineNo,jdbcType=VARCHAR}, #{backGoodsDesc,jdbcType=VARCHAR}, 
-      #{backGoodsState,jdbcType=BIT}, #{backGoodsAlipay,jdbcType=VARCHAR}, #{backGoodsIsTransfer,jdbcType=BIT}
+      #{backGoodsState,jdbcType=BIT}, #{backGoodsAlipay,jdbcType=VARCHAR},  #{backGoodsAlipayName,jdbcType=VARCHAR}, #{backGoodsIsTransfer,jdbcType=BIT}
       )
   </insert>
   <insert id="insertSelective" parameterType="BackGoods" >
@@ -198,6 +198,9 @@
       <if test="backGoodsAlipay != null" >
         back_goods_alipay,
       </if>
+      <if test="backGoodsAlipayName != null" >
+        back_goods_alipay_name,
+      </if>
       <if test="backGoodsIsTransfer != null" >
         back_goods_is_transfer,
       </if>
@@ -251,6 +254,9 @@
       <if test="backGoodsAlipay != null" >
         #{backGoodsAlipay,jdbcType=VARCHAR},
       </if>
+      <if test="backGoodsAlipayName != null" >
+        #{backGoodsAlipayName,jdbcType=VARCHAR},
+      </if>
       <if test="backGoodsIsTransfer != null" >
         #{backGoodsIsTransfer,jdbcType=BIT},
       </if>

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

@@ -16,6 +16,7 @@
     <result column="noreason_back_desc" property="noreasonBackDesc" jdbcType="VARCHAR" />
     <result column="noreason_back_state" property="noreasonBackState" jdbcType="BIT" />
     <result column="noreason_back_alipay" property="noreasonBackAlipay" jdbcType="VARCHAR" />
+    <result column="noreason_back_alipay_name" property="noreasonBackAlipayName" jdbcType="VARCHAR" />
     <result column="noreason_back_is_transfer" property="noreasonBackIsTransfer" jdbcType="BIT" />
     <result column="noreason_back_create_time" property="noreasonBackCreateTime" jdbcType="TIMESTAMP" />
     <result column="noreason_back_update_time" property="noreasonBackUpdateTime" jdbcType="TIMESTAMP" />
@@ -144,7 +145,7 @@
       noreason_back_back_tel, noreason_back_back_logistics_company, 
       noreason_back_back_logistics_no, noreason_back_back_postage, 
       noreason_back_back_machine_no, noreason_back_desc, 
-      noreason_back_state, noreason_back_alipay, noreason_back_is_transfer
+      noreason_back_state, noreason_back_alipay,noreason_back_alipay_name, noreason_back_is_transfer
       )
     values ( #{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
       #{signclosedId,jdbcType=INTEGER}, #{noreasonBackBackStatus,jdbcType=BIT}, #{noreasonBackBackName,jdbcType=VARCHAR}, 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -1440,13 +1440,13 @@ public class AdminCustomerController {
 //            backGoods.setBackGoodsBackPostage(backGoods.getBackGoodsBackPostage().intValue() * 100);
 //        }
 
-        if(backGoods.getBackGoodsBackStatus() != 1){
-            ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
-            cs.setSignclosedCustomerId(backGoods.getCustomerId());
-            cs.setSignclosedLogistics(backGoods.getBackGoodsBackLogisticsCompany());
-            cs.setSignclosedLogisticsNumber(backGoods.getBackGoodsBackLogisticsNo());
-            complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
-        }
+//        if(backGoods.getBackGoodsBackStatus() != 1){
+//            ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
+//            cs.setSignclosedCustomerId(backGoods.getCustomerId());
+//            cs.setSignclosedLogistics(backGoods.getBackGoodsBackLogisticsCompany());
+//            cs.setSignclosedLogisticsNumber(backGoods.getBackGoodsBackLogisticsNo());
+//            complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
+//        }
 
         int num = backGoodsService.updateBackGoods(backGoods, closedProducts, closedFittings);
         if (num > 0) {
@@ -1605,13 +1605,13 @@ public class AdminCustomerController {
 //            noreasonBack.setNoreasonBackBackPostage(noreasonBack.getNoreasonBackBackPostage().intValue() * 100);
 //        }
 
-        if(noreasonBack.getNoreasonBackBackStatus() != 1){
-            ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
-            cs.setSignclosedCustomerId(noreasonBack.getCustomerId());
-            cs.setSignclosedLogistics(noreasonBack.getNoreasonBackBackLogisticsCompany());
-            cs.setSignclosedLogisticsNumber(noreasonBack.getNoreasonBackBackLogisticsNo());
-            complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
-        }
+//        if(noreasonBack.getNoreasonBackBackStatus() != 1){
+//            ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
+//            cs.setSignclosedCustomerId(noreasonBack.getCustomerId());
+//            cs.setSignclosedLogistics(noreasonBack.getNoreasonBackBackLogisticsCompany());
+//            cs.setSignclosedLogisticsNumber(noreasonBack.getNoreasonBackBackLogisticsNo());
+//            complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
+//        }
 
         int num = noreasonBackService.updateNoreasonBack(noreasonBack, closedProducts, closedFittings);
         if (num > 0) {

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

@@ -39,140 +39,86 @@
             </div>
             <div class="formControls col-10 col-sm-10">
                 <input type="hidden" id="backGoodsId" name="backGoodsId" seleType="primary"/>
-                <span id="renewedSchedule" class="c-red"></span>
+                <span id="backGoodsSchedule" class="c-red"></span>
             </div>
         </div>
-        <div id="tab_demo" class="HuiTab">
-            <div class="tabBar clearfix"><span>寄回信息</span><span>邮费信息</span><span>工厂检查信息</span><span>工厂返修进度</span></div>
+        <input type="hidden" id="customerId" name="customerId" value="${customerId!''}" seleType="primary">
 
-         <div class="tabCon">
-
-            <input type="hidden" id="customerId" name="customerId" value="${customerId!''}" seleType="primary">
-
-
-        <#--<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 id="tab_demo" class="HuiTab">
 
-            <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 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>
                     </div>
-                    <div class="radio-box">
-                        <input type="radio" id="tel-5" name="backGoodsBackStatus" value="3" seleType="send">
-                        <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;">
-                        <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 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">
                     </div>
-                    <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="backGoodsBackLogisticsNo" name="backGoodsBackLogisticsNo" seleType="send">
                 </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="backGoodsBackName" name="backGoodsBackName" seleType="send">
-                </div>
-                <div class="formControls col-5 col-sm-5">
-                    <input type="text" class="input-text" value="" placeholder="寄件人电话" id="backGoodsBackTel" name="backGoodsBackTel" seleType="send">
+                <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="backGoodsBackName" name="backGoodsBackName" seleType="send">
+                    </div>
+                    <div class="formControls col-5 col-sm-5">
+                        <input type="text" class="input-text" value="" placeholder="寄件人电话" id="backGoodsBackTel" name="backGoodsBackTel" seleType="send">
+                    </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(1);" class="btn btn-primary" type="button">确认提交</button>
+                <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(1);" class="btn btn-primary" type="button">确认提交</button>
+                    </div>
                 </div>
-            </div>
-         </div>
+             </div>
 
              <#--<div class="row cl">-->
                  <#--<div class="formControls col-2 col-sm-2">-->
@@ -183,102 +129,77 @@
              <#--</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" seleType="postage">
-                    <label for="tel-6">不需要转账</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-7" name="backGoodsIsTransfer" value="1" seleType="postage">
-                    <label for="tel-7">已转账</label>
+            <div class="row cl" id="backTransferInfo" style="display: none">
+                <div class="formControls col-2 col-sm-2 text-r">
+                    <strong>邮费处理</strong>
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2" seleType="postage">
-                    <label for="tel-8">待转账</label>
+                <div class="formControls col-10 col-sm-10 skin-minimal">
+                    <div class="radio-box">
+                        <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" seleType="postage">
+                        <label for="tel-7">已转账</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2" seleType="postage">
+                        <label for="tel-8">待转账</label>
+                    </div>
                 </div>
             </div>
-        </div>
 
-        <div class="row cl" id="postageInformation">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>邮费信息</strong>
+            <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">
+                    <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="backGoodsAlipayName" name="backGoodsAlipayName" seleType="postage">
+                </div>
             </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">
-                <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="backGoodsAlipayName" name="backGoodsAlipayName" seleType="postage">
 
+            <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(2);" class="btn btn-primary" type="button">确认提交</button>
+                </div>
             </div>
-        </div>
+       </div>
+
+           <div class="tabCon">
+               <div class="row cl" style="margin-left: -70px;">
+                   <div class="formControls col-2 col-sm-2 text-r">
+                       <strong>QC进度</strong>
+                   </div>
+                   <div class="formControls col-10 col-sm-10">
+                       <table class="table table-border table-bg table-bordered">
+                           <tbody class="text-c" id="detect_table"><tr>
+                               <th>工厂检测现象</th><th>故障分类</th><th>故障原因</th><th>判定结果</th><th>故障指向</th><th>原因分析</th><th>生产维修</th>
+                           </tr>
+                           </tbody></table>
+                   </div>
+               </div>
+           </div>
+           <div class="tabCon">
+               <div class="row cl" style="margin-left: -70px;">
+                   <div class="formControls col-2 col-sm-2 text-r">
+                       <strong>返修进度</strong>
+                   </div>
+                   <div class="formControls col-10 col-sm-10">
+                       <table class="table table-border table-bg table-bordered">
+                           <tbody class="text-c" id="maintenance_table"><tr>
+                               <th>是否可返修</th><th>返修内容</th><th>返修日期</th>
+                           </tr>
+                           </tbody></table>
+                   </div>
+               </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" 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" 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>
-            <div class="formControls col-8 col-sm-8 text-c">
-                <button onClick="update_back_goods(2);" class="btn btn-primary" type="button">确认提交</button>
-            </div>
-        </div>
 
-           </div>
     </form>
     </div>
 </article>
@@ -289,6 +210,7 @@
 
     $(function(){
         $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","0")});
+
     // #tab_demo 父级id
     // #tab_demo .tabBar span 控制条
     // #tab_demo .tabCon 内容区
@@ -313,9 +235,9 @@
         })
 
         /* 监听邮费状态按钮 */
-        $("input[name='backGoodsIsTransfer']").change(function (){
-            initPostageInfo($(this).val());
-        })
+//        $("input[name='backGoodsIsTransfer']").change(function (){
+//            initPostageInfo($(this).val());
+//        })
     });
 
     /*初始化寄回信息*/
@@ -503,6 +425,7 @@
                     $('#backGoodsBackLogisticsNo').val(backGoods.backGoodsBackLogisticsNo);
                     $('#backGoodsBackPostage').val(backGoods.backGoodsBackPostage/100);
                     $('#backGoodsAlipay').val(backGoods.backGoodsAlipay);
+                    $('#backGoodsAlipayName').val(backGoods.backGoodsAlipayName);
                     $('input[name="backGoodsIsTransfer"]').each(function(){
                         if (this.value == backGoods.backGoodsIsTransfer) {
                             $(this).iCheck('check');

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

@@ -25,144 +25,165 @@
 <body>
 <article class="cl pd-20">
     <form action="" method="post" class="form form-horizontal" id="form-update-noreasonBack" name="form-update-noreasonBack">
-        <div class="row cl">
+
+        <div class="row cl" style="margin-left: -60px;margin-bottom: 20px;">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>当前进度</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <input type="hidden" id="noreasonBackId" name="noreasonBackId" />
+                <input type="hidden" id="noreasonBackId" name="noreasonBackId" seleType="primary"/>
                 <span id="noreasonBackSchedule" 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="noreasonBackBackStatus" value="1">
-                    <label for="tel-3">未寄回</label>
+        <input type="hidden" id="customerId" name="customerId" value="${customerId!''}"  seleType="primary">
+
+        <div id="tab_demo" class="HuiTab">
+
+            <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>
+                    </div>
+                    <div class="formControls col-10 col-sm-10 skin-minimal">
+                        <div class="radio-box">
+                            <input type="radio" id="tel-3" name="noreasonBackBackStatus" value="1" seleType="send">
+                            <label for="tel-3">未寄回</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-4" name="noreasonBackBackStatus" value="2" seleType="send">
+                            <label for="tel-4">已寄回</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-5" name="noreasonBackBackStatus" value="3" seleType="send">
+                            <label for="tel-5">已收货</label>
+                        </div>
+                    </div>
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-4" name="noreasonBackBackStatus" value="2">
-                    <label for="tel-4">已寄回</label>
+
+                <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="noreasonBackBackLogisticsCompany" id="noreasonBackBackLogisticsCompany" 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="noreasonBackBackLogisticsNo" name="noreasonBackBackLogisticsNo" seleType="send">
+                    </div>
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-5" name="noreasonBackBackStatus" value="3">
-                    <label for="tel-5">已收货</label>
+
+                <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="noreasonBackBackName" name="noreasonBackBackName" seleType="send">
+                    </div>
+                    <div class="formControls col-5 col-sm-5">
+                        <input type="text" class="input-text" value="" placeholder="寄件人电话" id="noreasonBackBackTel" name="noreasonBackBackTel" seleType="send">
+                    </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;">
-			<span class="select-box">
-				<select name="noreasonBackBackLogisticsCompany" id="noreasonBackBackLogisticsCompany" class="select">
-					<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 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_noreason_back(1);" class="btn btn-primary" type="button">确认提交</button>
+                    </div>
                 </div>
-                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="noreasonBackBackLogisticsNo" name="noreasonBackBackLogisticsNo">
-                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="noreasonBackBackPostage" name="noreasonBackBackPostage">
-                <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="noreasonBackAlipay" name="noreasonBackAlipay">
-            </div>
-        </div>
-        <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="noreasonBackIsTransfer" value="0">
-                    <label for="tel-6">不需要转账</label>
+
+            <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="noreasonBackIsTransfer" value="0" seleType="postage">
+                            <label for="tel-6">不需要转账</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-7" name="noreasonBackIsTransfer" value="1" seleType="postage">
+                            <label for="tel-7">已转账</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-8" name="noreasonBackIsTransfer" value="2" seleType="postage">
+                            <label for="tel-8">待转账</label>
+                        </div>
+                    </div>
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-7" name="noreasonBackIsTransfer" value="1">
-                    <label for="tel-7">已转账</label>
+
+                <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="noreasonBackBackPostage" name="noreasonBackBackPostage" seleType="postage">
+                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="noreasonBackAlipay" name="noreasonBackAlipay" seleType="postage">
+                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="noreasonBackAlipayName" name="noreasonBackAlipayName" seleType="postage">
+                    </div>
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-8" name="noreasonBackIsTransfer" value="2">
-                    <label for="tel-8">代转账</label>
+
+                <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_noreason_back(2);" class="btn btn-primary" type="button">确认提交</button>
+                    </div>
                 </div>
             </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="noreasonBackBackName" name="noreasonBackBackName">
-            </div>
-            <div class="formControls col-5 col-sm-5">
-                <input type="text" style="width: 190px;margin:0 10px;" class="input-text" value="" placeholder="寄件人电话" id="noreasonBackBackTel" name="noreasonBackBackTel">
-            </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="noreasonBackProduct" class="update-parts" style="float: left;width: 410px;margin-right: 10px;"></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 class="tabCon">
+                <div class="row cl" style="margin-left: -70px;">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>QC进度</strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10">
+                        <table class="table table-border table-bg table-bordered">
+                            <tbody class="text-c" id="detect_table"><tr>
+                                <th>工厂检测现象</th><th>故障分类</th><th>故障原因</th><th>判定结果</th><th>故障指向</th><th>原因分析</th><th>生产维修</th>
+                            </tr>
+                            </tbody></table>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-            </div>
-            <div class="formControls col-9 col-sm-9" 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 class="tabCon">
+                <div class="row cl" style="margin-left: -70px;">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>返修进度</strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10">
+                        <table class="table table-border table-bg table-bordered">
+                            <tbody class="text-c" id="maintenance_table"><tr>
+                                <th>是否可返修</th><th>返修内容</th><th>返修日期</th>
+                            </tr>
+                            </tbody></table>
+                    </div>
                 </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="noreasonBackDesc" id="noreasonBackDesc" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>
-            </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_noreason_back();" class="btn btn-primary" type="button">确认提交</button>
             </div>
+
         </div>
     </form>
     </div>
@@ -171,6 +192,10 @@
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
 <script type="text/javascript">
 
+    $(function(){
+        $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","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})))$/;//金额
@@ -374,6 +399,7 @@
                     $('#noreasonBackBackLogisticsNo').val(noreasonBack.noreasonBackBackLogisticsNo);
                     $('#noreasonBackBackPostage').val(noreasonBack.noreasonBackBackPostage/100);
                     $('#noreasonBackAlipay').val(noreasonBack.noreasonBackAlipay);
+                    $('#noreasonBackAlipayName').val(noreasonBack.noreasonBackAlipayName);
                     $('input[name="noreasonBackIsTransfer"]').each(function(){
                         if (this.value == noreasonBack.noreasonBackIsTransfer) {
                             $(this).iCheck('check');
@@ -416,13 +442,46 @@
         })
     }
 
+    function getseleType(type){
+        var obj = new Object();
+        var oldName = "";
+        $("[seleType="+ type +"]").each(function(){
+            var name = $(this).attr("name");
+            if(oldName != name){
+                oldName = name
+                if($(this).attr("type") == "radio"){
+                    obj[name] = $("[name="+ name +"]:checked").val();
+                }else{
+                    obj[name] = $("[name="+ name +"]").val();
+                }
+            }
+        });
+        $("[seleType='primary']").each(function(){
+            var name = $(this).attr("name");
+            if(oldName != name){
+                oldName = name;
+                obj[name] = $("[name="+ name +"]").val();
+            }
+        });
+        return obj;
+    }
+
     /*修改售后无理由退货信息*/
-    function update_noreason_back() {
-        var noreasonBack_flag = checkNoreason();
+    function update_noreason_back(type) {
+        var noreasonBack_flag = checkNoreason(type);
 
         var noreasonBackBackPostage = $("#noreasonBackBackPostage").val();
         $("#noreasonBackBackPostage").val(parseInt(noreasonBackBackPostage*100));
 
+        var obj = null;
+        if(type == 1){
+            obj = getseleType("send");
+        }else if(type == 2){
+            obj = getseleType("postage");
+        }else if(type ==3){
+            obj = getseleType("sendInformation");
+        }
+
         if (noreasonBack_flag) {
             $.ajax({
                 cache: true,
@@ -450,7 +509,7 @@
     }
 
     /*校验无理由退货填写信息*/
-    function checkNoreason() {
+    function checkNoreason(type) {
         var noreasonBack_flag = true;
         var noreasonBackBackStatus = $('input[name="noreasonBackBackStatus"]:checked').val();//寄回状态
         var noreasonBackBackLogisticsNo = $('#noreasonBackBackLogisticsNo').val().trim();//物流单号
@@ -458,69 +517,63 @@
         var noreasonBackBackLogisticsCompany = $("#noreasonBackBackLogisticsCompany option:selected").val();//寄回物流公司
         var noreasonBackBackName = $('#noreasonBackBackName').val();
         var noreasonBackBackTel = $('#noreasonBackBackTel').val();
-        /*var noreasonBackBackMachineNo = $('#noreasonBackBackMachineNo').val();*/
-        if (noreasonBackBackStatus == 1) {
-//            if (noreasonBackBackLogisticsNo != null && noreasonBackBackLogisticsNo != '') {
-//                alert("产品未寄回，不能有物流信息!");
-//                noreasonBack_flag = false;
-//                return noreasonBack_flag;
-//            }
-//            if (noreasonBackBackPostage != null && noreasonBackBackPostage != '') {
-//                alert("产品未寄回，不能有邮费!");
-//                noreasonBack_flag = false;
-//                return noreasonBack_flag;
-//            }
-//            if (noreasonBackBackLogisticsCompany != null && noreasonBackBackLogisticsCompany != '') {
-//                alert("产品未寄回，不能选择物流公司!");
-//                noreasonBack_flag = false;
-//                return noreasonBack_flag;
-//            }
-//            if (noreasonBackBackName != null && noreasonBackBackName != '') {
-//                alert("产品未寄回，不能填写寄回人信息!");
-//                noreasonBack_flag = false;
-//                return noreasonBack_flag;
-//            }
-//            if (noreasonBackBackTel != null && noreasonBackBackTel != '') {
-//                alert("产品未寄回，不能填写寄回人电话号码!");
-//                noreasonBack_flag = false;
-//                return noreasonBack_flag;
-//            }
-            /*if (noreasonBackBackMachineNo != null && noreasonBackBackMachineNo != '') {
-                alert("产品未寄回，不能填写机器编号!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
-            }*/
-        } else if (noreasonBackBackStatus == 2 || noreasonBackBackStatus == 3) {
-            if (noreasonBackBackLogisticsNo == null || noreasonBackBackLogisticsNo == '') {
-                alert("物流信息不能为空!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
+        var noreasonBackAlipay = $("#noreasonBackAlipay").val();
+        var noreasonBackAlipayName = $("#noreasonBackAlipayName").val();
+
+        if(type == 1 ){ //寄回信息
+            if(noreasonBackBackStatus == 2 || noreasonBackBackStatus == 3){
+                if (noreasonBackBackLogisticsCompany == null || noreasonBackBackLogisticsCompany == '') {
+                    vailErrorMsg($('#noreasonBackBackLogisticsCompany'),"需要选择物流公司!");
+                    backGoods_flag = false;
+                    return backGoods_flag;
+                }
+                if (noreasonBackBackLogisticsNo == null || noreasonBackBackLogisticsNo == '') {
+                    vailErrorMsg($('#noreasonBackBackLogisticsNo'),"需要填写物流单号!");
+                    backGoods_flag = false;
+                    return backGoods_flag;
+                }
+                if (noreasonBackBackName == null || noreasonBackBackName == '') {
+                    vailErrorMsg($('#noreasonBackBackName'),"需要填写寄件人信息!");
+                    backGoods_flag = false;
+                    return backGoods_flag;
+                }
+                if (noreasonBackBackTel == null || noreasonBackBackTel == '') {
+                    vailErrorMsg($('#noreasonBackBackTel'),"需要填写寄件人信息!");
+                    backGoods_flag = false;
+                    return backGoods_flag;
+                }
+                if (!mobile.test(noreasonBackBackTel)) {
+                    vailErrorMsg($('#noreasonBackBackTel'),"寄回人电话号码格式不正确，请重新输入!");
+                    backGoods_flag = false;
+                    return backGoods_flag;
+                }
+//                if (!uname.test(noreasonBackBackName)) {
+//                    alert("寄回人信息格式不正确，请重新输入!");
+//                    backGoods_flag = false;
+//                    return backGoods_flag;
+//                }
             }
-            if (!money.test(noreasonBackBackPostage)) {
-                alert("邮费格式不正确，请重新输入!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
+        }else if(type == 2){
+            if (noreasonBackBackPostage == null || noreasonBackBackPostage == '') {
+                vailErrorMsg($('#noreasonBackBackPostage'),"需要填写邮费!");
+                backGoods_flag = false;
+                return backGoods_flag;
             }
-            if (noreasonBackBackLogisticsCompany == null || noreasonBackBackLogisticsCompany == '') {
-                alert("请选择物流公司!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
+            if (!money.test(noreasonBackBackPostage)) {
+                vailErrorMsg($('#noreasonBackBackPostage'),"邮费格式不正确，请重新输入!");
+                backGoods_flag = false;
+                return backGoods_flag;
             }
-            if (!uname.test(noreasonBackBackName)) {
-                alert("寄回人信息格式不正确，请重新输入!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
+            if (noreasonBackAlipay == null || noreasonBackAlipay == '') {
+                vailErrorMsg($('#noreasonBackAlipay'),"需要填写支付宝账户!");
+                backGoods_flag = false;
+                return backGoods_flag;
             }
-            if (!mobile.test(noreasonBackBackTel)) {
-                alert("寄回人电话号码格式不正确，请重新输入!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
+            if (noreasonBackAlipayName == null || noreasonBackAlipayName == '') {
+                vailErrorMsg($('#noreasonBackAlipayName'),"需要填写支付宝姓名!");
+                backGoods_flag = false;
+                return backGoods_flag;
             }
-            /*if (noreasonBackBackMachineNo == null || noreasonBackBackMachineNo == '') {
-                alert("机器编号不能为空!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
-            }*/
         }
         return noreasonBack_flag;
     }

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

@@ -298,6 +298,7 @@
                     </div>
                 </div>
             </div>
+
         <div class="tabCon">
             <div class="row cl" style="margin-left: -70px;">
                 <div class="formControls col-2 col-sm-2 text-r">