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

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

@@ -43,7 +43,8 @@ public class ComplaintDetectInfo implements Serializable {
     private String questionTitle;//问题标题
     private Integer detectIsMaintenance;//是否需要维修 1 需要 2不需要
     private String productName;//产品名称
-
+    private Integer productTypeId;//产品类型id
+    private String productTypeName;//产品类型名称
 
     public Integer getDetectId() {
         return detectId;
@@ -236,4 +237,20 @@ public class ComplaintDetectInfo implements Serializable {
     public void setProductColorId(Integer productColorId) {
         this.productColorId = productColorId;
     }
+
+    public Integer getProductTypeId() {
+        return productTypeId;
+    }
+
+    public void setProductTypeId(Integer productTypeId) {
+        this.productTypeId = productTypeId;
+    }
+
+    public String getProductTypeName() {
+        return productTypeName;
+    }
+
+    public void setProductTypeName(String productTypeName) {
+        this.productTypeName = productTypeName;
+    }
 }

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

@@ -290,7 +290,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     fittingsInfo.setFittingsBar(itemJson.getString("goods_sn"));
                     List<FittingsInfo> Fittings = fittingsInfoMapper.listFittings(fittingsInfo);
                     if (Fittings == null || Fittings.size() == 0) {
-                        return;
+                        continue;
                     }
                     fittingsInfo = Fittings.get(0);
                     item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码

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

@@ -61,11 +61,12 @@
       cd.detect_date detectDate,
       cd.product_color_id productColorId,
       qd.describe_title questionTitle,
-      pi.product_name productName,
+      pt.type_name productTypeName,
       cd.maintenance_results maintenanceResults
     from tb_rst_complaint_detect cd
         LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
         LEFT JOIN tb_rst_question_describe qd on cd.customer_id = qd.customer_id
+        LEFT JOIN tb_rst_product_type pt on pi.product_type = pt.type_id
     <where>
       <if test="detectProductNumber != null and detectProductNumber != ''" >
        AND cd.detect_product_number = #{detectProductNumber,jdbcType=VARCHAR}
@@ -100,6 +101,9 @@
       <if test="detectIsMaintenance != null and detectIsMaintenance != ''" >
         AND cd.detect_is_maintenance = #{detectIsMaintenance,jdbcType=BIT}
       </if>
+      <if test="productTypeId != null" >
+        AND pt.type_id = #{productTypeId,jdbcType=INTEGER}
+      </if>
     </where>
   </select>
   <insert id="insert" parameterType="ComplaintDetectInfo" >

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

@@ -3,6 +3,7 @@ package com.iamberry.rst.controllers.cm;
 import com.iamberry.rst.core.cm.*;
 import com.iamberry.rst.core.order.Order;
 import com.iamberry.rst.core.order.Product;
+import com.iamberry.rst.core.order.ProductType;
 import com.iamberry.rst.core.order.RentType;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
@@ -114,9 +115,9 @@ public class AdminDetectController {
             url.append("&detectFailureClassification=").append(detectInfo.getDetectFailureClassification());
             mv.addObject("detectFailureClassification",detectInfo.getDetectFailureClassification());
         }
-        if (detectInfo.getDetectProductType() != null && detectInfo.getDetectProductType() != -1) {
-            url.append("&detectProductType=").append(detectInfo.getDetectProductType());
-            mv.addObject("detectProductType",detectInfo.getDetectProductType());
+        if (detectInfo.getProductTypeId() != null && detectInfo.getProductTypeId() != -1) {
+            url.append("&productTypeId=").append(detectInfo.getProductTypeId());
+            mv.addObject("productTypeId",detectInfo.getProductTypeId());
         }
 
         // 封装请求数据
@@ -130,7 +131,10 @@ public class AdminDetectController {
             total = pageTotal;
             result.setPages(total);
         }
-
+        //获取所有产品类型
+        ProductType productType = new ProductType();
+        List<ProductType> productTypeList = productService.listProductType(productType);
+        mv.addObject("productTypeList",productTypeList);
         url.append("&pageTotal=").append(total).append("&pageNO=");
         mv.addObject("page", result);
         mv.addObject("url", url.toString());

watero-rst-web/src/main/java/com/iamberry/rst/utils/test.java

@@ -5,6 +5,7 @@ import com.auth0.jwt.internal.org.apache.commons.codec.binary.Base64;
 import com.auth0.jwt.internal.org.apache.commons.codec.binary.StringUtils;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
 
 
 import java.io.File;
@@ -32,13 +33,16 @@ public class test {
 
 
     public static void main(String[] args) throws Exception {
-        /*ConsumerRecord<String, String> record = new ConsumerRecord<String, String>("4", 1, 1, "data", "{\"data\":\"7uiBfrOFcdy/EDWxcT6SlS1SvUzaqGDqdPa6XsnYNTrplpwdmjgJAo741xY0kRC8hmZ8/vfzF9f8C5g7pKI8TvzaeeNu675pH3s5SP/5/ba4eJOW8Qqwm/1H4nNX+1Ed/CTueaJe3E/BNsFxe7rF+nV1vzOwuvXM6YHC6yYNIi4t16eWO4Fyopbz12I60Pf8CTCNBf4XIxuHSB/BGVZpATEykU1vILnX89GzoJlV+10=\"}");
+        ConsumerRecord<String, String> record = new ConsumerRecord<String, String>("4", 1, 1, "data", "{\"data\":\"7uiBfrOFcdy/EDWxcT6SlSH10bmyKW4BoILZ7f4LQygzN9scB2To4W3gRf0nzI+kHOKWzrv5DHEfJNt9/QrlfTk6VcHGwiPGycwiPvDkoTe4eJOW8Qqwm/1H4nNX+1Ed/CTueaJe3E/BNsFxe7rF+qYIHqZnL4b2n9Padc5ySenpG7G0a5xepWP0KZYDN4KeCTCNBf4XIxuHSB/BGVZpATEykU1vILnX89GzoJlV+10=\"}");
         String appKey = "5kkyurvvtt58bbuxueee";//填APP KEY
         String secretKey = "rhj6na6u3y6uhy6qrbb3944mg5uqqpbb";//APP SECRET
         String data = decrypt(JSONObject.fromObject(record.value()).getString("data"),
                 secretKey.substring(8, 24));//解析后的真正数据
 
         JSONObject jasonObject = JSONObject.fromObject(data);
+
+        System.out.println(jasonObject);
+
         if(jasonObject.has("dps")){
             JSONArray dps = jasonObject.getJSONArray("dps");
             boolean flog = false;
@@ -60,6 +64,6 @@ public class test {
 
                 flog = false;
             }
-        }*/
+        }
     }
 }

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

@@ -101,7 +101,10 @@
         </div>
         <div class="row cl">
             <label class="form-label col-3">
-                <div class="tit-2">处理结果(<label id="customerIsSolve" style="color: red"></label>)</div>
+                <div class="tit-2">
+                    处理结果(<label id="customerIsSolve" style="color: red"></label>)
+                    <label id="postage" style="color: red"></label>
+                </div>
             </label>
             <div class="formControls col-10 col-sm-10">
             </div>
@@ -244,6 +247,23 @@
                     if (customer.customerIsSolve != 1 && customer.customerIsSolve != 2) {
                         resultshow(customer.customerIsSolve, customerCommon.relationBackStatus,customerCommon.relationSendStatus,
                                 customerCommon.maintenanceIsRepair,customerCommon.detectState);
+                        var postage = '';
+                        var postageMoney = 0;
+                        if (customerCommon.relationBackPostage != null) {
+                            postageMoney = customerCommon.relationBackPostage;
+                        }
+                        switch (customerCommon.relationIsTransfer) {
+                            case 0:
+                                postage = '不需要转账。';
+                                break;
+                            case 1:
+                                postage = '已转账邮费'+postageMoney/100+'元。';
+                                break;
+                            case 2:
+                                postage = '待转账邮费'+postageMoney/100+'元。';
+                                break;
+                        }
+                        $('#postage').html(postage);
                     }
 
                     $('#adminName').html(customer.adminName);

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

@@ -59,10 +59,11 @@
                 <strong>寄回信息</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
+                <div style="width: 120px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="backGoodsBackLogisticsCompany" id="backGoodsBackLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>
@@ -80,9 +81,9 @@
 				</select>
 			</span>
                 </div>
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="backGoodsBackLogisticsNo" name="backGoodsBackLogisticsNo">
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="backGoodsBackPostage" name="backGoodsBackPostage">
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay">
+                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="backGoodsBackLogisticsNo" name="backGoodsBackLogisticsNo">
+                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="backGoodsBackPostage" name="backGoodsBackPostage">
+                <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay">
             </div>
         </div>
         <div class="row cl">
@@ -120,7 +121,7 @@
                 <strong>寄回产品</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div id="backGoodsProduct" class="update-parts" style="float: left;width: 410px;margin-right: 10px;"></div>
+                <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;">
@@ -131,7 +132,7 @@
         <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 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>
@@ -166,10 +167,6 @@
     </form>
     </div>
 </article>
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <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>
 

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

@@ -58,10 +58,11 @@
                 <strong>寄回信息</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
+                <div style="width: 120px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="noreasonBackBackLogisticsCompany" id="noreasonBackBackLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>
@@ -79,9 +80,9 @@
 				</select>
 			</span>
                 </div>
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="noreasonBackBackLogisticsNo" name="noreasonBackBackLogisticsNo">
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="noreasonBackBackPostage" name="noreasonBackBackPostage">
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="noreasonBackAlipay" name="noreasonBackAlipay">
+                <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">
@@ -167,10 +168,6 @@
 </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>
-<#--<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码

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

@@ -50,7 +50,7 @@
                     <input type="radio" id="reissueSendStatus" name="reissueSendStatus" value="3">
                     <label for="tel-4">已收货</label>
                 </div>
-                Efast订单号<input style="width: 200px;margin:0 10px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="reissueBackEfastOrderId" name="reissueBackEfastOrderId">
+                Efast订单号<input style="width: 231px;margin-left: 20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="reissueBackEfastOrderId" name="reissueBackEfastOrderId">
             </div>
         </div>
         <div class="row cl">
@@ -58,10 +58,11 @@
                 <strong>寄回信息</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
+                <div style="width: 300px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="reissueSendLogisticsCompany" id="reissueSendLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>
@@ -79,7 +80,7 @@
 				</select>
 			</span>
                 </div>
-                <input style="width: 120px;margin-right: 10px;" 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">
             </div>
         </div>
         <div class="row cl">
@@ -95,27 +96,27 @@
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>用户信息</strong>
             </div>
-            <div class="formControls col-3 col-sm-3">
+            <div class="formControls col-5 col-sm-5">
                 <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="reissueSendName" name="reissueSendName">
             </div>
-            <div class="formControls col-3 col-sm-3">
-                <input type="text" style="width: 190px;margin:0 10px;" class="input-text" value="" placeholder="填写收件人手机号" id="reissueSendTel" name="reissueSendTel">
+            <div class="formControls col-5 col-sm-5">
+                <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="reissueSendTel" name="reissueSendTel">
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-2 col-sm-2 text-r"></label>
-            <div class="formControls col-4 col-sm-10">
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
+            <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>
                     </span>
                 </div>
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
+                <div style="width: 188px;display: inline-block;margin-right: 20px;">
                     <span class="select-box">
                         <select name="reissueCityNumber" id="reissueCityNumber" class="select"></select>
                     </span>
                 </div>
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
+                <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">
@@ -125,7 +126,7 @@
         </div>
         <div class="row cl">
             <label class="form-label col-2 col-sm-2 text-r"></label>
-            <div class="formControls col-5 col-sm-5">
+            <div class="formControls col-10 col-sm-10">
                 <input type="text" class="input-text" value="" placeholder="请填写详细地址" id="reissueSendAddress" name="reissueSendAddress">
             </div>
         </div>
@@ -314,19 +315,19 @@
         var reissue_flag = true;
         var reissueSendName = $('#reissueSendName').val();
         if (!uname.test(reissueSendName)) {
-            alert("寄回人信息格式不正确，请重新输入!");
+            layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:1000});
             reissue_flag = false;
             return reissue_flag;
         }
         var reissueSendTel = $('#reissueSendTel').val();
         if (!mobile.test(reissueSendTel)) {
-            alert("寄回人电话号码格式不正确，请重新输入!");
+            layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
             reissue_flag = false;
             return reissue_flag;
         }
         var reissueSendAddress = $('#reissueSendAddress').val();
         if (reissueSendAddress == null || reissueSendAddress == '') {
-            alert("寄出地址不能为空!");
+            layer.msg("寄出地址不能为空!",{icon: 5,time:1000});
             reissue_flag = false;
             return reissue_flag;
         }
