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

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

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

@@ -38,7 +38,7 @@ public class BackGoods  implements Serializable {
 
     private String backGoodsAlipay;             //转账账户
 
-    private String backGoodsAlipayName;             //转账账户 姓名
+    private String backGoodsAlipayName;             //转账账户姓名
 
     private Integer backGoodsIsTransfer;        //是否已转账邮费  0:不需要 1:已转  2:待转
 
@@ -234,12 +234,4 @@ 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-core/src/main/java/com.iamberry.rst.core/cm/NoreasonBack.java

@@ -37,6 +37,7 @@ public class NoreasonBack  implements Serializable {
     private Integer noreasonBackState;
 
     private String noreasonBackAlipay;          //转账账户
+    private String noreasonBackAlipayName;          //转账账户姓名
 
     private Integer noreasonBackIsTransfer;     //是否已转账邮费  0:不需要 1:已转  2:待转
 
@@ -232,4 +233,12 @@ public class NoreasonBack  implements Serializable {
     public void setNoreasonBackIsTransfer(Integer noreasonBackIsTransfer) {
         this.noreasonBackIsTransfer = noreasonBackIsTransfer;
     }
+
+    public String getNoreasonBackAlipayName() {
+        return noreasonBackAlipayName;
+    }
+
+    public void setNoreasonBackAlipayName(String noreasonBackAlipayName) {
+        this.noreasonBackAlipayName = noreasonBackAlipayName;
+    }
 }

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

@@ -19,12 +19,13 @@
     <result column="back_goods_is_transfer" property="backGoodsIsTransfer" jdbcType="BIT" />
     <result column="back_goods_create_time" property="backGoodsCreateTime" jdbcType="TIMESTAMP" />
     <result column="back_goods_update_time" property="backGoodsUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="back_goods_alipay_name" property="backGoodsAlipayName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     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, back_goods_is_transfer, back_goods_create_time, back_goods_update_time,back_goods_alipay_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -67,6 +68,7 @@
       g.back_goods_is_transfer,
       g.back_goods_create_time,
       g.back_goods_update_time,
+      g.back_goods_alipay_name,
       o.sales_pay_time salesPayTime
     from
       tb_rst_back_goods g
@@ -99,6 +101,7 @@
     <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>
 
@@ -312,6 +315,9 @@
       <if test="backGoodsUpdateTime != null" >
         back_goods_update_time = #{backGoodsUpdateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="backGoodsAlipayName != null" >
+        back_goods_alipay_name = #{backGoodsAlipayName,jdbcType=VARCHAR},
+      </if>
     </set>
     where back_goods_id = #{backGoodsId,jdbcType=INTEGER}
   </update>

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

@@ -19,13 +19,14 @@
     <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" />
+    <result column="noreason_back_alipay_name" property="noreasonBackAlipayName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     noreason_back_id, customer_id, order_id, signclosed_id, noreason_back_back_status, 
     noreason_back_back_name, 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_create_time, noreason_back_update_time
+    noreason_back_create_time, noreason_back_update_time,noreason_back_alipay_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -68,6 +69,7 @@
       b.noreason_back_is_transfer,
       b.noreason_back_create_time,
       b.noreason_back_update_time,
+      b.noreason_back_alipay_name,
       o.sales_pay_time salesPayTime
     from
       tb_rst_noreason_back b
@@ -100,6 +102,7 @@
     <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" />
+    <result column="noreason_back_alipay_name" property="noreasonBackAlipayName" jdbcType="VARCHAR" />
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 
@@ -204,6 +207,9 @@
       <if test="noreasonBackUpdateTime != null" >
         noreason_back_update_time = #{noreasonBackUpdateTime},
       </if>
+      <if test="noreasonBackAlipayName != null" >
+        noreason_back_alipay_name = #{noreasonBackAlipayName},
+      </if>
     </set>
     where noreason_back_id = #{noreasonBackId}
   </update>
@@ -224,7 +230,8 @@
       noreason_back_alipay = #{noreasonBackAlipay,jdbcType=VARCHAR},
       noreason_back_is_transfer = #{noreasonBackIsTransfer,jdbcType=BIT},
       noreason_back_create_time = #{noreasonBackCreateTime,jdbcType=TIMESTAMP},
-      noreason_back_update_time = #{noreasonBackUpdateTime,jdbcType=TIMESTAMP}
+      noreason_back_update_time = #{noreasonBackUpdateTime,jdbcType=TIMESTAMP},
+      noreason_back_alipay_name = #{noreasonBackAlipayName,jdbcType=VARCHAR}
     where noreason_back_id = #{noreasonBackId,jdbcType=INTEGER}
   </update>
 </mapper>

watero-rst-web/src/main/resources/dev-jdbc.properties

@@ -6,15 +6,15 @@ jdbc.driver=com.mysql.jdbc.Driver
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD end #####
 
 #\u6D4B\u8BD5
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/test_rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=rst_test
-#jdbc.password=RST_test
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/test_rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=rst_test
+jdbc.password=RST_test
 #
 
 ### \uFFFD\uFFFD\uFFFD\u053B\uFFFD\uFFFD\uFFFD
-jdbc.url=jdbc:mysql://192.168.1.254/rst_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=root
-jdbc.password=root
+#jdbc.url=jdbc:mysql://192.168.1.254/rst_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=root
+#jdbc.password=root
 ### \uFFFD\uFFFD\uFFFD\u053B\uFFFD\uFFFD\uFFFD end ######
 
 #pool settings

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

@@ -35,13 +35,13 @@
                 <strong>当前进度</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <input type="hidden" id="reissueId" name="reissueId" />
+                <input type="hidden" id="reissueId" name="reissueId" seleType="primary" />
                 <span id="reissueSchedule" class="c-red"></span>
             </div>
         </div>
-        <input type="hidden" id="customerId" name="customerId" value="${customerId!''}">
-
-        <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 id="tab_demo" class="HuiTab">
+        <div class="tabBar clearfix"><span>寄回信息</span></div>
 
         <div class="tabCon">
 
@@ -51,54 +51,58 @@
             </div>
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
-                    <input type="radio" id="tel-3" name="reissueSendStatus" value="1">
+                    <input type="radio" id="tel-3" name="reissueSendStatus" value="1" seleType="send">
                     <label for="tel-3">未寄送</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="tel-4" name="reissueSendStatus" value="2">
+                    <input type="radio" id="tel-4" name="reissueSendStatus" value="2" seleType="send">
                     <label for="tel-4">已寄送</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="tel-5" name="reissueSendStatus" value="3">
+                    <input type="radio" id="tel-5" name="reissueSendStatus" value="3" seleType="send">
                     <label for="tel-5">已收货</label>
                 </div>
-                Efast订单号<input style="width: 231px;margin-left: 20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="reissueBackEfastOrderId" name="reissueBackEfastOrderId">
+
             </div>
         </div>
-
         </div>
-
-        <div class="tabCon">
-
-        <div class="row cl" id="sendUserInfo" style="display: none;">
+        <div class="row cl">
+              <div class="formControls col-2 col-sm-2 text-r">
+                <strong>Efast订单号</strong>
+              </div>
+              <div class="formControls col-5 col-sm-5">
+                 <input  type="text" class="input-text" value="" placeholder="Efast订单号" id="reissueBackEfastOrderId" name="reissueBackEfastOrderId" seleType="send">
+              </div>
+        </div>
+        <div class="row cl" id="sendUserInfo">
             <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="reissueSendName" name="reissueSendName">
+                <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="reissueSendName" name="reissueSendName" seleType="sendInformation">
             </div>
             <div class="formControls col-5 col-sm-5">
-                <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="reissueSendTel" name="reissueSendTel">
+                <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="reissueSendTel" name="reissueSendTel" seleType="sendInformation">
             </div>
         </div>
 
-        <div class="row cl" id="sendAddressInfo" style="display: none">
+        <div class="row cl" id="sendAddressInfo">
             <label class="form-label col-2 col-sm-2 text-r"></label>
             <div class="formControls col-10 col-sm-10">
                 <div style="width: 188px;display: inline-block;margin-right: 20px;">
                     <span class="select-box">
-                        <select name="reissueProvinceNumber" id="reissueProvinceNumber" class="select"></select>
+                        <select name="reissueProvinceNumber" id="reissueProvinceNumber" class="select" seleType="sendInformation"></select>
                     </span>
                 </div>
                 <div style="width: 188px;display: inline-block;margin-right: 20px;">
                     <span class="select-box">
-                        <select name="reissueCityNumber" id="reissueCityNumber" class="select"></select>
+                        <select name="reissueCityNumber" id="reissueCityNumber" class="select" seleType="sendInformation"></select>
                     </span>
                 </div>
                 <div style="width: 189px;display: inline-block;">
                     <span class="select-box">
-                        <select name="reissueAreaNumber" id="reissueAreaNumber" class="select"></select>
-                        <input type="hidden" name="merge_address" id="merge_address">
+                        <select name="reissueAreaNumber" id="reissueAreaNumber" class="select" seleType="sendInformation"></select>
+                        <input type="hidden" name="merge_address" id="merge_address" seleType="sendInformation">
                     </span>
                 </div>
             </div>
@@ -107,18 +111,18 @@
         <div class="row cl" id="sendaddressDescInfo" style="display: none">
             <label class="form-label col-2 col-sm-2 text-r"></label>
             <div class="formControls col-10 col-sm-10">
-                <input type="text" class="input-text" value="" placeholder="请填写详细地址" id="reissueSendAddress" name="reissueSendAddress">
+                <input type="text" class="input-text" value="" placeholder="请填写详细地址" id="reissueSendAddress" name="reissueSendAddress" seleType="sendInformation">
             </div>
         </div>
 
-        <div class="row cl" id="sendLogisticsInfo" style="display: none">
+        <div class="row cl" id="sendLogisticsInfo" >
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄回信息</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
                 <div style="width: 300px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
-				<select name="reissueSendLogisticsCompany" id="reissueSendLogisticsCompany" class="select">
+				<select name="reissueSendLogisticsCompany" id="reissueSendLogisticsCompany" class="select" seleType="sendInformation">
 					<option value="">物流公司</option>
                     <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
@@ -138,20 +142,20 @@
 				</select>
 			</span>
                 </div>
-                <input style="width: 300px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="reissueSendLogisticsNo" name="reissueSendLogisticsNo">
+                <input style="width: 300px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="reissueSendLogisticsNo" name="reissueSendLogisticsNo" seleType="sendInformation">
             </div>
         </div>
 
-        <div class="row cl" id="sendDescInfo" style="display: none">
+        <div class="row cl" id="sendDescInfo">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>备注信息</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <textarea name="reissueDesc" id="reissueDesc" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>
+                <input class="input-text" name="reissueDesc" id="reissueDesc" placeholder="说点什么..." seleType="sendInformation"/>
             </div>
         </div>
 
-        <div class="row cl">
+        <#--<div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>补寄产品</strong>
             </div>
@@ -166,7 +170,7 @@
             <div class="formControls col-10 col-sm-10">
                 寄送产品将自动推送Efast，系统自动获取物流信息，并更新。如果在Efast作废订单等操作后，无法获取物流信息，请手动填写物流信息。
             </div>
-        </div>
+        </div>-->
         <div class="row cl">
             <div class="formControls col-2 col-sm-2">
             </div>
@@ -174,10 +178,8 @@
                 <button onClick="update_reissue_info();" class="btn btn-primary" type="button">确认修改</button>
             </div>
         </div>
-
         </div>
     </form>
-    </div>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
@@ -207,10 +209,10 @@
         });
         get_reissue_info();
 
