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

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

@@ -43,6 +43,7 @@ public class ComplaintSignclosedInfo implements Serializable {
     private List<SignclosedProductInfo> signclosedProductInfoList = new ArrayList<SignclosedProductInfo>();	//签收实体类
     private String provincesName;//寄件地址（省）
     private String cityName;//寄件地址（市）
+    private String describeHandleDesc;//处理描述
     public Integer getSignclosedId() {
         return signclosedId;
     }
@@ -266,4 +267,12 @@ public class ComplaintSignclosedInfo implements Serializable {
     public void setCustomerIdDescribe(String customerIdDescribe) {
         this.customerIdDescribe = customerIdDescribe;
     }
+
+    public String getDescribeHandleDesc() {
+        return describeHandleDesc;
+    }
+
+    public void setDescribeHandleDesc(String describeHandleDesc) {
+        this.describeHandleDesc = describeHandleDesc;
+    }
 }

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

@@ -29,7 +29,7 @@
     detect_phenomenon, detect_failure_classification, detect_failure_cause, detect_results, 
     detect_point, detect_analysis, detect_revolution_produced, detect_desc,
     signclosed_create_time, signclosed_update_time,detect_is_maintenance,detect_date,maintenance_results,
-    product_color_id
+    product_color_id,detect_date
   </sql>
   <select id="getComplaintDetectById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 

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

@@ -36,8 +36,10 @@
   </sql>
   <select id="getSignclosedById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
-    <include refid="Base_Column_List" />
+    <include refid="Base_Column_List" />,
+    tb_rst_question_describe.describe_handle_desc describeHandleDesc
     from tb_rst_complaint_signclosed
+    LEFT JOIN tb_rst_question_describe on tb_rst_question_describe.customer_id = tb_rst_complaint_signclosed.signclosed_customer_id
     where signclosed_id = #{signclosedId,jdbcType=INTEGER}
   </select>
 

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

@@ -63,6 +63,7 @@
       v.visit_status,
       v.visit_complete_date,
       v.visit_name,
+      v.visit_tel,
       v.visit_date,
       v.visit_time_select,
       v.visit_complete_name,
@@ -108,6 +109,9 @@
       <if test="customerId != null and customerId != ''">
         and c.customer_id = #{customerId}
       </if>
+      <if test="typeId != null and typeId != ''">
+        and c.type_id = #{typeId}
+      </if>
     </where>
     ORDER BY FIELD(c.customer_is_solve, 5, 3, 4, 6, 7, 2, 1),c.customer_id desc
   </select>

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

@@ -1377,6 +1377,11 @@
                 layer.msg("请填写问题标题！", {icon: 5, time: 3000});
                 return false;
             }
+            if(describeTitle.length > 50){
+                layer.close(index);
+                layer.msg("问题标题长度不能高于50个字符！", {icon: 5, time: 3000});
+                return false;
+            }
             if(desc == null || desc == ""){
                 layer.close(index);
                 layer.msg("请填写问题内容！", {icon: 5, time: 3000});
@@ -1781,8 +1786,8 @@
                     var fristInputStyle = "border-top: 1px solid #ddd;";
                     if(color.colorProductId == product.productId) {
                         colorHtml += '<tr >' +
-                                '         <td width="85" style="border-left: none;text-align: center;'+ fristInputStyle +'">' + color.colorName + '</td>' +
-                                '         <td width="15" style="'+ fristInputStyle +' padding: 0px;width: 25px;">' +
+                                '         <td width="55" style="border-left: none;text-align: center;'+ fristInputStyle +'">' + color.colorName + '</td>' +
+                                '         <td width="45" 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="color-' + color.colorProductId + '-' + color.colorId + '" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)" >' +
@@ -1805,8 +1810,8 @@
                     if(produceFit.productId == product.productId) {
                         var fristInputStyle = "border-top: 1px solid #ddd;";
                         produceFittingsHtml += '<tr >' +
-                                '         <td width="85" style="border-left: none;text-align: center; '+ fristInputStyle +'">' + produceFit.fittingsName +'</td>' +
-                                '         <td width="15" style="'+ fristInputStyle +'padding: 0px;width: 25px;">' +
+                                '         <td width="55" style="border-left: none;text-align: center; '+ fristInputStyle +'">' + produceFit.fittingsName +'</td>' +
+                                '         <td width="45" 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="fittings-' + produceFit.productId + '-' + produceFit.fittingsId +'" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)" >' +
@@ -2186,7 +2191,7 @@
         $("#closedProdcues").val(JSON.stringify(closedProdcues));
         $("#closedFittings").val(JSON.stringify(closedFittings));
 
-        var visitTimeSelect = $("input[name='visitTimeSelect']").val();
+        var visitTimeSelect = $("input[name='visitTimeSelect']:checked").val();
         var visit_date = $('#datemin').val();
         var myDate = new Date();
         var date = myDate.getFullYear()+"-"+(myDate.getMonth()+1)+"-"+myDate.getDate();

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

@@ -147,7 +147,7 @@
                 msg = '该时间已超过当前时间，请重新选择回访时间!';
                 flag = false;
                 return;
-            } else if (hours > 16 && visitTimeSelect == 3) {
+            } else if (hours > 18 && visitTimeSelect == 3) {
                 msg = '该时间已超过当前时间，请重新选择回访时间!';
                 flag = false;
                 return;
@@ -213,7 +213,7 @@
                 }
             });
         } else {
-            layer.msg(msg, {icon: 5, time: 500});
+            layer.msg(msg, {icon: 5, time: 2000});
         }
     }
 

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

