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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

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

@@ -58,6 +58,8 @@ public class BackGoods  implements Serializable {
     private Date salesPayTime;                  //支付时间
 
     private Integer detectState;                //品质检测状态
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date backGoodsBackReceiptDate;      //签收日期
 
     //QC质检集合
     private List<ComplaintDetectInfo> complaintDetectList = new ArrayList<ComplaintDetectInfo>();
@@ -249,4 +251,12 @@ public class BackGoods  implements Serializable {
     public void setBackGoodsAlipayName(String backGoodsAlipayName) {
         this.backGoodsAlipayName = backGoodsAlipayName;
     }
+
+    public Date getBackGoodsBackReceiptDate() {
+        return backGoodsBackReceiptDate;
+    }
+
+    public void setBackGoodsBackReceiptDate(Date backGoodsBackReceiptDate) {
+        this.backGoodsBackReceiptDate = backGoodsBackReceiptDate;
+    }
 }

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

@@ -51,6 +51,9 @@ public class NoreasonBack  implements Serializable {
     private Date noreasonBackCreateTime;
 
     private Date noreasonBackUpdateTime;
+    //签收日期
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date noreasonCackReceiptDate;
 
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
@@ -248,4 +251,12 @@ public class NoreasonBack  implements Serializable {
     public void setNoreasonBackAlipayName(String noreasonBackAlipayName) {
         this.noreasonBackAlipayName = noreasonBackAlipayName;
     }
+
+    public Date getNoreasonCackReceiptDate() {
+        return noreasonCackReceiptDate;
+    }
+
+    public void setNoreasonCackReceiptDate(Date noreasonCackReceiptDate) {
+        this.noreasonCackReceiptDate = noreasonCackReceiptDate;
+    }
 }

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

@@ -25,6 +25,7 @@ public class QuestionDescribe implements Serializable {
 
 
     private String questionId;     //问题id
+    private String customerDesc;     //客服备注
 
     public String getDescribeTitle() {
         return describeTitle;
@@ -73,4 +74,12 @@ public class QuestionDescribe implements Serializable {
     public void setQuestionId(String questionId) {
         this.questionId = questionId;
     }
+
+    public String getCustomerDesc() {
+        return customerDesc;
+    }
+
+    public void setCustomerDesc(String customerDesc) {
+        this.customerDesc = customerDesc;
+    }
 }

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

@@ -75,6 +75,9 @@ public class Renewed  implements Serializable {
     private Date renewedCreateTime;
     // 修改时间,
     private Date renewedUpdateTime;
+    // 签收日期,
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date renewedBackReceiptDate;
 
     private String detectPhenomenon;            //工厂检测现象
     private String detectFailureClassification; //故障分类
@@ -493,4 +496,12 @@ public class Renewed  implements Serializable {
     public void setRenewedAlipayName(String renewedAlipayName) {
         this.renewedAlipayName = renewedAlipayName;
     }
+
+    public Date getRenewedBackReceiptDate() {
+        return renewedBackReceiptDate;
+    }
+
+    public void setRenewedBackReceiptDate(Date renewedBackReceiptDate) {
+        this.renewedBackReceiptDate = renewedBackReceiptDate;
+    }
 }

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

@@ -75,6 +75,9 @@ public class Repair implements Serializable {
     private Date repairCreateTime;
     //  修改时间 ,
     private Date repairUpdateTime;
+    //  签收日期 ,
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date repairBackReceiptDate;
 
     private String detectPhenomenon;            //工厂检测现象
     private String detectFailureClassification; //故障分类
@@ -493,4 +496,12 @@ public class Repair implements Serializable {
     public void setRepairAlipayName(String repairAlipayName) {
         this.repairAlipayName = repairAlipayName;
     }
+
+    public Date getRepairBackReceiptDate() {
+        return repairBackReceiptDate;
+    }
+
+    public void setRepairBackReceiptDate(Date repairBackReceiptDate) {
+        this.repairBackReceiptDate = repairBackReceiptDate;
+    }
 }

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

@@ -20,12 +20,13 @@
     <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" />
+    <result column="back_goods_back_receipt_date" property="backGoodsBackReceiptDate" jdbcType="TIMESTAMP" />
   </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_alipay_name, back_goods_is_transfer, back_goods_create_time, back_goods_update_time
+    back_goods_alipay, back_goods_alipay_name, back_goods_is_transfer, back_goods_create_time, back_goods_update_time,back_goods_back_receipt_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -69,6 +70,7 @@
       g.back_goods_create_time,
       g.back_goods_update_time,
       g.back_goods_alipay_name,
+      g.back_goods_back_receipt_date,
       o.sales_pay_time salesPayTime
     from
       tb_rst_back_goods g
@@ -102,6 +104,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_back_receipt_date" property="backGoodsBackReceiptDate"/>
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 
@@ -143,14 +146,15 @@
       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_alipay_name, back_goods_is_transfer
+      back_goods_state, back_goods_alipay, back_goods_alipay_name, back_goods_is_transfer,back_goods_back_receipt_date
       )
     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},  #{backGoodsAlipayName,jdbcType=VARCHAR}, #{backGoodsIsTransfer,jdbcType=BIT}
+      #{backGoodsState,jdbcType=BIT}, #{backGoodsAlipay,jdbcType=VARCHAR},  #{backGoodsAlipayName,jdbcType=VARCHAR}, #{backGoodsIsTransfer,jdbcType=BIT},
+      #{backGoodsBackReceiptDate,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="BackGoods" >
@@ -324,6 +328,9 @@
       <if test="backGoodsAlipayName != null" >
         back_goods_alipay_name = #{backGoodsAlipayName,jdbcType=VARCHAR},
       </if>
+      <if test="backGoodsBackReceiptDate != null" >
+        back_goods_back_receipt_date = #{backGoodsBackReceiptDate,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where back_goods_id = #{backGoodsId,jdbcType=INTEGER}
   </update>

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

@@ -21,13 +21,14 @@
     <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" />
+    <result column="noreason_back_receipt_date" property="noreasonCackReceiptDate" jdbcType="TIMESTAMP" />
   </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_alipay_name
+    noreason_back_create_time, noreason_back_update_time,noreason_back_alipay_name,noreason_back_receipt_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -71,6 +72,7 @@
       b.noreason_back_create_time,
       b.noreason_back_update_time,
       b.noreason_back_alipay_name,
+      b.noreason_back_receipt_date,
       o.sales_pay_time salesPayTime
     from
       tb_rst_noreason_back b
@@ -104,6 +106,7 @@
     <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" />
+    <result column="noreason_back_receipt_date" property="noreasonCackReceiptDate" jdbcType="TIMESTAMP" />
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 
@@ -145,14 +148,15 @@
       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_alipay_name, noreason_back_is_transfer
+      noreason_back_state, noreason_back_alipay,noreason_back_alipay_name, noreason_back_is_transfer,noreason_back_receipt_date
       )
     values ( #{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
       #{signclosedId,jdbcType=INTEGER}, #{noreasonBackBackStatus,jdbcType=BIT}, #{noreasonBackBackName,jdbcType=VARCHAR}, 
       #{noreasonBackBackTel,jdbcType=CHAR}, #{noreasonBackBackLogisticsCompany,jdbcType=VARCHAR}, 
       #{noreasonBackBackLogisticsNo,jdbcType=VARCHAR}, #{noreasonBackBackPostage,jdbcType=INTEGER}, 
       #{noreasonBackBackMachineNo,jdbcType=VARCHAR}, #{noreasonBackDesc,jdbcType=VARCHAR}, 
-      #{noreasonBackState,jdbcType=BIT}, #{noreasonBackAlipay,jdbcType=VARCHAR},#{noreasonBackAlipayName,jdbcType=VARCHAR}, #{noreasonBackIsTransfer,jdbcType=BIT}
+      #{noreasonBackState,jdbcType=BIT}, #{noreasonBackAlipay,jdbcType=VARCHAR},#{noreasonBackAlipayName,jdbcType=VARCHAR}, #{noreasonBackIsTransfer,jdbcType=BIT},
+       #{noreasonCackReceiptDate,jdbcType=TIMESTAMP}
       )
   </insert>
 
@@ -211,6 +215,9 @@
       <if test="noreasonBackAlipayName != null" >
         noreason_back_alipay_name = #{noreasonBackAlipayName},
       </if>
+      <if test="noreasonCackReceiptDate != null" >
+        noreason_back_receipt_date = #{noreasonCackReceiptDate},
+      </if>
     </set>
     where noreason_back_id = #{noreasonBackId}
   </update>

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

@@ -24,11 +24,13 @@
   <!-- 查询问题集合 -->
   <select id="listQuestionDescribe" parameterType="QuestionDescribe" resultType="QuestionDescribe">
     select
-      *
+    tb_rst_question_describe.*,
+    tb_rst_customer_info.customer_desc
     from tb_rst_question_describe
+    LEFT JOIN tb_rst_customer_info on tb_rst_customer_info.customer_id = tb_rst_question_describe.customer_id
     <where>
       <if test="customerId">
-        customer_id = #{customerId}
+        tb_rst_question_describe.customer_id = #{customerId}
       </if>
     </where>
   </select>

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

@@ -30,6 +30,7 @@
     <result column="renewed_is_transfer" property="renewedIsTransfer" jdbcType="BIT" />
     <result column="renewed_create_time" property="renewedCreateTime" jdbcType="TIMESTAMP" />
     <result column="renewed_update_time" property="renewedUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="renewed_back_receipt_date" property="renewedBackReceiptDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
     renewed_id, customer_id, order_id, signclosed_id, renewed_back_efast_order_id, renewed_back_status, 
@@ -38,7 +39,7 @@
     renewed_send_tel, province_number, city_number, area_number, renewed_send_merge_address, 
     renewed_send_address, renewed_send_logistics_company, renewed_send_logistics_no, 
     renewed_desc, renewed_state, renewed_alipay, renewed_is_transfer, renewed_create_time, 
-    renewed_update_time
+    renewed_update_time,renewed_back_receipt_date
   </sql>
 
   <!-- 获取换新详情和品质检测信息 -->
@@ -72,7 +73,8 @@
       renewed_is_transfer,
       renewed_create_time,
       renewed_update_time,
-      renewed_alipay_name
+      renewed_alipay_name,
+      renewed_back_receipt_date
     from
       tb_rst_renewed
     <where>
@@ -117,6 +119,7 @@
     <result column="renewed_is_transfer" property="renewedIsTransfer"/>
     <result column="renewed_create_time" property="renewedCreateTime"/>
     <result column="renewed_update_time" property="renewedUpdateTime"/>
+    <result column="renewed_back_receipt_date" property="renewedBackReceiptDate"/>
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 
@@ -302,6 +305,9 @@
       <if test="renewedAlipayName != null" >
         renewed_alipay_name = #{renewedAlipayName},
       </if>
+      <if test="renewedBackReceiptDate != null" >
+        renewed_back_receipt_date = #{renewedBackReceiptDate},
+      </if>
     </set>
     where renewed_id = #{renewedId}
   </update>

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

@@ -31,6 +31,7 @@
     <result column="repair_is_transfer" property="repairIsTransfer" jdbcType="BIT" />
     <result column="repair_create_time" property="repairCreateTime" jdbcType="TIMESTAMP" />
     <result column="repair_update_time" property="repairUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="repair_back_receipt_date" property="repairBackReceiptDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
     repair_id, customer_id, order_id, signclosed_id, repair_back_efast_order_id, repair_back_status, 
@@ -38,7 +39,7 @@
     repair_back_postage, repair_back_machine_no, repair_send_status, repair_send_name, 
     repair_send_tel, province_number, city_number, area_number, repair_send_merge_address, 
     repair_send_address, repair_send_logistics_company, repair_send_logistics_no, repair_desc, 
-    repair_state, repair_alipay,repair_alipay_name, repair_is_transfer, repair_create_time, repair_update_time
+    repair_state, repair_alipay,repair_alipay_name, repair_is_transfer, repair_create_time, repair_update_time,repair_back_receipt_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -99,7 +100,8 @@
       repair_is_transfer,
       repair_create_time,
       repair_update_time,
-      repair_alipay_name
+      repair_alipay_name,
+      repair_back_receipt_date
     from
       tb_rst_repair
     <where>
@@ -145,6 +147,7 @@
     <result column="repair_is_transfer" property="repairIsTransfer"/>
     <result column="repair_create_time" property="repairCreateTime"/>
     <result column="repair_update_time" property="repairUpdateTime"/>
+    <result column="repair_back_receipt_date" property="repairBackReceiptDate"/>
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 
@@ -293,6 +296,9 @@
       <if test="repairAlipayName != null" >
         repair_alipay_name = #{repairAlipayName},
       </if>
+      <if test="repairBackReceiptDate != null" >
+        repair_back_receipt_date = #{repairBackReceiptDate},
+      </if>
     </set>
     where repair_id = #{repairId}
   </update>
@@ -324,7 +330,8 @@
       repair_alipay = #{repairAlipay,jdbcType=VARCHAR},
       repair_is_transfer = #{repairIsTransfer,jdbcType=BIT},
       repair_create_time = #{repairCreateTime,jdbcType=TIMESTAMP},
-      repair_update_time = #{repairUpdateTime,jdbcType=TIMESTAMP}
+      repair_update_time = #{repairUpdateTime,jdbcType=TIMESTAMP},
+      repair_back_receipt_date = #{repairBackReceiptDate,jdbcType=TIMESTAMP}
     where repair_id = #{repairId,jdbcType=INTEGER}
   </update>
 

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

@@ -153,6 +153,7 @@ public class AdminCustomerController {
         List<ComplaintTypeInfo> complaintTypeList = complaintTypeInfoService.listComplaintTypeInfo(new ComplaintTypeInfo());
         //查询跟进客服集合
         Admin admin = new Admin();
+        admin.setAdminDept(3);
         admin.setAdminStatus(1);
         List<Admin> adminList = sysService.listSelectAdmin(admin);
         //获取登录人id
@@ -533,6 +534,7 @@ public class AdminCustomerController {
 
         //查询跟进客服集合
         Admin admin = new Admin();
+        admin.setAdminDept(3);
         admin.setAdminStatus(1);
         List<Admin> adminList = sysService.listSelectAdmin(admin);
 
@@ -606,6 +608,7 @@ public class AdminCustomerController {
 
         //查询跟进客服集合
         Admin admin = new Admin();
+        admin.setAdminDept(3);
         admin.setAdminStatus(1);
         List<Admin> adminList = sysService.listSelectAdmin(admin);
         //获取登录人id

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

@@ -34,6 +34,14 @@
 
             </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" id="txtCustomerDesc">
+
+            </div>
+        </div>
 
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
@@ -75,6 +83,7 @@
                     $('#txtDescribeTitle').html(describe.describeTitle);
                     $('#txtDescribeContent').html(describe.describeContent);
                     $('#txtDescribeHandleDesc').html(describe.describeHandleDesc);
+                    $('#txtCustomerDesc').html(describe.customerDesc);
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

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

@@ -118,7 +118,14 @@
                         <input type="text" class="input-text" value="" placeholder="寄件人电话" id="backGoodsBackTel" name="backGoodsBackTel" seleType="send">
                     </div>
                 </div>
-
+                <div class="row cl" style="position: relative;/*display: none;*/">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>签收日期</strong>
+                    </div>
+                    <div class="formControls col-4 col-sm-4">
+                        <input type="text" placeholder="请选择签收日期" id="backGoodsBackReceiptDate"  name="backGoodsBackReceiptDate" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',minDate:'%y-%M-%d'})"  readonly="readonly" seleType="send">
+                    </div>
+                </div>
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2">
                     </div>
@@ -451,6 +458,7 @@
                     $('#backGoodsBackPostage').val(backGoods.backGoodsBackPostage/100);
                     $('#backGoodsAlipay').val(backGoods.backGoodsAlipay);
                     $('#backGoodsAlipayName').val(backGoods.backGoodsAlipayName);
+                    $('#backGoodsBackReceiptDate').val(formatDate(backGoods.backGoodsBackReceiptDate));
                     $('input[name="backGoodsIsTransfer"]').each(function(){
                         if (this.value == backGoods.backGoodsIsTransfer) {
                             $(this).iCheck('check');
@@ -582,6 +590,14 @@
 //                    return backGoods_flag;
 //                }
             }
+            if (backGoodsBackLogisticsCompany == 3) {
+                var backGoodsBackReceiptDate = $('#backGoodsBackReceiptDate').val();//签收日期
+                if (backGoodsBackReceiptDate == null || backGoodsBackReceiptDate == '') {
+                    layer.msg("签收日期不能为空",{icon: 5,time:1000});
+                    backGoods_flag = false;
+                    return backGoods_flag;
+                }
+            }
         }else if(type == 2){
             if (backGoodsBackPostage == null || backGoodsBackPostage == '') {
                 vailErrorMsg($('#backGoodsBackPostage'),"需要填写邮费!");

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

@@ -112,7 +112,14 @@
                         <input type="text" class="input-text" value="" placeholder="寄件人电话" id="noreasonBackBackTel" name="noreasonBackBackTel" seleType="send">
                     </div>
                 </div>
-
+                <div class="row cl" style="position: relative;/*display: none;*/">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>签收日期</strong>
+                    </div>
+                    <div class="formControls col-4 col-sm-4">
+                        <input type="text" placeholder="请选择签收日期" id="noreasonCackReceiptDate"  name="noreasonCackReceiptDate" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',minDate:'%y-%M-%d'})"  readonly="readonly" seleType="send">
+                    </div>
+                </div>
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2">
                     </div>
@@ -425,6 +432,7 @@
                     $('#noreasonBackBackPostage').val(noreasonBack.noreasonBackBackPostage/100);
                     $('#noreasonBackAlipay').val(noreasonBack.noreasonBackAlipay);
                     $('#noreasonBackAlipayName').val(noreasonBack.noreasonBackAlipayName);
+                    $('#noreasonCackReceiptDate').val(formatDate(noreasonBack.noreasonCackReceiptDate));
                     $('input[name="noreasonBackIsTransfer"]').each(function(){
                         if (this.value == noreasonBack.noreasonBackIsTransfer) {
                             $(this).iCheck('check');
@@ -549,28 +557,28 @@
             if(noreasonBackBackStatus == 2 || noreasonBackBackStatus == 3){
                 if (noreasonBackBackLogisticsCompany == null || noreasonBackBackLogisticsCompany == '') {
                     vailErrorMsg($('#noreasonBackBackLogisticsCompany'),"需要选择物流公司!");
-                    backGoods_flag = false;
-                    return backGoods_flag;
+                    noreasonBack_flag = false;
+                    return noreasonBack_flag;
                 }
                 if (noreasonBackBackLogisticsNo == null || noreasonBackBackLogisticsNo == '') {
                     vailErrorMsg($('#noreasonBackBackLogisticsNo'),"需要填写物流单号!");
-                    backGoods_flag = false;
-                    return backGoods_flag;
+                    noreasonBack_flag = false;
+                    return noreasonBack_flag;
                 }
                 if (noreasonBackBackName == null || noreasonBackBackName == '') {
                     vailErrorMsg($('#noreasonBackBackName'),"需要填写寄件人信息!");
-                    backGoods_flag = false;
-                    return backGoods_flag;
+                    noreasonBack_flag = false;
+                    return noreasonBack_flag;
                 }
                 if (noreasonBackBackTel == null || noreasonBackBackTel == '') {
                     vailErrorMsg($('#noreasonBackBackTel'),"需要填写寄件人信息!");
-                    backGoods_flag = false;
-                    return backGoods_flag;
+                    noreasonBack_flag = false;
+                    return noreasonBack_flag;
                 }
                 if (!mobile.test(noreasonBackBackTel)) {
                     vailErrorMsg($('#noreasonBackBackTel'),"寄回人电话号码格式不正确，请重新输入!");
-                    backGoods_flag = false;
-                    return backGoods_flag;
+                    noreasonBack_flag = false;
+                    return noreasonBack_flag;
                 }
 //                if (!uname.test(noreasonBackBackName)) {
 //                    alert("寄回人信息格式不正确，请重新输入!");
@@ -578,26 +586,34 @@
 //                    return backGoods_flag;
 //                }
             }
+            if (noreasonBackBackStatus == 3) {
+                var noreasonCackReceiptDate = $('#noreasonCackReceiptDate').val();//签收日期
+                if (noreasonCackReceiptDate == null || noreasonCackReceiptDate == '') {
+                    layer.msg("签收日期不能为空",{icon: 5,time:1000});
+                    noreasonBack_flag = false;
+                    return noreasonBack_flag;
+                }
+            }
         }else if(type == 2){
             if (noreasonBackBackPostage == null || noreasonBackBackPostage == '') {
                 vailErrorMsg($('#noreasonBackBackPostage'),"需要填写邮费!");
-                backGoods_flag = false;
-                return backGoods_flag;
+                noreasonBack_flag = false;
+                return noreasonBack_flag;
             }
             if (!money.test(noreasonBackBackPostage)) {
                 vailErrorMsg($('#noreasonBackBackPostage'),"邮费格式不正确，请重新输入!");
-                backGoods_flag = false;
-                return backGoods_flag;
+                noreasonBack_flag = false;
+                return noreasonBack_flag;
             }
             if (noreasonBackAlipay == null || noreasonBackAlipay == '') {
                 vailErrorMsg($('#noreasonBackAlipay'),"需要填写支付宝账户!");
-                backGoods_flag = false;
-                return backGoods_flag;
+                noreasonBack_flag = false;
+                return noreasonBack_flag;
             }
             if (noreasonBackAlipayName == null || noreasonBackAlipayName == '') {
                 vailErrorMsg($('#noreasonBackAlipayName'),"需要填写支付宝姓名!");
-                backGoods_flag = false;
-                return backGoods_flag;
+                noreasonBack_flag = false;
+                return noreasonBack_flag;
             }
         }
         return noreasonBack_flag;

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

@@ -129,7 +129,14 @@
                     <input type="text" class="input-text" value="" placeholder="寄件人电话" id="renewedBackTel" name="renewedBackTel" seleType="send">
                 </div>
             </div>
-
+                <div class="row cl" style="position: relative;/*display: none;*/">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>签收日期</strong>
+                    </div>
+                    <div class="formControls col-4 col-sm-4">
+                        <input type="text" placeholder="请选择签收日期" id="renewedBackReceiptDate"  name="renewedBackReceiptDate" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',minDate:'%y-%M-%d'})"  readonly="readonly" seleType="send">
+                    </div>
+                </div>
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2">
                     </div>
@@ -687,6 +694,7 @@
                     $('#renewedSendAddress').val(renewed.renewedSendAddress);
                     $('#renewedSendLogisticsNo').val(renewed.renewedSendLogisticsNo);
                     $('#renewedDesc').val(renewed.renewedDesc);
+                    $('#renewedBackReceiptDate').val(formatDate(renewed.renewedBackReceiptDate));
 
                     var detect_table = $('#detect_table');
                     var maintenance_table = $('#maintenance_table');
@@ -860,6 +868,14 @@
                     return renewed_flag;
                 }
             }
+            if (renewedBackStatus == 3) {
+                var renewedBackReceiptDate = $('#renewedBackReceiptDate').val();//签收日期
+                if (renewedBackReceiptDate == null || renewedBackReceiptDate == '') {
+                    layer.msg("签收日期不能为空",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
+            }
         }else if(type == 2){
             var renewedIsTransfer = $('input[name="renewedIsTransfer"]:checked').val();
             var renewedBackPostage = $('#renewedBackPostage').val().trim();//寄回邮费

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

@@ -130,7 +130,14 @@
                         <input type="text" class="input-text" value="" placeholder="寄件人电话" id="repairBackTel" name="repairBackTel" seleType="send">
                     </div>
                 </div>
-
+                <div class="row cl" style="position: relative;/*display: none;*/">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>签收日期</strong>
+                    </div>
+                    <div class="formControls col-4 col-sm-4">
+                        <input type="text" placeholder="请选择签收日期" id="repairBackReceiptDate"  name="repairBackReceiptDate" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',minDate:'%y-%M-%d'})"  readonly="readonly" seleType="send">
+                    </div>
+                </div>
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2">
                     </div>
@@ -687,6 +694,7 @@
                     $('#repairSendAddress').val(repair.repairSendAddress);
                     $('#repairSendLogisticsNo').val(repair.repairSendLogisticsNo);
                     $('#repairDesc').val(repair.repairDesc);
+                    $('#repairBackReceiptDate').val(formatDate(repair.repairBackReceiptDate));
 
                     var detect_table = $('#detect_table');
                     var maintenance_table = $('#maintenance_table');
@@ -810,6 +818,7 @@
         var repairBackLogisticsCompany = $("#repairBackLogisticsCompany option:selected").val();//寄回物流公司
         var repairBackName = $('#repairBackName').val();//寄件人姓名
         var repairBackTel = $('#repairBackTel').val();//寄件人电话
+
         if(type == 1){
             var repairBackStatus = $('input[name="repairBackStatus"]:checked').val();//寄回状态
             if (repairBackStatus == 1) {
@@ -860,6 +869,14 @@
                     return repair_flag;
                 }
             }
+            if (repairBackStatus == 3) {
+                var repairBackReceiptDate = $('#repairBackReceiptDate').val();//签收日期
+                if (repairBackReceiptDate == null || repairBackReceiptDate == '') {
+                    layer.msg("签收日期不能为空",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
+            }
         }else if(type == 2){
             var repairIsTransfer = $('input[name="repairIsTransfer"]:checked').val();
             var repairBackPostage = $('#repairBackPostage').val().trim();//寄回邮费