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

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

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

@@ -121,15 +121,18 @@ public class ComplaintDetectInfo implements Serializable {
     private Integer state;//查询各状态条数
     private Integer signclosedIsWhetherLess;//是否少件 1是 2否
     private Integer salesmanAdminId;//业务员id
+    private String salesmanAdminName;//业务员姓名
     private String  detectName;//客户姓名
     private String detectTel;//客户电话
     private Integer questionId;//客户问题id
     private Integer methodId;//新增维修 处理方式id
+    private Integer typeId;//新增维修 处理方式类型id
+    private String methodName;//新增维修 处理方式名称
+    private String typeName;//新增维修 处理方式类型名称
     private Integer detectSource;//数据来源1，自动录入2手动添加
     private String questionName;//问题名称
     private String questionProfile;//问题回复
 
-
     public String getQuestionName() {
         return questionName;
     }
@@ -817,4 +820,35 @@ public class ComplaintDetectInfo implements Serializable {
     public void setDetectSource(Integer detectSource) {
         this.detectSource = detectSource;
     }
+
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+    public String getSalesmanAdminName() {
+        return salesmanAdminName;
+    }
+
+    public void setSalesmanAdminName(String salesmanAdminName) {
+        this.salesmanAdminName = salesmanAdminName;
+    }
+
+    public String getMethodName() {
+        return methodName;
+    }
+
+    public void setMethodName(String methodName) {
+        this.methodName = methodName;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

@@ -165,6 +165,46 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
                     }
                 }
             }
+            //故障原因
+            if(record.getConfigli2() != null) {
+                if (record.getConfigli2().length > 0) {
+                    StringBuffer detectFailureCause = new StringBuffer("");
+                    for (String configid : record.getConfigli2()) {
+                        detectFailureCause.append(adddetectItem(configid, record.getDetectId()) + ";");
+                    }
+                    record.setDetectFailureCause(detectFailureCause.toString());
+                }
+            }
+            //判定结果
+            if(record.getConfigli3() != null){
+                if(record.getConfigli3().length > 0){
+                    StringBuffer detectResults = new StringBuffer("");
+                    for (String configid : record.getConfigli3()){
+                        detectResults.append(adddetectItem(configid,record.getDetectId())+";");
+                    }
+                    record.setDetectResults(detectResults.toString());
+                }
+            }
+            //故障指向
+            if(record.getConfigli4() != null) {
+                if (record.getConfigli4().length > 0) {
+                    StringBuffer detectPoint = new StringBuffer("");
+                    for (String configid : record.getConfigli4()) {
+                        detectPoint.append(adddetectItem(configid, record.getDetectId()) + ";");
+                    }
+                    record.setDetectPoint(detectPoint.toString());
+                }
+            }
+            //原因分析
+            if(record.getConfigli5() != null) {
+                if (record.getConfigli5().length > 0) {
+                    StringBuffer detectNalysis = new StringBuffer("");
+                    for (String configid : record.getConfigli5()) {
+                        detectNalysis.append(adddetectItem(configid, record.getDetectId()) + ";");
+                    }
+                    record.setDetectNalysis(detectNalysis.toString());
+                }
+            }
         }catch (Exception e){
             throw new RuntimeException("修改检测维修内容失败");
         }
@@ -312,46 +352,7 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
                 record.setDetectPhenomenon(detectPhenomenon.toString());
             }
         }
