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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

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

@@ -104,6 +104,9 @@
       <if test="productTypeId != null" >
         AND pt.type_id = #{productTypeId,jdbcType=INTEGER}
       </if>
+      <if test="customerId != null" >
+        AND cd.customer_id like CONCAT('%',#{customerId},'%')
+      </if>
     </where>
       ORDER BY cd.signclosed_create_time DESC
   </select>

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

@@ -168,6 +168,9 @@
       <if test="signclosedIsQuality != null and signclosedIsQuality != ''" >
         AND cs.signclosed_is_quality = #{signclosedIsQuality}
       </if>
+      <if test="signclosedCustomerId != null " >
+        AND cs.signclosed_customer_id like CONCAT('%',#{signclosedCustomerId},'%')
+      </if>
     </where>
     order by cs.signclosed_create_time DESC
   </select>

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

@@ -618,12 +618,14 @@ public class AdminCustomerController {
         }
         customerInfo.setTransactionNumber(orderId);
 
+        Integer customerId = customerInfo.getCustomerId();
         logger.info("-----------------添加客诉开始----------------------");
         try {
             flag = customerService.saveCustomerInfo(customerInfo, salesOrder);
         } catch (RuntimeException e) {
             return new ResponseJson(500, e.getMessage(), 500);
         }
+        customerId = customerInfo.getCustomerId();
         logger.info("-----------------添加客诉结束----------------------");
         if (flag < 1) {
             return new ResponseJson(500, "添加客诉失败!", 500);
@@ -673,10 +675,10 @@ public class AdminCustomerController {
             String result = smsService.sendOtherCMS(phone, text);
 
             if (!"SUCCESS".equals(result)) {
-                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。", 505);
+                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。客诉Id为："+ customerId, 505);
             }
         }
-        return new ResponseJson(200, "添加客诉成功!", 200);
+        return new ResponseJson(200, "添加客诉成功!客诉Id为：" + customerId, 200);
     }
 
     /**
@@ -694,7 +696,7 @@ public class AdminCustomerController {
     }
 
     /**
-     * 添加客诉
+     * 发送短信
      *
      * @param request
      * @return

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

@@ -7,6 +7,7 @@ import com.iamberry.rst.core.order.ProductType;
 import com.iamberry.rst.core.order.RentType;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.PtsBom;
 import com.iamberry.rst.core.pts.PtsDevice;
 import com.iamberry.rst.faces.cm.AwaitingSignclosedProductInfoService;
 import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
@@ -17,6 +18,7 @@ import com.iamberry.rst.service.cm.mapper.AwaitingSignclosedProductMapper;
 import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedInfoMapper;
 import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedProductInfoMapper;
 import com.iamberry.rst.utils.AdminUtils;
+import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -78,66 +80,73 @@ public class AdminDetectController {
     @RequiresPermissions("detect:select:detect")
     @RequestMapping("/select_detect_list")
     public ModelAndView selectDetectList(HttpServletRequest request,
-                                        @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
-                                        @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
-                                        @RequestParam(value = "pageSize", defaultValue = "5", required = false) int pageSize,
+                                         @RequestParam(value = "pageSize", defaultValue = "5", required = false) Integer pageSize,
+                                         @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
+                                         @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum,
                                          ComplaintDetectInfo detectInfo) {
 
         ModelAndView mv = new ModelAndView("cm/inspection/detect_list");
-        StringBuilder url = new StringBuilder("/admin/detect/select_detect_list?pageSize=" + pageSize);
-
+//        StringBuilder url = new StringBuilder("/admin/detect/select_detect_list?pageSize=" + pageSize);
         // 请求参数
-        if (StringUtils.isNotEmpty(detectInfo.getQuestionTitle())) {
-            url.append("&questionTitle=").append(detectInfo.getQuestionTitle());
-            mv.addObject("questionTitle",detectInfo.getQuestionTitle());
-        }
-        if (StringUtils.isNotEmpty(detectInfo.getDetectPhenomenon())) {
-            url.append("&detectPhenomenon=").append(detectInfo.getDetectPhenomenon());
-            mv.addObject("detectPhenomenon",detectInfo.getDetectPhenomenon());
-        }
-        if (StringUtils.isNotEmpty(detectInfo.getDetectFailureCause())) {
-            url.append("&detectFailureCause=").append(detectInfo.getDetectFailureCause());
-            mv.addObject("detectFailureCause",detectInfo.getDetectFailureCause());
-        }
-        if (StringUtils.isNotEmpty(detectInfo.getDetectPoint())) {
-            url.append("&detectPoint=").append(detectInfo.getDetectPoint());
-            mv.addObject("detectPoint",detectInfo.getDetectPoint());
-        }
-        if (StringUtils.isNotEmpty(detectInfo.getDetectAnalysis())) {
-            url.append("&detectAnalysis=").append(detectInfo.getDetectAnalysis());
-            mv.addObject("detectAnalysis",detectInfo.getDetectAnalysis());
-        }
-        if (detectInfo.getDetectState() != null && detectInfo.getDetectState() != -1) {
-            url.append("&detectState=").append(detectInfo.getDetectState());
-            mv.addObject("detectState",detectInfo.getDetectState());
-        }
-        if (StringUtils.isNotEmpty(detectInfo.getDetectFailureClassification())) {
-            url.append("&detectFailureClassification=").append(detectInfo.getDetectFailureClassification());
-            mv.addObject("detectFailureClassification",detectInfo.getDetectFailureClassification());
-        }
-        if (detectInfo.getProductTypeId() != null && detectInfo.getProductTypeId() != -1) {
-            url.append("&productTypeId=").append(detectInfo.getProductTypeId());
-            mv.addObject("productTypeId",detectInfo.getProductTypeId());
-        }
+//        if (StringUtils.isNotEmpty(detectInfo.getQuestionTitle())) {
+//            url.append("&questionTitle=").append(detectInfo.getQuestionTitle());
+//            mv.addObject("questionTitle",detectInfo.getQuestionTitle());
+//        }
+//        if (StringUtils.isNotEmpty(detectInfo.getDetectPhenomenon())) {
+//            url.append("&detectPhenomenon=").append(detectInfo.getDetectPhenomenon());
+//            mv.addObject("detectPhenomenon",detectInfo.getDetectPhenomenon());
+//        }
+//        if (StringUtils.isNotEmpty(detectInfo.getDetectFailureCause())) {
+//            url.append("&detectFailureCause=").append(detectInfo.getDetectFailureCause());
+//            mv.addObject("detectFailureCause",detectInfo.getDetectFailureCause());
+//        }
+//        if (StringUtils.isNotEmpty(detectInfo.getDetectPoint())) {
+//            url.append("&detectPoint=").append(detectInfo.getDetectPoint());
+//            mv.addObject("detectPoint",detectInfo.getDetectPoint());
+//        }
+//        if (StringUtils.isNotEmpty(detectInfo.getDetectAnalysis())) {
+//            url.append("&detectAnalysis=").append(detectInfo.getDetectAnalysis());
+//            mv.addObject("detectAnalysis",detectInfo.getDetectAnalysis());
+//        }
+//        if (detectInfo.getDetectState() != null && detectInfo.getDetectState() != -1) {
+//            url.append("&detectState=").append(detectInfo.getDetectState());
+//            mv.addObject("detectState",detectInfo.getDetectState());
+//        }
+//        if (StringUtils.isNotEmpty(detectInfo.getDetectFailureClassification())) {
+//            url.append("&detectFailureClassification=").append(detectInfo.getDetectFailureClassification());
+//            mv.addObject("detectFailureClassification",detectInfo.getDetectFailureClassification());
+//        }
+//        if (detectInfo.getProductTypeId() != null && detectInfo.getProductTypeId() != -1) {
+//            url.append("&productTypeId=").append(detectInfo.getProductTypeId());
+//            mv.addObject("productTypeId",detectInfo.getProductTypeId());
+//        }
 
         // 封装请求数据
-        PageRequest<ComplaintDetectInfo> pageRequest = new PageRequest<>(detectInfo, pageNO, pageSize, pageTotal == null);
+        PageRequest<ComplaintDetectInfo> pageRequest = new PageRequest<>(detectInfo, pageNO, pageSize, totalNum == 0);
         // 查询订单列表
         PagedResult<ComplaintDetectInfo> result = complaintDetectInfoService.listComplaintDetect(pageRequest);
-        long total = 0;
-        if (pageTotal == null) {
-            total = result.getPages();
-        } else {
-            total = pageTotal;
-            result.setPages(total);
+        if (totalNum != 0) {
+            result.setTotal(totalNum);
         }
+
+//        long total = 0;
+//        if (pageTotal == null) {
+//            total = result.getPages();
+//        } else {
+//            total = pageTotal;
+//            result.setPages(total);
+//        }
         //获取所有产品类型
         ProductType productType = new ProductType();
         List<ProductType> productTypeList = productService.listProductType(productType);
         mv.addObject("productTypeList",productTypeList);
-        url.append("&pageTotal=").append(total).append("&pageNO=");
-        mv.addObject("page", result);
-        mv.addObject("url", url.toString());
+
+
+//        url.append("&pageTotal=").append(total).append("&pageNO=");
+//        mv.addObject("page", result);
+//        mv.addObject("url", url.toString());
+
+        StitchAttrUtil.setModelAndView(detectInfo, mv, "/admin/detect/select_detect_list", result);
         return mv;
     }
 

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

@@ -38,6 +38,7 @@
     <div class="text-c">
         <form action="${path}/admin/customer/select_customer_list" method="post">
             <button type="button" style="cursor:pointer; float: left;height: 35px;" class="my-btn-search" onclick="toAddCustomer();">新建客诉</button>
+            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerId!}" placeholder="客诉编号" id="customerId" name="customerId">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerName!}" placeholder="请输入姓名" id="customerName" name="customerName">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerTel!}" placeholder="请输入电话号码" id="customerTel" name="customerTel">
 
@@ -99,6 +100,7 @@
         <table class="table table-border table-bg table-bordered">
         <thead>
         <tr class="text-c">
+            <th width="50">客诉编号</th>
             <th width="50">跟进客服</th>
             <th width="60">姓名</th>
             <th width="70">电话</th>
@@ -121,6 +123,7 @@
             <#if page.dataList?? &&  (page.dataList?size > 0) >
                     <#list page.dataList as customer>
                         <tr class="text-c">
+                            <td>${customer.customerId!''}</td>
                             <td>${customer.adminName!''}</td>
                             <td>${customer.customerName!''}</td>
                             <#if (customer.customerTel)?? && customer.customerTel?length gt 7>

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

@@ -34,7 +34,7 @@
     <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;"><span class="c-red">*</span>检测结果：</label>
-            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
                 <div class="radio-box">
                     <input type="radio" id="radio-3" name="detectState" value="3" checked/>
                     <label for="radio-3">检测通过</label>
@@ -47,43 +47,43 @@
         </div>
         <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 class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea rows="3" cols="30" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="工厂检测现象">${detectInfo.detectPhenomenon!''}</textarea>
             </div>
         </div>
         <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;">
+            <div class="formControls col-xs-9 col-sm-9 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">
             <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="formControls col-xs-9 col-sm-9 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">
             <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="formControls col-xs-9 col-sm-9 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">
             <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="formControls col-xs-9 col-sm-9 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">
             <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="formControls col-xs-9 col-sm-9 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;"><span class="c-red">*</span>检测日期：</label>
-            <div class="formControls col-8 col-sm-8 text-c huanhang" style="margin-left: -4.5%;">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>检测日期：</label>
+            <div class="formControls col-9 col-sm-9 text-c huanhang" style="margin: 10px 0px;margin-left: -5%;">
                 <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>
@@ -102,7 +102,7 @@
         </div>
         <div class="input-box" id="revolutionProducedId">
             <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="col-xs-9 col-sm-9 skin-minimal" style="margin: 10px 0px;">
                 <div class="radio-box">
                     <input type="radio"  id="radio-7" name="detectRevolutionProduced" value="2" checked/>
                     <label for="radio-7">立即转入</label>
@@ -115,7 +115,7 @@
         </div>
         <div class="input-box">
             <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="formControls col-xs-9 col-sm-9 skin-minimal" style="margin: 10px 0px;">
                 <div class="radio-box">
                     <input type="radio" id="radio-9" name="maintenanceResults" value="1" checked/>
                     <label for="radio-9">通过</label>

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

@@ -41,6 +41,7 @@
     <div class="text-c">
         <form name="form1" action="${path}/admin/detect/select_detect_list" method="post">
             <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_detect('添加品质检测','${path}/admin/detect/to_add_detect','670','450');">新建品检</button>
+            <input class="my-input" style="width: 70px;" type="text" name="customerId" value="${customerId!}" placeholder="客诉编号"/>
             <input class="my-input" style="width: 70px;" type="text" name="questionTitle" value="${questionTitle!}" placeholder="客诉问题"/>
             <input class="my-input" style="width: 70px;" type="text" name="detectPhenomenon" value="${detectPhenomenon!}" placeholder="工厂检测现象"/>
             <input class="my-input" style="width: 70px;" type="text" name="detectFailureCause" value="${detectFailureCause!}" placeholder="故障原因"/>
@@ -70,6 +71,7 @@
         <table class="table table-border table-bordered table-bg table-hover table-sort">
             <thead>
             <tr class="text-c">
+                <th width="100">客诉编号</th>
                 <th width="100">产品类型</th>
                 <th width="100">产品型号</th>
                 <th width="100">状态</th>
@@ -90,6 +92,7 @@
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as detect>
                 <tr>
+                    <td class="text-c" width="100">${detect.customerId!}</td>
                     <td class="text-c" width="100">${detect.productTypeName!}</td>
                     <td class="text-c" width="100">${detect.detectProductNumber!}</td>
                     <td class="text-c" width="100">
@@ -156,13 +159,13 @@
                     </#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');">
+                               onclick="update_info('修改检测信息','${path}/admin/detect/to_update_complete?detectId=${detect.detectId!''}','670','450');">
                                 <i class="Hui-iconfont">&#xe60c;</i>
                             </a>
                         </#if>
                         <#if detect.detectState == 4>
                             <a style="text-decoration:none" href="javascript:;" title="修改检测信息"
-                               onclick="update_info('修改检测信息','${path}/admin/detect/to_update_complete?detectId=${detect.detectId!''}','570','450');">
+                               onclick="update_info('修改检测信息','${path}/admin/detect/to_update_complete?detectId=${detect.detectId!''}','670','450');">
                                 <i class="Hui-iconfont">&#xe60c;</i>
                             </a>
                         </#if>

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

@@ -33,7 +33,7 @@
     <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;"><span class="c-red">*</span>检测结果：</label>
-            <div class=" col-xs-7 col-sm-7 skin-minimal huanhang" >
+            <div class=" col-xs-9 col-sm-9 skin-minimal huanhang" >
                 <div class="radio-box">
                     <input type="radio" id="radio-3" name="detectState" value="3"
                            <#if detectInfo.detectState == 3>checked</#if>
@@ -48,49 +48,49 @@
         </div>
        <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 class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;width: 83%;" rows="3" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="工厂检测现象">${detectInfo.detectPhenomenon!''}</textarea>
             </div>
         </div>
         <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 class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;width: 83%;" rows="3" cols="20" name="detectFailureClassification" id="detectFailureClassification" class="my-textarea" placeholder="故障分类">${detectInfo.detectFailureClassification!''}</textarea>
             </div>
         </div>
         <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 class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;width: 83%;" rows="3" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="故障原因">${detectInfo.detectFailureCause!''}</textarea>
             </div>
         </div>
         <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 class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;width: 83%;" rows="3" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="判定结果">${detectInfo.detectResults!''}</textarea>
             </div>
         </div>
         <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 class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;width: 83%;" rows="3" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="故障指向">${detectInfo.detectPoint!''}</textarea>
             </div>
         </div>
         <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 class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <textarea style="margin-left: 0%;width: 83%;" 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;"><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?string("yyyy-MM-dd")!''}" 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;margin: 10px 0px;"><span class="c-red">*</span>检测日期：</label>
+            <div class="formControls col-8 col-sm-8 text-c huanhang" style="margin-left: -4%;margin: 10px 0px;">
+                <input class="my-input-date" style="width: 94%;" 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;"><span class="c-red">*</span>QC检查状态：</label>
-            <div class="col-xs-7 col-sm-7 skin-minimal">
+            <div class="col-xs-9 col-sm-9 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="radio-9">通过</label>

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

@@ -33,6 +33,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: 100px;margin-top: -0.5%;" type="text" name="maintenanceCustomerId" value="${maintenanceCustomerId!}" 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>
@@ -52,6 +53,7 @@
         <table class="table table-border table-bordered table-bg table-hover table-sort">
             <thead>
             <tr class="text-c">
+                <th width="60">客诉编号</th>
                 <th width="150">设备编号</th>
                 <th width="150">产品类型</th>
                 <th width="90">产品型号</th>
@@ -69,6 +71,7 @@
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as maintenanceInfo>
                 <tr>
+                    <td class="text-c" >${maintenanceInfo.maintenanceCustomerId!}</td>
                     <td class="text-c" width="100">
                     <#if !maintenanceInfo.maintenanceEquipmentNumber??>
                         暂无配件

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

@@ -41,6 +41,7 @@
     <div class="text-c">
         <form name="form1" action="${path}/admin/signclosed/select_signclosed_list" method="post">
             <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_signclosed('${path}/admin/signclosed/to_add_signclosed');">新建签收</button>
+            <input class="my-input" style="width: 70px;" type="text" name="signclosedCustomerId" value="${signclosedCustomerId!}" placeholder="客诉编号"/>
             <input class="my-input" style="width: 70px;" type="text" name="signclosedSendName" value="${signclosedSendName!}" placeholder="寄件人姓名"/>
             <input class="my-input" style="width: 70px;" type="text" name="signclosedSendTel" value="${signclosedSendTel!}" placeholder="寄件人电话号码"/>
             <input class="my-input" style="width: 70px;" type="text" name="signclosedLogisticsNumber" value="${signclosedLogisticsNumber!}" placeholder="快递单号"/>
@@ -62,6 +63,7 @@
         <table class="table table-border table-bordered table-bg table-hover table-sort">
             <thead>
             <tr class="text-c">
+                <th width="100">客诉编号</th>
                 <th width="100">签收类型</th>
                 <th width="160">物流</th>
                 <th width="120">寄件人姓名</th>
@@ -84,6 +86,7 @@
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as signclosed>
                 <tr>
+                    <td class="text-c" width="100">${signclosed.signclosedCustomerId!}</td>
                     <td class="text-c" width="100">
                         <#if signclosed.signclosedType == 1>
                             客诉寄回