-        /* 监听寄回状态按钮 */
+        /*/!* 监听寄回状态按钮 *!/
         $("input[name='reissueSendStatus']").change(function (){
             initBackInfo($(this).val());
-        })
+        })*/
 
     });
 
@@ -263,8 +265,8 @@
                         }
                     });
 
-                    /*初始化寄出信息*/
-                    initSendInfo(reissue.reissueSendStatus);
+                    /*/!*初始化寄出信息*!/
+                    initSendInfo(reissue.reissueSendStatus);*/
 
                     var sendProduct = '';
                     if (reissue.sendProdcues != null && reissue.sendProdcues.length > 0) {

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

@@ -76,7 +76,7 @@
                 </div>
             </div>
 
-            <div class="row cl" id="backLogisticsInfo" style="display: none">
+            <div class="row cl" id="backLogisticsInfo">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>寄回信息</strong>
                 </div>
@@ -109,7 +109,7 @@
                 </div>
             </div>
 
-            <div class="row cl" style="position: relative;display: none;" id="backUserInfo">
+            <div class="row cl" style="position: relative;" id="backUserInfo">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>寄件信息</strong>
                 </div>
@@ -130,7 +130,7 @@
                 </div>
         </div>
         <div class="tabCon">
-            <div class="row cl" id="backTransferInfo" <#--style="display: none"-->>
+            <div class="row cl" id="backTransferInfo">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>邮费处理</strong>
                 </div>
@@ -186,9 +186,16 @@
                         <input type="radio" id="tel-12" name="renewedSendStatus" value="3" seleType="sendInformation">
                         <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" seleType="sendInformation">
                 </div>
-
+            </div>
+            <div class="row cl">
+                <div class="formControls col-2 col-sm-2 text-r">
+                    <strong>Efast订单号</strong>
+                </div>
+                <div class="formControls col-5 col-sm-5">
+                    <input type="text" class="input-text" value="" placeholder="Efast订单号" id="renewedBackEfastOrderId" name="renewedBackEfastOrderId" seleType="sendInformation">
+                </div>
+            </div>
                 <#--<div class="row cl">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄出产品</strong>
@@ -205,7 +212,7 @@
                     </div>
                 </div>-->
 
-                <div class="row cl" id="sendUserInfo" style="display: none;">
+                <div class="row cl" id="sendUserInfo">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>用户信息</strong>
                     </div>
@@ -216,7 +223,7 @@
                         <input type="text" class="input-text" placeholder="填写收件人手机号" id="renewedSendTel" name="renewedSendTel" seleType="sendInformation">
                     </div>
                 </div>
-                <div class="row cl" id="sendAddressInfo" style="display: none">
+                <div class="row cl" id="sendAddressInfo">
                     <div class="formControls col-2 col-sm-2 text-r">
 
                     </div>
@@ -239,13 +246,13 @@
                         </div>
                     </div>
                 </div>
-                <div class="row cl" id="sendaddressDescInfo" style="display: none">
+                <div class="row cl" id="sendaddressDescInfo">
                     <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" seleType="sendInformation">
                     </div>
                 </div>
-                <div class="row cl"  id="sendLogisticsInfo" style="display: none">
+                <div class="row cl"  id="sendLogisticsInfo">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄出信息</strong>
                     </div>
@@ -275,7 +282,7 @@
                         <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="renewedSendLogisticsNo" name="renewedSendLogisticsNo" seleType="sendInformation">
                     </div>
                 </div>
-                <div class="row cl" id="sendDescInfo" style="display: none">
+                <div class="row cl" id="sendDescInfo">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄出备注</strong>
                     </div>
@@ -283,16 +290,14 @@
                         <input type="text" class="input-text" placeholder="寄出备注" id="renewedDesc" name="renewedDesc" seleType="sendInformation">
                     </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_renewed_info(3);" 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_renewed_info(3);" 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">
@@ -324,7 +329,6 @@
         </div>
         <input type="hidden" id="customerId" name="customerId" value="${customerId!''}" seleType="primary">
     </form>
-    </div>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
@@ -352,27 +356,27 @@
         get_renewed_info();
         showUpdateSendProduct();
 
-        /* 监听寄回状态按钮 */
+        /*/!* 监听寄回状态按钮 *!/
         $("input[name='renewedBackStatus']").change(function (){
             initBackInfo($(this).val());
         })
 
-        /* 监听寄出状态按钮 */
+        /!* 监听寄出状态按钮 *!/
         $("input[name='renewedSendStatus']").change(function (){
             initSendInfo($(this).val());
         })
 
-        /* 监听邮费状态按钮 */
+        /!* 监听邮费状态按钮 *!/
         $("input[name='renewedIsTransfer']").change(function (){
             initPostageInfo($(this).val());
-        })
+        })*/
     });
 
