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

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

@@ -132,6 +132,7 @@ public class ComplaintDetectInfo implements Serializable {
     private Integer detectSource;//数据来源1，自动录入2手动添加
     private String questionName;//问题名称
     private String questionProfile;//问题回复
+    private Integer companyId;//所屬公司
 
     public String getQuestionName() {
         return questionName;
@@ -851,4 +852,12 @@ public class ComplaintDetectInfo implements Serializable {
     public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
 }

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

@@ -69,7 +69,8 @@
       cd.detect_source detectSource,
       cq.question_name questionName,
       cq.question_profile questionProfile,
-      ssa.admin_name salesmanAdminName
+      ssa.admin_name salesmanAdminName,
+      cd.company_id companyId
     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
@@ -169,7 +170,8 @@
     ssa.admin_name salesmanAdminName,
     cq.question_name questionName,
     cpms.proc_method_name methodName,
-    cpts.proc_type_name typeName
+    cpts.proc_type_name typeName,
+    cd.company_id companyId
     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
@@ -321,7 +323,7 @@
         and cd.detect_state != 40
       </if>
       <if test="detectSource != null and detectSource == 2">
-        and cd.detect_source = 2 OR cd.detect_state = 40
+        and cd.detect_state in(30,34,38,40)
       </if>
       <if test="salesmanAdminId != null and salesmanAdminId != ''">
         and ssa.admin_id = #{salesmanAdminId}
@@ -479,6 +481,9 @@
       <if test="maintenanceCutTime != null" >
           maintenance_cut_time = #{maintenanceCutTime}
       </if>
+      <if test="companyId != null" >
+        company_id = #{companyId}
+      </if>
     </set>
     where
         detect_id = #{detectId,jdbcType=INTEGER}
@@ -522,7 +527,8 @@
     detect_tel,
     question_id,
     method_id,
-    detect_source
+    detect_source,
+    company_id
     )
     values
       (
@@ -561,7 +567,8 @@
       #{detectTel},
       #{questionId},
       #{methodId},
-      #{detectSource}
+      #{detectSource},
+      #{companyId}
       )
   </insert>
 

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

@@ -1254,7 +1254,7 @@ public class AdminDetectController {
         procType.setProcTypeStatus(1);
         procTypeList = procTypeService.getProcTypeList(procType);
         mv.addObject("procTypeList",procTypeList);
-        StitchAttrUtil.getSa().setModelAndView(detect, mv, "/admin/detect/select_detect_list", result);
+        StitchAttrUtil.getSa().setModelAndView(detect, mv, "/admin/detect/detect_repair_list", result);
         return mv;
     }
 
@@ -1271,11 +1271,11 @@ public class AdminDetectController {
         if(detectId == null || detectId.equals("")){
             return mv;
         }
-
+        ComplaintDetectInfo detectinfo = complaintDetectInfoService.getDetectById(Integer.valueOf(detectId));
         Product product = new Product();
         List<Product> productList = productService.listProductAndColorAndfittings(product);
         ProductColor color = new ProductColor();
-        color.setColorProductId(product.getProductId());
+        color.setColorProductId(detectinfo.getProductId());
         List<ProductColor> productColorList = productService.listProduceColor(color);
         mv.addObject("productColorList",productColorList);
         mv.addObject("productList",productList);
@@ -1287,7 +1287,6 @@ public class AdminDetectController {
         Admin admin = new Admin();
         admin.setAdminDept(15);
         List<Admin> listAdmin = sysMapper.listAdmin(admin);
-        ComplaintDetectInfo detectinfo = complaintDetectInfoService.getDetectById(Integer.valueOf(detectId));
         List<CompanyInfo> companyInfoList =  companyInfoService.listCompanyInfo(new CompanyInfo());
         mv.addObject("companyInfoList",companyInfoList);
         mv.addObject("listComplaintQuestionInfo",listComplaintQuestionInfo);

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

@@ -88,37 +88,39 @@
 					</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 id="detectDiv" style="display: none;">
+                <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>
-			<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 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>
             </div>
 		</form>
@@ -212,6 +214,10 @@
                             $("#detectOffer").text(detectinfo.detectOffer/100);
                         }
                         $("#detectDesc").text(detectinfo.detectDesc);
+                        if(detectinfo.detectState === 30 || detectinfo.detectState === 34 || detectinfo.detectState === 38){
+                            $("#detectDiv").show();
+                        }
+
                     }
                 },
                 error: function(XmlHttpRequest, textStatus, errorThrown){

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

@@ -107,6 +107,7 @@
                     </#list>
                 </#if>
             </select>
+            <input class="my-input" style="width: 120px;height: 29px;" type="text" name="detectNumber" id="detectNumber" value="${detectNumber!}" placeholder="维修编号"/>
             <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="客诉问题"/>
@@ -196,11 +197,15 @@
                                 </a><br>
                             </#if>
                             <#if detect.detectState == 40>
-                                <a style="text-decoration:none" href="javascript:;" title="完善客户信息"
-                                   onclick="add_remark('完善客户信息','${path}/admin/detect/to_perfect_detect?detectId=${detect.detectId!''}','700','750');">
-                                    <i class="Hui-iconfont">完善客户信息</i>
+                                <a style="text-decoration:none" href="javascript:;" title="完善信息"
+                                   onclick="add_remark('完善信息','${path}/admin/detect/to_perfect_detect?detectId=${detect.detectId!''}','600','650');">
+                                    <i class="Hui-iconfont">完善信息</i>
                                 </a><br>
                             </#if>
+                        <a style="text-decoration:none" href="javascript:;" title="详情"
+                           onclick="detail('${path}/admin/detect/to_detail?detectId=${detect.detectId!''}');">
+                            <i class="Hui-iconfont">详情</i>
+                        </a><br>
                     </td>
                 </tr>
                 </#list>
@@ -227,7 +232,7 @@
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
-                    var html = '<option value="" >业务员</option>';
+                    var html = '<option value="" >处理方式</option>';
                     if (data.returnCode == 200) {
                         for(var i=0;i<data.returnMsg.list.length;i++){
                             listInfo = data.returnMsg.list[i];
@@ -251,6 +256,10 @@
     function add_remark(title,url,w,h){
         layer_show(title,url,w,h);
     }
+    /*详情*/
+    function detail(url){
+        location.href = url;
+    }
 </script>
 </body>
 </html>

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

@@ -59,7 +59,7 @@
             <#if companyInfoList?? &&  (companyInfoList?size > 0) >
                 <#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"  name="companyId" <#if detectinfo.companyId == companyInfo.companyId>checked="checked"</#if>value="${companyInfo.companyId!''}" datatype="*" nullmsg="请选择所属公司！">
                         <label for="tel-1">${companyInfo.companyName!''}</label>
                     </div>
                 </#list>
@@ -116,7 +116,7 @@
                 <select id="productId" name="productId" class="my-select" style="width: 158px;">
                     <#if (productList?size > 0)>
                             <#list productList as product>
-                                <option value="${product.productId!""}">${product.productName!""}</option>
+                                <option value="${product.productId!""}" <#if detectinfo.productId == product.productId>checked="checked"</#if> >${product.productName!""}</option>
                             </#list>
                     </#if>
                 </select>
@@ -124,7 +124,7 @@
                 <select id="productColorId" name="productColorId" class="my-select" style="width: 158px;">
                     <#if (productColorList?size > 0)>
                         <#list productColorList as productColor>
-                            <option value="${productColor.colorId!""}">${productColor.colorName!""}</option>
+                            <option value="${productColor.colorId!""}" <#if detectinfo.productColorId == productColor.colorId>checked="checked"</#if> >${productColor.colorName!""}</option>
                         </#list>
                     </#if>
                 </select>

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

@@ -531,7 +531,7 @@
                                     '<input type="hidden" class="color_id" id="" value="'+ productColor.colorId +'" >' +
                                     ' <td>'+ cufte(productColor.productName) +'</td>' +
                                     ' <td>'+ cufte(productColor.colorName) +'</td>' +
-                                    ' <td>'+ cufte(productColor.colorPrice)/100 +'</td>' +
+                                    /*' <td>'+ cufte(productColor.colorPrice)/100 +'</td>' +*/
                                     ' <td><input type="text" class="input-text input-number item-num"  style="width: 100%;border: none;text-align: center;" name="" id="" placeholder="产品数量" value="1" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>' +
                                     ' <td><a href="javascript:void(0)" class="del_product all_down" onclick="delProduct($(this))" >删除</a></td>' +
                                     ' </tr>';

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/tooth_print_List.ftl

@@ -205,7 +205,7 @@
                     '<img style="position: absolute; width: 130px;height: 128px;margin-top: 24px;" src="'+machineQrcode+'" />' +
                     '<span style="position: absolute;margin-left: 20px;margin-top: 133px;font-size: 16px;">'+machineCreateTime+'</span>' +
                     '</div>');*/
-            if(produceName === "上朵Lips系列便携声波牙刷（贝母白）" ||produceName === "上朵Lips系列便携声波牙刷（樱花粉）" ||produceName === "上朵Lips系列便携声波牙刷（幻影黑）"){
+            /*if(produceName === "上朵Lips系列便携声波牙刷（贝母白）" ||produceName === "上朵Lips系列便携声波牙刷（樱花粉）" ||produceName === "上朵Lips系列便携声波牙刷（幻影黑）"){
                 $("#printlist").append('<div style="width: 160px;height: 151px;position: relative;"> ' +
                         '<span style="position: absolute;margin-left: 13px;z-index: 99;font-size: 16px;margin-top: 2px;">产品唯一码</span>' +
                         '<img style="position: absolute; width: 110px;height: 110px;margin-top: 12px;margin-left: -5px;" src="'+machineQrcode+'" />' +
@@ -216,7 +216,11 @@
                         '<img style="position: absolute; width: 130px;height:128px;margin-top: 24px;margin-left: -20px;" src="'+machineQrcode+'" />' +
                         '<span style="position: absolute;margin-left: 0px;margin-top: 133px;font-size: 16px;">'+machineCreateTime+'</span>' +
                         '</div>');
-            }
+            }*/
+            $("#printlist").append('<div style="width: 160px;height: 151px;position: relative;"> ' +
+                    '<span style="position: absolute;margin-left: 13px;z-index: 99;font-size: 16px;margin-top: 2px;">产品唯一码</span>' +
+                    '<img style="position: absolute; width: 110px;height: 110px;margin-top: 12px;margin-left: -5px;" src="'+machineQrcode+'" />' +
+                    '</div>');
 
 
             if(${machineIsPrint} == '1')
@@ -357,7 +361,7 @@
         var produceModel =  produce.produceModel;        //获取产品型号后两位
         var produceName = produce.produceName;            //获取产品名称
         var produceBrand = produce.produceBrand;            //获取品牌字母
-        if(produceName === "上朵Lips系列便携声波牙刷（贝母白）" || produceName === "上朵Lips系列便携声波牙刷（樱花粉）" || produceName === "上朵Lips系列便携声波牙刷（幻影黑）"){
+        /*if(produceName === "上朵Lips系列便携声波牙刷（贝母白）" || produceName === "上朵Lips系列便携声波牙刷（樱花粉）" || produceName === "上朵Lips系列便携声波牙刷（幻影黑）"){
             $("#printlist").append('<div style="width: 160px;height: 154px;position: relative;"> ' +
                     '<span style="position: absolute;margin-left: 15px;z-index: 99;font-size: 16px;margin-top: 2px;">产品唯一码</span>' +
                     '<img style="position: absolute; width: 110px;height: 110px;margin-top: 12px;" src="'+machineQrcode+'" />' +
@@ -368,7 +372,11 @@
                     '<img style="position: absolute; width: 130px;height:128px;margin-top: 24px;margin-left: -20px;" src="'+machineQrcode+'" />' +
                     '<span style="position: absolute;margin-left: 0px;margin-top: 133px;font-size: 16px;">'+machineCreateTime+'</span>' +
                     '</div>');
-        }
+        }*/
+        $("#printlist").append('<div style="width: 160px;height: 154px;position: relative;"> ' +
+                '<span style="position: absolute;margin-left: 15px;z-index: 99;font-size: 16px;margin-top: 2px;">产品唯一码</span>' +
+                '<img style="position: absolute; width: 110px;height: 110px;margin-top: 12px;" src="'+machineQrcode+'" />' +
+                '</div>');
         if(${machineIsPrint} == '1')
         {
             updatePrint(machineBarcode,false);