@@ -352,19 +352,31 @@
                     $('#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') {
+                    if (customer.customerIsVisit == 2) {
                         var visitTime = '';
                         switch (customer.visitTimeSelect) {
                             case 1:visitTime = '9:00-12:00';break;
                             case 2:visitTime = '12:00-14:00';break;
                             case 3:visitTime = '14:00-18:00';break;
                         }
-                        var visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
-                                        '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
-                                        '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
-                                        convertUndefinedToEmpty(customer.visitCompleteName)+'&nbsp;&nbsp;'+
-                                        convertUndefinedToEmpty(customer.visitCompleteTel)+'</span>&nbsp;&nbsp;完成回访';
+                        var visitText = "";
+                        if(customer.visitStatus == 1){
+                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
+                                    '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
+                                    '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
+                                    convertUndefinedToEmpty(customer.visitName)+'&nbsp;&nbsp;'+
+                                    convertUndefinedToEmpty(customer.visitTel)+'</span>&nbsp;&nbsp;进行回访';
+
+                    }
+                        if(customer.visitStatus == 2){
+                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
+                                    '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
+                                    '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
+                                    convertUndefinedToEmpty(customer.visitCompleteName)+'&nbsp;&nbsp;'+
+                                    convertUndefinedToEmpty(customer.visitCompleteTel)+'</span>&nbsp;&nbsp;完成回访';
+                        }
                         $('#txtVisit').html(visitText);
+
                     }
                 }
             },

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

@@ -151,7 +151,7 @@
                             <td>${customer.companyName!''}<br/>${customer.storeName!''}</td>
                             <td>${(customer.salesTime?string("yyyy-MM-dd"))!''}</td>
                             <td>${customer.customerArea!''}</td>
-                            <td>进${customer.customerInTDS!'0'}<br/>出${customer.customerOutTDS!'0'}</td>
+                            <td>进${customer.customerInTDS!'0'}PPM<br/>出${customer.customerOutTDS!'0'}PPM</td>
                             <td id="txt_customerIsSolve">
                                 <#if customer.customerIsSolve == 1>
                                     已解决

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