-    /*初始化寄回信息*/
+    /*/!*初始化寄回信息*!/
     function initBackInfo(statusCode){
         if(statusCode == 1){
             $("#backLogisticsInfo").hide();
-            /*$("#backTransferInfo").hide();*/
+            /!*$("#backTransferInfo").hide();*!/
             $("#backUserInfo").hide();
         }else{
             $("#backLogisticsInfo").show();
@@ -381,7 +385,7 @@
         }
     }
 
-    /*显示隐藏邮费信息*/
+    /!*显示隐藏邮费信息*!/
     function initPostageInfo(statusCode){
         if(statusCode == 1){
             $("#postageInformation").show();
@@ -390,7 +394,7 @@
         }
     }
 
-    /*初始化寄出信息*/
+    /!*初始化寄出信息*!/
     function initSendInfo(statusCode){
         if(statusCode == 1){
             $("#sendUserInfo").hide();
@@ -405,7 +409,7 @@
             $("#sendLogisticsInfo").show();
             $("#sendDescInfo").show();
         }
-    }
+    }*/
 
 
     /*显示所有产品及配件信息*/
@@ -624,12 +628,12 @@
                             $(this).iCheck('check');
                         }
                     });
-                    /*初始化寄回信息*/
+                    /*/!*初始化寄回信息*!/
                     initBackInfo(renewed.renewedBackStatus);
-                    /*初始化寄出信息*/
+                    /!*初始化寄出信息*!/
                     initSendInfo(renewed.renewedSendStatus);
                     //初始化邮费信息
