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

@@ -135,6 +135,10 @@ public class ComplaintDetectInfo implements Serializable {
     private String questionProfile;//问题回复
     private Integer companyId;//所屬公司
 
+    private String signclosedStoreName;//店铺名称
+
+    private Integer detectIsDownload;
+
     public String getQuestionName() {
         return questionName;
     }
@@ -869,4 +873,20 @@ public class ComplaintDetectInfo implements Serializable {
     public void setSignclosedTel(String signclosedTel) {
         this.signclosedTel = signclosedTel;
     }
+
+    public String getSignclosedStoreName() {
+        return signclosedStoreName;
+    }
+
+    public void setSignclosedStoreName(String signclosedStoreName) {
+        this.signclosedStoreName = signclosedStoreName;
+    }
+
+    public Integer getDetectIsDownload() {
+        return detectIsDownload;
+    }
+
+    public void setDetectIsDownload(Integer detectIsDownload) {
+        this.detectIsDownload = detectIsDownload;
+    }
 }

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

@@ -47,6 +47,8 @@ public class ComplaintSignclosedInfo implements Serializable {
     private String signclosedLogisticsName;//物流公司名称
     private String date;//日期查询
     private Integer signclosedIsWhetherLess;//是否少件 1是2否
+    private Integer signclosedStoreId;//店铺id
+    private String signclosedStoreName;//店铺名称
 
     private Integer adminId;//登录人id
 
@@ -289,4 +291,20 @@ public class ComplaintSignclosedInfo implements Serializable {
     public void setSignclosedIsWhetherLess(Integer signclosedIsWhetherLess) {
         this.signclosedIsWhetherLess = signclosedIsWhetherLess;
     }
+
+    public Integer getSignclosedStoreId() {
+        return signclosedStoreId;
+    }
+
+    public void setSignclosedStoreId(Integer signclosedStoreId) {
+        this.signclosedStoreId = signclosedStoreId;
+    }
+
+    public String getSignclosedStoreName() {
+        return signclosedStoreName;
+    }
+
+    public void setSignclosedStoreName(String signclosedStoreName) {
+        this.signclosedStoreName = signclosedStoreName;
+    }
 }

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

@@ -470,6 +470,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                     }
                 }
             }catch (Exception e){
+                e.printStackTrace();
                 throw new RuntimeException("------------改为优尼雅客户生成检测信息出错------------");
             }
 

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

@@ -72,7 +72,11 @@
       cq.question_name questionName,
       cq.question_profile questionProfile,
       ssa.admin_name salesmanAdminName,
-      cd.company_id companyId
+      cq.question_name questionName,
+      cpms.proc_method_name methodName,
+      cpts.proc_type_name typeName,
+      cd.company_id companyId,
+      si.store_name signclosedStoreName
     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
@@ -90,6 +94,9 @@
     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
+    LEFT JOIN tb_rst_store_info si on cs.signclosed_store_id = si.store_id
 
     where detect_id = #{detectId,jdbcType=INTEGER}
     GROUP BY c.customer_id
@@ -174,7 +181,8 @@
     cq.question_name questionName,
     cpms.proc_method_name methodName,
     cpts.proc_type_name typeName,
-    cd.company_id companyId
+    cd.company_id companyId,
+    si.store_name signclosedStoreName
     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
@@ -195,6 +203,7 @@
     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
+    LEFT JOIN tb_rst_store_info si on cs.signclosed_store_id = si.store_id
     <where>
       <if test="productTypeId != null" >
         AND pt.type_id = #{productTypeId,jdbcType=INTEGER}
@@ -346,6 +355,9 @@
       <if test="typeId != null and typeId != ''">
         and cpts.proc_type_id = #{typeId}
       </if>
+      <if test="detectIsDownload != null and detectIsDownload != ''">
+        and cd.detect_is_download = #{detectIsDownload}
+      </if>
     </where>
       GROUP BY cd.detect_id
       ORDER BY cd.detect_create_time DESC
@@ -485,7 +497,10 @@
           maintenance_cut_time = #{maintenanceCutTime},
       </if>
       <if test="companyId != null" >
-        company_id = #{companyId}
+        company_id = #{companyId},
+      </if>
+      <if test="detectIsDownload != null" >
+        detect_is_download = #{detectIsDownload}
       </if>
     </set>
     where

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