@@ -209,6 +209,9 @@
     function showUpdateSendProduct() {
         var productList = getProduct() ; //所有产品
         var html = "";
+        if(productList == null){
+            return false;
+        }
         for(var i=0;i<productList.length;i++) {
             var product = productList[i];
             var produceFittings = product.fittingsList;  //获取该产品的所有配件
@@ -329,6 +332,11 @@
     function getProduct(){
         var productList;
         var productName = $("#selectProcuct").val();
+        if(productName == null || productName == ""){
+            var productTable = '<td colspan="3">暂无数据！</td>';
+            $("#addProduct").html(productTable);
+            return null;
+        }
         $.ajax({
             type: "POST",
             data:{'productName':productName},
@@ -336,7 +344,12 @@
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
+                    $("#addProduct").html("");
                     productList = data.returnMsg.productList;
+                }else{
+                    var productTable = '<td colspan="3">暂无数据！</td>';
+                    $("#addProduct").html(productTable);
+                    return null;
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

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

@@ -207,6 +207,9 @@
     function showUpdateSendProduct() {
         var productList = getProduct() ; //所有产品
         var html = "";
+        if(productList == null){
+            return false;
+        }
         for(var i=0;i<productList.length;i++) {
             var product = productList[i];
             var produceFittings = product.fittingsList;  //获取该产品的所有配件
@@ -326,6 +329,11 @@
     function getProduct(){
         var productList;
         var productName = $("#selectProcuct").val();
+        if(productName == null || productName == ""){
+            var productTable = '<td colspan="3">暂无数据！</td>';
+            $("#addProduct").html(productTable);
+            return null;
+        }
         $.ajax({
             type: "POST",
             data:{'productName':productName},
@@ -333,7 +341,12 @@
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
+                    $("#addProduct").html("");
                     productList = data.returnMsg.productList;
+                }else{
+                    var productTable = '<td colspan="3">暂无数据！</td>';
+                    $("#addProduct").html(productTable);
+                    return null;
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

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

@@ -366,6 +366,9 @@
     function showUpdateSendProduct() {
         var productList = getProduct() ; //所有产品
         var html = "";
+        if(productList == null){
+            return false;
+        }
         for(var i=0;i<productList.length;i++) {
             var product = productList[i];
             var produceFittings = product.fittingsList;  //获取该产品的所有配件
@@ -486,6 +489,11 @@
     function getProduct(){
         var productList;
         var productName = $("#selectProcuct").val();
+        if(productName == null || productName == ""){
+            var productTable = '<td colspan="3">暂无数据！</td>';
+            $("#addProduct").html(productTable);
+            return null;
+        }
         $.ajax({
             type: "POST",
             data:{'productName':productName},
@@ -493,7 +501,12 @@
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
+                    $("#addProduct").html("");
                     productList = data.returnMsg.productList;
+                }else{
+                    var productTable = '<td colspan="3">暂无数据！</td>';
+                    $("#addProduct").html(productTable);
+                    return null;
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

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

@@ -366,6 +366,9 @@
     function showUpdateSendProduct() {
         var productList = getProduct() ; //所有产品
         var html = "";
+        if(productList == null){
+            return false;
+        }
         for(var i=0;i<productList.length;i++) {
             var product = productList[i];
             var produceFittings = product.fittingsList;  //获取该产品的所有配件
@@ -486,6 +489,11 @@
     function getProduct(){
         var productList;
         var productName = $("#selectProcuct").val();
+        if(productName == null || productName == ""){
+            var productTable = '<td colspan="3">暂无数据！</td>';
+            $("#addProduct").html(productTable);
+            return null;
+        }
         $.ajax({
             type: "POST",
             data:{'productName':productName},
@@ -493,7 +501,12 @@
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
+                    $("#addProduct").html("");
                     productList = data.returnMsg.productList;
+                }else{
+                    var productTable = '<td colspan="3">暂无数据！</td>';
+                    $("#addProduct").html(productTable);
+                    return null;
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

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

@@ -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-3 col-sm-3 huanhang" style="text-align: right;">检测产品：</label>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>检测产品：</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>
@@ -76,14 +76,14 @@
             </div>
         </div>
         <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">检测日期：</label>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>检测日期：</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">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">检测结果：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>检测结果：</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/>
@@ -95,27 +95,44 @@
                 </div>
             </div>
         </div>
-        <div class="input-box" style="margin-left: 17%;">
-            <textarea rows="3" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="工厂检测现象"></textarea>
+        <div class="input-box" >
+            <label class="col-3 col-sm-3 huanhang"  style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>工厂检测现象：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
+                    <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="工厂检测现象"></textarea>
+            </div>
         </div>
-        <div class="input-box" style="margin-left: 17%;">
-            <textarea rows="3" cols="20" name="detectFailureClassification" id="detectFailureClassification" class="my-textarea" placeholder="故障分类"></textarea>
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang"  style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障分类：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectFailureClassification" id="detectFailureClassification" class="my-textarea" placeholder="故障分类"></textarea>
+            </div>
         </div>
-        <div class="input-box" style="margin-left: 17%;">
-            <textarea rows="3" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="故障原因"></textarea>
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang"  style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障原因：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
+            <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="故障原因"></textarea>
+            </div>
         </div>
-        <div class="input-box" style="margin-left: 17%;">
-            <textarea rows="3" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="判定结果"></textarea>
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang"  style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>判定结果：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
+            <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="判定结果"></textarea>
+            </div>
         </div>
-        <div class="input-box" style="margin-left: 17%;">
-            <textarea rows="3" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="故障指向"></textarea>
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang"  style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障指向：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
+            <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="故障指向"></textarea>
+            </div>
         </div>
-        <div class="input-box" style="margin-left: 17%;">
-            <textarea rows="3" cols="20" name="detectAnalysis" id="detectAnalysis" class="my-textarea" placeholder="原因分析"></textarea>
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang"  style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>原因分析：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
+            <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectAnalysis" id="detectAnalysis" class="my-textarea" placeholder="原因分析"></textarea>
+            </div>
         </div>
-
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否维修：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>是否维修：</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/>
@@ -128,7 +145,7 @@
             </div>
         </div>
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">是否已转入：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>是否已转入：</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="2" checked/>
@@ -138,7 +155,7 @@
                     <input type="radio" id="radio-8" name="detectRevolutionProduced" value="1"/>
                      <label for="radio-8">未转入维修</label>
                 </div>
-            </div>
+        </div>
         </div>
 
         <div class="input-box" >
@@ -150,7 +167,7 @@
             </div>
         </div>
         <div style="margin-left: 35%;">
-           <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
+            <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>
 </article>

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

@@ -33,7 +33,7 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">检测结果：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>检测结果：</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/>
@@ -45,57 +45,50 @@
                 </div>
             </div>
         </div>
-
-        <#--<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" 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" 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" 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" 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" 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 class="input-box" >
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>工厂检测现象：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea rows="3" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="工厂检测现象">${detectInfo.detectPhenomenon!''}</textarea>
+            </div>
         </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 class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障分类：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea rows="3" cols="20" name="detectFailureClassification" id="detectFailureClassification" class="my-textarea" placeholder="故障分类">${detectInfo.detectFailureClassification!''}</textarea>
+            </div>
         </div>
-        <div class="input-box" style="margin-left: 17%;">
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障原因：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
             <textarea rows="3" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="故障原因">${detectInfo.detectFailureCause!''}</textarea>
+            </div>
         </div>
-        <div class="input-box" style="margin-left: 17%;">
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>判定结果：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
             <textarea rows="3" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="判定结果">${detectInfo.detectResults!''}</textarea>
+            </div>
         </div>
-        <div class="input-box" style="margin-left: 17%;">
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障指向：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
             <textarea rows="3" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="故障指向">${detectInfo.detectPoint!''}</textarea>
+            </div>
         </div>
-        <div class="input-box" style="margin-left: 17%;">
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>原因分析：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
             <textarea rows="3" cols="20" name="detectAnalysis" id="detectAnalysis" class="my-textarea" placeholder="原因分析">${detectInfo.detectAnalysis!''}</textarea>
+            </div>
         </div>
         <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">检测日期：</label>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>检测日期：</label>
             <div class="formControls col-8 col-sm-8 text-c huanhang" style="margin-left: -4.5%;">
-                <input class="my-input-date" type="text" value="${detectInfo.detectDate!''}" name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
+                <input class="my-input-date" type="text" value="<#if detectInfo.detectDate??>${detectInfo.detectDate?string("yyyy-MM-dd")!''}</#if>" name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
             </div>
         </div>
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">是否转入生产：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>是否转入生产：</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/>
@@ -108,7 +101,7 @@
             </div>
         </div>
         <div class="input-box" id="revolutionProducedId">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">立即转入生产：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>立即转入生产：</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/>
@@ -121,7 +114,7 @@
             </div>
         </div>
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">QC检查状态：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>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/>

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

@@ -126,21 +126,25 @@
                            onclick="add_remark('修改备注','${path}/admin/detect/to_add_remark?detectId=${detect.detectId!''}','570','450');">
                             <i class="Hui-iconfont">&#xe6df;</i>
                         </a>
-                       <#if detect.detectIsMaintenance??>
-                            <#if detect.detectIsMaintenance == 2>
-                                <a style="text-decoration:none" href="javascript:;" title="需要转入生产"
-                                   onclick="update_info('需要转入生产','${path}/admin/detect/to_produced_info?detectId=${detect.detectId!''}&state=1','570','450');">
-                                    <i class="Hui-iconfont">&#xe644;</i>
-                                </a>
-                            <#else >
-                        </#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','670','450');">
-                                    <i class="Hui-iconfont">&#xe6e1;</i>
-                                </a>
+                    <#if detect.detectState??>
+                        <#if detect.detectState == 2>
+                           <#if detect.detectIsMaintenance??>
+                                <#if detect.detectIsMaintenance == 2>
+                                    <a style="text-decoration:none" href="javascript:;" title="需要转入生产"
+                                       onclick="update_info('需要转入生产','${path}/admin/detect/to_produced_info?detectId=${detect.detectId!''}&state=1','570','450');">
+                                        <i class="Hui-iconfont">&#xe644;</i>
+                                    </a>
+                                <#else >
+                            </#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','670','450');">
+                                        <i class="Hui-iconfont">&#xe6e1;</i>
+                                    </a>
+                                </#if>
                             </#if>
                         </#if>
+                    </#if>
                         <#if detect.detectState == 3>
                             <a style="text-decoration:none" href="javascript:;" title="修改检测信息"
                                onclick="update_info('修改检测信息','${path}/admin/detect/to_update_complete?detectId=${detect.detectId!''}','570','450');">

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

@@ -32,8 +32,8 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <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;">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>检测结果：</label>
+            <div class=" col-xs-7 col-sm-7 skin-minimal huanhang" >
                 <div class="radio-box">
                     <input type="radio" id="radio-3" name="detectState" value="3"
                            <#if detectInfo.detectState == 3>checked</#if>
@@ -46,33 +46,50 @@
                 </div>
             </div>
         </div>
-
-        <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 class="input-box" >
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>工厂检测现象：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="工厂检测现象">${detectInfo.detectPhenomenon!''}</textarea>
+            </div>
         </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 class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障分类：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectFailureClassification" id="detectFailureClassification" class="my-textarea" placeholder="故障分类">${detectInfo.detectFailureClassification!''}</textarea>
+            </div>
         </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 class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障原因：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="故障原因">${detectInfo.detectFailureCause!''}</textarea>
+            </div>
         </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 class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>判定结果：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="判定结果">${detectInfo.detectResults!''}</textarea>
+            </div>
         </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 class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障指向：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="故障指向">${detectInfo.detectPoint!''}</textarea>
+            </div>
         </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 class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>原因分析：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;" rows="3" cols="20" name="detectAnalysis" id="detectAnalysis" class="my-textarea" placeholder="原因分析">${detectInfo.detectAnalysis!''}</textarea>
+            </div>
         </div>
         <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">检测日期：</label>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>检测日期：</label>
             <div class="formControls col-8 col-sm-8 text-c huanhang" style="margin-left: -4.5%;">
-                <input class="my-input-date" type="text" value="${detectInfo.detectDate!''}" name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
+                <input class="my-input-date" type="text" value="${detectInfo.detectDate?string("yyyy-MM-dd")!''}" name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
             </div>
         </div>
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">QC检查状态：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>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>/>

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

@@ -59,7 +59,7 @@
         </div>
 -->
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">转入生产部门：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>转入生产部门：</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-1" name="detectIsMaintenance" onclick="show();" value="1" checked/>
@@ -73,7 +73,7 @@
         </div>
 
         <div class="input-box" id="revolutionProducedId">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">已转入生产：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>已转入生产：</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="detectRevolutionProduced" value="2"

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

@@ -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-3 col-sm-3 huanhang" style="text-align: right;">维修产品：</label>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>维修产品：</label>
             <div class="col-9 col-sm-9 text-c">
                 <div class="radio-box"  style="margin-right: -36%; padding-left: 0px;">
                 <table class="table table-border table-bg table-bordered" style="width: 420px;">
@@ -77,14 +77,14 @@
             </div>
         </div>
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">维修日期：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>维修日期：</label>
             <div class="formControls col-7 col-sm-7 text-c huanhang" style="margin-left: -5%;">
                 <input class="my-input-date" type="text"  name="maintenanceContent_Date" id="maintenanceContentDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择维修日期" readonly="readonly"/>
             </div>
         </div>
 
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">维修结果：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>维修结果：</label>
             <div class="col-8 col-sm-8 text-c skin-minimal" >
                 <div class="radio-box">
                     <input type="radio" id="radio-3" name="maintenanceState" value="1" checked/>
@@ -98,7 +98,7 @@
         </div>
 
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可返修：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>是否可返修：</label>
             <div class=" col-8 col-sm-8 text-c skin-minimal">
                 <div class="radio-box">
                     <input type="radio" id="radio-5" name="maintenanceIsRepair" value="1" checked/>
@@ -111,7 +111,7 @@
             </div>
         </div>
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可入库：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>是否可入库：</label>
             <div class="formControls col-10 col-sm-10 text-c skin-minimal">
                 <div class="radio-box">
                     <input type="radio" id="radio-7" name="maintenanceIsWarehousing" value="2" checked/>

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

@@ -69,13 +69,13 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box"   style="text-align:center;">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">机器编码：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>机器编码：</label>
             <div class="col-7 col-sm-7  skin-minimal"  style="float: left;padding-left: 0px;">
                 <input class="my-input" style="width: 100%;" value="${maintenanceInfo.maintenanceEquipmentNumber!''}" type="text" id="maintenanceEquipmentNumber" name="maintenanceEquipmentNumber" placeholder="请输入机器编码"/>
             </div>
             </div>
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">维修结果：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>维修结果：</label>
                 <div class="col-8 col-sm-8 text-c skin-minimal" >
                     <div class="radio-box">
                         <input type="radio" id="radio-3" name="maintenanceState" value="1"  <#if maintenanceInfo.maintenanceState == 1>checked</#if>/>
@@ -89,7 +89,7 @@
         </div>
 
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可返修：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>是否可返修：</label>
             <div class="col-8 col-sm-8 text-c skin-minimal" >
                 <div class="radio-box">
                     <input type="radio" id="radio-5" name="maintenanceIsRepair" value="1" <#if maintenanceInfo.maintenanceIsRepair == 1>checked</#if>/>
@@ -102,7 +102,7 @@
             </div>
         </div>
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可入库：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>是否可入库：</label>
             <div class="col-10 col-sm-10 text-c skin-minimal" >
                 <div class="radio-box">
                     <input type="radio" id="radio-7" name="maintenanceIsWarehousing" value="2" <#if maintenanceInfo.maintenanceIsWarehousing == 2>checked</#if>/>

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

@@ -33,7 +33,7 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">维修产品：</label>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>维修产品：</label>
             <div class="col-9 col-sm-9 text-c">
                 <div class="radio-box"  style="margin-right: -37%;padding-left: 0px;">
                     <table class="table table-border table-bg table-bordered" style="width: 420px;">
@@ -78,14 +78,14 @@
             </div>
         </div>
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">维修日期：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>维修日期：</label>
             <div class="formControls col-7 col-sm-7 text-c huanhang" style="margin-left: -4.5%;">
                 <input class="my-input-date" type="text" value="${(maintenanceInfo.maintenanceContentDate)?string("yyyy-MM-dd")!''}"  name="maintenanceContent_Date" id="maintenanceContentDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择维修日期" readonly="readonly"/>
             </div>
         </div>
 
-        <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">维修结果：</label>
+        <div class="input-box" style="margin-top: 11%;">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>维修结果：</label>
             <div class="col-8 col-sm-8 text-c skin-minimal" >
                 <div class="radio-box">
                     <input type="radio" id="radio-3" name="maintenanceState" value="1" <#if maintenanceInfo.maintenanceState == 1>checked</#if>/>
@@ -99,7 +99,7 @@
         </div>
 
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可返修：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>是否可返修：</label>
             <div class=" col-8 col-sm-8 text-c skin-minimal">
                 <div class="radio-box">
                     <input type="radio" id="radio-5" name="maintenanceIsRepair" value="1" <#if maintenanceInfo.maintenanceIsRepair == 1>checked</#if>/>
@@ -112,7 +112,7 @@
             </div>
         </div>
         <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可入库：</label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>是否可入库：</label>
             <div class="formControls col-10 col-sm-10 text-c skin-minimal">
                 <div class="radio-box">
                     <input type="radio" id="radio-7" name="maintenanceIsWarehousing" value="2" <#if maintenanceInfo.maintenanceIsWarehousing == 2>checked</#if>/>

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

@@ -69,8 +69,8 @@
             </div>
         </div>
         <div >
-            <label class="form-label col-5 col-sm-5 huanhang" style="margin-left: 40px;margin-top: 100px;">提示：<br>
-                此内容由QA同事填写。</label>
+            <label class="form-label col-5 col-sm-5 huanhang" style="margin-left: 40px;margin-top: 20px;">提示：<br>
+                此内容由QC同事填写。</label>
         </div>
     </form>
 </article>

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

@@ -64,18 +64,22 @@
                 <div class="formControls col-4 col-sm-4">
                     <#if (signclosedList?size > 0)>
                         <#list signclosedList as signclosed>
+                        <span class="label label-success radius">
                             <#if signclosed.signclosedProductType == 1>
                                 ${signclosed.productName!''}-${signclosed.colorName!''}*${signclosed.productNum!''}台
                             <#else>
                                 ${signclosed.productName!''}*${signclosed.productNum!''}件
                             </#if>
+                        </span>
                         </#list>
                     </#if>
                 </div>
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3">客服备注：</label>
-               <#if ifcomplaintSignclosedInfo?? >${complaintSignclosedInfo.signclosedCustomerDesc!''}</#if>
+                <div class="formControls col-4 col-sm-4" style="margin-left: -0.2%">
+                    <#if complaintSignclosedInfo?? >${complaintSignclosedInfo.describeHandleDesc!''}</#if>
+                </div>
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回产品：</label>
@@ -113,14 +117,13 @@
                                 <#if signclosed.signclosedProductType == 2>
                                 <td></td>
                                 <td></td>
-                                <td><input type="checkbox" value="${signclosed.signclosedProductId!''}" name="alreadyFittingsName" datatype="*">${signclosed.productName!''}
+                                <td><input type="checkbox" checked value="${signclosed.signclosedProductId!''}" name="alreadyFittingsName" datatype="*">${signclosed.productName!''}
                                     <input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="${signclosed.productNum!''}" placeholder="数量" id="alreadyFittingsId${signclosed.signclosedProductId!''}" name="alreadyFittingsId${signclosed.signclosedProductId!''}"><br>
                                 </td>
                                 </#if>
                             </tr>
                             </#list>
                         </#if>
-
                         </tbody>
                     </table>
                 </div>
@@ -164,12 +167,12 @@
                 <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="radio-box">
-                        <input type="radio" id="tel-4" name="signclosedIsFittings" value="1" datatype="*" checked  >
-                        <label for="tel-4">缺少配件</label>
+                        <input type="radio" id="tel-5" name="signclosedIsFittings" value="2" datatype="*" checked>
+                        <label for="tel-5">不缺配件</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-5" name="signclosedIsFittings" value="2" datatype="*">
-                        <label for="tel-5">不缺配件</label>
+                        <input type="radio" id="tel-4" name="signclosedIsFittings" value="1" datatype="*">
+                        <label for="tel-4">缺少配件</label>
                     </div>
                 </div>
             </div>

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

@@ -179,7 +179,7 @@
                     <td class="text-c" width="100">
                         <#if signclosed.signclosedIsFittings == 1>
                             缺少
-                        <#else>
+                        <#elseif  signclosed.signclosedIsFittings == 2>
                             不缺少
                         </#if>
                     </td>
@@ -223,10 +223,12 @@
                            onclick="add_remark('修改备注','${path}/admin/signclosed/to_update_remark?signclosedId=${signclosed.signclosedId!''}','570','450');">
                             <i class="Hui-iconfont">&#xe692;</i>
                         </a>
-                        <a style="text-decoration:none" href="javascript:;" title="修改寄件人信息"
-                           onclick="add_remark('修改寄件人信息','${path}/admin/signclosed/to_update_sender?signclosedId=${signclosed.signclosedId!''}','570','450');">
-                            <i class="Hui-iconfont">&#xe60c;</i>
-                        </a>
+                        <#if signclosed.signclosedState == 1>
+                            <a style="text-decoration:none" href="javascript:;" title="修改寄件人信息"
+                               onclick="add_remark('修改寄件人信息','${path}/admin/signclosed/to_update_sender?signclosedId=${signclosed.signclosedId!''}','570','450');">
+                                <i class="Hui-iconfont">&#xe60c;</i>
+                            </a>
+                        </#if>
                         <#if signclosed.signclosedIsInto == 2>
                             <a style="text-decoration:none" href="javascript:;" title="转入品检"
                                onclick="into_complaint('${signclosed.signclosedId!''}');">

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

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

wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/qrcode/MachineQrCodeHandler.java

@@ -282,13 +282,36 @@ public class MachineQrCodeHandler {
         //查询用户信息
         memberInfo = memberService.getMemberByUserOpenId(memberInfo.getUserOpenid());
         if (memberInfo != null && memberInfo.getUserStatus() == 2) {
-            request.getRequestDispatcher("/view/warranty_card.html").forward(request,res);
+            res.sendRedirect("/wateroPF/view/warranty_card.html?num=1");
         } else {
             request.getRequestDispatcher("/view/guanzhu.html").forward(request,res);
         }
     }
 
     /**
+     * 检查是否关注微信公众号
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/check_warranty")
+    public ResultMsg checkWarranty(HttpServletRequest request) throws Exception {
+        ResultMsg msg = new ResultMsg();
+        Member memberInfo = WechatUtils.getUserBySession(request);
+        //查询用户信息
+        memberInfo = memberService.getMemberByUserOpenId(memberInfo.getUserOpenid());
+        if (memberInfo != null && memberInfo.getUserStatus() == 2) {
+            msg.setData(true);
+        } else {
+            msg.setData(false);
+        }
+        msg.setStatus(true);
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        return msg;
+    }
+
+    /**
      * 获取ip地址
      * @param request
      * @return

wateroPF-wechat-web/src/main/webapp/view/add_machine.html

@@ -113,7 +113,9 @@
     var numberProvince = null;
     var numberCity = null;
     var numberDistrict = null;
+    var num = getParam("num");
     mui.ready(function(){
+        check_warranty();
         //选择示例
         var userPicker = new mui.PopPicker();
         userPicker.setData([{
@@ -156,6 +158,38 @@
         document.querySelector('.loading-bg').style.display='none';
     });
 
+    function check_warranty() {
+        if (num != 1) {
+            window.location.href = base_path + '/qrcode/_add_warranty';
+		}
+
+        /*$.ajax({
+            type: 'get',
+            url: base_path + '/qrcode/check_warranty',
+            dataType: 'json',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.status){
+                    if (!dt.data) {
+                        mui.openWindow({
+                            url: '/wateroPF/view/guanzhu.html'
+                        })
+					}
+                } else {
+                    mui.openWindow({
+                        url: '/wateroPF/view/guanzhu.html'
+                    })
+				}
+            },
+            error: function(xhr, type, errorThrown) {
+                mui.openWindow({
+                    url: '/wateroPF/view/guanzhu.html'
+                })
+                console.log("请检查网络或刷新页面重试！");
+            }
+        });*/
+	}
+
     wx.ready(function () {
         // 7.2 获取当前地理位置
         wx.getLocation({

wateroPF-wechat-web/src/main/webapp/view/warranty_card.html

@@ -67,6 +67,8 @@
 	<script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
 	<script src="//s.iamberry.com/wateroPF/new/js/page/main.js?v=2016101701"></script>
 	<script type="text/javascript">
+        var num = getParam("num");
+
 	mui.ready(function(){
 
         mui.ajax(base_path + '/qrcode/select_warranty_card_list?dates=' + new Date().getTime(), {
@@ -127,7 +129,8 @@
 	}
 	//添加质保卡
     mui('body').on('tap', '.go_add_warranty_card', function() {
-        location.href='/wateroPF/view/add_machine.html';
+        alert(num);
+        location.href='/wateroPF/view/add_machine.html?num='+num;
 	});
 
     function dateFormat(now) {