-                    initPostageInfo(renewed.renewedIsTransfer);
+                    initPostageInfo(renewed.renewedIsTransfer);*/
 
                     $('#renewedSchedule').html(renewedSchedule);
                     $("#renewedBackLogisticsCompany option[value='" + renewed.renewedBackLogisticsCompany + "']").attr("selected","true");

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

@@ -78,7 +78,7 @@
                     </div>
                 </div>
 
-                <div class="row cl" id="backLogisticsInfo" style="display: none">
+                <div class="row cl" id="backLogisticsInfo"<#-- style="display: none"-->>
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄回信息</strong>
                     </div>
@@ -111,7 +111,7 @@
                     </div>
                 </div>
 
-                <div class="row cl" style="position: relative;display: none;" id="backUserInfo">
+                <div class="row cl" style="position: relative;/*display: none;*/" id="backUserInfo">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄件信息</strong>
                     </div>
@@ -188,9 +188,16 @@
                             <input type="radio" id="tel-12" name="repairSendStatus" value="3" seleType="sendInformation">
                             <label for="tel-12">已收货</label>
                         </div>
-                        Efast订单号<input style="width: 231px;margin-left:20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="repairBackEfastOrderId" name="repairBackEfastOrderId" seleType="sendInformation">
                     </div>
-
+                </div>
+                <div class="row cl">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>Efast订单号</strong>
+                    </div>
+                    <div class="formControls col-5 col-sm-5">
+                        <input type="text" class="input-text" value="" placeholder="Efast订单号" id="repairBackEfastOrderId" name="repairBackEfastOrderId" seleType="sendInformation">
+                    </div>
+                </div>
                 <#--<div class="row cl">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄出产品</strong>
