修改了客诉品质检测查询

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

@@ -1,5 +1,7 @@
 package com.iamberry.rst.core.cm;
 
+import com.iamberry.rst.core.order.ProductColor;
+
 import java.io.Serializable;
 
 public class ClosedProdcue  implements Serializable {
@@ -20,6 +22,7 @@ public class ClosedProdcue  implements Serializable {
 
     private Integer productType;        //商品类型
     private String productNumber;       //产品型号
+    private ProductColor productColor;      //颜色
 
     public String getClosedProductName() {
         return closedProductName;
@@ -92,4 +95,12 @@ public class ClosedProdcue  implements Serializable {
     public void setProductNumber(String productNumber) {
         this.productNumber = productNumber;
     }
+
+    public ProductColor getProductColor() {
+        return productColor;
+    }
+
+    public void setProductColor(ProductColor productColor) {
+        this.productColor = productColor;
+    }
 }

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

@@ -89,6 +89,7 @@ public class CustomerServiceImpl implements CustomerService {
         if(flag < 1){
             throw new RuntimeException("添加客诉失败");
         }
+        logger.info("-----------添加客诉-添加客诉基本信息---------------");
 
         QuestionDescribe questionDescribe = new QuestionDescribe();
         questionDescribe.setCustomerId(customerInfo.getCustomerId());
@@ -99,6 +100,7 @@ public class CustomerServiceImpl implements CustomerService {
         if(flag < 1){
             throw new RuntimeException("添加客诉问题失败");
         }
+        logger.info("-----------添加客诉-添加客诉问题---------------");
 
         if ("2".equals(customerInfo.getCustomerIsVisit())) {
             Visit visit = new Visit();
@@ -114,6 +116,7 @@ public class CustomerServiceImpl implements CustomerService {
             if(flag < 1){
                 throw new RuntimeException("添加客诉回访失败");
             }
+            logger.info("-----------添加客诉-添加客诉回访信息---------------");
         }
 
         if (2 == customerInfo.getCustomerCounselType() &&
@@ -122,6 +125,7 @@ public class CustomerServiceImpl implements CustomerService {
                 ){
 
             salesOrder = salesOrderMapper.getSalesOrderById(salesOrder.getSalesId());
+            logger.info("-----------添加客诉-查询订单--------------");
 
             CustomerCommon customerCommon = customerInfo.getCustomerCommon();
             customerCommon.setCustomerId(customerInfo.getCustomerId()); //设置客诉id
@@ -134,8 +138,12 @@ public class CustomerServiceImpl implements CustomerService {
             customerCommon.setRelationIsTransfer(0);    //是否已转账邮费  0:不需要
             customerCommon.setRelationBackPostage(0);   //邮费默认为0
 
+            customerCommon.setRelationBackName(customerCommon.getRelationSendName()); //姓名
+            customerCommon.setRelationBackTel(customerCommon.getRelationSendTel()); //电话号码
+
             /*  初始化产品类型，名称，配件名称 */
             customerService.setName(customerCommon);
+            logger.info("-----------添加客诉-初始化产品，配件信息--------------");
 
             ComplaintDetectInfo complaintDetectInfo = new ComplaintDetectInfo();  //品质检测
             ComplaintSignclosedInfo complaintSignclosedInfo = new ComplaintSignclosedInfo(); //客诉-签收表
@@ -185,7 +193,7 @@ public class CustomerServiceImpl implements CustomerService {
                     break;
                 case 6: //退货
 
-                   customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
+                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
 
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
@@ -202,6 +210,7 @@ public class CustomerServiceImpl implements CustomerService {
                     customerService.saveComplaintDetectInfo(complaintDetectInfo,customerCommon);   //创建品检
                     break;
             }
+            logger.info("-----------添加客诉-创建仓储/品检成功--------------");
             customerCommon.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储id
 
             Object object = CustomerCommon.getRelation(customerInfo.getCustomerIsSolve(), customerCommon);
@@ -236,7 +245,7 @@ public class CustomerServiceImpl implements CustomerService {
             if (flag < 1) {
                 throw new RuntimeException("添加客诉处理结果失败");
             }
-
+            logger.info("-----------添加客诉-添加换新/维修/补发/退货/无理由退货信息成功--------------");
             customerCommon.setRelationId(relationId);
 
             CustomerCommon.setProduceOrFitting(customerInfo.getCustomerIsSolve(),customerCommon);
@@ -253,6 +262,7 @@ public class CustomerServiceImpl implements CustomerService {
             if(customerCommon.getSendFittings() != null && customerCommon.getSendFittings().size() > 0){
                 sendFittingMapper.insert(customerCommon.getSendFittings());
             }
+            logger.info("-----------添加客诉-寄回寄出产品配件成功--------------");
         }
         return flag;
     }
@@ -262,6 +272,7 @@ public class CustomerServiceImpl implements CustomerService {
      * 产品配件初始化
      * @param cc
      */
+    @Transactional
     public void setName(CustomerCommon cc){
         for (int i=0;i<cc.getSendProdcues().size();i++) {
             Product product = productMapper.getProduce(cc.getSendProdcues().get(i).getProductId());
@@ -277,13 +288,12 @@ public class CustomerServiceImpl implements CustomerService {
             cc.getSendFittings().get(i).setFittingsId(fittingsInfo.getFittingsId());
         }
         for (int i=0;i<cc.getClosedProdcues().size();i++) {
-            Product product = productMapper.getProduce(cc.getSendProdcues().get(i).getProductId());
+            Product product = productMapper.getProduce(cc.getClosedProdcues().get(i).getProductId());
             cc.getClosedProdcues().get(i).setClosedProductName(product.getProductName());
             cc.getClosedProdcues().get(i).setProductType(product.getProductType());
             cc.getClosedProdcues().get(i).setProductNumber(product.getProductNumber());
-
-            ProductColor productColor = productMapper.getProduceColor(cc.getSendProdcues().get(i).getColorId());
-            cc.getSendProdcues().get(i).setProductColor(productColor);
+            ProductColor productColor = productMapper.getProduceColor(cc.getClosedProdcues().get(i).getColorId());
+            cc.getClosedProdcues().get(i).setProductColor(productColor);
         }
         for (int i=0;i<cc.getClosedFittings().size();i++) {
             FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById(cc.getClosedFittings().get(i).getFittingsId());
@@ -304,6 +314,7 @@ public class CustomerServiceImpl implements CustomerService {
         complaintDetectInfo.setCustomerId(customerCommon.getCustomerId());    //添加客诉
         complaintDetectInfo.setDetectState(1);      //状态  1待仓库转入
         complaintDetectInfo.setDetectRevolutionProduced(1);  //是否转入生产部门  1待转入
+        complaintDetectInfo.setDetectIsMaintenance(1);   //是否需要维修，1 需要 2不需要
         for(int i=0 ;i< customerCommon.getClosedProdcues().size();i++){
             ClosedProdcue closedProdcue = customerCommon.getClosedProdcues().get(i);
             for(int j=0; j<closedProdcue.getClosedProdcueNumber();j++){
@@ -470,7 +481,7 @@ public class CustomerServiceImpl implements CustomerService {
             map.put("EfastOrderId",oList.get(0).getOrderId());
             logger.info("换新，维修 ,补发向Efast 推送订单成功，订单号为：" + oList.get(0).getOrderId());
         }else{
-            logger.info("换新，维修 ,补发向Efast 推送订单，推送失败");
+            logger.info("换新，维修 ,补发向Efast 推送订单，推送失败,交易号为：" + customerCommon.getTransactionNumber());
         }
         return map;
     }
@@ -582,8 +593,16 @@ public class CustomerServiceImpl implements CustomerService {
         }
         if(oList != null && oList.size() > 0){
             map.put("EfastOrderId",oList.get(0).getOrderId());
+
+            SalesOrder sa =  new SalesOrder();
+            sa.setSalesId(salesOrder.getSalesId());
+            sa.setSalesOrderId(oList.get(0).getOrderId());
+            orderNum = salesOrderMapper.updateSalesOrder(sa);
+            if (orderNum <= 0) {
+                throw new RuntimeException("系统修改订单失败,订单回滚，Efast交易号："+salesOrder.getSalesDealCode());
+            }
         }else{
-            throw new RuntimeException("添加订单项失败");
+            throw new RuntimeException("添加Efast订单失败");
         }
         map.put("status",status);
         return map;
@@ -624,11 +643,9 @@ public class CustomerServiceImpl implements CustomerService {
         efastOrder.setItemList(itemList);
 
         JSONObject jsonObject = new JSONObject();
-        boolean fg = false;
         try{
             jsonObject = efastOrderService.returnOrderFormEfast(efastOrder);
             logger.info("------将原订单生成退货订单返回数据：" + jsonObject + "------");
-            fg = true;
             /*if(jsonObject != null){
                 Object obj;
                 obj = jsonObject.get("return_sn");
@@ -644,9 +661,6 @@ public class CustomerServiceImpl implements CustomerService {
         }catch (Exception e){
             logger.info("------将原订单生成退货订单报错------");
         }
-        if(!fg){
-            throw new RuntimeException("Efast生成退单失败");
-        }
     }
 
     @Override

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

@@ -61,7 +61,7 @@
       cd.detect_date detectDate,
       cd.product_color_id productColorId,
       qd.describe_title questionTitle,
-      pt.type_name productTypeName,
+    pt.type_name productName,
       cd.maintenance_results maintenanceResults
     from tb_rst_complaint_detect cd
         LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
@@ -195,7 +195,7 @@
         detect_is_maintenance = #{detectIsMaintenance,jdbcType=TIMESTAMP},
       </if>
       <if test="maintenanceResults != null" >
-        maintenance_results = #{maintenanceResults,jdbcType=BIT}
+        maintenance_results = #{maintenanceResults,jdbcType=BIT},
       </if>
       <if test="productColorId != null" >
         product_color_id = #{productColorId,jdbcType=INTEGER}

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

@@ -125,6 +125,7 @@
         AND product_color_id = #{productColorId}
       </if>
     </where>
+    ORDER BY cm.maintenance_create_time DESC
   </select>
   <insert id="insert" parameterType="ComplaintMaintenanceInfo" >
     insert into tb_rst_complaint_maintenance (maintenance_id, detect_id, maintenance_equipment_number, 

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

@@ -63,7 +63,7 @@
       AND question_state = 1
     </where>
     ORDER BY question_create_time DESC
-    limit 0,5
+    limit 0,20
   </select>
 
   <insert id="insert" parameterType="ComplaintQuestionInfo"  useGeneratedKeys="true" keyProperty="questionId">

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

@@ -146,7 +146,7 @@
         cs.signclosed_send_name = #{signclosedSendName}
       </if>
       <if test="signclosedSendTel != null and signclosedSendTel != ''" >
-        AND cs.signclosed_send_tel = #{signclosedSendTel}
+        AND cs.signclosed_send_tel like CONCAT('%',#{signclosedSendTel},'%')
       </if>
       <if test="signclosedLogisticsNumber != null and signclosedLogisticsNumber != ''" >
         AND cs.signclosed_logistics_number = #{signclosedLogisticsNumber}
@@ -167,6 +167,7 @@
         AND cs.signclosed_is_quality = #{signclosedIsQuality}
       </if>
     </where>
+    order by cs.signclosed_create_time DESC
   </select>
 
   <insert id="insert" parameterType="ComplaintSignclosedInfo" useGeneratedKeys="true" keyProperty="signclosedId" >

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

@@ -51,12 +51,12 @@
 
   <!-- 添加客诉回访信息 -->
   <insert id="addVisitInfo" parameterType="Visit" useGeneratedKeys="true"  keyProperty="visitId" >
-    insert into tb_rst_visit (visit_id, customer_id, admin_id, 
+    insert into tb_rst_visit (visit_id, customer_id, admin_id, designated_admin_id,
       visit_name, visit_tel, visit_date, 
       visit_time_select, visit_status, visit_complete_date, 
       visit_complete_name, visit_complete_tel, visit_complete_remark, 
       visit_complete_sex)
-    values (#{visitId,jdbcType=INTEGER}, #{customerId,jdbcType=INTEGER}, #{adminId,jdbcType=INTEGER}, 
+    values (#{visitId,jdbcType=INTEGER}, #{customerId,jdbcType=INTEGER}, #{adminId,jdbcType=INTEGER}, #{designatedAdminId,jdbcType=INTEGER},
       #{visitName,jdbcType=VARCHAR}, #{visitTel,jdbcType=CHAR}, #{visitDate,jdbcType=DATE}, 
       #{visitTimeSelect,jdbcType=BIT}, #{visitStatus,jdbcType=TINYINT}, #{visitCompleteDate,jdbcType=DATE}, 
       #{visitCompleteName,jdbcType=VARCHAR}, #{visitCompleteTel,jdbcType=CHAR}, #{visitCompleteRemark,jdbcType=VARCHAR}, 

watero-rst-service/src/main/java/com/iamberry/rst/service/order/EfastOrderServiceImpl.java

@@ -131,7 +131,6 @@ public class EfastOrderServiceImpl implements EfastOrderService {
             if (oderSn != null) {
                 String msg = respData.getString("msg");
                 if ("success".equals(msg)) {
-
                     order_sn = oderSn;
                     transactionNumber = order.getOrderId();
                     return true;
@@ -188,6 +187,12 @@ public class EfastOrderServiceImpl implements EfastOrderService {
                     || order.getOrderAmount() == null || order.getOrderPayMoney() == null
                     || order.getOrderNum() == null || order.getOrderPayType() == null) {
                 logger.info("rst-取消推送此订单-->>" + order.getOrderId() + ",到百胜 有内容为空-->" + order);
+                logger.info("rst-取消推送此订单--为空判断-->>：订单是否为空："+ order==null?"为空":"不为空" + "；省份："+order.getOrderProvince() + "； 订单编号Oid" + order.getOid()+
+                    "； 市:"+ order.getOrderCity() + "； 地区："+ order.getOrderArea() + "； 详细地址："+ order.getOrderAddress() +"； 收件人姓名："+ order.getOrderAddressName() +
+                        "； 收货人电话："+ order.getOrderAddressTel() +  "； 订单编号："+ order.getOrderId() + "； 身份证号："+ order.getOrderOpenId() + "； sku："+ order.getOrderProductBarCode() +
+                        "； 产品名称："+ order.getOrderProductName() + "； 订单金额："+ order.getOrderAmount() + "； 应付金额："+ order.getOrderPayMoney() + "； 商品数量："+ order.getOrderNum() +
+                        "； 支付方式："+ order.getOrderPayType()
+                );
                 it.remove();
             }
         }

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

@@ -237,17 +237,14 @@ public class AdminCustomerController {
 
         try {
             Map<String, Object> map = customerService.sendEfastOrder(salesOrder);
-            if (map.get("status") == 1) {
-                salesOrder.setSalesOrderId((String) map.get("EfastOrderId"));
-            } else {
-                return new ResponseJson(500, "添加订单失败!", 500);
-            }
+//            if (map.get("status") == 1) {
+//                salesOrder.setSalesOrderId((String) map.get("EfastOrderId"));
+//            }
         } catch (RuntimeException e) {
-            return new ResponseJson(500, e.getMessage(), 500);
+            return new ResponseJson(500, "添加订单成功--"+ e.getMessage(), 500);
         }
-
         Integer orderId = salesOrder.getSalesId();
-        ResponseJson rj = new ResponseJson(200, "添加成功", 200);
+        ResponseJson rj = new ResponseJson(200, "添加订单成功", 200);
         rj.addResponseKeyValue("orderId", orderId);
         return rj;
     }
@@ -513,6 +510,7 @@ public class AdminCustomerController {
         ResponseJson rj = new ResponseJson(200, "修改成功!", 200);
 
         ProductType productType = new ProductType();
+        productType.setTypeStatus(1);
         List<ProductType> productTypeList = productService.listProductType(productType);
 
         if (productTypeList != null && productTypeList.size() > 0) {
@@ -585,6 +583,10 @@ public class AdminCustomerController {
     @RequestMapping("/save_customer")
     public ResponseJson addCustomer(HttpServletRequest request, CustomerInfo customerInfo, SalesOrder salesOrder, CustomerCommon customerCommon,
                                     String sendProdcuesJson, String sendFittingsJson, String closedProdcuesJson, String closedFittingsJson) throws Exception {
+        ResponseJson rjx = this.isValiData(customerInfo);
+        if(rjx.getResultCode() == 500){
+            return rjx;
+        }
         Integer flag = 0;
         JSONArray jsonArray;
         List<SendProdcue> sendProdcueList;
@@ -621,11 +623,13 @@ public class AdminCustomerController {
         }
         customerInfo.setTransactionNumber(orderId);
 
+        logger.info("-----------------添加客诉开始----------------------");
         try {
             flag = customerService.saveCustomerInfo(customerInfo, salesOrder);
         } catch (RuntimeException e) {
             return new ResponseJson(500, e.getMessage(), 500);
         }
+        logger.info("-----------------添加客诉结束----------------------");
         if (flag < 1) {
             return new ResponseJson(500, "添加客诉失败!", 500);
         }
@@ -686,12 +690,12 @@ public class AdminCustomerController {
      * @param customerInfo
      * @return
      */
-    public boolean isValiData(CustomerInfo customerInfo) {
-        boolean flag = true;
-//        if (customerInfo.getBomName() == null || "".equals(customerInfo.getBomName())) {
-//            return false;
-//        }
-        return flag;
+    public ResponseJson isValiData(CustomerInfo customerInfo) {
+        ResponseJson rj = new ResponseJson();
+        if(customerInfo.getAdminId() == null){
+            return new ResponseJson(500, "未填写客诉id", 500);
+        }
+        return rj;
     }
 
     /**

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

@@ -147,14 +147,19 @@ public class AdminSignclosedController {
             for (int i = 0;i<alreadyColorName.length;i++){
                 /**获取机器数量**/
                 String number = request.getParameter("alreadyColorId"+alreadyColorName[i]);
+                if(number == null || number.equals("")){
+                    msg.setResultCode(200);
+                    msg.setReturnCode(503);
+                    return msg;
+                }
                 alreadyColorMap.put(alreadyColorName[i],Integer.valueOf(number));
                 /**获取机器编号数组**/
                 String[] machineNumbers = request.getParameterValues("machineNumber"+alreadyColorName[i]);
-                /*if(machineNumbers.length != Integer.valueOf(number)){
+                if(machineNumbers.length != Integer.valueOf(number)){
                     msg.setResultCode(200);
                     msg.setReturnCode(501);
                     return msg;
-                }*/
+                }
                 machineNumberMap.put("machineNumber"+alreadyColorName[i],machineNumbers);
             }
         }

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

@@ -2,6 +2,9 @@ package com.iamberry.rst.utils;
 
 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.security.Key;
@@ -24,7 +27,7 @@ public class test {
     }
 
 
-    /*public static void main(String[] args) throws Exception {
+   /* public static void main(String[] args) throws Exception {
         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

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/add_customer.ftl

@@ -111,11 +111,11 @@
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>咨询类型：</label>
                 <div class="formControls col-10 col-sm-10 skin-minimal">
                     <div class="radio-box">
-                        <input type="radio" class="customerCounselType" id="customer-type-1" name="customerCounselType" value="1" checked >
+                        <input type="radio" class="customerCounselType" id="customer-type-1" name="customerCounselType" value="1"  >
                         <label for="customer-type-1">售前咨询</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" class="customerCounselType" id="customer-type-2" name="customerCounselType" value="2" >
+                        <input type="radio" class="customerCounselType" id="customer-type-2" name="customerCounselType" value="2"  checked>
                         <label for="customer-type-2">售后咨询</label>
                     </div>
                 </div>
@@ -165,7 +165,7 @@
                         <em></em>
                         <strong>相关QA</strong>
                         <a href="javascript:void(0)" style="margin-left: 200px;" onclick="closeQA()">关闭</a>
-                        <ul id="question">
+                        <ul id="question" style="padding-top: 15px">
                             <#--<li class="ask">1、净水机面板操作不灵敏，是怎么回事？</li>
                             <li class="answer">答：<span>4净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>-->
                         </ul>
@@ -224,7 +224,7 @@
                 <label class="form-label col-1 col-sm-1">处理类型：</label>
                 <div class="formControls col-10 col-sm-10 skin-minimal">
                     <div class="radio-box" id="solved">
-                        <input type="radio" id="customer-process-1" value="1" name="customerIsSolve" checked>
+                        <input type="radio" id="customer-process-1" value="1" name="customerIsSolve" >
                         <label for="customer-process-1">已解决</label>
                     </div>
                     <div class="radio-box" id="noSolved">
@@ -232,11 +232,11 @@
                         <label for="customer-process-2">未解决</label>
                     </div>
                     <div class="radio-box" id="renewed" style="display: none">
-                        <input type="radio" id="customer-process-3" value="3" name="customerIsSolve">
+                        <input type="radio" id="customer-process-3" value="3" name="customerIsSolve" checked>
                         <label for="customer-process-3">换新</label>
                     </div>
                     <div class="radio-box" id="maintain" style="display: none">
-                        <input type="radio" id="customer-process-4" value="4" name="customerIsSolve">
+                        <input type="radio" id="customer-process-4" value="4" name="customerIsSolve" >
                         <label for="customer-process-4">维修</label>
                     </div>
                     <div class="radio-box" id="reissue" style="display: none">
@@ -351,7 +351,7 @@
 
                     <table class="table table-border table-bg table-bordered">
                         <thead>
-                            <tr class="text-c">
+                            <tr class="text-c" id="table1">
                                 <th style="text-align: center;" width="60">产品名称</th>
                                 <th style="text-align: center;" width="60">产品颜色</th>
                                 <th style="text-align: center;" width="60">产品配件</th>
@@ -368,10 +368,10 @@
             </div>
 
             <div class="row cl" id="TDScollect" style="display: none;">
-                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>TDS收集：</label>
+                <label class="form-label col-1 col-sm-1">TDS收集：</label>
                 <div class="formControls col-2 col-sm-2" style="position: relative;">
                     <input type="hidden" name="arrcity_3word" id="arrcity_3word" value="" />
-                    <input style="width: 140px;" placeholder="" class="input-text my-search-input" placeholder="请输入城市名称搜索" type="text" name="arrcity" id="arrcity" />
+                    <input style="width: 190px;" placeholder="" class="input-text my-search-input" placeholder="请输入城市名称搜索" type="text" name="arrcity" id="arrcity" />
                     <div id="suggest" class="ac_results"></div>
                 </div>
                 <div class="formControls col-2 col-sm-2">
@@ -383,10 +383,10 @@
                 </div>
                 <input type="hidden" name="customerArea" id="customerArea">
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)">
+                    <input type="text" class="input-text" value="" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)">
+                    <input type="text" class="input-text" value="" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
                 </div>
             </div>
             <div class="row cl" id="TDScollectShow" style="display: none;">
@@ -421,11 +421,11 @@
 
                     <table class="table table-border table-bg table-bordered">
                         <thead>
-                        <tr class="text-c">
-                            <th style="text-align: center;" width="60">产品名称</th>
-                            <th style="text-align: center;" width="60">产品颜色</th>
-                            <th style="text-align: center;" width="60">产品配件</th>
-                        </tr>
+                            <tr class="text-c" id="table2">
+                                <th style="text-align: center;" width="60">产品名称</th>
+                                <th style="text-align: center;" width="60">产品颜色</th>
+                                <th style="text-align: center;" width="60">产品配件</th>
+                            </tr>
                         </thead>
                         <tbody id="back-product">
                             <tr id="showOrder">
@@ -437,7 +437,8 @@
 
             </div>
             <div class="row cl">
-                <label class="form-label col-1 col-sm-1">处理描述：</label>
+                <#--处理描述-->
+                <label class="form-label col-1 col-sm-1">客诉备注：</label>
                 <div class="formControls col-5 col-sm-5">
                     <script id="describeHandleDescText" type="text/plain" style="width:983px;height:250px;"></script>
                     </script>
@@ -551,15 +552,14 @@
     });
 
     $(document).on('click', '.dalog-ask .answer', function() {
-        var msg = $(this).find("span").html();
-        UE.getEditor('describeContentText').setContent(msg);
 
-        $("#questionId").val($(this).find(".quesId").val());
+        var questionId = $(this).find(".quesId").val()
+        var title = $(this).find("span").html();
+        var desc = $(this).find("#questionProfile").html()
 
-        var title = $(this).prev().html();
+        $("#questionId").val(questionId);
         $("#describeTitle").val(title);
-
-        //$("#questionId").val(.find(".quesId").val());
+        UE.getEditor('describeContentText').setContent(desc);
 
         //$("#answer-textarea").text();
         $(".dalog-ask").hide(); //隐藏qa
@@ -684,6 +684,8 @@
         elementPathEnabled : false  /*去掉元素路径*/
     });
 
+    var isInitSendAddressSms = false;
+
     sendAddressSms.ready(function() {
         sendAddressSms.setHeight(130);  //固定高度
     });
@@ -701,11 +703,22 @@
         noReasonBack : ["录入客诉","督促用户寄回","录入快递单号","仓库收货","品质检测","退款","退货完成"]
     }
 
+    /*处理结果的变更状态  产品列表表头信息*/
+    var isSolveTitleMsg = {
+        solved : [[],[]],
+        noSolved : [[],[]],
+        renewed : [["退回产品","退回产品颜色","退回产品配件"],["更换产品","更换产品颜色","更换产品配件"]],
+        maintain : [["需要维修的产品","需要维修的产品颜色","需要维修的产品配件"],["维修产品","维修产品颜色","维修产品配件"]],
+        reissue : [["补发产品","补发产品颜色","补发产品配件"],[]],
+        backGoods : [["退回产品","退回产品颜色","退回产品配件"],[]],
+        noReasonBack : [["退回产品","退回产品颜色","退回产品配件"],[]]
+    }
+
     /*个人id*/
     var adminId = 0;
 
     /* 咨询类型  1：售前咨询  2：售后咨询  3：其他  */
-    var allCustomerInfoType = 1;
+    var allCustomerInfoType;
 
     /*全局标识当前状态  type : 1 ：已解决  2：未解决  3：换新  4：维修  5：补发   6：退货  7：无理由退货*/
     var allCustomerType = 1;
@@ -735,7 +748,7 @@
         initVisitSysAdmin();
 
         /*初始化选择处理结果 -- type : 1 ：已解决  2：未解决  3：换新  4：维修  5：补发   6：退货  7：无理由退货 */
-        initProcessResult(1);
+        initProcessResult(3);
 
         /*监听来源入口选择事件*/
         $("input[name='customerSourceType']").change(function (){
@@ -750,12 +763,18 @@
         /*监听客诉类型选择事件*/
         $("input[name='customerCounselType']").change(function (){
             allCustomerInfoType = parseInt($(this).val());
+            if(allCustomerInfoType == 1){
+                $("#customer-process-1").iCheck('check');  //设置已解决
+                allCustomerType = 1;
+            }else{
+                $("#customer-process-3").iCheck('check');  //设置换新
+                allCustomerType =3;
+            }
             initProcessResult(allCustomerType);
         })
 
         /*监听处理结果选择事件*/
         $("[name='customerIsSolve']").change(function(){
-            allCustomerType = parseInt($(this).val());
             initProcessResult(parseInt($(this).val()));
         })
 
@@ -807,13 +826,13 @@
             setTDSCollect();
         });
         /*实时监听文本框-- TDS进水*/
-        document.getElementById("customerInTDS").addEventListener("input", function(){
-            setTDSCollect();
-        });
+//        document.getElementById("customerInTDS").addEventListener("input", function(){
+//            setTDSCollect();
+//        });
         /*实时监听文本框-- TDS出水*/
-        document.getElementById("customerOutTDS").addEventListener("input", function(){
-            setTDSCollect();
-        });
+//        document.getElementById("customerOutTDS").addEventListener("input", function(){
+//            setTDSCollect();
+//        });
 
         /* 监听手机号 失去焦点时  将其他手机号码未填的 */
         $(".associated-phone").blur(function (){
@@ -867,23 +886,15 @@
     * */
     function visitByType(type){
         if(1 == type){  //不需要回访
-            $("#customer-visit-2").prop("checked",true); //不需要回访
-            initCheckByNode($("#customer-visit-2"));
+            $("#customer-visit-2").iCheck('check');  //设置不需要回访
             $("#needToVisit").css("display","none");
         }else{
-            $("#customer-visit-1").prop("checked",true); //需要回访
-            initCheckByNode($("#customer-visit-1"));
+            $("#customer-visit-1").iCheck('check');  //设置需要回访
             $("#needToVisit").css("display","block");
         }
         initVisitEvent();
     }
 
-//    function keyFun(node){
-//        var c=$(node);
-//        var temp_amount=c.val().replace(/[^\d]/g,'');
-//        $(node).val(Number(temp_amount));
-//    }
-
     /*初始化客服*/
     var sysAminList;
     function initSysAdmin() {
@@ -996,9 +1007,17 @@
         if(type == null || type == ""){
             type = 1;
         }
+
+        allCustomerType = type;
+
+        if(allCustomerInfoType == null || allCustomerInfoType == ""){
+            allCustomerInfoType = $("input[name='customerCounselType']:checked").val();
+        }
+
         var statusHtml = '<li><span class="arrow"></span><div class="number">status_index</div><div>status_html</div></li>';
         var resultHtml = '';
         var result = {};
+        var resultProductTableTitle = {};
 
         $("#solved").show(); //已解决
         $("#noSolved").show();//未解决
@@ -1024,9 +1043,9 @@
             }
         }else if(allCustomerInfoType == 2){ //售后
 
-            var msg = UE.getEditor('sendAddressSms').getContent();
-            if(msg == null || msg == ""){
+            if(!isInitSendAddressSms){
                 initComplaintQuestionInfo("m");
+                isInitSendAddressSms = true;
             }
 
             /* 在选择售后类型是，直接初始化省市区，使用isInitAddress 变量来判断 */
@@ -1054,6 +1073,7 @@
                     break;
                 case 3: //换新
                     result = isSolve.renewed;
+                    resultProductTableTitle = isSolveTitleMsg.renewed;
                     $("#relationProduct").html("换新产品");
                     $("#processResultStatus").show();
                     $("#orderHead").show();
@@ -1067,12 +1087,13 @@
                     $("#TDScollectShow").show();
                     $("#sendAddressInfo").show();
                     $("#sendAddressByPhone").show();
-                    $("#updateProduct").show();
+                    $("#updateProduct").hide(); //换新产品
                     $("#postageAccount").show();    //邮费转账账户
                     visitByType(2); //需要回访
                     break;
                 case 4: //维修
                     result = isSolve.maintain;
+                    resultProductTableTitle = isSolveTitleMsg.maintain;
                     $("#relationProduct").html("维修产品");
                     $("#processResultStatus").show();
                     $("#orderHead").show();
@@ -1086,12 +1107,13 @@
                     $("#TDScollectShow").show();
                     $("#sendAddressInfo").show();
                     $("#sendAddressByPhone").show();
-                    $("#updateProduct").show();
+                    $("#updateProduct").hide();//维修产品
                     $("#postageAccount").show();    //邮费转账账户
                     visitByType(2); //需要回访
                     break;
                 case 5://补发
                     result = isSolve.reissue;
+                    resultProductTableTitle = isSolveTitleMsg.reissue;
                     $("#relationProduct").html("补发产品");
                     $("#processResultStatus").show();
                     $("#orderHead").show();
@@ -1111,6 +1133,7 @@
                     break;
                 case 6: //退货
                     result = isSolve.backGoods;
+                    resultProductTableTitle = isSolveTitleMsg.backGoods;
                     $("#relationProduct").html("退货产品");
                     $("#processResultStatus").show();
                     $("#orderHead").show();
@@ -1130,6 +1153,7 @@
                     break;
                 case 7://无理由退货
                     result = isSolve.noReasonBack;
+                    resultProductTableTitle = isSolveTitleMsg.noReasonBack;
                     $("#relationProduct").html("退货产品");
                     $("#processResultStatus").show();
                     $("#orderHead").show();
@@ -1156,6 +1180,17 @@
             html = html.replace("status_html",result[i]);
             resultHtml += html;
         }
+
+        if(resultProductTableTitle != null && resultProductTableTitle.length > 0){
+            /* 根据处理类型来切换 产品列表的列名称 */
+            for(var i=0;i<resultProductTableTitle[0].length;i++){
+                $("#table1").find("th").eq(i).html(resultProductTableTitle[0][i]);
+            }
+            for(var i=0;i<resultProductTableTitle[1].length;i++){
+                $("#table2").find("th").eq(i).html(resultProductTableTitle[1][i]);
+            }
+        }
+
         $("#processResultStatus").html(resultHtml);
     }
 
@@ -1179,8 +1214,8 @@
     /*初始化问题大类*/
     function initComplaintTypeInfo() {
         //默认为售前咨询
-        var customerCounselTypeOverall = allCustomerInfoType;
-
+        //var customerCounselTypeOverall = allCustomerInfoType;
+        var customerCounselTypeOverall = null;
         $.ajax({
             type: "POST",
             data: {
@@ -1274,9 +1309,14 @@
                     if (data.returnCode == 200) {
                         for(var i=0;i<data.returnMsg.complaintQuestionInfoList.length;i++){
                             var complaintQuestion= data.returnMsg.complaintQuestionInfoList[i];
-                            html += '<li class="ask">'+ complaintQuestion.questionName +'' +
-                                    '</li>' +
-                                    '<li class="answer" style="height: 65px;overflow: hidden;">答：<span>'+ complaintQuestion.questionProfile +'</span><input class="quesId" type="hidden" value="'+ complaintQuestion.questionId +'"></li>';
+                            //html += '<li class="ask">'+ complaintQuestion.questionName +'' +
+                            //        '</li>' +
+                            //        '<li class="answer" style="height: 65px;overflow: hidden;">答：<span>'+ complaintQuestion.questionProfile +'</span><input class="quesId" type="hidden" value="'+ complaintQuestion.questionId +'"></li>';
+                            html += '' +
+                                    '<li class="answer" style="height: 20px;overflow: hidden;border-bottom: 1px solid #ddd;"><span>'+ complaintQuestion.questionName +'</span>' +
+                                    '<input class="quesId" type="hidden" value="'+ complaintQuestion.questionId +'">' +
+                                    '<div id="questionProfile" style="display: block">'+ complaintQuestion.questionProfile +'</div>' +
+                                    '</li>';
                         }
                     }else{
                         html = '<span style="font-size: 12px; margin-top: 10px; display: block;">未搜索到QA信息，请更换关键字或者直接录入到系统!</span>';
@@ -1288,13 +1328,21 @@
                     if (data.returnCode == 200) {
                         msg = data.returnMsg.complaintQuestionInfoList[0].questionProfile;
                     }
-                    UE.getEditor('sendAddressSms').setContent(msg,false);
+                    addSmsMsg(msg);
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){
             }
         });
+    }
+
+    /*添加邮寄信息*/
+    function addSmsMsg(msg){
+        sendAddressSms.addListener("ready", function () {
+            // editor准备好之后才可以使用
+            sendAddressSms.setContent(msg);
 
+        });
     }
 
     /**
@@ -1500,13 +1548,13 @@
                         }
                         var time = formatDate(new Date(salesOrder.salesCreateTime),"yyyy-MM-dd");
                         html += '' +
-                                ' <td>'+ convertUndefinedToEmpty(salesOrder.companyName) +'-'+ convertUndefinedToEmpty(salesOrder.storeName) +'</td>' +
-                                ' <td>'+ salesOrder.salesId +'</td>' +
-                                ' <td>'+ salesOrder.salesAddressName +'</td>' +
-                                ' <td>'+ salesOrder.salesAddressTel +'</td>' +
-                                ' <td>'+ salesOrder.salesAmount +'</td>' +
-                                ' <td>'+ productsHtml +'</td>' +
-                                ' <td>'+ time +'</td>' +
+                                ' <td style="text-align: center;">'+ convertUndefinedToEmpty(salesOrder.companyName) +'-'+ convertUndefinedToEmpty(salesOrder.storeName) +'</td>' +
+                                ' <td style="text-align: center;">'+ salesOrder.salesId +'</td>' +
+                                ' <td style="text-align: center;">'+ salesOrder.salesAddressName +'</td>' +
+                                ' <td style="text-align: center;">'+ salesOrder.salesAddressTel +'</td>' +
+                                ' <td style="text-align: center;">'+ salesOrder.salesAmount/100 +'</td>' +
+                                ' <td style="text-align: center;">'+ productsHtml +'</td>' +
+                                ' <td style="text-align: center;">'+ time +'</td>' +
                                 '';
                        //address = '<td colspan="1">收货地址</td><td colspan="6" class="td-manage text-c" >'+ salesOrder.salesAddressInfo +'&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #0a6999;text-decoration: underline;" href="javascript:void(0);" title="编辑" onclick="updateAdress()">修改地址</a></td>' ;
                         address = salesOrder.salesAddressInfo;
@@ -1581,8 +1629,11 @@
                     abbreviation = addrss.replace(cityReg,"");
                     break;
                 case 2:
-                    var districtReg = new RegExp("市","g");
+                    var districtReg = new RegExp("区","g");
                     abbreviation = addrss.replace(districtReg,"");
+
+                    districtReg = new RegExp("市","g");
+                    abbreviation = abbreviation.replace(districtReg,"");
                     break;
                 default:
                     break;
@@ -1666,11 +1717,11 @@
             var disId = "";
             $("#district").html(districtHtml);
             if(selectDistrict != null && selectDistrict.length > 0 ){
-                disId = selectDistrict[0].cityId;
+                disId = selectDistrict[0].districtId;
             }else{
-                disId = district[0].cityId;
+                disId = district[0].districtId;
             }
-            $("#city option[value='" + disId + "']").attr("selected","true");
+            $("#district option[value='" + disId + "']").attr("selected","true");
         }
     }
 
@@ -1734,7 +1785,7 @@
                                 '         <td width="15" style="'+ fristInputStyle +' padding: 0px;width: 25px;">' +
                                 '             <input type="hidden" class="input-produce-id" value="' + color.colorProductId + '">' +
                                 '             <input type="hidden" class="input-color-id" value="' + color.colorId + '">' +
-                                '             <input type="text" class="input-text input-color-number number-input" style="width: 100%;border: none;text-align: center;" value="'+ number +'" placeholder="产品数量"  id="" name="" onkeyup="keyFun($(this))" onpaste="keyFun($(this))" >' +
+                                '             <input type="text" class="input-text input-color-number number-input" style="width: 100%;border: none;text-align: center;" value="'+ number +'" placeholder="产品数量"  id="color-' + color.colorProductId + '-' + color.colorId + '" name="" onkeyup="keyFun($(this))" onpaste="keyFun($(this))" >' +
                                 '         </td>' +
                                 '     </tr>';
                         fristInputStyle = "";
@@ -1758,7 +1809,7 @@
                                 '         <td width="15" style="'+ fristInputStyle +'padding: 0px;width: 25px;">' +
                                 '             <input type="hidden" class="input-produce-id" value="' + produceFit.productId + '">' +
                                 '             <input type="hidden" class="input-fittings-id" value="' + produceFit.fittingsId +'">' +
-                                '             <input type="text" class="input-text input-fittings-number" style="width: 100%;border: none;text-align: center;" value="'+ number +'" placeholder="配件数量" id="" name="" onkeyup="keyFun($(this))" onpaste="keyFun($(this))" >' +
+                                '             <input type="text" class="input-text input-fittings-number" style="width: 100%;border: none;text-align: center;" value="'+ number +'" placeholder="配件数量" id="fittings-' + produceFit.productId + '-' + produceFit.fittingsId +'" name="" onkeyup="keyFun($(this))" onpaste="keyFun($(this))" >' +
                                 '         </td>' +
                                 '     </tr>';
                         fristInputStyle = "";
@@ -1785,8 +1836,6 @@
 
         $("#addProduct").html(html);
 
-//        initCheck(); //因为需要展示产品，所以再次初始化多选框
-
         setBackProduct(html);  //设置寄回产品
 
         monitorProduct();   //监听产品变化
@@ -1850,7 +1899,20 @@
         if(html != null && html != "" && typeof(html) != "undefined"){
             $("#back-product").html(html);
         }else{
-
+            $("#addProduct").find(".input-color-number").each(function(){
+                var number = $(this).val();
+                if(number != null && number != ""){
+                    var colorNodeId = $(this).attr("id");
+                    $("#back-product").find("#"+colorNodeId).val(number);
+                }
+            })
+            $("#addProduct").find(".input-fittings-number").each(function(){
+                var number = $(this).val();
+                if(number != null && number != ""){
+                    var fittingsNodeId = $(this).attr("id");
+                    $("#back-product").find("#"+fittingsNodeId).val(number);
+                }
+            })
         }
     }
 
@@ -1861,14 +1923,46 @@
 
         if(TDSAddress != null && TDSAddress != ""){
             $("#DTS-address").html("地址：" + TDSAddress);
-            var customerInTDS = $("#customerInTDS").val();
-            var customerOutTDS = $("#customerOutTDS").val()
-            if(customerInTDS != null && customerInTDS != "" && customerOutTDS != null && customerOutTDS != ""){
-                $("#DTS-in").html("进水：" + customerInTDS + " PPM");
-                $("#DTS-out").html("出水：" + customerOutTDS + " PPM");
+        }
+    }
+
+    /*TDS联动处理*/
+    function TDSLinkage(node,maxNumber,minNumber){
+        setTDSCollect();
+
+        var number = 0;
+        var c=$(node);
+        if(c.val() == ""){
+            $(node).val("");
+        }else{
+            var temp_amount=c.val().replace(/[^\d]/g,'');
+            number  = Number(temp_amount)
+            if(maxNumber!= null && maxNumber!= "" && number > maxNumber){
+                number = maxNumber;
+            }
+            if(minNumber!= null && minNumber!= "" && number < minNumber){
+                number = minNumber;
             }
+            $(node).val(number);
+        }
+
+        var nodeName = $(node).attr("id");
+        if(nodeName == "customerInTDS" ){
+            $("#DTS-in").html("进水：" + number + " PPM");
+        }else if(nodeName == "customerOutTDS" ){
+            $("#DTS-out").html("出水：" + number + " PPM");
         }
     }
+
+    /**
+     * 获取当前节点，将当前节点的val值除了数字其他的删掉
+     * @param node
+     * @param maxNumber  最大值
+     * @param minNumber  最小值
+     */
+    function keyFun(node,maxNumber,minNumber){
+
+    }
 </script>
 <script>
     $(function(){
@@ -1916,9 +2010,7 @@
         if(customerSourceType == 3){
             var customerSourceOld = $("#customerSourceOld").val();
             if(customerSourceOld == null || customerSourceOld == "" || typeof(customerSourceOld)=="undefined"){
-
                 vailErrorMsg($("#customerSourceOld"),"未填写来源入口");
-
                 return false;
             }else{
                 $("#customerSource").val(customerSourceOld);
@@ -2090,6 +2182,25 @@
         $("#closedProdcues").val(JSON.stringify(closedProdcues));
         $("#closedFittings").val(JSON.stringify(closedFittings));
 
+        var visitTimeSelect = $("input[name='visitTimeSelect']").val();
+        var visit_date = $('#datemin').val();
+        var myDate = new Date();
+        var date = myDate.getFullYear()+"-"+(myDate.getMonth()+1)+"-"+myDate.getDate();
+        var hours = myDate.getHours();
+        //如果两个时间相等，则判断可选的回访时间
+        if(Date.parse(visit_date) == Date.parse(date)){
+            if (hours > 12 && visitTimeSelect == 1) {
+                vailErrorMsg($("#datemin"),"该时间已超过当前时间，请重新选择回访时间!");
+                return false;
+            } else if (hours > 14 && visitTimeSelect == 2) {
+                vailErrorMsg($("#datemin"),"该时间已超过当前时间，请重新选择回访时间!");
+                return false;
+            } else if (hours > 18 && visitTimeSelect == 3) {
+                vailErrorMsg($("#datemin"),"该时间已超过当前时间，请重新选择回访时间!");
+                return false;
+            }
+        }
+
         return true;
     }
 

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

@@ -308,7 +308,7 @@
                     })
                     $('#salesItem').html(salesItem);
                     $('#salesPayTime').html(salesOrder.salesPayTime);
-                    $('#relationSendMergeAddress').html(customerCommon.relationSendMergeAddress+"-"+customerCommon.relationSendAddress);
+                    $('#relationSendMergeAddress').html( convertUndefinedToEmpty(customerCommon.relationSendMergeAddress)+"-"+convertUndefinedToEmpty(customerCommon.relationSendAddress));
                     $('#describeHandleDesc').html(customer.describeHandleDesc);
 
                     if (customerCommon.sendProdcues != null && customerCommon.sendProdcues.length > 0) {
@@ -343,7 +343,7 @@
                     } else {
                         $('#divCloseProdcue').hide();
                     }
-                    $('#customerTDS').html("<strong>TDS收集:</strong>"+customerCommon.relationSendMergeAddress+",进水"+
+                    $('#customerTDS').html("<strong>TDS收集:</strong>"+  convertUndefinedToEmpty(customerCommon.relationSendMergeAddress) +",进水"+
                             (customer.customerInTDS==undefined?0:customer.customerInTDS)+"ppm"+",出水"+(customer.customerOutTDS==undefined?0:customer.customerOutTDS)+"ppm");
 
                     if (customer.customerIsVisit == '2') {

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

@@ -49,14 +49,14 @@
                     </#list>
                 </#if>
             </select>
-            <select class="my-select" name="complaintId" style="height: 36px;width: 120px;margin: 0px;">
+           <#-- <select class="my-select" name="complaintId" style="height: 36px;width: 120px;margin: 0px;">
                 <option value ="">客诉类型</option>
                 <#if complaintTypeList?? &&  (complaintTypeList?size > 0) >
                     <#list complaintTypeList as complaint>
                         <option value ="${complaint.complaintId!}" <#if customerInfo.complaintId??><#if customerInfo.complaintId ==complaint.complaintId >selected="selected"</#if></#if>>${complaint.complaintClassName!}</option>
                     </#list>
                 </#if>
-            </select>
+            </select>-->
             <select class="my-select" name="customerIsVisit" style="height: 36px;width: 120px;margin: 0px;>
                 <option value ="">是否需要回访</option>
                 <option value="">是否回访</option>
@@ -85,7 +85,7 @@
             <th width="70">电话</th>
             <th width="80">来源入口</th>
             <th width="80">客诉产品</th>
-            <th width="80">客诉类型</th>
+            <#--<th width="80">客诉类型</th>-->
             <th width="80">问题类型</th>
             <th width="100">问题简述</th>
             <th width="80">销售</th>
@@ -119,7 +119,7 @@
                                 </#if>
                             </td>
                             <td>${customer.typeName!''}</td>
-                            <td>${customer.complaintClassName!''}</td>
+                            <#--<td>${customer.complaintClassName!''}</td>-->
                             <td>${customer.smallClassName!''}</td>
                             <td>
                                 ${customer.describeTitle!'暂无'}<br/>
@@ -409,10 +409,11 @@
                 success: function(data){
                     if (data.returnCode == 200) {
                         layer.msg(data.resultMsg,{icon: 1,time:1000});
-                        $('#txt_customerIsSolve').html('已解决');
+                       // $('#txt_customerIsSolve').html('已解决');
                     } else {
                         layer.msg(data.resultMsg,{icon: 5,time:1000});
                     }
+                    location.replace(location.href);
                 },
                 error: function(XmlHttpRequest, textStatus, errorThrown){
                 }

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

@@ -137,7 +137,8 @@
                 <tr class="text-c">
                     <th width="50">销售公司</th>
                     <th width="50">店铺名称</th>
-                    <th width="100">订单编号<span style="font-weight: normal;float: left;display: block;width: 100%;">(Efast交易号)</span></th>
+                    <th width="50">订单编号</th>
+                    <th width="100">交易号</th>
                     <th width="60">收货人姓名</th>
                     <th width="80">收货人电话</th>
                     <th width="80">订单金额</th>
@@ -150,7 +151,7 @@
                 <tbody id="orderAll">
 
                      <tr class="text-c">
-                         <td colspan="10">请输入搜索条件，搜索订单~
+                         <td colspan="11">请输入搜索条件，搜索订单~
                          </td>
                      </tr>
 
@@ -346,6 +347,7 @@
                         html += '<tr class="text-c">' +
                                 ' <td>'+ convertUndefinedToEmpty(salesOrder.companyName) +'</td>' +
                                 ' <td>'+ convertUndefinedToEmpty(salesOrder.storeName) +'</td>' +
+                                ' <td>'+ salesOrder.salesId +'</td>' +
                                 ' <td>'+ salesOrder.salesDealCode +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressName +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressTel +'</td>' +
@@ -357,7 +359,7 @@
                                 ' </tr>';
                     }
                 }else{
-                    html = '<tr class="text-c"><td colspan="10">没有搜索到订单，请点击“添加订单”按钮，添加订单。</td></tr>';
+                    html = '<tr class="text-c"><td colspan="11">没有搜索到订单，请点击“添加订单”按钮，添加订单。</td></tr>';
                 }
                 $("#orderAll").html(html);
                 layer.close(index);

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

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

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

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

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

@@ -14,10 +14,10 @@
         .my-input{padding: 8px 5px;width: 80%;border:1px solid rgba(0,0,0,.1);}
         .my-input-date{padding: 8px 10px;border:1px solid rgba(0,0,0,.1);width: 80%;background: url(http://s.iamberry.com/images/rili-1.png) 98.5% center no-repeat; background-size:auto 50%;}
         .input-box{margin: 18px 0;}
-        .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
+        .input-dic{float: left;margin:5px 10px 0 0;font-size: 14px;}
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
         .add-list>li{margin: 10px 0;}
-        .my-textarea{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
+        .my-textarea{padding: 5px 10px;width: 65%;border:1px solid rgba(0,0,0,.1);margin-left: 12.5%;}
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
@@ -32,7 +32,7 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <label class="form-label col-2 col-sm-2 huanhang">检测产品：</label>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">检测产品：</label>
             <div class="formControls col-9 col-sm-9 text-c huanhang" style="margin-bottom: 15px;">
                 <table class="table table-border table-bg table-bordered" style="width: 420px;">
                     <thead>
@@ -48,7 +48,9 @@
                         <tr>
 
                         <td>
-                            <input type="radio" onclick="emptyingNumber();" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
+                            <div class="formControls col-xs-12 col-sm-12 skin-minimal">
+                            <input type="radio"  id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>&nbsp;&nbsp;${product.productName!''}
+                            </div>
                         </td>
                         <td>
                             <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:90%" class="my-select">
@@ -70,108 +72,106 @@
                     </#if>
                     </tbody>
                 </table>
-
-            <#--<#if (productList?size > 0)>
-                <#list productList as product>
-
-
-
-                    <input type="radio" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
-                    <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:60px" class="select">
-                        <#if (product.colorList?size > 0)>
-                            <#list product.colorList as colorList>
-                                <option value ="${colorList.colorId!''}">${colorList.colorName!''}</option>
-                            </#list>
-                        <#else>
-                            <option value ="">暂无颜色</option>
-                        </#if>
-                    </select>
-                    <input class="input-text" type="text" id="maintenanceEquipmentNumber${product.productId!''}" name="maintenanceEquipmentNumber${product.productId!''}" style="width: 20%;" placeholder="机器编号" /><br>
-                </#list>
-            </#if>-->
-
             </div>
         </div>
         <div class="input-box">
-            <span class="input-dic spanhidth">检测日期</span>
-            <input class="my-input-date" type="text" style="width: 76%;"  name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">检测日期：</label>
+            <div class="formControls col-8 col-sm-8 text-c huanhang" style="margin-left: -4.5%;">
+                <input class="my-input-date" type="text"  name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
+            </div>
         </div>
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">检测结果</span>
-            <label for="radio-3">
-                <input type="radio" id="radio-3" name="detectState" value="3" checked/>检测通过
-            </label>
-            <label for="radio-4" style="margin-left: 50px;">
-                <input type="radio" id="radio-4" name="detectState" value="4"/>检测未通过
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">检测结果：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <div class="radio-box">
+                    <input type="radio" id="radio-3" name="detectState" value="3" checked/>
+                    <label for="tel-3">检测通过</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-4" name="detectState" value="4"/>
+                    <label for="tel-4">检测未通过</label>
+                </div>
+            </div>
         </div>
-
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="工厂检测现象"></textarea>
         </div>
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectFailureClassification" id="detectFailureClassification" class="my-textarea" placeholder="故障分类"></textarea>
         </div>
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="故障原因"></textarea>
         </div>
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="判定结果"></textarea>
         </div>
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="故障指向"></textarea>
         </div>
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectAnalysis" id="detectAnalysis" class="my-textarea" placeholder="原因分析"></textarea>
         </div>
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否维修</span>
-            <label for="radio-5">
-                <input type="radio" id="radio-5" name="detectIsMaintenance" value="1" checked/>需要维修
-            </label>
-            <label for="radio-6" style="margin-left: 50px;">
-                <input type="radio" id="radio-6" name="detectIsMaintenance" value="2"/>不需要维修
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否维修：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal">
+                <div class="radio-box">
+                    <input type="radio" id="radio-5" name="detectIsMaintenance" value="1" checked/>
+                    <label for="tel-5">需要维修</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-6" name="detectIsMaintenance" value="2"/>
+                    <label for="tel-6">不需要维修</label>
+                </div>
+            </div>
         </div>
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否已转入</span>
-            <label for="radio-7">
-                <input type="radio" id="radio-7" name="detectRevolutionProduced" value="1" checked/>已转入维修
-            </label>
-            <label for="radio-8" style="margin-left: 50px;">
-                <input type="radio" id="radio-8" name="detectRevolutionProduced" value="2"/>未转入维修
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">是否已转入：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
+                <div class="radio-box">
+                    <input type="radio" id="radio-7" name="detectRevolutionProduced" value="1" checked/>
+                    <label for="tel-7">已转入维修</label>
+                </div>
+                 <div class="radio-box" style="margin-left: -4.1%;">
+                    <input type="radio" id="radio-8" name="detectRevolutionProduced" value="2"/>
+                     <label for="tel-8">未转入维修</label>
+                </div>
+            </div>
         </div>
 
-        <div class="input-box">
-            <span class="input-dic spanhidth">备注</span>
-            <textarea rows="3" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
+        <div class="input-box" >
+            <label class="form-label col-3 col-sm-3 huanhang"  style="text-align: right;">备注：</label>
+            <div class="formControls col-xs-9 col-sm-9">
+                <div class="radio-box">
+                    <textarea rows="3" style="width: 200%;margin-left: -15%;margin-top: 5%;" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
+                </div>
+            </div>
         </div>
-        <div>
+        <div style="margin-left: 35%;">
            <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
-    function emptyingNumber() {
-        $("input[name='productId']").each(function () {
-            $("#maintenanceEquipmentNumber"+$(this).val()).val("");
+    /*初始化单选框样式*/
+        $(function(){
+            $('input[name="productId"]').on('ifChecked', function(event){
+                $("input[name='productId']").each(function () {
+                    $("#maintenanceEquipmentNumber"+$(this).val()).val("");
+                });
+            });
+
+            $('.skin-minimal input').iCheck({
+                checkboxClass: 'icheckbox-blue',
+                radioClass: 'iradio-blue',
+                increaseArea: '20%'
+            });
         });
-    }
 
-    function  add() {
-        $("input[name='checkbox']:checkbox:checked").each(function () {
 
-        });
+    function  add() {
 
         var detectDate = $("#detectDate").val();
         if( detectDate == null || detectDate == "" ){
@@ -257,6 +257,7 @@
             }
         });
     }
+
 </script>
 </body>
 </html>

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

@@ -23,6 +23,8 @@
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        .spanWidth{width: 133px;float: left}
+        .huanhang{ float:left}
     </style>
     <meta name="keywords" content="${path}">
     <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
@@ -31,79 +33,126 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">检测结果</span>
-            <label for="radio-3">
-                <input type="radio" id="radio-3" name="detectState" value="3" checked/>检测通过
-            </label>
-            <label for="radio-4" style="margin-left: 50px;">
-                <input type="radio" id="radio-4" name="detectState" value="4"/>检测未通过
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">检测结果：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <div class="radio-box">
+                    <input type="radio" id="radio-3" name="detectState" value="3" checked/>
+                    <label for="tel-3">检测通过</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-4" name="detectState" value="4"/>
+                    <label for="tel-4">检测未通过</label>
+                </div>
+            </div>
         </div>
 
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <#--<div class="input-box" style="margin-left: 14.2%">
+            <span class="input-dic">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectPhenomenon" id="detectPhenomenon"  class="my-textarea" placeholder="工厂检测现象">${detectInfo.detectPhenomenon!''}</textarea>
         </div>
-        <div class="input-box">
+        <div class="input-box" style="margin-left: 14.2%">
             <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectFailureClassification" id="detectFailureClassification"  class="my-textarea" placeholder="故障分类">${detectInfo.detectFailureClassification!''}</textarea>
         </div>
-        <div class="input-box">
+        <div class="input-box" style="margin-left: 14.2%">
             <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectFailureCause" id="detectFailureCause"  class="my-textarea" placeholder="故障原因">${detectInfo.detectFailureCause!''}</textarea>
         </div>
-        <div class="input-box">
+        <div class="input-box" style="margin-left: 14.2%">
             <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectResults" id="detectResults"  class="my-textarea" placeholder="判定结果">${detectInfo.detectResults!''}</textarea>
         </div>
-        <div class="input-box">
+        <div class="input-box" style="margin-left: 14.2%">
             <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectPoint" id="detectPoint"  class="my-textarea" placeholder="故障指向">${detectInfo.detectPoint!''}</textarea>
         </div>
-        <div class="input-box">
+        <div class="input-box" style="margin-left: 14.2%">
             <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectAnalysis" id="detectAnalysis"  class="my-textarea" placeholder="原因分析">${detectInfo.detectAnalysis!''}</textarea>
+        </div>-->
+        <div class="input-box" style="margin-left: 17%;">
+            <textarea rows="3" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="工厂检测现象">${detectInfo.detectPhenomenon!''}</textarea>
+        </div>
+        <div class="input-box" style="margin-left: 17%;">
+            <textarea rows="3" cols="20" name="detectFailureClassification" id="detectFailureClassification" class="my-textarea" placeholder="故障分类">${detectInfo.detectFailureClassification!''}</textarea>
+        </div>
+        <div class="input-box" style="margin-left: 17%;">
+            <textarea rows="3" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="故障原因">${detectInfo.detectFailureCause!''}</textarea>
+        </div>
+        <div class="input-box" style="margin-left: 17%;">
+            <textarea rows="3" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="判定结果">${detectInfo.detectResults!''}</textarea>
+        </div>
+        <div class="input-box" style="margin-left: 17%;">
+            <textarea rows="3" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="故障指向">${detectInfo.detectPoint!''}</textarea>
+        </div>
+        <div class="input-box" style="margin-left: 17%;">
+            <textarea rows="3" cols="20" name="detectAnalysis" id="detectAnalysis" class="my-textarea" placeholder="原因分析">${detectInfo.detectAnalysis!''}</textarea>
         </div>
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否需要转入生产部门</span>
-            <label for="radio-5">
-                <input type="radio" id="radio-5" name="detectIsMaintenance" onclick="show()" value="1" checked/>需要转入生产部门
-            </label>
-            <label for="radio-6" style="margin-left: 50px;">
-                <input type="radio" id="radio-6" name="detectIsMaintenance" onclick="hide()" value="2"/>不需要转入生产部门
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">是否转入生产：</label>
+            <div class=" col-xs-8 col-sm-8 skin-minimal" style="margin: 10px 0px;">
+                <div class="radio-box">
+                    <input type="radio" id="radio-5" name="detectIsMaintenance" value="1" checked/>需要转入
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-6" name="detectIsMaintenance" value="2"/>不需要转入
+                </div>
+            </div>
         </div>
         <div class="input-box" id="revolutionProducedId">
-            <span class="input-dic" style="margin-top: 0">立即转入生产部门</span>
-            <label for="radio-7">
-                <input type="radio" id="radio-7" name="detectRevolutionProduced" value="2" checked/>立即转入
-            </label>
-            <label for="radio-8" style="margin-left: 50px;">
-                <input type="radio" id="radio-8" name="detectRevolutionProduced" value="1"/>以后转入
-            </label>
-        </div>
-        <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">QC检查状态</span>
-            <label for="radio-7">
-                <input type="radio" id="radio-9" name="maintenanceResults" value="1" checked/>通过
-            </label>
-            <label for="radio-8" style="margin-left: 50px;">
-                <input type="radio" id="radio-10" name="maintenanceResults" value="2"/>不通过
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">立即转入生产：</label>
+            <div class="col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
+                <div class="radio-box">
+                    <input type="radio"  id="radio-7" name="detectRevolutionProduced" value="2" checked/>立即转入
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-8" name="detectRevolutionProduced" value="1"/>以后转入
+                </div>
+            </div>
         </div>
         <div class="input-box">
-            <span class="input-dic spanhidth">备注</span>
-            <textarea rows="3" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">QC检查状态：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
+                <div class="radio-box">
+                    <input type="radio" id="radio-9" name="maintenanceResults" value="1" checked/>通过
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-10" name="maintenanceResults" value="2"/>不通过
+                </div>
+            </div>
         </div>
+            <div class="input-box" >
+                <label class="form-label col-3 col-sm-3 huanhang"  style="text-align: right;">备注：</label>
+                <div class="formControls col-xs-9 col-sm-9">
+                    <div class="radio-box">
+                        <textarea rows="3" style="width: 200%;margin-left: -15%;margin-top: 5%;" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
+                    </div>
+                </div>
+            </div>
         <div>
             <input type="hidden" value="${detectId!''}" id="detectId" name="detectId">
-           <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
+           <button type="button" style="margin-left: 35%;" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
+    /*初始化单选框样式*/
+    $(function(){
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+        $('input[name="detectIsMaintenance"]').on('ifChecked', function(event){
+            if($(this).val() == 1){
+                show();
+            }else{
+                hide();
+            }
+        });
+    });
     function hide() {
         $("#revolutionProducedId").hide();
     }

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

@@ -130,7 +130,7 @@
                         </#if>
                             <#if detect.detectRevolutionProduced == 1>
                                 <a style="text-decoration:none" href="javascript:;" title="转入生产"
-                                   onclick="update_info('转入生产','${path}/admin/detect/to_detect_complete?detectId=${detect.detectId!''}&state=2','570','450');">
+                                   onclick="update_info('转入生产','${path}/admin/detect/to_detect_complete?detectId=${detect.detectId!''}&state=2','670','450');">
                                     <i class="Hui-iconfont">&#xe6e1;</i>
                                 </a>
                             </#if>
@@ -147,10 +147,14 @@
                                 <i class="Hui-iconfont">&#xe60c;</i>
                             </a>
                         </#if>
-                        <a style="text-decoration:none" href="javascript:;" title="查看仓储进度"
-                           onclick="add_remark('查看仓储进度','${path}/admin/detect/to_view_progress?signclosedId=${detect.signclosedId!''}','570','450');">
-                            <i class="Hui-iconfont">&#xe6cd;</i>
-                        </a>
+                        <#if detect.signclosedId??>
+                            <#if detect.detectState == 1>
+                                <a style="text-decoration:none" href="javascript:;" title="查看仓储进度"
+                                   onclick="add_remark('查看仓储进度','${path}/admin/detect/to_view_progress?signclosedId=${detect.signclosedId!''}','570','450');">
+                                    <i class="Hui-iconfont">&#xe6cd;</i>
+                                </a>
+                            </#if>
+                        </#if>
                     </td>
                 </tr>
                 </#list>

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

@@ -17,12 +17,13 @@
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
         .add-list>li{margin: 10px 0;}
-        .my-textarea{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
+        .my-textarea{padding: 5px 10px;width: 65%;border:1px solid rgba(0,0,0,.1);margin-left: 12.5%;}
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        .huanhang{ float:left}
     </style>
     <meta name="keywords" content="${path}">
     <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
@@ -31,90 +32,76 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">检测结果</span>
-            <label for="radio-3">
-                <input type="radio" id="radio-3" name="detectState" value="3"
-                       <#if detectInfo.detectState == 3>checked</#if>
-                       />检测通过
-            </label>
-            <label for="radio-4" style="margin-left: 50px;">
-                <input type="radio" id="radio-4" name="detectState" value="4"
-                       <#if detectInfo.detectState == 4>checked</#if>
-                />检测未通过
-            </label>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 12px 0px;">检测结果：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <div class="radio-box">
+                    <input type="radio" id="radio-3" name="detectState" value="3"
+                           <#if detectInfo.detectState == 3>checked</#if>
+                           />检测通过
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-4" name="detectState" value="4"
+                           <#if detectInfo.detectState == 4>checked</#if>
+                    />检测未通过
+                </div>
+            </div>
         </div>
 
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-            <textarea rows="3" cols="20" name="detectPhenomenon" id="detectPhenomenon"  class="my-textarea" placeholder="工厂检测现象">${detectInfo.detectPhenomenon!''}</textarea>
+        <div class="input-box" style="margin-left: 17%;">
+            <textarea rows="3" cols="20" style="margin-left: 2.9%;" name="detectPhenomenon" id="detectPhenomenon"  class="my-textarea" placeholder="工厂检测现象">${detectInfo.detectPhenomenon!''}</textarea>
         </div>
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectFailureClassification" id="detectFailureClassification"  class="my-textarea" placeholder="故障分类">${detectInfo.detectFailureClassification!''}</textarea>
         </div>
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectFailureCause" id="detectFailureCause"  class="my-textarea" placeholder="故障原因">${detectInfo.detectFailureCause!''}</textarea>
         </div>
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectResults" id="detectResults"  class="my-textarea" placeholder="判定结果">${detectInfo.detectResults!''}</textarea>
         </div>
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectPoint" id="detectPoint"  class="my-textarea" placeholder="故障指向">${detectInfo.detectPoint!''}</textarea>
         </div>
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectAnalysis" id="detectAnalysis"  class="my-textarea" placeholder="原因分析">${detectInfo.detectAnalysis!''}</textarea>
         </div>
 
-        <#--<div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否需要转入生产部门</span>
-            <label for="radio-5">
-                <input type="radio" id="radio-5" name="detectIsMaintenance" onclick="show()" value="1" checked/>需要转入生产部门
-            </label>
-            <label for="radio-6" style="margin-left: 50px;">
-                <input type="radio" id="radio-6" name="detectIsMaintenance" onclick="hide()" value="2"/>不需要转入生产部门
-            </label>
-        </div>
-        <div class="input-box" id="revolutionProducedId">
-            <span class="input-dic" style="margin-top: 0">立即转入生产部门</span>
-            <label for="radio-7">
-                <input type="radio" id="radio-7" name="detectRevolutionProduced" value="2" checked/>立即转入
-            </label>
-            <label for="radio-8" style="margin-left: 50px;">
-                <input type="radio" id="radio-8" name="detectRevolutionProduced" value="1"/>以后转入
-            </label>
-        </div>-->
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">QC检查状态</span>
-            <label for="radio-7">
-                <input type="radio" id="radio-9" name="maintenanceResults" value="1" checked/>通过
-            </label>
-            <label for="radio-8" style="margin-left: 50px;">
-                <input type="radio" id="radio-10" name="maintenanceResults" value="2"/>不通过
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">QC检查状态：</label>
+            <div class="col-xs-7 col-sm-7 skin-minimal">
+                <div class="radio-box">
+                    <input type="radio" id="radio-9" name="maintenanceResults" value="1" <#if detectInfo.maintenanceResults??><#if detectInfo.maintenanceResults == 1>checked</#if></#if>/>
+                    <label for="tel-7">通过</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-10" name="maintenanceResults" value="2" <#if detectInfo.maintenanceResults??><#if detectInfo.maintenanceResults == 2>checked</#if></#if>/>
+                    <label for="tel-7">不通过</label>
+                </div>
+            </div>
         </div>
         <div class="input-box">
-            <span class="input-dic spanhidth">备注</span>
-            <textarea rows="3" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
-        </div>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">备注：</label>
+            <div class="formControls col-xs-9 col-sm-9">
+                <div class="radio-box">
+                    <textarea rows="3" cols="20" style="width: 200%;margin-left: -15%;margin-top: 5%;" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
+                </div>
+            </div>
         <div>
             <input type="hidden" value="${detectId!''}" id="detectId" name="detectId">
-           <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
+           <button type="button" style="margin-left: 35%" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
-    function hide() {
-        $("#revolutionProducedId").hide();
-    }
-    function show() {
-        $("#revolutionProducedId").show();
-    }
-
+    /*初始化单选框样式*/
+    $(function(){
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+    });
     function  add() {
 
         var detectPhenomenon = $("#detectPhenomenon").val();

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

@@ -111,7 +111,9 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     layer.msg('修改成功',{icon: 1,time:1000},function () {
-                        location.replace(location.href);
+                        window.parent.location.reload();
+                        var index = parent.layer.getFrameIndex(window.name);
+                        parent.layer.close(index)
                     });
                 } else {
                     layer.msg('修改失败',{icon: 5,time:1000});

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

@@ -94,7 +94,7 @@
                         parent.layer.close(index)
                     });
                 } else {
-                    layer.msg('催促失败',{icon: 5,time:1000});
+                    layer.msg('催促失败,请检查是否是仓储转入',{icon: 5,time:1000});
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/add_maintenance.ftl

@@ -47,7 +47,7 @@
                         <#list productList as product>
                         <tr>
                             <td>
-                                <input type="radio" onclick="emptyingNumber();" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
+                                <input type="radio" onclick="emptyingNumber();" id="radio-1${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
                             </td>
                             <td>
                                 <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:90%" class="my-select">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/maintenance_list.ftl

@@ -27,7 +27,7 @@
     <div class="text-c">
         <form name="form1" action="${path}/admin/maintenance/select_maintenance_list" method="post">
             <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_maintenance('添加维修记录','${path}/admin/maintenance/to_add_maintenance','670','450');">新建维修工单</button>
-            <input class="my-input" style="width: 70px;" type="text" name="customerIdDescribe" value="${customerIdDescribe!}" placeholder="客诉描述"/>
+            <input class="my-input" style="width: 100px;margin-top: -0.5%;" type="text" name="customerIdDescribe" value="${customerIdDescribe!}" placeholder="客诉描述"/>
             <select class="my-select" name="maintenanceResults" style="height: 30px;width: 150px">
                 <option value ="">QC检测结果</option>
                 <option value ="1" <#if maintenanceResults??><#if maintenanceResults == 1>selected="selected"</#if></#if>>通过</option>
@@ -56,7 +56,7 @@
                 <th width="100">是否入库</th>
                 <th width="150">备注</th>
                 <th width="150">返修日期</th>
-                <th width="50">操作</th>
+                <th width="80">操作</th>
             </tr>
             </thead>
             <tbody id="listid">

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

@@ -61,7 +61,8 @@
         <form action="" method="post" class="form form-horizontal" id="form-signclosed-add">
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收类型：</label>
-				<div class="radio-box">
+                <div class="formControls col-7 col-sm-7  skin-minimal" style="margin-left: -2.8%;">
+				    <div class="radio-box">
                         <input type="radio" id="tel-1" name="signclosedType" value="1" datatype="*"  checked nullmsg="请选择签收类型！">
                         <label for="tel-1">客诉寄回</label>
                     </div>
@@ -74,52 +75,8 @@
                         <label for="tel-3">其他</label>
                         <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="选择其他时有值" id="signclosedTypeName" name="signclosedTypeName">
                     </div>
-
-            </div>
-            <#--<div class="row cl">
-                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回产品：</label>
-                <div class="formControls col-8 col-sm-8 text-c" id="produceSelect">
-                    <table class="table table-border table-bg table-bordered">
-                        <thead>
-                        <tr class="text-c">
-                            <th style="text-align: center;" width="100">产品名称</th>
-                            <th style="text-align: center;" width="100">产品颜色</th>
-                            <th style="text-align: center;" width="100">产品配件</th>
-                        </tr>
-                        </thead>
-                        <tbody id="addProduct">
-                        <#if (productList?size > 0)>
-                            <#list productList as product>
-                            <tr >
-                                <td>${product.productName!''}</td>
-                                <td>
-                                    <#if (product.colorList?size > 0)>
-                                        <#list product.colorList as colorList>
-                                            <input type="checkbox" id="" value="${colorList.colorId!''}" name="colorName" datatype="*">${colorList.colorName!''}
-                                            <input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="" placeholder="数量" id="colorId${colorList.colorId!''}" name="colorId${colorList.colorId!''}"><br>
-                                        </#list>
-                                    <#else>
-                                        暂无颜色，请先添加产品颜色
-                                    </#if>
-                                </td>
-                                <td>
-                                    <#if (product.fittingsList?size > 0)>
-                                        <#list product.fittingsList as fittingsList>
-                                        <input type="checkbox" id="" value="${fittingsList.fittingsId!''}" name="fittingsName" datatype="*">${fittingsList.fittingsName!''}
-                                        <input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="" placeholder="数量" id="fittingsId${fittingsList.fittingsId!''}" name="fittingsId${fittingsList.fittingsId!''}"><br>
-                                        </#list>
-                                    <#else>
-                                        暂无配件，请先添加配件
-                                    </#if>
-                                </td>
-
-                            </tr>
-                            </#list>
-                        </#if>
-                        </tbody>
-                    </table>
                 </div>
-            </div>-->
+            </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回物流：</label>
                 <div class="formControls col-3 col-sm-3 skin-minimal">
@@ -150,8 +107,8 @@
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄件人信息：</label>
                 <div class="formControls col-4 col-sm-4 skin-minimal">
-                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
-                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
+                    <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
+                    <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
                 </div>
             </div>
 
@@ -203,7 +160,7 @@
 
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否少配件：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.8%;">
                     <div class="radio-box">
                         <input type="radio" id="tel-4" name="signclosedIsFittings" value="1" datatype="*" checked  >
                         <label for="tel-4">缺少配件</label>
@@ -216,14 +173,14 @@
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收日期：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -0.8%;">
                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text my-input-date" placeholder="签收日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="signclosed_date" name="signclosed_date" readonly="readonly"/>
                 </div>
             </div>
 
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否品检：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.8%;">
                     <div class="radio-box">
                         <input type="radio" id="tel-6" name="signclosedIsQuality" value="1" datatype="*" checked  >
                         <label for="tel-6">需要品检</label>
@@ -236,7 +193,7 @@
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否已转入：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.8%;">
                     <div class="radio-box">
                         <input type="radio" id="tel-8" name="signclosedIsInto" value="1" datatype="*" checked  >
                         <label for="tel-8">已转入品检</label>
@@ -249,7 +206,7 @@
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否已经签收：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.8%;">
                     <div class="radio-box">
                         <input type="radio" id="tel-10" name="signclosedState" onclick="show();" value="1" datatype="*" checked  >
                         <label for="tel-8">已签收</label>
@@ -262,7 +219,7 @@
             </div>
             <div class="row cl" id="objectsStateId">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>物件状态：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.8%;">
                     <div class="radio-box">
                         <input type="radio" id="tel-12" name="signclosedObjectsState" value="1" datatype="*" checked  >
                         <label for="tel-8">正常签收</label>
@@ -330,7 +287,7 @@
                         if(value.colorList != null) {
                             if (value.colorList.length > 0) {
                                 $.each(value.colorList, function (i, value) {
-                                    colorTable = colorTable + '<td id="tdColorId' + value.colorId + '"><input type="checkbox" value="' + value.colorId + '" name="alreadyColorName" datatype="*">' + value.colorName + ''
+                                    colorTable = colorTable + '<td id="tdColorId' + value.colorId + '" style="border: 1px solid #DCDCDC;"><input type="checkbox" value="' + value.colorId + '" name="alreadyColorName" datatype="*">' + value.colorName + ''
                                             + '<input type="text" style="width: 50px;margin-left: 10px;" class="input-text" oninput="generateInput(' + value.colorId + ')" onpropertychange="generateInput(' + value.colorId + ')"  placeholder="数量" id="alreadyColorId' + value.colorId + '" name="alreadyColorId' + value.colorId + '"><br>' +
                                             '</td>'
                                 });
@@ -352,7 +309,7 @@
                         }else{
                             fittingsTable = '暂无配件，请先添加配件';
                         }
-                        var productTable = '<tr>'
+                        var productTable = '<tr">'
                                 +'<td>'+value.productName+'</td>'
                                 +'<td><table border="0">'+colorTable+'</table></td>'
                                 +'<td>'+fittingsTable+'</td>'
@@ -463,6 +420,11 @@
             layer.msg('寄件人电话格式不正确',{icon: 5,time:1000});
             return;
         }
+        var signclosed_date = $("#signclosed_date").val();
+        if( signclosed_date == null || signclosed_date == "" ){
+            layer.msg('请选择签收日期',{icon: 5,time:1000});
+            return;
+        }
 
         var signclosedDesc = $("#signclosedDesc").val();
         if( signclosedDesc != null || signclosedDesc == "" ){
@@ -481,11 +443,14 @@
                 if (data.returnCode == 200) {
                     layer.msg('添加成功',{icon: 1,time:1000},function () {
                         location.replace(location.href);
+                        window.location.href= "${path}/admin/signclosed/select_signclosed_list";
                     });
                 } else if(data.returnCode == 501) {
                     layer.msg('机器编号未填写',{icon: 5,time:1000});
                 } else if(data.returnCode == 502) {
                     layer.msg('请至少选择一件已签收的产品',{icon: 5,time:1000});
+                } else if(data.returnCode == 503) {
+                    layer.msg('请输入产品数量',{icon: 5,time:1000});
                 }else{
                     layer.msg('添加失败',{icon: 5,time:1000});
                 }

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

@@ -60,26 +60,28 @@
     <div class="pd-20 cl">
         <form action="" method="post" class="form form-horizontal" id="form-signclosed-add">
             <div class="row cl">
-                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄送信息：</label>
-                <#if (signclosedList?size > 0)>
-                    <#list signclosedList as signclosed>
-                        <#if signclosed.signclosedProductType == 1>
-                            ${signclosed.productName!''}-${signclosed.colorName!''}*${signclosed.productNum!''}台
-                        <#else>
-                            ${signclosed.productName!''}*${signclosed.productNum!''}件
-                        </#if>
-                    </#list>
-                </#if>
+                <label class="form-label col-3 col-sm-3">寄送信息：</label>
+                <div class="formControls col-4 col-sm-4">
+                    <#if (signclosedList?size > 0)>
+                        <#list signclosedList as signclosed>
+                            <#if signclosed.signclosedProductType == 1>
+                                ${signclosed.productName!''}-${signclosed.colorName!''}*${signclosed.productNum!''}台
+                            <#else>
+                                ${signclosed.productName!''}*${signclosed.productNum!''}件
+                            </#if>
+                        </#list>
+                    </#if>
+                </div>
             </div>
             <div class="row cl">
-                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>客服备注：</label>
+                <label class="form-label col-3 col-sm-3">客服备注：</label>
                <#if ifcomplaintSignclosedInfo?? >${complaintSignclosedInfo.signclosedCustomerDesc!''}</#if>
             </div>
             <div class="row cl">
-                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回产品：</label>
+                <label class="form-label col-3 col-sm-3">寄回产品：</label>
                 <div class="formControls col-8 col-sm-8 text-c" id="produceSelect">
                     <div>
-                        <input type="text" oninput="selectProduct();" onpropertychange="selectProduct();" class="input-text" style="width: 826px;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
+                        <input type="text" oninput="selectProduct();" onpropertychange="selectProduct();" class="input-text" style="width: 100%;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
                     </div>
                     <table class="table table-border table-bg table-bordered">
                         <thead>
@@ -95,15 +97,17 @@
                             <tr>
                                 <#if signclosed.signclosedProductType == 1>
                                 <td>${signclosed.productName!''}</td>
-                                <td><table border="0">
-                                    <td id="tdColorId${signclosed.signclosedProductColor!''}"><input type="checkbox" value="${signclosed.signclosedProductColor!''}" name="alreadyColorName" datatype="*">${signclosed.colorName!''}
-                                    <input type="text" style="width: 50px;margin-left: 10px;" value="${signclosed.productNum!''}" class="input-text" oninput="generateInput( ${signclosed.signclosedProductColor!''})" onpropertychange="generateInput(${signclosed.signclosedProductColor!''})"  placeholder="数量" id="alreadyColorId${signclosed.signclosedProductColor!''}" name="alreadyColorId${signclosed.signclosedProductColor!''}"><br>
-                                        <#list 1..signclosed.productNum as t>
-                                            <input type="text" class="input-text" style="width: 110px;" placeholder="机器编号" name="machineNumber${signclosed.signclosedProductColor!''}" >
-                                        </#list>
-
-                                    </td>
-                                </table></td>
+                                <td style="margin: 0px;padding: 0px;height: 20px;">
+                                    <table border="0">
+                                        <td id="tdColorId${signclosed.signclosedProductColor!''}" style="border-top: 1px solid #ddd;">
+                                            <input type="checkbox" checked value="${signclosed.signclosedProductColor!''}" name="alreadyColorName" datatype="*">${signclosed.colorName!''}
+                                            <input type="text" style="width: 50px;margin-left: 10px;" value="${signclosed.productNum!''}" class="input-text" oninput="generateInput( ${signclosed.signclosedProductColor!''})" onpropertychange="generateInput(${signclosed.signclosedProductColor!''})"  placeholder="数量" id="alreadyColorId${signclosed.signclosedProductColor!''}" name="alreadyColorId${signclosed.signclosedProductColor!''}"><br>
+                                            <#list 1..signclosed.productNum as t>
+                                                <input type="text" class="input-text" style="width: 110px;" placeholder="机器编号" name="machineNumber${signclosed.signclosedProductColor!''}" >
+                                            </#list>
+                                         </td>
+                                    </table>
+                                </td>
                                 <td> </td>
                                 </#if>
                                 <#if signclosed.signclosedProductType == 2>
@@ -125,41 +129,40 @@
 
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄件人信息：</label>
-                <div class="formControls col-4 col-sm-4 skin-minimal">
-                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
+                <div class="formControls col-4 col-sm-4" style="margin-left: -0.9%">
+                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName" onkeyup="value=value.replace(/[A-Za-z\d]/g,'')" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[A-Za-z\d]/g,''))">
                     <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
                 </div>
             </div>
 
             <div class="row cl" style="position: relative;">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄件区域：</label>
-                <div class="formControls col-3 col-sm-3 skin-minimal">
-                    <span class="select-box">
+                <div class="formControls col-4 col-sm-4 skin-minimal">
+                    <span class="select-box" style="width: 150px;">
                     <select name="signclosedAddrProvinces" id="province" class="select">
 
-
                     </select>
                      </span>
-                </div>
-                    <div class="formControls col-3 col-sm-3 skin-minimal">
-                    <span class="select-box">
+                    <span class="select-box" style="width: 150px;margin-left: 7px;">
                     <select name="signclosedAddrCity" id="city" class="select">
 
-
                     </select>
                     </span>
                 </div>
+                <div class="formControls col-3 col-sm-3 skin-minimal">
+
+                </div>
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收日期：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -0.9%">
                     <input type="text" style="width: 150px;margin-left: 10px;" class="input-text my-input-date" placeholder="签收日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="signclosed_date" name="signclosed_date" readonly="readonly"/>
                 </div>
             </div>
 
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否少配件：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.5%">
                     <div class="radio-box">
                         <input type="radio" id="tel-4" name="signclosedIsFittings" value="1" datatype="*" checked  >
                         <label for="tel-4">缺少配件</label>
@@ -173,14 +176,14 @@
 
             <div class="row cl" id="objectsStateId">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>物件状态：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.5%">
                     <div class="radio-box">
                         <input type="radio" id="tel-12" name="signclosedObjectsState" value="1" datatype="*" checked  >
-                        <label for="tel-8">正常签收</label>
+                        <label for="tel-12">正常签收</label>
                     </div>
                     <div class="radio-box">
                         <input type="radio" id="tel-13" name="signclosedObjectsState" value="2" datatype="*">
-                        <label for="tel-9">物件不对</label>
+                        <label for="tel-13">物件不对</label>
                     </div>
                 </div>
             </div>
@@ -235,32 +238,32 @@
                         if(value.colorList != null) {
                             if (value.colorList.length > 0) {
                                 $.each(value.colorList, function (i, value) {
-                                    colorTable = colorTable + '<td id="tdColorId' + value.colorId + '"><input type="checkbox" value="' + value.colorId + '" name="alreadyColorName" datatype="*">' + value.colorName + ''
+                                    colorTable = colorTable + '<td id="tdColorId' + value.colorId + '" style="border-top: 1px solid #ddd; "><input type="checkbox" value="' + value.colorId + '" name="alreadyColorName" datatype="*">' + value.colorName + ''
                                             + '<input type="text" style="width: 50px;margin-left: 10px;" class="input-text" oninput="generateInput(' + value.colorId + ')" onpropertychange="generateInput(' + value.colorId + ')"  placeholder="数量" id="alreadyColorId' + value.colorId + '" name="alreadyColorId' + value.colorId + '"><br>' +
                                             '</td>'
                                 });
                             }else{
-                                colorTable = '暂无颜色，请先添加产品颜色';
+                                colorTable = '<span>暂无颜色，请先添加产品颜色</span>';
                             }
                         }else {
-                            colorTable = '暂无颜色，请先添加产品颜色';
+                            colorTable = '<span>暂无颜色，请先添加产品颜色</span>';
                         }
                         if(value.fittingsList != null) {
                             if (value.fittingsList.length > 0) {
                                 $.each(value.fittingsList, function (i, value) {
-                                    fittingsTable = fittingsTable + '<input type="checkbox" value="' + value.fittingsId + '" name="alreadyFittingsName" datatype="*">' + value.fittingsName + ''
-                                            + '<input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="" placeholder="数量" id="alreadyFittingsId' + value.fittingsId + '" name="alreadyFittingsId' + value.fittingsId + '"><br>'
+                                    fittingsTable = fittingsTable + '<input type="checkbox" style="margin-left: 5px;" value="' + value.fittingsId + '" name="alreadyFittingsName" datatype="*">' + value.fittingsName + ''
+                                            + '<input type="text" style="width: 50px;" class="input-text" value="" placeholder="数量" id="alreadyFittingsId' + value.fittingsId + '" name="alreadyFittingsId' + value.fittingsId + '"><br>'
                                 });
                             }else{
-                                fittingsTable = '暂无配件，请先添加配件';
+                                fittingsTable = '<span>暂无配件，请先添加配件</span>';
                             }
                         }else{
-                            fittingsTable = '暂无配件，请先添加配件';
+                            fittingsTable = '<span>暂无配件，请先添加配件</span>';
                         }
                         var productTable = '<tr>'
                                 +'<td>'+value.productName+'</td>'
-                                +'<td><table border="0">'+colorTable+'</table></td>'
-                                +'<td>'+fittingsTable+'</td>'
+                                +'<td style="margin: 0px;padding: 0px;height: 20px;"><table border="0" style="height: 65px;">'+colorTable+'</table></td>'
+                                +'<td style="margin: 0px;padding: 0px;height: 20px;">'+fittingsTable+'</td>'
                                 +'</tr>';
                         $("#addProduct").append(productTable);
                     });
@@ -333,6 +336,11 @@
             layer.msg('寄件人姓名不能为空',{icon: 5,time:1000});
             return;
         }
+        /*var reg=/^[\u2E80-\u9FFF]+$/;
+        if(!reg.text(signclosedSendName)){
+            layer.msg('寄件人姓名格式错误',{icon: 5,time:1000});
+            return;
+        }*/
         if( signclosedSendName.length > 10 ){
             layer.msg('寄件人姓名长度不得大于10个字符',{icon: 5,time:1000});
             return;
@@ -351,7 +359,11 @@
             layer.msg('寄件人电话格式不正确',{icon: 5,time:1000});
             return;
         }
-
+        var signclosed_date = $("#signclosed_date").val();
+        if( signclosed_date == null || signclosed_date == "" ){
+            layer.msg('签收日期不能为空',{icon: 5,time:1000});
+            return;
+        }
         var signclosedDesc = $("#signclosedDesc").val();
         if( signclosedDesc != null || signclosedDesc == "" ){
             if( signclosedDesc.length > 300 ){
@@ -368,7 +380,7 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     layer.msg('添加成功',{icon: 1,time:1000},function () {
-                        location.replace(location.href);
+                        window.location.href= "${path}/admin/signclosed/select_signclosed_list";
                     });
                 } else if(data.returnCode == 501) {
                     layer.msg('机器编号未填写',{icon: 5,time:1000});

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

@@ -31,86 +31,105 @@
 <body>
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
-        <div class="row cl">
-            <label class=" col-3 col-sm-3" style="color: #0000cc;">原寄送信息</label>
-        </div>
-        <div class="row cl">
-            <label class=" col-3 col-sm-3 huanhang">寄件人姓名：</label>
-            <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
-                    <span>
-                        ${complaintSignclosedInfo.signclosedSendName!''}
-                    </span>
+        <div >
+            <div class="row cl">
+                <label class=" col-3 col-sm-3" style="color: #0000cc;">原寄送信息</label>
             </div>
-        </div>
-        <div class="row cl" style="position: relative;">
-            <label class="form-label col-3 col-sm-3 huanhang">寄件人电话：</label>
-            <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
-                    <span>
-                    ${complaintSignclosedInfo.signclosedSendTel!''}
-                    </span>
+            <div class="row cl">
+                <label class=" col-4 col-sm-4 huanhang" style="text-align: right;">寄件人姓名：</label>
+                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                        <span>
+                            ${complaintSignclosedInfo.signclosedSendName!''}
+                        </span>
+                </div>
             </div>
-        </div>
-        <div class="row cl" style="position: relative;">
-            <label class="form-label col-3 col-sm-3 huanhang">物流公司：</label>
-            <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
-                    <span>
-                        <#if complaintSignclosedInfo.signclosedLogistics??>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "sto">申通快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "yto">圆通快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "sf">顺丰快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "ems">邮政EMS</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "zto">中通快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "zjs">宅急送</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "yunda">韵达快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "pick">上门提货</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "htky">汇通快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "ttkdex">天天快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "jd">京东快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "01">其他</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "02">上门送货</#if>
-                       ,
-                        ${complaintSignclosedInfo.signclosedLogisticsNumber!''}
+            <div class="row cl" style="position: relative;">
+                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;">寄件人电话：</label>
+                <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
+                        <span>
+                        ${complaintSignclosedInfo.signclosedSendTel!''}
+                        </span>
+                </div>
+            </div>
+            <div class="row cl" style="position: relative;">
+                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;">物流公司：</label>
+                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                        <span>
+                            <#if complaintSignclosedInfo.signclosedLogistics??>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "sto">申通快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "yto">圆通快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "sf">顺丰快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "ems">邮政EMS</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "zto">中通快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "zjs">宅急送</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "yunda">韵达快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "pick">上门提货</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "htky">汇通快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "ttkdex">天天快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "jd">京东快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "01">其他</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "02">上门送货</#if>
+                            </#if>
+                        </span>
+                </div>
+            </div>
+
+            <div class="row cl" style="position: relative;">
+                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;">物流单号：</label>
+                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                        <span>
+                        <#if complaintSignclosedInfo.signclosedLogisticsNumber??>
+                            ${complaintSignclosedInfo.signclosedLogisticsNumber!''}
                         </#if>
-                    </span>
+                        </span>
+                </div>
             </div>
         </div>
-        <div class="row cl" style="position: relative;">
-            <label class="form-label col-3 col-sm-3" style="color: #0000cc;">现寄送信息</label>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-3 col-sm-3 huanhang"><span class="c-red">*</span>寄件人姓名：</label>
-            <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
-                <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
+        <div>
+            <div class="row cl" style="position: relative;">
+                <label class="form-label col-3 col-sm-3" style="color: #0000cc;">现寄送信息</label>
             </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-3 col-sm-3 huanhang"><span class="c-red">*</span>寄件人电话：</label>
-            <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
-                <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
+            <div class="row cl">
+                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人姓名：</label>
+                <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
+                    <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
+                </div>
             </div>
-        </div>
-        <div class="row cl" style="position: relative;">
-            <label class="form-label col-3 col-sm-3 huanhang"><span class="c-red">*</span>物流信息：</label>
-            <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
-                    <select name="signclosedLogistics" class="my-select" style="width: 150px;margin-left: 0px;">
-                        <option value="">请选择物流公司</option>
-                        <option value="sto">申通快递</option>
-                        <option value="yto">圆通快递</option>
-                        <option value="sf">顺丰快递</option>
-                        <option value="ems">邮政EMS</option>
-                        <option value="zto">中通快递</option>
-                        <option value="zjs">宅急送</option>
-                        <option value="yunda">韵达快递</option>
-                        <option value="cces">cces快递</option>
-                        <option value="pick">上门提货</option>
-                        <option value="htky">汇通快递</option>
-                        <option value="ttkdex">天天快递</option>
-                        <option value="stars">星晨急便</option>
-                        <option value="jd">京东快递</option>
-                        <option value="01">其他</option>
-                        <option value="02">上门送货</option>
-                    </select>
-                <input type="text" style="width: 150px;margin-top: 15px;" class="input-text" placeholder="物流单号" id="signclosedLogisticsNumber" name="signclosedLogisticsNumber">
+            <div class="row cl">
+                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人电话：</label>
+                <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
+                    <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
+                </div>
+            </div>
+            <div class="row cl" style="position: relative;">
+                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;"><span class="c-red">*</span>物流信息：</label>
+                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                        <select name="signclosedLogistics" class="my-select" style="width: 150px;margin-left: 0px;">
+                            <option value="">请选择物流公司</option>
+                            <option value="sto">申通快递</option>
+                            <option value="yto">圆通快递</option>
+                            <option value="sf">顺丰快递</option>
+                            <option value="ems">邮政EMS</option>
+                            <option value="zto">中通快递</option>
+                            <option value="zjs">宅急送</option>
+                            <option value="yunda">韵达快递</option>
+                            <option value="cces">cces快递</option>
+                            <option value="pick">上门提货</option>
+                            <option value="htky">汇通快递</option>
+                            <option value="ttkdex">天天快递</option>
+                            <option value="stars">星晨急便</option>
+                            <option value="jd">京东快递</option>
+                            <option value="01">其他</option>
+                            <option value="02">上门送货</option>
+                        </select>
+                </div>
+            </div>
+
+            <div class="row cl" style="position: relative;">
+                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;"><span class="c-red">*</span>物流信息：</label>
+                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                    <input type="text" style="width: 150px;" class="input-text" placeholder="物流单号" id="signclosedLogisticsNumber" name="signclosedLogisticsNumber">
+                </div>
             </div>
         </div>
         <div style="text-align:center;">

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

@@ -149,6 +149,10 @@ function listDistrict(cityId,districtName){
  */
 function keyFun(node,maxNumber,minNumber){
     var c=$(node);
+    if(c.val() == ""){
+        $(node).val("");
+        return false;
+    }
     var temp_amount=c.val().replace(/[^\d]/g,'');
     var number  = Number(temp_amount)
     if(maxNumber!= null && maxNumber!= "" && number > maxNumber){
@@ -170,7 +174,7 @@ function keyFun(node,maxNumber,minNumber){
  * 用于展示错误信息，并让该节点得到焦点
  */
 function vailErrorMsg(node,msg){
-    layer.msg(msg, {icon: 5, time: 3000});
+    layer.msg(msg, {icon: 5, time: 5000});
     node.select();
     window.setTimeout(function(){
         node.focus();