@@ -335,23 +336,23 @@
         var reissueSendLogisticsNo = $('#reissueSendLogisticsNo').val();//寄出物流单号
         if (reissueSendLogisticsCompany == 1) {
             if (reissueSendLogisticsCompany != null && reissueSendLogisticsCompany != '') {
-                alert("产品未寄送，不能选择物流公司!");
+                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
                 reissue_flag = false;
                 return reissue_flag;
             }
             if (reissueSendLogisticsNo != null && reissueSendLogisticsNo != '') {
-                alert("产品未寄送，不能填写物流单号!");
+                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:1000});
                 reissue_flag = false;
                 return reissue_flag;
             }
         } else if (reissueSendLogisticsCompany == 2 || reissueSendLogisticsCompany == 3) {
             if (reissueSendLogisticsCompany == null || reissueSendLogisticsCompany == '') {
-                alert("请选择寄回物流公司!");
+                layer.msg("请选择寄回物流公司!",{icon: 5,time:1000});
                 reissue_flag = false;
                 return reissue_flag;
             }
             if (reissueSendLogisticsNo == null || reissueSendLogisticsNo == '') {
-                alert("请填写物流单号!");
+                layer.msg("请填写物流单号!",{icon: 5,time:1000});
                 reissue_flag = false;
                 return reissue_flag;
             }

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

@@ -57,9 +57,10 @@
                 <strong>寄回信息</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
+                <div style="width: 120px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="renewedBackLogisticsCompany" id="renewedBackLogisticsCompany" class="select">
+                    <option value="">物流公司</option>
 					<option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
@@ -78,9 +79,9 @@
 				</select>
 			</span>
                 </div>
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="renewedBackLogisticsNo" name="renewedBackLogisticsNo">
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage">
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay">
+                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="renewedBackLogisticsNo" name="renewedBackLogisticsNo">
+                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage">
+                <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay">
             </div>
         </div>
         <div class="row cl">
@@ -118,7 +119,7 @@
                 <strong>寄回产品</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div class="update-parts" id="renewedProduct" style="float: left;width: 410px;margin-right: 10px;"></div>
+                <div class="update-parts" id="renewedProduct" 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;">
@@ -129,7 +130,7 @@
         <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 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>
@@ -153,7 +154,7 @@
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
                     <input type="radio" name="renewedSendStatus" value="1">
-                    <label for="tel-9">未寄出</label>
+                    <label for="tel-10">未寄出</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" name="renewedSendStatus" value="2">
@@ -163,35 +164,37 @@
                     <input type="radio" name="renewedSendStatus" value="3">
                     <label for="tel-10">已收货</label>
                 </div>
-                Efast订单号<input style="width: 200px;margin:0 10px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="renewedBackEfastOrderId" name="renewedBackEfastOrderId">
+                Efast订单号<input style="width: 231px;margin-left:20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="renewedBackEfastOrderId" name="renewedBackEfastOrderId">
             </div>
         </div>
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>用户信息</strong>
             </div>
-            <div class="formControls col-2 col-sm-2">
+            <div class="formControls col-5 col-sm-5">
                 <input type="text" class="input-text" placeholder="填写收件人姓名" id="renewedSendName" name="renewedSendName">
             </div>
-            <div class="formControls col-2 col-sm-2">
-                <input type="text" style="width: 190px;margin:0 10px;" class="input-text" placeholder="填写收件人手机号" id="renewedSendTel" name="renewedSendTel">
+            <div class="formControls col-5 col-sm-5">
+                <input type="text" class="input-text" placeholder="填写收件人手机号" id="renewedSendTel" name="renewedSendTel">
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2"></label>
-            <div class="formControls col-4 col-sm-10">
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
-                    <span class="select-box">
+            <div class="formControls col-2 col-sm-2 text-r">
+
+            </div>
+            <div class="formControls col-10 col-sm-10">
+                <div style="width: 188px;display: inline-block;margin-right: 20px;">
+                    <span class="select-box" style="padding-right: 0px;">
                         <select name="provinceNumber" id="provinceNumber" class="select"></select>
                     </span>
                 </div>
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
-                    <span class="select-box">
+                <div style="width: 188px;display: inline-block;margin-right: 20px;">
+                    <span class="select-box" style="padding-right: 0px;">
                         <select name="cityNumber" id="cityNumber" class="select"></select>
                     </span>
                 </div>
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
-                    <span class="select-box">
+                <div style="width: 189px;display: inline-block;">
+                    <span class="select-box" style="padding-right: 0px;">
                         <select name="areaNumber" id="areaNumber" class="select"></select>
                         <input type="hidden" id="merge_address" name="merge_address">
                     </span>
@@ -200,7 +203,7 @@
         </div>
         <div class="row cl">
             <label class="form-label col-2 col-sm-2"></label>
-            <div class="formControls col-5 col-sm-5">
+            <div class="formControls col-10 col-sm-10">
                 <input type="text" class="input-text" placeholder="请填写详细地址" id="renewedSendAddress" name="renewedSendAddress">
             </div>
         </div>
@@ -209,10 +212,11 @@
                 <strong>寄出信息</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
+                <div style="width: 300px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="renewedSendLogisticsCompany" id="renewedSendLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>
@@ -230,7 +234,7 @@
 				</select>
 			</span>
                 </div>
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="快递单号" id="renewedSendLogisticsNo" name="renewedSendLogisticsNo">
+                <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="renewedSendLogisticsNo" name="renewedSendLogisticsNo">
             </div>
         </div>
         <div class="row cl">
@@ -257,7 +261,7 @@
             </div>
         </div>
         <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
+            <div class="formControls col-2 col-sm-2 text-r">
                 <strong>QC进度</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
@@ -278,7 +282,7 @@
             </div>
         </div>
         <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
+            <div class="formControls col-2 col-sm-2 text-r">
                 <strong>返修进度</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
@@ -625,85 +629,74 @@
         var renewedBackLogisticsCompany = $("#renewedBackLogisticsCompany option:selected").val();//寄回物流公司
         var renewedBackName = $('#renewedBackName').val();
         var renewedBackTel = $('#renewedBackTel').val();
-        //var renewedBackMachineNo = $('#renewedBackMachineNo').val();
         if (renewedBackStatus == 1) {
             if (renewedBackLogisticsNo != null && renewedBackLogisticsNo != '') {
-                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:500});
+                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackPostage != null && renewedBackPostage != '') {
-                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:500});
+                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackLogisticsCompany != null && renewedBackLogisticsCompany != '') {
-                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:500});
+                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackName != null && renewedBackName != '') {
-                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:500});
+                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackTel != null && renewedBackTel != '') {
-                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:500});
+                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
-            /*if (renewedBackMachineNo != null && renewedBackMachineNo != '') {
-                alert("产品未寄回，不能填写机器编号!");
-                renewed_flag = false;
-                return renewed_flag;
-            }*/
         } else if (renewedBackStatus == 2 || renewedBackStatus == 3) {
             if (renewedBackLogisticsNo == null || renewedBackLogisticsNo == '') {
-                layer.msg("物流信息不能为空!",{icon: 5,time:500});
+                layer.msg("物流信息不能为空!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (!money.test(renewedBackPostage)) {
-                layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:500});
+                layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackLogisticsCompany == null || renewedBackLogisticsCompany == '') {
-                layer.msg("请选择物流公司!",{icon: 5,time:500});
+                layer.msg("请选择物流公司!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (!uname.test(renewedBackName)) {
-                layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:500});
+                layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (!mobile.test(renewedBackTel)) {
-                layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:500});
+                layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
-            /*if (renewedBackMachineNo == null || renewedBackMachineNo == '') {
-                alert("机器编号不能为空!");
-                renewed_flag = false;
-                return renewed_flag;
-            }*/
         }
         var renewedSendName = $('#renewedSendName').val();
         if (!uname.test(renewedSendName)) {
-            layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:500});
+            layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:1000});
             renewed_flag = false;
             return renewed_flag;
         }
         var renewedSendTel = $('#renewedSendTel').val();
         if (!mobile.test(renewedSendTel)) {
-            layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:500});
+            layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
             renewed_flag = false;
             return renewed_flag;
         }
         var renewedSendAddress = $('#renewedSendAddress').val();
         if (renewedSendAddress == null || renewedSendAddress == '') {
-            layer.msg("寄出地址不能为空!",{icon: 5,time:500});
+            layer.msg("寄出地址不能为空!",{icon: 5,time:1000});
             renewed_flag = false;
             return renewed_flag;
         }