@@ -207,7 +214,7 @@
                     </div>
                 </div>-->
 
-                    <div class="row cl" id="sendUserInfo" style="display: none;">
+                    <div class="row cl" id="sendUserInfo">
                         <div class="formControls col-2 col-sm-2 text-r">
                             <strong>用户信息</strong>
                         </div>
@@ -218,7 +225,7 @@
                             <input type="text" class="input-text" placeholder="填写收件人手机号" id="repairSendTel" name="repairSendTel" seleType="sendInformation">
                         </div>
                     </div>
-                    <div class="row cl" id="sendAddressInfo" style="display: none">
+                    <div class="row cl" id="sendAddressInfo">
                         <div class="formControls col-2 col-sm-2 text-r">
 
                         </div>
@@ -241,13 +248,13 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row cl" id="sendaddressDescInfo" style="display: none">
+                    <div class="row cl" id="sendaddressDescInfo">
                         <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" seleType="sendInformation">
                         </div>
                     </div>
-                    <div class="row cl"  id="sendLogisticsInfo" style="display: none">
+                    <div class="row cl"  id="sendLogisticsInfo">
                         <div class="formControls col-2 col-sm-2 text-r">
                             <strong>寄出信息</strong>
                         </div>
@@ -277,7 +284,7 @@
                             <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="repairSendLogisticsNo" name="repairSendLogisticsNo" seleType="sendInformation">
                         </div>
                     </div>