@@ -23,7 +23,7 @@
     signclosed_id, signclosed_logistics,
     signclosed_logistics_number, signclosed_send_name, signclosed_send_tel, signclosed_addr_provinces, 
     signclosed_addr_city,signclosed_addr_area, signclosed_date,signclosed_customer_id,signclosed_desc,
-    signclosed_create_time, signclosed_update_time,signclosed_customer_desc,sendback_id,signclosed_is_whetherLess
+    signclosed_create_time, signclosed_update_time,signclosed_customer_desc,sendback_id,signclosed_is_whetherLess,signclosed_store_id
   </sql>
   <select id="getSignclosedById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -131,12 +131,14 @@
     cs.signclosed_is_receiving,
     cs.sendback_id,
     cs.signclosed_is_whetherLess,
+    cs.signclosed_store_id,
     ap.province signclosedAddrProvincesName,
     ac.city signclosedAddrCityName,
     ad.district signclosedAddrAreaName,
     qd.describe_title customerIdDescribe,
     li.logistics_name signclosedLogisticsName,
-    cs.signclosed_company_id signclosedCompanyId
+    cs.signclosed_company_id signclosedCompanyId,
+    si.store_name signclosedStoreName
     FROM
     tb_rst_complaint_signclosed cs
     LEFT JOIN tb_rst_address_province ap ON cs.signclosed_addr_provinces = ap.province_id
@@ -144,6 +146,7 @@
     LEFT JOIN tb_rst_address_district ad on ad.district_id = cs.signclosed_addr_area
     LEFT JOIN tb_rst_cm_question_describe qd on cs.signclosed_customer_id = qd.customer_id
     LEFT JOIN tb_rst_logistics_info li on cs.signclosed_logistics = li.logistics_rst_code
+    LEFT JOIN tb_rst_store_info si on cs.signclosed_store_id = si.store_id
 
     <where>
       <if test="signclosedSendName != null and signclosedSendName != ''" >
@@ -177,7 +180,7 @@
       signclosed_send_name, signclosed_send_tel, 
       signclosed_addr_provinces, signclosed_addr_city, signclosed_addr_area, signclosed_date,
       signclosed_customer_id,
-      signclosed_desc,signclosed_customer_desc,signclosed_is_receiving,signclosed_company_id,sendback_id,signclosed_is_whetherLess
+      signclosed_desc,signclosed_customer_desc,signclosed_is_receiving,signclosed_company_id,sendback_id,signclosed_is_whetherLess,signclosed_store_id
       )
     values (
       #{signclosedLogistics,jdbcType=VARCHAR}, #{signclosedLogisticsNumber,jdbcType=VARCHAR},
@@ -190,7 +193,8 @@
       #{signclosedIsReceiving,jdbcType=VARCHAR},
       #{signclosedCompanyId,jdbcType=VARCHAR},
       #{sendbackId,jdbcType=INTEGER},
-      #{signclosedIsWhetherLess,jdbcType=INTEGER}
+      #{signclosedIsWhetherLess,jdbcType=INTEGER},
+      #{signclosedStoreId,jdbcType=INTEGER}
       )
   </insert>
   <update id="updateSignclosedById" parameterType="ComplaintSignclosedInfo" >
@@ -242,10 +246,13 @@
         sendback_id = #{sendbackId,jdbcType=INTEGER},
       </if>
       <if test="signclosedIsWhetherLess != null" >
-        signclosed_is_whetherLess = #{signclosedIsWhetherLess,jdbcType=INTEGER}
+        signclosed_is_whetherLess = #{signclosedIsWhetherLess,jdbcType=INTEGER},
       </if>
       <if test="signclosedCompanyId != null" >
-        signclosed_company_id = #{signclosedCompanyId,jdbcType=INTEGER}
+        signclosed_company_id = #{signclosedCompanyId,jdbcType=INTEGER},
+      </if>
+      <if test="signclosedStoreId != null" >
+        signclosed_store_id = #{signclosedStoreId,jdbcType=INTEGER}
       </if>
     </set>
       where

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