@@ -712,23 +705,23 @@
         var renewedSendLogisticsNo = $('#renewedSendLogisticsNo').val();//寄出物流单号
         if (renewedSendLogisticsCompany == 1) {
             if (renewedSendLogisticsCompany != null && renewedSendLogisticsCompany != '') {
-                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:500});
+                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedSendLogisticsNo != null && renewedSendLogisticsNo != '') {
-                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:500});
+                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
         } else if (renewedSendLogisticsCompany == 2 || renewedSendLogisticsCompany == 3) {
             if (renewedSendLogisticsCompany == null || renewedSendLogisticsCompany == '') {
-                layer.msg("请选择寄回物流公司!",{icon: 5,time:500});
+                layer.msg("请选择寄回物流公司!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedSendLogisticsNo == null || renewedSendLogisticsNo == '') {
-                layer.msg("请填写物流单号!",{icon: 5,time:500});
+                layer.msg("请填写物流单号!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }

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

@@ -11,7 +11,6 @@
     <link href="${path}/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
     <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
     <link href="${path}/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
-<#--<link href="lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css" />-->
     <style>
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .select-box{background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size: auto 100%;}
@@ -58,10 +57,11 @@
                 <strong>寄回信息</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
+                <div style="width: 120px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="repairBackLogisticsCompany" id="repairBackLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>
@@ -79,9 +79,9 @@
 				</select>
 			</span>
                 </div>
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="repairBackLogisticsNo" name="repairBackLogisticsNo">
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="repairBackPostage" name="repairBackPostage">
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay">
+                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="repairBackLogisticsNo" name="repairBackLogisticsNo">
+                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="repairBackPostage" name="repairBackPostage">
+                <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay">
             </div>
         </div>
         <div class="row cl">
@@ -119,7 +119,7 @@
                 <strong>寄回产品</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div class="update-parts" id="repairProduct" style="float: left;width: 410px;margin-right: 10px;"></div>
+                <div class="update-parts" id="repairProduct" 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;">
@@ -130,7 +130,7 @@
         <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 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>
@@ -154,7 +154,7 @@
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
                     <input type="radio" name="repairSendStatus" value="1">
-                    <label for="tel-9">未寄出</label>
+                    <label for="tel-19">未寄出</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" name="repairSendStatus" value="2">
@@ -164,35 +164,37 @@
                     <input type="radio" name="repairSendStatus" value="3">
                     <label for="tel-10">已收货</label>
                 </div>
-                Efast订单号<input style="width: 200px;margin:0 10px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="repairBackEfastOrderId" name="repairBackEfastOrderId">
+                Efast订单号<input style="width: 231px;margin-left:20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="repairBackEfastOrderId" name="repairBackEfastOrderId">
             </div>
         </div>
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>用户信息</strong>
             </div>
-            <div class="formControls col-2 col-sm-2">
+            <div class="formControls col-5 col-sm-5">
                 <input type="text" class="input-text" placeholder="填写收件人姓名" id="repairSendName" name="repairSendName">
             </div>
-            <div class="formControls col-2 col-sm-2">
-                <input type="text" style="width: 190px;margin:0 10px;" class="input-text" placeholder="填写收件人手机号" id="repairSendTel" name="repairSendTel">
+            <div class="formControls col-5 col-sm-5">
+                <input type="text" class="input-text" placeholder="填写收件人手机号" id="repairSendTel" name="repairSendTel">
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2"></label>
-            <div class="formControls col-4 col-sm-10">
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
-                    <span class="select-box">
+            <div class="formControls col-2 col-sm-2 text-r">
+
+            </div>
+            <div class="formControls col-10 col-sm-10">
+                <div style="width: 188px;display: inline-block;margin-right: 20px;">
+                    <span class="select-box" style="padding-right: 0px;">
                         <select name="repairProvinceNumber" id="repairProvinceNumber" class="select"></select>
                     </span>
                 </div>
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
-                    <span class="select-box">
+                <div style="width: 188px;display: inline-block;margin-right: 20px;">
+                    <span class="select-box" style="padding-right: 0px;">
                         <select name="repairCityNumber" id="repairCityNumber" class="select"></select>
                     </span>
                 </div>
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
-                    <span class="select-box">
+                <div style="width: 189px;display: inline-block;">
+                    <span class="select-box" style="padding-right: 0px;">
                         <select name="repairAreaNumber" id="repairAreaNumber" class="select"></select>
                         <input type="hidden" name="merge_address" id="merge_address">
                     </span>
@@ -201,7 +203,7 @@
         </div>
         <div class="row cl">
             <label class="form-label col-2 col-sm-2"></label>
-            <div class="formControls col-5 col-sm-5">
+            <div class="formControls col-10 col-sm-10">
                 <input type="text" class="input-text" placeholder="请填写详细地址" id="repairSendAddress" name="repairSendAddress">
             </div>
         </div>
@@ -210,10 +212,11 @@
                 <strong>寄出信息</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div style="width: 100px;display: inline-block;margin-right: 10px;">
+                <div style="width: 300px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="repairSendLogisticsCompany" id="repairSendLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>
@@ -231,7 +234,7 @@
 				</select>
 			</span>
                 </div>
-                <input style="width: 120px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="快递单号" id="repairSendLogisticsNo" name="repairSendLogisticsNo">
+                <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="repairSendLogisticsNo" name="repairSendLogisticsNo">
             </div>
         </div>
         <div class="row cl">
@@ -258,7 +261,7 @@
             </div>
         </div>
         <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
+            <div class="formControls col-2 col-sm-2 text-r">
                 <strong>QC进度</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
@@ -279,7 +282,7 @@
             </div>
         </div>
         <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
+            <div class="formControls col-2 col-sm-2 text-r">
                 <strong>返修进度</strong>
             </div>
             <div class="formControls col-10 col-sm-10">

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

@@ -40,10 +40,13 @@
                 <option value ="3" <#if detectState??><#if detectState == 3>selected="selected"</#if></#if>>检查通过</option>
                 <option value ="4" <#if detectState??><#if detectState == 4>selected="selected"</#if></#if>>检查未通过</option>
             </select>
-            <select class="my-select" name="detectProductType" style="height: 30px;width: 150px">
+            <select class="my-select" name="productTypeId" style="height: 30px;width: 150px">
                 <option value ="">选择产品类型</option>
-                <option value ="1" <#if detectProductType??><#if detectProductType == 1>selected="selected"</#if></#if>>净水机</option>
-                <option value ="2" <#if detectProductType??><#if detectProductType == 2>selected="selected"</#if></#if>>冲奶机</option>
+                <#if (productTypeList?size > 0)>
+                    <#list productTypeList as typeList>
+                        <option value ="${typeList.typeId!}" <#if productTypeId??><#if productTypeId == typeList.typeId>selected="selected"</#if></#if>>${typeList.typeName!}</option>
+                    </#list>
+                </#if>
             </select>
             <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
         </form>
@@ -72,7 +75,7 @@
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as detect>
                 <tr>
-                    <td class="text-c" width="100">${detect.productName!}</td>
+                    <td class="text-c" width="100">${detect.productTypeName!}</td>
                     <td class="text-c" width="100">${detect.detectProductNumber!}</td>
                     <td class="text-c" width="100">
                         <#if detect.detectState == 1>