-        //故障原因
-        if(record.getConfigli2() != null) {
-            if (record.getConfigli2().length > 0) {
-                StringBuffer detectFailureCause = new StringBuffer("");
-                for (String configid : record.getConfigli2()) {
-                    detectFailureCause.append(adddetectItem(configid, record.getDetectId()) + ";");
-                }
-                record.setDetectFailureCause(detectFailureCause.toString());
-            }
-        }
-        //判定结果
-        if(record.getConfigli3() != null){
-            if(record.getConfigli3().length > 0){
-                StringBuffer detectResults = new StringBuffer("");
-                for (String configid : record.getConfigli3()){
-                    detectResults.append(adddetectItem(configid,record.getDetectId())+";");
-                }
-                record.setDetectResults(detectResults.toString());
-            }
-        }
-        //故障指向
-        if(record.getConfigli4() != null) {
-            if (record.getConfigli4().length > 0) {
-                StringBuffer detectPoint = new StringBuffer("");
-                for (String configid : record.getConfigli4()) {
-                    detectPoint.append(adddetectItem(configid, record.getDetectId()) + ";");
-                }
-                record.setDetectPoint(detectPoint.toString());
-            }
-        }
-        //原因分析
-        if(record.getConfigli5() != null) {
-            if (record.getConfigli5().length > 0) {
-                StringBuffer detectNalysis = new StringBuffer("");
-                for (String configid : record.getConfigli5()) {
-                    detectNalysis.append(adddetectItem(configid, record.getDetectId()) + ";");
-                }
-                record.setDetectNalysis(detectNalysis.toString());
-            }
-        }
+
             if(complaintDetectInfoMapper.updateDetectById(record) > 0){
                 if(imgs != null){
                     if(imgs.length > 0){
@@ -561,38 +562,14 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
         }else{
             date.set(Calendar.DATE, date.get(Calendar.DATE) + 5);
         }
-
-        switch (detectInfo.getDetectState()){
-            case 30:
                 if(detectInfo.getDetectProcessingResults() == 1){//付费维修
                     detectInfo.setDetectState(31);//同意付费维修
                     detectInfo.setCompleteCutTime(date.getTime());
-                }
-                if(detectInfo.getDetectProcessingResults() == 3 || detectInfo.getDetectProcessingResults() == 4){//退货、换货
-                    if(detect.getDetectRenovation() == 1){
-                        detectInfo.setDetectState(20);//待翻新
-                    }else{
-                        detectInfo.setDetectState(22);//待报废
-                    }
-                }
-                if(detectInfo.getDetectProcessingResults() == 5){//原机退回
-                    detectInfo.setDetectState(33);//
-                }
-                break;
-            case 34:
-                detectInfo.setDetectState(35);
-                detectInfo.setCompleteCutTime(date.getTime());
-                break;
-            case 38:
-                if(detectInfo.getDetectProcessingResults() == 1){//付费维修
-                    detectInfo.setDetectState(31);//同意付费维修
+                }else if(detectInfo.getDetectProcessingResults() == 2){//免费维修
+                    detectInfo.setDetectState(35);//同意付费维修
                     detectInfo.setCompleteCutTime(date.getTime());
                 }
-                if(detectInfo.getDetectProcessingResults() == 2){//免费维修
-                    detectInfo.setDetectState(35);//同意免费维修
-                    detectInfo.setCompleteCutTime(date.getTime());
-                }
-                if(detectInfo.getDetectProcessingResults() == 3 || detectInfo.getDetectProcessingResults() == 4){//退货、换货
+                if(detectInfo.getDetectProcessingResults() == 3 || detect.getDetectProcessingResults() == 4){//退货、换货
                     if(detect.getDetectRenovation() == 1){
                         detectInfo.setDetectState(20);//待翻新
                     }else{
@@ -600,19 +577,16 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
                     }
                 }
                 if(detectInfo.getDetectProcessingResults() == 5){//原机退回
-                    detectInfo.setDetectState(37);//原机退回
+                    detectInfo.setDetectState(33);//
                 }
-                break;
-        }
-
         try {
             if(complaintDetectInfoMapper.updateDetectById(detectInfo) > 0){
                 //添加业务员操作记录
                 TreatmentRecordLog log = new TreatmentRecordLog();
                 log.setDetectId(detectInfo.getDetectId());
-                log.setRecordAdminId(detectInfo.getSalesmanAdminId());
-                log.setRecordDesc(detectInfo.getDetectCustomerDesc());
-                log.setRecordProcessingResults(detectInfo.getDetectProcessingResults());
+                log.setRecordAdminId(detect.getSalesmanAdminId());
+                log.setRecordDesc(detect.getDetectCustomerDesc());
+                log.setRecordProcessingResults(detect.getDetectProcessingResults());
                 complaintDetectInfoMapper.addTreatmentRecordLog(log);
                 //发送确认短信
                 String results = "";

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -295,6 +295,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                                     detectInfo.setDetectRenovation(0);
                                     detectInfo.setDetectProcessingResults(0);
                                     detectInfo.setSignclosedId(infos.getSignclosedId());
+                                    detectInfo.setDetectSource(1);
                                     Calendar date = Calendar.getInstance();
                                     date.setTime(new Date());
                                     boolean fl = false;
@@ -359,6 +360,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                             detectInfo.setDetectRenovation(0);
                             detectInfo.setDetectProcessingResults(0);
                             detectInfo.setSignclosedId(sigInfo.getSignclosedId());
+                            detectInfo.setDetectSource(1);
                             Calendar date = Calendar.getInstance();
                             date.setTime(new Date());
                             boolean fl = false;

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

@@ -68,7 +68,8 @@
       cd.method_id methodId,
       cd.detect_source detectSource,
       cq.question_name questionName,
-      cq.question_profile questionProfile
+      cq.question_profile questionProfile,
+      ssa.admin_name salesmanAdminName
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
@@ -85,6 +86,8 @@
     LEFT JOIN tb_rst_address_district ad on ad.district_id = cs.signclosed_addr_area
     LEFT JOIN tb_rst_sys_admin sa on c.admin_id = sa.admin_id
     LEFT JOIN tb_rst_cm_complaint_question cq on cq.question_id = cd.question_id
+    LEFT JOIN tb_rst_sys_admin ssa on cd.salesman_admin_id = ssa.admin_id
+
     where detect_id = #{detectId,jdbcType=INTEGER}
     GROUP BY c.customer_id
   </select>
@@ -162,7 +165,11 @@
     cd.detect_tel detectTel,
     cd.question_id questionId,
     cd.method_id methodId,
-    cd.detect_source detectSource
+    cd.detect_source detectSource,
+    ssa.admin_name salesmanAdminName,
+    cq.question_name questionName,
+    cpms.proc_method_name methodName,
+    cpts.proc_type_name typeName
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
@@ -179,6 +186,10 @@
     LEFT JOIN tb_rst_address_city ac ON cs.signclosed_addr_city = ac.city_id
     LEFT JOIN tb_rst_address_district ad on ad.district_id = cs.signclosed_addr_area
     LEFT JOIN tb_rst_sys_admin sa on c.admin_id = sa.admin_id
+    LEFT JOIN tb_rst_cm_complaint_question cq on cq.question_id = cd.question_id
+    LEFT JOIN tb_rst_sys_admin ssa on cd.salesman_admin_id = ssa.admin_id
+    LEFT JOIN tb_rst_cm_proc_method cpms on cd.method_id = cpms.proc_method_id
+    LEFT JOIN tb_rst_cm_proc_type cpts on cpms.proc_type_id = cpts.proc_type_id
     <where>
       <if test="productTypeId != null" >
         AND pt.type_id = #{productTypeId,jdbcType=INTEGER}
@@ -306,6 +317,27 @@
       <if test="maintenanceResults != null and maintenanceResults != ''">
         and cd.maintenance_results = #{maintenanceResults}
       </if>
+      <if test="detectSource != null and detectSource != ''">
+        and cd.detect_source = #{detectSource}
+      </if>
+      <if test="salesmanAdminId != null and salesmanAdminId != ''">
+        and ssa.admin_id = #{salesmanAdminId}
+      </if>
+      <if test="methodId != null and methodId != ''">
+        and cd.method_id = #{methodId}
+      </if>
+      <if test="detectName != null and detectName != ''">
+        and cd.detect_name like CONCAT('%',#{detectName},'%')
+      </if>
+      <if test="detectTel != null and detectTel != ''">
+        and cd.detect_tel like CONCAT('%',#{detectTel},'%')
+      </if>
+      <if test="questionName != null and questionName != ''">
+        and cq.question_name like CONCAT('%',#{questionName},'%')
+      </if>
+      <if test="typeId != null and typeId != ''">
+        and cpts.proc_type_id = #{typeId}
+      </if>
     </where>
       GROUP BY cd.detect_id
       ORDER BY cd.detect_create_time DESC

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

@@ -2,6 +2,7 @@ package com.iamberry.rst.controllers.cm;
 
 import com.iamberry.rst.core.cm.CompanyInfo;
 import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
+import com.iamberry.rst.core.cm.ProcType;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.fm.*;
 import com.iamberry.rst.core.order.Product;
@@ -12,6 +13,7 @@ import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 import com.iamberry.rst.faces.cm.CompanyInfoService;
+import com.iamberry.rst.faces.cm.ProcTypeService;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.fm.AwaitingSignclosedProductInfoService;
 import com.iamberry.rst.faces.fm.ComplaintDetectInfoService;
@@ -39,6 +41,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -71,6 +74,8 @@ public class AdminDetectController {
     private ComplaintQuestionInfoMapper complaintQuestionInfoMapper;
     @Autowired
     private SysMapper sysMapper;
+    @Autowired
+    private ProcTypeService procTypeService;
     /**
      * 跳转到添加检测记录页面
      *
@@ -123,7 +128,6 @@ public class AdminDetectController {
                                          ComplaintDetectInfo detect) throws ParseException {
 
         ModelAndView mv = new ModelAndView("cm/inspection/detect_list");
-
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         // 封装请求数据
         PageRequest<ComplaintDetectInfo> pageRequest = new PageRequest<>(detect, pageNO, pageSize, totalNum == 0);
@@ -260,6 +264,14 @@ public class AdminDetectController {
             return mv;
         }
         ComplaintDetectInfo detectinfo = complaintDetectInfoService.getDetectById(Integer.valueOf(detectId));
+        List<DetectionConfig> config2 = complaintDetectInfoService.listDetectionConfig(2);
+        List<DetectionConfig> config3 = complaintDetectInfoService.listDetectionConfig(3);
+        List<DetectionConfig> config4 = complaintDetectInfoService.listDetectionConfig(4);
+        List<DetectionConfig> config5 = complaintDetectInfoService.listDetectionConfig(5);
+        mv.addObject("config2",config2);
+        mv.addObject("config3",config3);
+        mv.addObject("config4",config4);
+        mv.addObject("config5",config5);
         List<MaterialNumberInfo> listMaterial = complaintDetectInfoService.listMaterialNumber();
         mv.addObject("detectId",detectId);
         mv.addObject("detectState",detectState);
@@ -315,55 +327,7 @@ public class AdminDetectController {
         return mv;
     }
 
-    /**
-     * 获取检测详情
-     *
-     * @return
-     */
-    @RequiresPermissions("info:update:info")
-    @RequestMapping(value = "/get_detail")
-    public ResponseJson getDetail(HttpServletRequest request) {
-        String detectId = request.getParameter("detectId");
-        ResponseJson msg = new ResponseJson();
-        if(detectId == null || detectId.equals("")){
-            msg.setResultCode(500);
-            msg.setReturnCode(500);
-        }
-        ComplaintDetectInfo detectinfo = complaintDetectInfoService.getDetectById(Integer.valueOf(detectId));
-        List<ComplaintDetectImg> imgList = complaintDetectInfoService.listDetectImg(Integer.valueOf(detectId));
-        List<MaterialItem> listMaterialItem = complaintDetectInfoService.listMaterialItem(Integer.valueOf(detectId));
-        List<QcInfo> listQcInfo = complaintDetectInfoService.listQcInfo(Integer.valueOf(detectId));
-        List<TreatmentRecordLog> listTreatmentRecordLog = complaintDetectInfoService.listTreatmentRecordLog(Integer.valueOf(detectId));
-        if(detectinfo.getSalesOrderId() != null){
-            SalesOrder salesOrder = salesOrderService.getSalesOrderByOrderId(detectinfo.getSalesOrderId());
-            msg.addResponseKeyValue("salesOrder",salesOrder);
-        }
-        DetectionItem detectionItem = new DetectionItem();
-        detectionItem.setDetectId(Integer.valueOf(detectId));
-        //查询检测现象
-        detectionItem.setConfigType(1);
-        msg.addResponseKeyValue("detectPhenomenonList",complaintDetectInfoService.listDetectionItem(detectionItem));
-        //查询故障原因
-        detectionItem.setConfigType(2);
-        msg.addResponseKeyValue("detectFailureCauseList",complaintDetectInfoService.listDetectionItem(detectionItem));
-        //查询判定结果
-        detectionItem.setConfigType(3);
-        msg.addResponseKeyValue("detectResultsList",complaintDetectInfoService.listDetectionItem(detectionItem));
-        //查询故障指向
-        detectionItem.setConfigType(4);
-        msg.addResponseKeyValue("detectPointList",complaintDetectInfoService.listDetectionItem(detectionItem));
-        //查询原因分析
-        detectionItem.setConfigType(5);
-        msg.addResponseKeyValue("detectNalysisList",complaintDetectInfoService.listDetectionItem(detectionItem));
-        msg.addResponseKeyValue("listTreatmentRecordLog",listTreatmentRecordLog);
-        msg.addResponseKeyValue("listQcInfo",listQcInfo);
-        msg.addResponseKeyValue("listMaterialItem",listMaterialItem);
-        msg.addResponseKeyValue("detectinfo",detectinfo);
-        msg.addResponseKeyValue("imgList",imgList);
-        msg.setResultCode(200);
-        msg.setReturnCode(200);
-        return msg;
-    }
+
 
     /**
      * 跳转到修改检测页面
@@ -522,6 +486,14 @@ public class AdminDetectController {
             return msg;
         }
         String[] configli6 = request.getParameterValues("configli6");
+        String[] configli2 = request.getParameterValues("configli2");
+        String[] configli3 = request.getParameterValues("configli3");
+        String[] configli4 = request.getParameterValues("configli4");
+        String[] configli5 = request.getParameterValues("configli5");
+        detectInfo.setConfigli2(configli2);
+        detectInfo.setConfigli3(configli3);
+        detectInfo.setConfigli4(configli4);
+        detectInfo.setConfigli5(configli5);
         detectInfo.setConfigli6(configli6);
         if(detectInfo.getDetectState() != null){
             if(detectInfo.getDetectState() == 32 || detectInfo.getDetectState() == 36 ){
@@ -603,15 +575,7 @@ public class AdminDetectController {
         ComplaintDetectInfo detectInfo = complaintDetectInfoService.getDetectById(Integer.valueOf(detectId));
         //查询维修配置信息
         List<DetectionConfig> config1 = complaintDetectInfoService.listDetectionConfig(1);
-        List<DetectionConfig> config2 = complaintDetectInfoService.listDetectionConfig(2);
-        List<DetectionConfig> config3 = complaintDetectInfoService.listDetectionConfig(3);
-        List<DetectionConfig> config4 = complaintDetectInfoService.listDetectionConfig(4);
-        List<DetectionConfig> config5 = complaintDetectInfoService.listDetectionConfig(5);
         mv.addObject("config1",config1);
-        mv.addObject("config2",config2);
-        mv.addObject("config3",config3);
-        mv.addObject("config4",config4);
-        mv.addObject("config5",config5);
         detectInfo.setDetectDate(new Date());
         mv.addObject("detectId",detectId);
         mv.addObject("detectInfo",detectInfo);
@@ -704,15 +668,7 @@ public class AdminDetectController {
         }
         String[] componentsImgs = request.getParameterValues("componentsImg");
         String[] configli1 = request.getParameterValues("configli1");
-        String[] configli2 = request.getParameterValues("configli2");
-        String[] configli3 = request.getParameterValues("configli3");
-        String[] configli4 = request.getParameterValues("configli4");
-        String[] configli5 = request.getParameterValues("configli5");
         detectInfo.setConfigli1(configli1);
-        detectInfo.setConfigli2(configli2);
-        detectInfo.setConfigli3(configli3);
-        detectInfo.setConfigli4(configli4);
-        detectInfo.setConfigli5(configli5);
         detectInfo.setDetectCompletionTime(new Date());
         Integer num = complaintDetectInfoService.updateDetectById(detectInfo,componentsImgs);
         if (num < 1) {
@@ -816,36 +772,7 @@ public class AdminDetectController {
         return msg;
     }
 
-    /**
-     * 业务员确认处理结果
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @RequiresPermissions("complete:update:complete")
-    @ResponseBody
-    @RequestMapping("/salesman_confirm")
-    public ResponseJson salesmanConfirm(HttpServletRequest request, ComplaintDetectInfo detectInfo) throws Exception {
-        ResponseJson msg = new ResponseJson();
-        if(detectInfo == null){
-            msg.setResultCode(500);
-            msg.setReturnCode(500);
-            return msg;
-        }
-        if(detectInfo.getDetectId() == null || "".equals(detectInfo.getDetectId())){
-            msg.setResultCode(500);
-            msg.setReturnCode(500);
-            return msg;
-        }
-        if (!complaintDetectInfoService.salesmanConfirm(detectInfo)) {
-            msg.setResultCode(500);
-            msg.setReturnCode(500);
-        } else {
-            msg.setResultCode(200);
-            msg.setReturnCode(200);
-        }
-        return msg;
-    }
+
 
     /**
      * 查询维修信息条数
@@ -1286,5 +1213,49 @@ public class AdminDetectController {
         return msg;
     }*/
 
+    /**
+     * 客诉 - 查询维修处理列表
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("detect:Repair:detect")
+    @RequestMapping("/detect_repair_list")
+    public ModelAndView detectRepairList(HttpServletRequest request,
+                                         @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
+                                         @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
+                                         @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum,
+                                         ComplaintDetectInfo detect) throws ParseException {
+
+        ModelAndView mv = new ModelAndView("cm/inspection/detect_repair_list");
+        detect.setDetectSource(2);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        // 封装请求数据
+        PageRequest<ComplaintDetectInfo> pageRequest = new PageRequest<>(detect, pageNO, pageSize, totalNum == 0);
+        // 查询订单列表
+        PagedResult<ComplaintDetectInfo> result = complaintDetectInfoService.listComplaintDetect(pageRequest);
+        if (totalNum != 0) {
+            result.setTotal(totalNum);
+        }
+        //获取所有产品类型
+        ProductType productType = new ProductType();
+        List<ProductType> productTypeList = productService.listProductType(productType);
+        mv.addObject("productTypeList",productTypeList);
+        Product product = new Product();
+        List<Product> productList = productService.listProductAndColorAndfittings(product);
+        mv.addObject("productList",productList);
+        //查询业务员
+        Admin admin = new Admin();
+        admin.setAdminDept(15);
+        List<Admin> listAdmin = sysMapper.listAdmin(admin);
+        mv.addObject("listAdmin",listAdmin);
+        ProcType procType = new ProcType();
+        List<ProcType> procTypeList = new ArrayList<>();
+        procType.setProcTypeStatus(1);
+        procTypeList = procTypeService.getProcTypeList(procType);
+        mv.addObject("procTypeList",procTypeList);
+        StitchAttrUtil.getSa().setModelAndView(detect, mv, "/admin/detect/select_detect_list", result);
+        return mv;
+    }
+
 }
 

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

@@ -0,0 +1,155 @@
+package com.iamberry.rst.controllers.cm;
+
+import com.iamberry.rst.core.cm.CompanyInfo;
+import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
+import com.iamberry.rst.core.cm.ProcType;
+import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.core.fm.*;
+import com.iamberry.rst.core.order.Product;
+import com.iamberry.rst.core.order.ProductColor;
+import com.iamberry.rst.core.order.ProductType;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.sys.Admin;
+import com.iamberry.rst.core.tools.LogisticsInfo;
+import com.iamberry.rst.faces.cm.CompanyInfoService;
+import com.iamberry.rst.faces.cm.ProcTypeService;
+import com.iamberry.rst.faces.cm.SalesOrderService;
+import com.iamberry.rst.faces.fm.AwaitingSignclosedProductInfoService;
+import com.iamberry.rst.faces.fm.ComplaintDetectInfoService;
+import com.iamberry.rst.faces.fm.ComplaintSignclosedInfoService;
+import com.iamberry.rst.faces.fm.ComplaintSignclosedProductInfoService;
+import com.iamberry.rst.faces.product.ProductService;
+import com.iamberry.rst.service.cm.mapper.ComplaintQuestionInfoMapper;
+import com.iamberry.rst.service.sys.mapper.SysMapper;
+import com.iamberry.rst.utils.AdminUtils;
+import com.iamberry.rst.utils.GenerateKeyUtil;
+import com.iamberry.rst.utils.StitchAttrUtil;
+import com.iamberry.wechat.tools.ResponseJson;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by wxm on 2017/8/29.
+ */
+@Controller
+@RequestMapping("/detect")
+public class detectController {
+
+   // private
+    @Autowired
+    private ComplaintDetectInfoService complaintDetectInfoService;
+    @Autowired
+    private SalesOrderService salesOrderService;
+    /**
+     * 跳转到修改确认售后处理方式页面
+     *
+     * @return
+     */
+    @RequestMapping(value = "/to_detect_msg")
+    public ModelAndView toDetectMsg(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("cm/inspection/detect_msg");
+        String detectId = request.getParameter("detectId");
+        mv.addObject("detectId",detectId);
+        return mv;
+    }
+
+    /**
+     * 获取检测详情
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/get_detail")
+    public ResponseJson getDetail(HttpServletRequest request) {
+        String detectId = request.getParameter("detectId");
+        ResponseJson msg = new ResponseJson();
+        if(detectId == null || detectId.equals("")){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        ComplaintDetectInfo detectinfo = complaintDetectInfoService.getDetectById(Integer.valueOf(detectId));
+        List<ComplaintDetectImg> imgList = complaintDetectInfoService.listDetectImg(Integer.valueOf(detectId));
+        List<MaterialItem> listMaterialItem = complaintDetectInfoService.listMaterialItem(Integer.valueOf(detectId));
+        List<QcInfo> listQcInfo = complaintDetectInfoService.listQcInfo(Integer.valueOf(detectId));
+        List<TreatmentRecordLog> listTreatmentRecordLog = complaintDetectInfoService.listTreatmentRecordLog(Integer.valueOf(detectId));
+        if(detectinfo.getSalesOrderId() != null){
+            SalesOrder salesOrder = salesOrderService.getSalesOrderByOrderId(detectinfo.getSalesOrderId());
+            msg.addResponseKeyValue("salesOrder",salesOrder);
+        }
+        DetectionItem detectionItem = new DetectionItem();
+        detectionItem.setDetectId(Integer.valueOf(detectId));
+        //查询检测现象
+        detectionItem.setConfigType(1);
+        msg.addResponseKeyValue("detectPhenomenonList",complaintDetectInfoService.listDetectionItem(detectionItem));
+        //查询故障原因
+        detectionItem.setConfigType(2);
+        msg.addResponseKeyValue("detectFailureCauseList",complaintDetectInfoService.listDetectionItem(detectionItem));
+        //查询判定结果
+        detectionItem.setConfigType(3);
+        msg.addResponseKeyValue("detectResultsList",complaintDetectInfoService.listDetectionItem(detectionItem));
+        //查询故障指向
+        detectionItem.setConfigType(4);
+        msg.addResponseKeyValue("detectPointList",complaintDetectInfoService.listDetectionItem(detectionItem));
+        //查询原因分析
+        detectionItem.setConfigType(5);
+        msg.addResponseKeyValue("detectNalysisList",complaintDetectInfoService.listDetectionItem(detectionItem));
+        msg.addResponseKeyValue("listTreatmentRecordLog",listTreatmentRecordLog);
+        msg.addResponseKeyValue("listQcInfo",listQcInfo);
+        msg.addResponseKeyValue("listMaterialItem",listMaterialItem);
+        msg.addResponseKeyValue("detectinfo",detectinfo);
+        msg.addResponseKeyValue("imgList",imgList);
+        msg.setResultCode(200);
+        msg.setReturnCode(200);
+        return msg;
+    }
+
+    /**
+     * 业务员确认处理结果
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/salesman_confirm")
+    public ResponseJson salesmanConfirm(HttpServletRequest request, ComplaintDetectInfo detectInfo) throws Exception {
+        ResponseJson msg = new ResponseJson();
+        if(detectInfo == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        if(detectInfo.getDetectId() == null || "".equals(detectInfo.getDetectId())){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        if (!complaintDetectInfoService.salesmanConfirm(detectInfo)) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+        }
+        return msg;
+    }
+}
+

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -83,8 +83,6 @@ public class MQTask implements InitializingBean {
 	@Autowired
 	private  CompanyInfoService companyInfoService;
 	@Autowired
-	private  CmRelationService cmRelationService;
-	@Autowired
 	private ComplaintDetectInfoService complaintDetectInfoService;
 	@Autowired
 	private  EfastUtil efastUtil;

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

@@ -47,16 +47,117 @@
 <body>
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
+
+        <div class="input-box">
+            <label class="form-label col-1 col-sm-1 huanhang" style="text-align: center;">故障原因：</label>
+            <div class="formControls col-6 col-sm-6 huanhang" style="margin: 10px 0px;">
+                <select id="configSelect2" name="configSelect2" class="chosen" style="width: 43%;">
+                    <option value="">请选择故障原因</option>
+                    <#if (config2?size > 0)>
+                        <#list config2 as config>
+                                <option value="${config.configId!""}">${config.configDetectContent!""}</option>
+                        </#list>
+                    </#if>
+                </select>
+
+            </div>
+        </div>
+
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"></label>
+            <div class="formControls col-7 col-sm-7 huanhang" id="config2" style="margin: 10px 0px;">
+                <div class="row">
+                    <ul class="close-box" id="configui2">
+
+                    </ul>
+                </div>
+
+            </div>
+        </div>
+
+        <div class="input-box">
+            <label class="form-label col-1 col-sm-1 huanhang" style="text-align: center;">判定结果：</label>
+            <div class="formControls col-6 col-sm-6 huanhang" style="margin: 10px 0px;">
+                <select id="configSelect3" name="configSelect3" class="chosen" style="width: 43%;">
+                    <option value="">请选择判定结果</option>
+                    <#if (config3?size > 0)>
+                        <#list config3 as config>
+                                <option value="${config.configId!""}">${config.configDetectContent!""}</option>
+                        </#list>
+                    </#if>
+                </select>
+
+            </div>
+        </div>
+
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"></label>
+            <div class="formControls col-7 col-sm-7 huanhang" id="config3" style="margin: 10px 0px;">
+                <div class="row">
+                    <ul class="close-box" id="configui3">
+
+                    </ul>
+                </div>
+
+            </div>
+        </div>
+
+        <div class="input-box">
+            <label class="form-label col-1 col-sm-1 huanhang" style="text-align: center;">故障指向：</label>
+            <div class="formControls col-6 col-sm-6 huanhang" style="margin: 10px 0px;">
+                <select id="configSelect4" name="configSelect4" class="chosen" style="width: 43%;">
+                    <option value="">请选择故障指向</option>
+                    <#if (config4?size > 0)>
+                        <#list config4 as config>
+                                <option value="${config.configId!""}">${config.configDetectContent!""}</option>
+                        </#list>
+                    </#if>
+                </select>
+
+            </div>
+        </div>
+
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"></label>
+            <div class="formControls col-7 col-sm-7 huanhang" id="config4" style="margin: 10px 0px;">
+                <div class="row">
+                    <ul class="close-box" id="configui4">
+
+                    </ul>
+                </div>
+
+            </div>
+        </div>
+
+        <div class="input-box">
+            <label class="form-label col-1 col-sm-1 huanhang" style="text-align: center">原因分析：</label>
+            <div class="formControls col-6 col-sm-6 huanhang" style="margin: 10px 0px;">
+                <select id="configSelect5" name="configSelect5" class="chosen" style="width: 43%;">
+                    <option value="">请选择原因分析</option>
+                    <#if (config5?size > 0)>
+                        <#list config5 as config>
+                                <option value="${config.configId!""}">${config.configDetectContent!""}</option>
+                        </#list>
+                    </#if>
+                </select>
+
+            </div>
+        </div>
+
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"></label>
+            <div class="formControls col-7 col-sm-7 huanhang" id="config5" style="margin: 10px 0px;">
+                <div class="row">
+                    <ul class="close-box" id="configui5">
+
+                    </ul>
+                </div>
+
+            </div>
+        </div>
         <div class="row cl">
                 <label class="form-label col-1 col-sm-1 huanhang" style="text-align: center">维修配件：</label>
                 <div class="formControls col-6 col-sm-6 huanhang" style="">
-
-                        <#--<select class="select" id="materialId" name="materialId" >
-                            <option value="1" >请选择（可多选）</option>
-                            <#list listMaterial as material>
-                                <option value="${material.materialName}" >${material.materialName}</option>
-                            </#list>
-                        </select>-->
                         <select id="configSelect6" name="configSelect6" class="chosen" style="width: 43%;">
                             <#if (listMaterial?size > 0)>
                                     <#list listMaterial as material>
@@ -104,6 +205,85 @@
         $(obj).parent().remove();
     }
 
+    $('#configSelect2').change(function() {
+        var name = $("#configSelect2 option:selected").text();
+        var id = $('#configSelect2').val();
+        var bl = true;
+        if(id != "") {
+            $("input[name='configli2']").each(function (j, item) {
+                var s = $(item).val();
+                if (s === id) {
+                    bl = false;
+                }
+            });
+            if (bl) {
+                $("#configui2").append('<li class="b-close" id="configDetele2">' +
+                        ' <input type="hidden" value="' + id + '" name="configli2">' + name +
+                        '<span class="my-close" onclick="deleteli(this)"></span>' +
+                        '</li>');
+            }
+        }
+    });
+
+    $('#configSelect3').change(function() {
+        var name = $("#configSelect3 option:selected").text();
+        var id = $('#configSelect3').val();
+        var bl = true;
+        if(id != "") {
+            $("input[name='configli3']").each(function (j, item) {
+                var s = $(item).val();
+                if (s === id) {
+                    bl = false;
+                }
+            });
+            if (bl) {
+                $("#configui3").append('<li class="b-close" id="configDetele3">' +
+                        ' <input type="hidden" value="' + id + '" name="configli3">' + name +
+                        '<span class="my-close" onclick="deleteli(this)"></span>' +
+                        '</li>');
+            }
+        }
+    });
+
+    $('#configSelect4').change(function() {
+        var name = $("#configSelect4 option:selected").text();
+        var id = $('#configSelect4').val();
+        var bl = true;
+        if(id != "") {
+            $("input[name='configli4']").each(function (j, item) {
+                var s = $(item).val();
+                if (s === id) {
+                    bl = false;
+                }
+            });
+            if (bl) {
+                $("#configui4").append('<li class="b-close" id="configDetele4">' +
+                        ' <input type="hidden" value="' + id + '" name="configli4">' + name +
+                        '<span class="my-close" onclick="deleteli(this)"></span>' +
+                        '</li>');
+            }
+        }
+    });
+
+    $('#configSelect5').change(function() {
+        var name = $("#configSelect5 option:selected").text();
+        var id = $('#configSelect5').val();
+        var bl = true;
+        if(id != "") {
+            $("input[name='configli5']").each(function (j, item) {
+                var s = $(item).val();
+                if (s === id) {
+                    bl = false;
+                }
+            });
+            if (bl) {
+                $("#configui5").append('<li class="b-close" id="configDetele5">' +
+                        ' <input type="hidden" value="' + id + '" name="configli5">' + name +
+                        '<span class="my-close" onclick="deleteli(this)"></span>' +
+                        '</li>');
+            }
+        }
+    });
     $('#configSelect6').change(function() {
         var name = $("#configSelect6 option:selected").text();
         var id = $('#configSelect6').val();

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

@@ -192,7 +192,10 @@
                 <tr>
                     <#--<td class="text-c" width="100">${detect.customerId!}</td>-->
                     <td class="text-c" width="100">${detect.detectNumber!''}</td>
-                    <td class="text-c" width="100"><#if detect.customerId??>${detect.procTypeName!''}-${detect.procMethodName!''}</#if></td>
+                    <td class="text-c" width="100">
+                        <#if detect.customerId??>${detect.procTypeName!''}-${detect.procMethodName!''}</#if>
+                        <#if detect.typeName??>${detect.typeName!''}-${detect.methodName!''}</#if>
+                    </td>
                     <td class="text-c" width="100">${detect.productName!'暂无产品'}(${detect.colorName!'暂无颜色'})</td>
                     <td class="text-c" width="100">
                         <#if detect.detectState == 1>

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

@@ -0,0 +1,268 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<title></title>
+		<#include "/base/list_base.ftl">
+
+		<style>
+			.Hui-aside{top:60px;padding-top: 0;background-color: #292f36;width:138px;}
+        .container-fluid{padding: 8px 15px;}
+        #Hui-userbar{top:8px;}
+        .Hui-article-box{top:58px;}
+        .navbar{background: #292f36;}
+        .navbar-slogan{font-size: 14px;}
+        .Hui-aside .menu_dropdown dt{border-bottom: 0}
+        .Hui-aside .menu_dropdown dt {color: #fff; background: #292f36;}
+        .Hui-aside .menu_dropdown dt.selected{background: #50a2ea;color:#fff;border-left: 4px solid #1f6eb3;}
+        .Hui-aside .menu_dropdown dt:hover {  color: #f0f0f0 !important;  }
+        .Hui-aside .menu_dropdown dt .Hui-iconfont {  color: #fff;  }
+        .menu_dropdown dt .menu_dropdown-arrow {  color: #fff;  }
+        .Hui-aside .menu_dropdown dd ul{background: #292f36;  }
+        .Hui-aside .menu_dropdown li a{color: #94a0b5;}
+        .Hui-aside .menu_dropdown li.active a{color: #50a2ea;}
+        .acrossTab li{color: #999;}
+        .acrossTab li.active{color:#50a2ea;}
+		table{border: 1px solid rgba(0,0,0,.1);}
+		table th{background: #f7fafd;}
+		table th,table td{border-collapse: collapse;border: 1px solid rgba(0,0,0,.1);text-align: center;padding: 5px 0;}
+		</style>
+	</head>
+	<body>
+		<article class="page-container" style="padding: 10px;">
+		<form action="/" method="post" class="form form-horizontal" id="form">
+			<div class="row cl">
+			    <label class="form-label col-12 col-sm-12"><strong>所属客户：</strong>
+					<span id="detectName"></span>
+				</label>
+			</div>
+			<div class="row cl">
+			    <label class="form-label col-12 col-sm-12"><strong>产品信息：</strong>
+					<span id="productName"></span>
+				</label>
+			</div>
+			<div class="row cl">
+			    <label class="form-label col-12 col-sm-12"><strong>咨询问题：</strong>
+					<span id="questionName"></span>
+				</label>
+			</div>
+			<div class="row cl">
+			    <label class="form-label col-12 col-sm-12"><strong>检测信息：</strong></label>
+			</div>
+			<div class="row cl">
+			    <div class="col-12 col-sm-12">
+					<table>
+						<tr>
+							<th>是否故障</th><td id="isMaintenance" style="width: 50%;">是</td>
+						</tr>
+						<tr>
+							<th>是否可翻新</th><td id="detectRenovation">否</td>
+						</tr>
+						<tr>
+							<th>浮子类型</th><td id="detectFloatType">长</td>
+						</tr>
+						<tr>
+							<th>厚膜类型</th><td id="detectFilmType"></td>
+						</tr>
+						<tr>
+							<th>是否为翻新机</th><td id="detectIsRefurbishing"></td>
+						</tr>
+						<tr>
+							<th>生产月份</th><td id="detectProduction"></td>
+						</tr>
+						<tr>
+							<th>版本号</th><td id="detectVersionNumber"></td>
+						</tr>
+						<tr>
+							<th>检测现象</th><td id="detectPhenomenon"></td>
+						</tr>
+						<tr>
+							<th>维修报价</th><td id="detectOffer"></td>
+						</tr>
+						<tr>
+							<th>备注信息</th><td id="detectDesc"></td>
+						</tr>
+					</table>
+				</div>
+			</div>
+			<div class="row cl">
+			    <label class="form-label col-12 col-sm-12"><strong>当前已检测完成，请确认：</strong></label>
+			</div>
+			<div class="row cl">
+                <div class="formControls col-12 col-sm-12 skin-minimal customerSourceType_text_all">
+                    <div class="radio-box">
+                        <input type="radio" name="detectProcessingResults" value="2" id="radio-1" checked="checked">
+                        <label for="radio-1" class="">免费维修</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" name="detectProcessingResults" value="1" id="radio-2"/>
+                        <label for="radio-2">付费维修</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" name="detectProcessingResults" value="5" id="radio-3"/>
+                        <label for="radio-3" class="">原机退回</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" name="detectProcessingResults" value="4" id="radio-4"/>
+                        <label for="radio-4" class="">换货</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" name="detectProcessingResults" value="3" id="radio-5"/>
+                        <label for="radio-5" class="">退货</label>
+                    </div>
+                </div>
+            </div>
+			<div class="row cl">
+                <div class="col-6 col-sm-6 col-offset-3">
+                    <input type="hidden" id="methodId" value="6">
+                    <button class="btn btn-block btn-primary" type="button" onclick="updateDetect();">确认</button>
+                </div>
+            </div>
+		</form>
+		<p style="font-size: 12px;text-align:center;color: #f00;padding: 15px 0 20px 0;">*确认处理后，系统将不支持再修改，维修部立即开始处理*</p>
+		</article>
+	</body>
+    <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+	<script>
+        var detectId = getParam("detectId");
+            $('.skin-minimal input').iCheck({
+                checkboxClass: 'icheckbox-blue',
+                radioClass: 'iradio-blue',
+                increaseArea: '20%'
+            });
+            getDetect();
+
+
+        $("#radio-1").click(function (){
+            $("#methodId").val(6);
+        });
+        $("#radio-2").click(function (){
+            $("#methodId").val(7);
+        });
+        $("#radio-3").click(function (){
+            $("#methodId").val(44);
+        });
+        $("#radio-4").click(function (){
+            $("#methodId").val(3);
+        });
+        $("#radio-5").click(function (){
+            $("#methodId").val(8);
+        });
+
+        function getDetect() {
+            $.ajax({
+                cache: true,
+                type: "POST",
+                url: "${path}/detect/get_detail",
+                data:{detectId:detectId},// 你的formid
+                async: false,
+                success: function(data){
+                    if (data.returnCode == 200) {
+                        var detectinfo = data.returnMsg.detectinfo;
+                        var isMaintenance = "";
+                        if(detectinfo.isMaintenance === 1){
+                            isMaintenance = "有故障";
+                        }else if(detectinfo.isMaintenance === 2){
+                            isMaintenance = "无故障";
+                        }
+                        var detectRenovation = "";
+                        if(detectinfo.detectRenovation === 1){
+                            detectRenovation = "可翻新";
+                        }else if(detectinfo.detectRenovation === 2){
+                            detectRenovation = "不可翻新";
+                        }
+                        var detectFloatType = "";
+                        if(detectinfo.detectFloatType === 1){
+                            detectFloatType = "长";
+                        }else if(detectinfo.detectFloatType === 2){
+                            detectFloatType = "短";
+                        }
+                        var detectFilmType = "";
+                        if(detectinfo.detectFilmType === 1){
+                            detectFilmType = "圆";
+                        }else if(detectinfo.detectFilmType === 2){
+                            detectFilmType = "扁";
+                        }
+                        var detectIsRefurbishing = "";
+                        if(detectinfo.detectIsRefurbishing === 1){
+                            detectIsRefurbishing = "是";
+                        }else if(detectinfo.detectIsRefurbishing === 2){
+                            detectIsRefurbishing = "否";
+                        }
+                        var detectPhenomenon = "";
+                        $(detectinfo.configli1).each(function (){
+                            detectPhenomenon = detectPhenomenon+this.configDetectContent+";";
+                        });
+
+                        $("#detectName").text(detectinfo.detectName+","+detectinfo.detectTel);
+                        $("#productName").text(detectinfo.productName+"("+detectinfo.colorName+")");
+                        $("#questionName").text(detectinfo.questionName);
+                        $("#isMaintenance").text(isMaintenance);
+                        $("#detectRenovation").text(detectRenovation);
+                        $("#detectFloatType").text(detectFloatType);
+                        $("#detectFilmType").text(detectFilmType);
+                        $("#detectIsRefurbishing").text(detectIsRefurbishing);
+                        $("#detectProduction").text(detectinfo.detectProduction);
+                        $("#detectVersionNumber").text(detectinfo.detectVersionNumber);
+                        $("#detectPhenomenon").text(detectinfo.detectPhenomenon);
+                        if(detectinfo.detectOffer != null && detectinfo.detectOffer != ""){
+                            $("#detectOffer").text(detectinfo.detectOffer/100);
+                        }
+                        $("#detectDesc").text(detectinfo.detectDesc);
+                    }
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                    layer.msg('删除失败',{icon: 5,time:1000});
+                }
+            });
+        };
+
+
+        function updateDetect() {
+            var detectProcessingResults = $('input[name="detectProcessingResults"]:checked').val();//处理结果
+            //查询处理方式
+            var methodId = $("#methodId").val();//处理结果
+
+
+
+            $.ajax({
+                cache: true,
+                type: "POST",
+                url: "${path}/detect/salesman_confirm",
+                data:{ "detectId": detectId,
+                    "detectProcessingResults": detectProcessingResults,// 你的formid
+                    "methodId": methodId},
+                async: false,
+                success: function(data){
+                    if (data.returnCode == 200) {
+                        layer.alert("提交成功！", function() {
+                            location.reload();
+                        });
+                    }else {
+                        layer.alert("提交失败！");
+                    }
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                    layer.msg('删除失败',{icon: 5,time:1000});
+                }
+            });
+        };
+
+
+
+        function getParam(paramName) {
+            paramValue = "", isFound = !1;
+            if(this.location.search.indexOf("?") == 0 && this.location.search.indexOf("=") > 1) {
+                arrSource = unescape(this.location.search).substring(1, this.location.search.length).split("&"), i = 0;
+                while(i < arrSource.length && !isFound) {
+                    arrSource[i].indexOf("=") > 0 && arrSource[i].split("=")[0].toLowerCase() == paramName.toLowerCase() && (paramValue = arrSource[i].split("=")[1], isFound = !0), i++
+                }
+            }
+            return paramValue == "" && (paramValue = null), paramValue
+        };
+
+	</script>
+</html>

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

@@ -0,0 +1,247 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+<#include "/base/list_base.ftl">
+    <style>
+        /**{padding: 0;margin: 0;}*/
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 25px;margin-right: 5px;}
+        /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
+        .my-select{border: 1px solid rgba(0,0,0,.1);
+            padding: 6px 20px 6px 15px;
+            height: 34px;
+            -webkit-appearance: none;
+            appearance: none;
+            background: url(${path}/common/images/pts/select-11.png) right center no-repeat;
+            background-size: auto 100%;}
+        .my-btn-search{border: 1px solid #50a2ea;padding: 1px 25px;background-color: #fff;color: #50a2ea;height: 32px;}
+        .barcodeImg{margin:10px 0px}
+        .table-bg thead th{background-color: #f7fafd;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        .txt2{
+            width:60px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+
+        html,body
+        {
+            margin: 0;
+            padding: 0;
+        }
+        *{
+            box-sizing: border-box;
+            -moz-box-sizing: border-box;
+        }
+        .page
+        {
+            width: 21cm;
+            min-height: 29.7cm;
+            padding:1cm 0;
+            margin: 1cm auto;
+            border: 0;
+            background: white;
+        }
+        @page
+        {
+            size: A4;
+            margin: 0;
+        }
+        @media print
+        {
+            .page
+            {
+                margin: 0;
+                border: initial;
+                border-radius: initial;
+                width: initial;
+                min-height: initial;
+                box-shadow: initial;
+                background: initial;
+                page-break-after: always;
+            }
+        }
+        .table2 .text-column-3{height: 1.5cm;max-height: 1.5cm; text-align: left;text-indent: 0;padding:0.3rem .3rem .3rem 1.2rem;}
+        .page .print-date{padding: 0 1cm 0.5cm 1cm;text-align: left;font-size: 0.75rem;}
+        .yulia-logo{width: 2.5cm;padding:0;vertical-align: middle;float: left;}
+        .yulia-name{margin: 0 auto;padding: 0 0 0.5cm 0;text-align: center;position: relative;font-weight: bold;font-size: 1rem;letter-spacing: 1rem;}
+        .yulia-name .before{position: absolute;left: 0;width: 3cm;height: 0;border: 1px solid #000;top: 0.5625rem;}
+        .yulia-name .after{position: absolute;right: 0;width: 3cm;height: 0.125rem;border: 1px solid #000;top: 0.5625rem;}
+        .table2 {margin:0 0 0.5cm 1cm;width: 19cm;border: 1px solid #000;border-collapse: collapse;text-align: left;}
+        .table2 th{font-size: 0.875rem;font-weight: 500;}
+        .table2 thead tr th,
+        .table2 tbody tr td {font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 1px solid #000;border-collapse: collapse;background-color: #fff;height: 0.88cm;}
+        pre>a u{color: #50a2ea;}
+        pre>a span{color: #f00;}
+    </style>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">/</span> RST管理
+    <span class="c-gray en">/</span> 维修列表
+    <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+
+    <div class="text-c">
+        <form name="form1" action="${path}/admin/detect/detect_repair_list" method="post" style="border: 1px solid rgba(0,0,0,.1);background: #fff;padding: 10px;border-radius: 5px;text-align: left;">
+            <div style="height: 10px;display: block;">&nbsp;</div>
+            <select id="salesmanAdminId" name="salesmanAdminId" class="my-select" style="width: 120px;">
+                <option value="" >业务员</option>
+                <#if (listAdmin?size > 0)>
+                    <#list listAdmin as info>
+                         <option value="${info.adminId!""}" <#if salesmanAdminId??><#if salesmanAdminId = info.adminId>selected</#if></#if>>${info.adminName!""}</option>
+                    </#list>
+                </#if>
+            </select>
+            <select class="my-select" name="typeId" id="typeId" style="width: 120px;">
+
+                <#if (procTypeList?size > 0)>
+                    <#list procTypeList as info>
+                        <#if info.procTypeId = 2 || info.procTypeId = 3 || info.procTypeId = 4>
+                            <option value="${info.procTypeId!""}" <#if typeId??><#if typeId = info.procTypeId>selected</#if></#if>>${info.procTypeName!""}</option>
+                        </#if>
+                    </#list>
+                </#if>
+            </select>
+            <input class="my-input" style="width: 120px;height: 29px;" type="text" name="detectName" id="detectName" value="${detectName!}" placeholder="客户姓名"/>
+            <input class="my-input" style="width: 120px;height: 29px;" type="text" name="detectTel" id="detectTel" value="${detectTel!}" placeholder="客户电话"/>
+            <input class="my-input" style="width: 120px;height: 29px;" type="text" name="questionName" id="questionName" value="${questionName!}" placeholder="客诉问题"/>
+            <button style="cursor:pointer;" type="submit" class="my-btn-search">查询</button>&nbsp;&nbsp;
+        </form>
+
+    </div>
+    <div class="mt-20">
+        <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>
+                <th width="100">客户问题</th>
+                <th width="100">机器信息</th>
+                <th width="100">维修状态</th>
+                <th width="100">检测日期</th>
+                <th width="120">操作</th>
+            </tr>
+            </thead>
+            <tbody id="listid">
+            <#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.salesmanAdminName!''}</td>
+                    <td class="text-c" width="100">${detect.detectNumber!''}</td>
+                    <td class="text-c" width="100">${detect.detectName!''}<br>${detect.detectTel!''}</td>
+                    <td class="text-c" width="100">${detect.questionName!''}</td>
+                    <td class="text-c" width="100">${detect.productName!'暂无产品'}(${detect.colorName!'暂无颜色'})</td>
+                    <td class="text-c" width="100">
+                        <#if detect.detectState == 1>
+                            <span class="c-red">待检测机器<#if detect.maintenanceCutTime??>(${detect.maintenanceCutTime?string("yyyy/MM/dd")}前完成)</#if></span>
+                        </#if>
+                        <#if detect.detectState == 30>
+                            <span class="c-red">待确认</span>
+                        </#if>
+                        <#if detect.detectState == 31>
+                            <span class="c-red">待维修<#if detect.completeCutTime??>(${detect.completeCutTime?string("yyyy/MM/dd")}前完成)</#if></span>
+                        </#if>
+                        <#if detect.detectState == 32>
+                            <span class="c-success">维修完成</span>
+                        </#if>
+                        <#if detect.detectState == 33>
+                            <span class="c-success">用户不维修（原机退回）</span>
+                        </#if>
+                        <#if detect.detectState == 34>
+                            <span class="c-red">待确认</span>
+                        </#if>
+                        <#if detect.detectState == 35>
+                            <span class="c-red">待维修<#if detect.completeCutTime??>(${detect.completeCutTime?string("yyyy/MM/dd")}前完成)</#if></span>
+                        </#if>
+                        <#if detect.detectState == 36>
+                            <span class="c-success">维修完成</span>
+                        </#if>
+                        <#if detect.detectState == 37>
+                            机器无故障，原机退回
+                        </#if>
+                        <#if detect.detectState == 38>
+                            <span class="c-red">机器故障，待确认</span>
+                        </#if>
+                        <#if detect.detectState == 20>
+                            待翻新入库
+                        </#if>
+                        <#if detect.detectState == 21>
+                        <span class="c-success">已翻新</span>
+                        </#if>
+                        <#if detect.detectState == 22>
+                            不能翻新，待报废
+                        </#if>
+                        <#if detect.detectState == 23>
+                            <span class="c-success">已报废回收</span>
+                        </#if>
+                    </td>
+                    <td class="text-c" width="100">${(detect.detectDate?string("yyyy-MM-dd"))!'-'}</td>
+                    <!-- 遍历操作 -->
+                    <td class="td-manage text-c" width="120">
+                            <#if detect.detectState == 30 || detect.detectState == 34|| detect.detectState == 38>
+                                <a style="text-decoration:none" href="javascript:;" title="确认处理"
+                                   onclick="add_remark('确认处理','${path}/detect/to_detect_msg?detectId=${detect.detectId!''}','570','750');">
+                                    <i class="Hui-iconfont">确认处理</i>
+                                </a><br>
+                            </#if>
+                    </td>
+                </tr>
+                </#list>
+            <#else >
+            <tr><td class="td-manage text-c" colspan = "18">暂时没有维修信息</td></tr>
+            </#if>
+            </tbody>
+        </table>
+    </div>
+
+</div>
+<div style="padding-top: 10px;"></div>
+<#include "/base/page_util.ftl">
+<script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs_v_5_0.js"></script>
+<script type="text/javascript" src="${path}/common/lib/jquery.PrintArea/jquery.PrintArea.js"></script>
+<script type="text/javascript">
+    procType();
+    function procType(){
+        var procTypeId;
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/proc/type",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    var html = '<option value="" >业务员</option>';
+                    if (data.returnCode == 200) {
+                        for(var i=0;i<data.returnMsg.list.length;i++){
+                            listInfo = data.returnMsg.list[i];
+                            if(i == 1 ){
+                                procTypeId = listInfo.procTypeId;
+                            }
+                            if(listInfo.procTypeId === 2 || listInfo.procTypeId === 3 || listInfo.procTypeId === 4 ){
+                                html += '<option value="'+ listInfo.procTypeId +'">'+ listInfo.procTypeName +'</option>';
+                            }
+                        }
+                    }else{
+                        html = '';
+                    }
+                    $("[name='typeId']").html(html);
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        })
+    }
+    function add_remark(title,url,w,h){
+        layer_show(title,url,w,h);
+    }
+</script>
+</body>
+</html>

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

@@ -144,167 +144,7 @@
 
             </div>
         </div>
-       <#--<div class="input-box" >
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">检测现象：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="请输入工厂的检测现象">${detectInfo.detectPhenomenon!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectPhenomenon!''}" name="detectPhenomenon" id="detectPhenomenon"  placeholder="请输入检测现象"/>
-            </div>
-        </div>-->
-        <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;">故障原因：</label>
-            <div class="formControls col-9 col-sm-9 huanhang" style="margin: 10px 0px;">
-                <select id="configSelect2" name="configSelect2" class="chosen" style="width: 93%;">
-                    <option value="">请选择故障原因</option>
-                    <#if (config2?size > 0)>
-                            <#list config2 as config>
-                                <option value="${config.configId!""}">${config.configDetectContent!""}</option>
-                            </#list>
-                    </#if>
-                </select>
-
-            </div>
-        </div>
-
-        <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"></label>
-            <div class="formControls col-9 col-sm-9 huanhang" id="config2" style="margin: 10px 0px;">
-                <div class="row">
-                    <ul class="close-box" id="configui2">
-
-                    </ul>
-                </div>
-
-            </div>
-        </div>
-
-        <#--<div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">故障原因：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="请输入故障原因">${detectInfo.detectFailureCause!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectFailureCause!''}" name="detectFailureCause" id="detectFailureCause"  placeholder="请输入故障原因"/>
-            </div>
-        </div>-->
-
-        <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;">判定结果：</label>
-            <div class="formControls col-9 col-sm-9 huanhang" style="margin: 10px 0px;">
-                <select id="configSelect3" name="configSelect3" class="chosen" style="width: 93%;">
-                    <option value="">请选择判定结果</option>
-                    <#if (config3?size > 0)>
-                            <#list config3 as config>
-                                <option value="${config.configId!""}">${config.configDetectContent!""}</option>
-                            </#list>
-                    </#if>
-                </select>
-
-            </div>
-        </div>
-
-        <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"></label>
-            <div class="formControls col-9 col-sm-9 huanhang" id="config3" style="margin: 10px 0px;">
-                <div class="row">
-                    <ul class="close-box" id="configui3">
-
-                    </ul>
-                </div>
-
-            </div>
-        </div>
-
-        <#--<div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">判定结果：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="请输入判定结果">${detectInfo.detectResults!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectResults!''}" name="detectResults" id="detectResults"  placeholder="请输入判定结果"/>
-            </div>
-        </div>-->
-
-        <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;">故障指向：</label>
-            <div class="formControls col-9 col-sm-9 huanhang" style="margin: 10px 0px;">
-                <select id="configSelect4" name="configSelect4" class="chosen" style="width: 93%;">
-                    <option value="">请选择故障指向</option>
-                    <#if (config4?size > 0)>
-                            <#list config4 as config>
-                                <option value="${config.configId!""}">${config.configDetectContent!""}</option>
-                            </#list>
-                    </#if>
-                </select>
-
-            </div>
-        </div>
-
-        <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"></label>
-            <div class="formControls col-9 col-sm-9 huanhang" id="config4" style="margin: 10px 0px;">
-                <div class="row">
-                    <ul class="close-box" id="configui4">
-
-                    </ul>
-                </div>
-
-            </div>
-        </div>
-
-        <#--<div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">故障指向：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="请输入故障指向">${detectInfo.detectPoint!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectPoint!''}" name="detectPoint" id="detectPoint"  placeholder="请输入故障指向"/>
-            </div>
-        </div>-->
-
-        <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;">原因分析：</label>
-            <div class="formControls col-9 col-sm-9 huanhang" style="margin: 10px 0px;">
-                <select id="configSelect5" name="configSelect5" class="chosen" style="width: 93%;">
-                    <option value="">请选择原因分析</option>
-                    <#if (config5?size > 0)>
-                            <#list config5 as config>
-                                <option value="${config.configId!""}">${config.configDetectContent!""}</option>
-                            </#list>
-                    </#if>
-                </select>
-
-            </div>
-        </div>
-
-        <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"></label>
-            <div class="formControls col-9 col-sm-9 huanhang" id="config5" style="margin: 10px 0px;">
-                <div class="row">
-                    <ul class="close-box" id="configui5">
-
-                    </ul>
-                </div>
 
-            </div>
-        </div>
-
-        <#--<div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">原因分析：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectNalysis" id="detectNalysis" class="my-textarea" placeholder="请输入原因分析">${detectInfo.detectNalysis!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectNalysis!''}" name="detectNalysis" id="detectNalysis"  placeholder="请输入原因分析"/>
-            </div>
-        </div>-->
-        <#--<div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">故障分类：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-            &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectClassification" id="detectClassification" class="my-textarea" placeholder="请输入故障分类">${detectInfo.detectClassification!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectClassification!''}" name="detectClassification" id="detectClassification"  placeholder="请输入故障分类"/>
-            </div>
-        </div>-->
-    <#--    <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">检测内容：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectContent" id="detectContent" class="my-textarea" placeholder="请输入检测内容">${detectInfo.detectContent!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectContent!''}" name="detectContent" id="detectContent"  placeholder="请输入检测内容"/>
-
-            </div>
-        </div>-->
         <div class="input-box">
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">维修报价：</label>
             <div class="formControls col-9 col-sm-9 text-c huanhang" style="margin-left: -4%;margin: 10px 0px 10px -14px;">
@@ -382,89 +222,6 @@
         }
 
     });
-
-    $('#configSelect2').change(function() {
-        var name = $("#configSelect2 option:selected").text();
-        var id = $('#configSelect2').val();
-        var bl = true;
-        if(id != "") {
-            $("input[name='configli2']").each(function (j, item) {
-                var s = $(item).val();
-                if (s === id) {
-                    bl = false;
-                }
-            });
-            if (bl) {
-                $("#configui2").append('<li class="b-close" id="configDetele2">' +
-                        ' <input type="hidden" value="' + id + '" name="configli2">' + name +
-                        '<span class="my-close" onclick="deleteli(this)"></span>' +
-                        '</li>');
-            }
-        }
-    });
-
-    $('#configSelect3').change(function() {
-        var name = $("#configSelect3 option:selected").text();
-        var id = $('#configSelect3').val();
-        var bl = true;
-        if(id != "") {
-            $("input[name='configli3']").each(function (j, item) {
-                var s = $(item).val();
-                if (s === id) {
-                    bl = false;
-                }
-            });
-            if (bl) {
-                $("#configui3").append('<li class="b-close" id="configDetele3">' +
-                        ' <input type="hidden" value="' + id + '" name="configli3">' + name +
-                        '<span class="my-close" onclick="deleteli(this)"></span>' +
-                        '</li>');
-            }
-        }
-    });
-
-    $('#configSelect4').change(function() {
-        var name = $("#configSelect4 option:selected").text();
-        var id = $('#configSelect4').val();
-        var bl = true;
-        if(id != "") {
-            $("input[name='configli4']").each(function (j, item) {
-                var s = $(item).val();
-                if (s === id) {
-                    bl = false;
-                }
-            });
-            if (bl) {
-                $("#configui4").append('<li class="b-close" id="configDetele4">' +
-                        ' <input type="hidden" value="' + id + '" name="configli4">' + name +
-                        '<span class="my-close" onclick="deleteli(this)"></span>' +
-                        '</li>');
-            }
-        }
-    });
-
-    $('#configSelect5').change(function() {
-        var name = $("#configSelect5 option:selected").text();
-        var id = $('#configSelect5').val();
-        var bl = true;
-        if(id != "") {
-            $("input[name='configli5']").each(function (j, item) {
-                var s = $(item).val();
-                if (s === id) {
-                    bl = false;
-                }
-            });
-            if (bl) {
-                $("#configui5").append('<li class="b-close" id="configDetele5">' +
-                        ' <input type="hidden" value="' + id + '" name="configli5">' + name +
-                        '<span class="my-close" onclick="deleteli(this)"></span>' +
-                        '</li>');
-            }
-        }
-    });
-
-
-
     /***
      * 删除图片
      */
@@ -503,74 +260,6 @@
     }
 
     function  add() {
-        /*var detectPhenomenon = $("#detectPhenomenon").val();
-        if( detectPhenomenon == null || detectPhenomenon == "" ){
-            layer.msg('请输入检测现象',{icon: 5,time:1000});
-            return;
-        }
-        if( detectPhenomenon.length > 300 ){
-            layer.msg('工厂检测现象长度不得大于150个字符',{icon: 5,time:1000});
-            return;
-        }
-        var detectClassification = $("#detectClassification").val();
-        if( detectClassification == null || detectClassification == "" ){
-            layer.msg('请输入故障分类',{icon: 5,time:1000});
-            return;
-        }
-        if( detectClassification.length > 50 ){
-            layer.msg('故障分类长度不得大于25个字符',{icon: 5,time:1000});
-            return;
-        }
-        var detectFailureCause = $("#detectFailureCause").val();
-        if( detectFailureCause == null || detectFailureCause == "" ){
-            layer.msg('请输入故障原因',{icon: 5,time:1000});
-            return;
-        }
-        if( detectFailureCause.length > 100 ){
-            layer.msg('故障原因长度不得大于50个字符',{icon: 5,time:1000});
-            return;
-        }
-
-        var detectResults = $("#detectResults").val();
-        if( detectResults == null || detectResults == "" ){
-            layer.msg('请输入判定结果',{icon: 5,time:1000});
-            return;
-        }
-        if( detectResults.length > 100 ){
-            layer.msg('判定结果长度不得大于50个字符',{icon: 5,time:1000});
-            return;
-        }
-
-        var detectPoint = $("#detectPoint").val();
-        if( detectPoint == null || detectPoint == "" ){
-            layer.msg('请输入故障指向',{icon: 5,time:1000});
-            return;
-        }
-        if( detectPoint.length > 100 ){
-            layer.msg('故障指向长度不得大于50个字符',{icon: 5,time:1000});
-            return;
-        }
-
-        var detectNalysis = $("#detectNalysis").val();
-        if( detectNalysis == null || detectNalysis == "" ){
-            layer.msg('请输入原因分析',{icon: 5,time:1000});
-            return;
-        }
-        if( detectNalysis.length > 100 ){
-            layer.msg('原因分析长度不得大于50个字符',{icon: 5,time:1000});
-            return;
-        }
-
-        var detectContent = $("#detectContent").val();
-        if( detectContent == null || detectContent == "" ){
-            layer.msg('请输入维修内容',{icon: 5,time:1000});
-            return;
-        }
-        if( detectContent.length > 300 ){
-            layer.msg('维修内容长度不得大于150个字符',{icon: 5,time:1000});
-            return;
-        }*/
-
         var detect_Offer = $("#detect_Offer").val();
         if(detect_Offer != null && detect_Offer != ""){
             $("#detectOffer").val(detect_Offer * 100)