@@ -812,12 +812,13 @@ public class AdminDetectController {
     public void salesOrderExcel(HttpServletRequest request,HttpServletResponse res
             , ComplaintDetectInfo detectInfo) throws Exception{
         //根据id查询订单数据
+        detectInfo.setDetectIsDownload(1);
         List<ComplaintDetectInfo> detectList = complaintDetectInfoService.listComplaintDetect(detectInfo);
-        if (detectList == null || detectList.size() == 0) {
+        /*if (detectList == null || detectList.size() == 0) {
             return;
-        }
+        }*/
         String[] cells = {
-                "维修编号","产品名称","颜色","生产月份","机身条码","是否少件",
+                "维修编号","快递单号","产品名称","颜色","生产月份","机身条码","是否少件",
                 "退货地区","返厂日期","购买日期","客诉日期","客诉类型",
                 "客诉问题","售后原因","售后处理类型","工厂检测现象","是否翻新机",
                 "故障原因","判断结果","故障指向","原因分析",
@@ -893,11 +894,12 @@ public class AdminDetectController {
             }
             // 创建单元格，设置值
             row.createCell(0).setCellValue(detect.getDetectNumber()==null?"":detect.getDetectNumber());
-            row.createCell(1).setCellValue(detect.getProductName()==null?"":detect.getProductName());
-            row.createCell(2).setCellValue(detect.getColorName()==null?"":detect.getColorName());
-            row.createCell(3).setCellValue(detect.getDetectProduction()==null?"":detect.getDetectProduction());
-            row.createCell(4).setCellValue(detect.getDetectFuselageBarcode()==null?"":detect.getDetectFuselageBarcode());
-            row.createCell(5).setCellValue(signclosedIsWhetherLess);
+            row.createCell(1).setCellValue(detect.getLogisticsNumber()==null?"":detect.getLogisticsNumber());
+            row.createCell(2).setCellValue(detect.getProductName()==null?"":detect.getProductName());
+            row.createCell(3).setCellValue(detect.getColorName()==null?"":detect.getColorName());
+            row.createCell(4).setCellValue(detect.getDetectProduction()==null?"":detect.getDetectProduction());
+            row.createCell(5).setCellValue(detect.getDetectFuselageBarcode()==null?"":detect.getDetectFuselageBarcode());
+            row.createCell(6).setCellValue(signclosedIsWhetherLess);
             StringBuffer area = new StringBuffer(" ");
             if(detect.getSignclosedAddrProvincesName() == null || detect.getSignclosedAddrProvincesName().equals("")){
                 area.append("");
@@ -914,38 +916,45 @@ public class AdminDetectController {
             }else{
                 area.append("-"+detect.getSignclosedAddrCityName());
             }
-            row.createCell(6).setCellValue(area.toString());
+            row.createCell(7).setCellValue(area.toString());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             if(detect.getSignclosedDate()==null){
-                row.createCell(7).setCellValue( "");
+                row.createCell(8).setCellValue( "");
             }else{
-                row.createCell(7).setCellValue(sdf.format(detect.getSignclosedDate()));
+                row.createCell(8).setCellValue(sdf.format(detect.getSignclosedDate()));
             }
             if(detect.getSalesTime()==null){
-                row.createCell(8).setCellValue("");
+                row.createCell(9).setCellValue("");
             }else{
-                row.createCell(8).setCellValue(sdf.format(detect.getSalesTime()));
+                row.createCell(9).setCellValue(sdf.format(detect.getSalesTime()));
             }
             if(detect.getCustomerCreateTime()==null){
-                row.createCell(9).setCellValue("");
+                row.createCell(10).setCellValue("");
             }else{
-                row.createCell(9).setCellValue(sdf.format(detect.getCustomerCreateTime()));
+                row.createCell(10).setCellValue(sdf.format(detect.getCustomerCreateTime()));
             }
 
-            row.createCell(10).setCellValue(detect.getProcTypeName()==null?"":detect.getProcTypeName());
-            row.createCell(11).setCellValue(detect.getQuestionTitle()==null?"":detect.getQuestionTitle());
-            row.createCell(11).setCellValue(detect.getDescribeHandleDesc()==null?"":detect.getDescribeHandleDesc());
-            row.createCell(12).setCellValue(detect.getProcMethodName()==null?"":detect.getProcMethodName());
-            row.createCell(13).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
-            row.createCell(14).setCellValue(detectIsRefurbishing);
-            row.createCell(15).setCellValue(detect.getDetectFailureCause()==null?"":detect.getDetectFailureCause());
-            row.createCell(16).setCellValue(detect.getDetectResults()==null?"":detect.getDetectResults());
-            row.createCell(17).setCellValue(detect.getDetectPoint()==null?"":detect.getDetectPoint());
-            row.createCell(18).setCellValue(detect.getDetectNalysis()==null?"":detect.getDetectNalysis());
-            row.createCell(19).setCellValue(detect.getDetectContent()==null?"":detect.getDetectContent());
-            row.createCell(20).setCellValue(detectFilmType);
-            row.createCell(21).setCellValue(detectFloatType);
-            row.createCell(22).setCellValue(detect.getDetectVersionNumber()==null?"":detect.getDetectVersionNumber());
+            row.createCell(11).setCellValue(detect.getProcTypeName()==null?"":detect.getProcTypeName());
+            row.createCell(12).setCellValue(detect.getQuestionTitle()==null?"":detect.getQuestionTitle());
+            row.createCell(13).setCellValue(detect.getDescribeHandleDesc()==null?"":detect.getDescribeHandleDesc());
+            row.createCell(14).setCellValue(detect.getProcMethodName()==null?"":detect.getProcMethodName());
+            row.createCell(15).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
+            row.createCell(16).setCellValue(detectIsRefurbishing);
+            row.createCell(17).setCellValue(detect.getDetectFailureCause()==null?"":detect.getDetectFailureCause());
+            row.createCell(18).setCellValue(detect.getDetectResults()==null?"":detect.getDetectResults());
+            row.createCell(19).setCellValue(detect.getDetectPoint()==null?"":detect.getDetectPoint());
+            row.createCell(20).setCellValue(detect.getDetectNalysis()==null?"":detect.getDetectNalysis());
+            row.createCell(21).setCellValue(detect.getDetectContent()==null?"":detect.getDetectContent());
+            row.createCell(22).setCellValue(detectFilmType);
+            row.createCell(23).setCellValue(detectFloatType);
+            row.createCell(24).setCellValue(detect.getDetectVersionNumber()==null?"":detect.getDetectVersionNumber());
+
+            //修改为已打印
+            ComplaintDetectInfo info = new ComplaintDetectInfo();
+            info.setDetectId(detect.getDetectId());
+            info.setDetectIsDownload(2);
+            complaintDetectInfoService.perfectDetect(info);
+
         }
         //下载导出订单Excel
         downloadOrderExcel(res,wb);

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

@@ -460,6 +460,22 @@ public class AdminSignclosedController {
         }
         return msg;
     }
+
+    /**
+     * 跳转到改为优尼雅客户页面
+     *
+     * @return
+     */
+    @RequiresPermissions("signclosed:update:signclosed")
+    @RequestMapping(value = "/to_Yny")
+    public ModelAndView to_Yny(HttpServletRequest request,Integer signclosedId) {
+        ModelAndView mv = new ModelAndView("cm/signclosed/signclosed_yny");
+        List<CompanyInfo> companyInfoList =  companyInfoService.listCompanyInfo(new CompanyInfo());
+        mv.addObject("companyInfoList",companyInfoList);
+        mv.addObject("signclosedId",signclosedId);
+        return mv;
+    }
+
     /**
      * 改为优尼雅客户并增加维修记录
      *

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

@@ -211,7 +211,9 @@
             </tr>
             <tr>
                 <th width="10">问题描述：</th>
-                <td width="10" style="font-weight: normal;"><span><#if detectinfo.questionTitle??>${detectinfo.questionTitle!''}-${detectinfo.questionTitle!''}</#if></span></td>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.questionTitle??>${detectinfo.questionTitle!''}-${detectinfo.questionTitle!''}</#if>
+                <br><#if detectinfo.questionTitle??><#if detectinfo.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detectinfo.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if>-->
+                </span></td>
                 <td width="10"></td>
                 <th width="10"></th>
                 <td width="10" style="font-weight: normal;"></td>

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

@@ -159,6 +159,7 @@
             <tr class="text-c">
                 <#--<th width="100">客诉编号</th>-->
                 <th width="100">检测编号</th>
+                    <th width="90">店铺</th>
                 <th width="100">客诉处理</th>
                 <th width="100">产品</th>
                 <th width="100">当前状态</th>
@@ -176,7 +177,7 @@
                 <th width="100">原因分析</th>
                 <th width="100">维修内容</th>
                 <th width="100">维修报价</th>-->
-                <th width="100">客诉描述</th>
+                <th width="100">机器故障问题</th>
                 <#--<th width="150">客诉描述</th>-->
                 <#--<th width="150">是否转入生产部门</th>-->
                 <th width="100">QC检测</th>
@@ -193,6 +194,7 @@
                 <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.signclosedStoreName??>${detect.signclosedStoreName!''}</#if></td>
                     <td class="text-c" width="100">
                         <#if detect.customerId??>${detect.procTypeName!''}-${detect.procMethodName!''}</#if>
                         <#if detect.typeName??>${detect.typeName!''}-${detect.methodName!''}</#if>
@@ -247,12 +249,14 @@
                     <td class="text-c" width="100">${detect.signclosedAddrProvincesName!}-${detect.signclosedAddrCityName!}-${detect.signclosedAddrAreaName!}</td>
                     <td class="text-c" width="100">${detect.logisticsNumber!''}</td>
                     <td class="text-c" width="100">
-                        <#if detect.isMaintenance == 1>
-                            是
-                        <#elseif detect.isMaintenance == 2>
-                            否
-                        <#else>
-                            机器待检测
+                        <#if detect.isMaintenance??>
+                            <#if detect.isMaintenance == 1>
+                                是
+                            <#elseif detect.isMaintenance == 2>
+                                否
+                            <#else>
+                                机器待检测
+                            </#if>
                         </#if>
                     </td>
                     <td class="text-c" width="100">
@@ -274,7 +278,7 @@
                     <td class="text-c" width="100"><div  title="${detect.detectNalysis!}">${detect.detectNalysis!'-'}</div></td>
                     <td class="text-c" width="100"><div  title="${detect.detectContent!}">${detect.detectContent!'-'}</div></td>
                     <td class="text-c" width="100"><#if detect.detectOffer??>${detect.detectOffer/100}<#else>-</#if></td>-->
-                    <td class="text-c" width="100"><span class="txt2" title="${detect.questionTitle!}" >${detect.questionTitle!'-'}</span><br><#if detect.questionTitle??><#if detect.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detect.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if></td>
+                    <td class="text-c" width="100"><span class="txt2" >${detect.questionTitle!''}${detect.questionName!''}</span><#--<br><#if detect.questionTitle??><#if detect.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detect.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if>--></td>
                         <td class="text-c" width="100">
                     <#if detect.maintenanceResults??>
                         <#if detect.maintenanceResults == 1>
@@ -579,6 +583,10 @@
                         $("#procTypeNameTd").html(detectInfo.procTypeName+"("+detectInfo.procMethodName+")");
                     }
 
+                    if(detectInfo.typeName != null && detectInfo.typeName != ""){
+                        $("#procTypeNameTd").html(detectInfo.typeName+"("+detectInfo.methodName+")");
+                    }
+
                     if(detectInfo.productName != null && detectInfo.productName != ""){
                         $("#productNameTd").html(detectInfo.productName);
                     }

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

@@ -120,9 +120,9 @@
             <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="100">客户信息</th>
                 <th width="100">客户问题</th>
@@ -132,7 +132,7 @@
                 <th width="120">操作</th>
             </tr>
             </thead>
-            <tbody id="listid">1
+            <tbody id="listid">
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as detect>
                 <tr>

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

@@ -68,7 +68,7 @@
                         <#list companyInfoList as companyInfo>
 
                             <div class="radio-box">
-                                <input type="radio"  name="companyId" <#if companyInfo_index == 0>checked="checked"</#if>value="${companyInfo.companyId!''}" datatype="*" nullmsg="请选择所属公司！">
+                                <input type="radio" onclick="setStore(${companyInfo.companyId!''})" name="companyId" <#if companyInfo_index == 0>checked="checked"</#if>value="${companyInfo.companyId!''}" datatype="*" nullmsg="请选择所属公司！">
                                 <label for="tel-1">${companyInfo.companyName!''}</label>
                             </div>
                         </#list>
@@ -76,6 +76,18 @@
                 </div>
             </div>
             <input value="" id="signclosedCompanyId" name="signclosedCompanyId" type="hidden">
+
+            <div class="row cl">
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>店铺：</label>
+                <div class="formControls col-2 col-sm-2 skin-minimal">
+                    <span class="select-box">
+                    <select id="signclosedStoreId" name="signclosedStoreId" class="select">
+
+                    </select>
+                    </span>
+                </div>
+            </div>
+
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>快递信息：</label>
                 <div class="formControls col-2 col-sm-2 skin-minimal">
@@ -568,6 +580,29 @@
         }
         layer.close(index);
     }
+
+    setStore(1);
+    /*获取销售店铺*/
+    function setStore(companyId){
+        $.ajax({
+            type: "POST",
+            data: {
+                companyId : companyId
+            },
+            url: "${path}/admin/customer/select_storeInfo",
+            success: function(data){
+                $("#signclosedStoreId").empty();    //清空下拉框
+                if (data.returnCode == 200) {
+                    for(var i=0;i<data.returnMsg.storeInfoList.length;i++){
+                        var storeInfo = data.returnMsg.storeInfoList[i];
+                        $("#signclosedStoreId").append("<option  value='"+ storeInfo.storeId +"'>"+ storeInfo.storeName +"</option>");
+                    }
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+    }
 </script>
 <!--/请在上方写此页面业务相关的脚本-->
 </body>

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

@@ -140,7 +140,7 @@
                         <#if signclosed.signclosedCompanyId??>
                             <#if signclosed.signclosedCompanyId == 1 || signclosed.signclosedCompanyId == 2>
                              <a style="text-decoration:none" href="javascript:;" title="优尼雅客户"
-                              onclick="into_Yny(${signclosed.signclosedId!''});">
+                                 onclick="add_remark('优尼雅客户','${path}/admin/signclosed/to_Yny?signclosedId=${signclosed.signclosedId!''}','700','450');">
                                  <i>优尼雅客户</i>
                              </a>
                             </#if>
@@ -245,31 +245,7 @@
         });
     }
 
-    /*优尼雅客户*/
-    function into_Yny(signclosedId){
-        layer.alert('确定改为优尼雅客户吗？', function () {
-            $.ajax({
-                cache: true,
-                type: "POST",
-                url: "${path}/admin/signclosed/update_company",
-                data:{"signclosedId":signclosedId,
-                      "signclosedCompanyId" : 3},
-                async: false,
-                success: function(data){
-                    if (data.returnCode == 200) {
-                        layer.msg('修改成功',{icon: 1,time:1000},function () {
-                            location.replace(location.href);
-                        });
-                    } else {
-                        layer.msg('修改失败',{icon: 5,time:1000});
-                    }
-                },
-                error: function(XmlHttpRequest, textStatus, errorThrown){
-                    layer.msg('操作错误',{icon: 5,time:1000});
-                }
-            });
-        });
-    }
+
 </script>
 </body>
 </html>

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

@@ -72,6 +72,7 @@
             <tr class="text-c">
                 <th width="50">签收ID</th>
                 <#--<th width="50">客诉编号</th>-->
+                <th width="90">店铺</th>
                 <th width="90">售后原因</th>
                 <th width="90">物流状态</th>
                 <th width="160">物流</th>
@@ -80,7 +81,6 @@
                 <th width="250">签收产品</th>
                 <th width="50">是否少件</th>
                 <th width="130">退货地区</th>
-
                 <#--<th width="150">客服备注</th>-->
                 <th width="150">签收日期</th>
                 <th width="150">签收图片</th>
@@ -94,6 +94,7 @@
                 <tr>
                     <td class="text-c" width="70" style="color: #50a2ea;">${signclosed.signclosedId!}</td>
                     <#--<td class="text-c" width="70">${signclosed.signclosedCustomerId!}</td>-->
+                    <td class="text-c" width="100"><#if signclosed.signclosedStoreName??>${signclosed.signclosedStoreName!}</td></#if>
                     <td class="text-c" width="100">${signclosed.customerIdDescribe!}</td>
                     <td class="text-c" width="100">
                         <#if signclosed.signclosedIsReceiving??>

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

@@ -0,0 +1,163 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+<#include "/base/add_base.ftl">
+    <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
+    <link href="${path}/common/lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css"/>
+    <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css"/>
+    <style>
+        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+
+        #suggest, #suggest2 {width:200px}
+        .gray {color:gray}
+        .ac_results {background:#fff;border:1px solid #7f9db9;position: absolute;z-index: 10000;display: none}
+        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
+        .ac_results li {border:1px solid #fff}
+        .ac_over, .ac_results li a:hover {background:#c8e3fc}
+        .ac_results li a span {float:right}
+        .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
+        .check-box, .radio-box{padding-left: 0;}
+
+        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
+        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
+        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
+        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
+        .dalog-ask .ask{color: #000;margin: 10px 0 5px 0;}
+        .dalog-ask .answer{color: #666;margin-bottom: 10px;}
+        .dalog-ask .answer:hover{color: #32a3d8;cursor: pointer;}
+        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
+        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
+        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
+        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
+        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
+        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
+        .time-line-list>li:first-child .arrow{display: none;}
+        .table-bg th{background-color: #f7fafd;height: 40px;}
+        .table-bg td{height: 40px;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
+        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;}
+    </style>
+    <title>添加签收 - 客诉管理 - RST</title>
+</head>
+<body>
+<article class="page-container" style="padding: 10px;">
+    <div class="pd-20 cl">
+        <form action="" method="post" class="form form-horizontal" id="form-signclosed-add">
+           <#-- <div class="row cl">
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>所属公司：</label>
+                <div class="formControls col-9 col-sm-9">
+                    <#if companyInfoList?? &&  (companyInfoList?size > 0) >
+                        <#list companyInfoList as companyInfo>
+
+                            <div class="radio-box">
+                                <input type="radio" onclick="setStore(${companyInfo.companyId!''})" name="companyId" <#if companyInfo_index == 0>checked="checked"</#if>value="${companyInfo.companyId!''}" datatype="*" nullmsg="请选择所属公司！">
+                                <label for="tel-1">${companyInfo.companyName!''}</label>
+                            </div>
+                        </#list>
+                    </#if>
+                </div>
+            </div>-->
+
+
+            <div class="row cl">
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>店铺：</label>
+                <div class="formControls col-9 col-sm-9 skin-minimal">
+                    <span class="select-box">
+                    <select id="signclosedStoreId" name="signclosedStoreId" class="select">
+
+                    </select>
+                    </span>
+                </div>
+            </div>
+            <div class="row cl">
+                <div class="col-4 col-sm-4 col-offset-3">
+                    <input type="hidden" value="">
+                    <button onClick="into_Yny(${signclosedId!''});" class="btn btn-block btn-primary size-XL" type="button">确认</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</article>
+
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript" src="${path}/common/lib/webuploader/0.1.5/webuploader.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/jquery.provincesCity.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/provincesData.js"></script>
+<script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/cm.lib/dimensions.js"></script>-->
+<script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
+<script type="text/javascript" src="${path}/common/js/common/address.js"></script>
+<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/ajaxfileupload.js"></script>
+<script type="text/javascript">
+
+    setStore(3);
+    /*获取销售店铺*/
+    function setStore(companyId){
+        $.ajax({
+            type: "POST",
+            data: {
+                companyId : companyId
+            },
+            url: "${path}/admin/customer/select_storeInfo",
+            success: function(data){
+                $("#signclosedStoreId").empty();    //清空下拉框
+                if (data.returnCode == 200) {
+                    for(var i=0;i<data.returnMsg.storeInfoList.length;i++){
+                        var storeInfo = data.returnMsg.storeInfoList[i];
+                        $("#signclosedStoreId").append("<option  value='"+ storeInfo.storeId +"'>"+ storeInfo.storeName +"</option>");
+                    }
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+    }
+
+    /*优尼雅客户*/
+    function into_Yny(signclosedId){
+        /*layer.alert('确定改为优尼雅客户吗？', function () {*/
+        var signclosedStoreId = $("#signclosedStoreId").val();
+
+            $.ajax({
+                cache: true,
+                type: "POST",
+                url: "${path}/admin/signclosed/update_company",
+                data:{"signclosedId":signclosedId,
+                    "signclosedCompanyId" : 3,
+                    "signclosedStoreId" : signclosedStoreId},
+                async: false,
+                success: function(data){
+                    if (data.returnCode == 200) {
+                        layer.msg('修改成功',{icon: 1,time:1000},function () {
+                            window.parent.location.reload();
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layer.close(index)
+                        });
+                    } else {
+                        layer.msg('修改失败',{icon: 5,time:1000});
+                    }
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                    layer.msg('操作错误',{icon: 5,time:1000});
+                }
+            });
+        /*});*/
+    }
+</script>
+<!--/请在上方写此页面业务相关的脚本-->
+</body>
+</html>