-                    <div class="row cl" id="sendDescInfo" style="display: none">
+                    <div class="row cl" id="sendDescInfo">
                         <div class="formControls col-2 col-sm-2 text-r">
                             <strong>寄出备注</strong>
                         </div>
@@ -285,16 +292,14 @@
                             <input type="text" class="input-text" placeholder="寄出备注" id="repairDesc" name="repairDesc" seleType="sendInformation">
                         </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_repair_info(3);" 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_repair_info(3);" 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">
@@ -326,7 +331,6 @@
         </div>
         <input type="hidden" id="customerId" name="customerId" value="${customerId!''}" seleType="primary">
     </form>
-    </div>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
@@ -354,27 +358,27 @@
         get_repair_info();
         showUpdateSendProduct();
 
-        /* 监听寄回状态按钮 */
+        /*/!* 监听寄回状态按钮 *!/
         $("input[name='repairBackStatus']").change(function (){
             initBackInfo($(this).val());
         })
 
-        /* 监听寄出状态按钮 */
+        /!* 监听寄出状态按钮 *!/
         $("input[name='repairSendStatus']").change(function (){
             initSendInfo($(this).val());
         })
 
-        /* 监听邮费状态按钮 */
+        /!* 监听邮费状态按钮 *!/
         $("input[name='repairIsTransfer']").change(function (){
             initPostageInfo($(this).val());
-        })
+        })*/
     });
 
     /*初始化寄回信息*/
-    function initBackInfo(statusCode){
+    /*function initBackInfo(statusCode){
         if(statusCode == 1){
             $("#backLogisticsInfo").hide();
-            /*$("#backTransferInfo").hide();*/
+            /!*$("#backTransferInfo").hide();*!/
             $("#backUserInfo").hide();
         }else{
             $("#backLogisticsInfo").show();
@@ -383,7 +387,7 @@
         }
     }
 
-    /*显示隐藏邮费信息*/
+    /!*显示隐藏邮费信息*!/
     function initPostageInfo(statusCode){
         if(statusCode == 1){
             $("#postageInformation").show();
@@ -392,7 +396,7 @@
         }
     }
 
-    /*初始化寄出信息*/
+    /!*初始化寄出信息*!/
     function initSendInfo(statusCode){
         if(statusCode == 1){
             $("#sendUserInfo").hide();
@@ -407,7 +411,7 @@
             $("#sendLogisticsInfo").show();
             $("#sendDescInfo").show();
         }
-    }
+    }*/
 
 
     /*显示所有产品及配件信息*/
@@ -626,12 +630,12 @@
                             $(this).iCheck('check');
                         }
                     });
-                    /*初始化寄回信息*/
+                    /*/!*初始化寄回信息*!/
                     initBackInfo(repair.repairBackStatus);
-                    /*初始化寄出信息*/
+                    /!*初始化寄出信息*!/
                     initSendInfo(repair.repairSendStatus);
                     //初始化邮费信息
-                    initPostageInfo(repair.repairIsTransfer);
+                    initPostageInfo(repair.repairIsTransfer);*/
 
                     $('#repairSchedule').html(repairSchedule);
                     $("#repairBackLogisticsCompany option[value='" + repair.repairBackLogisticsCompany + "']").attr("selected","true");