修改系统报价功能。

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

@@ -779,6 +779,7 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
                 temp.setAdminId(d.getSalesmanAdminId());
                 d.setSalesmanAdminName(sysMapper.get(temp).getAdminName());
             }
+            d.setPhenomena(complaintDetectInfoMapper.listDetectPhenomenon(d.getDetectId()));
         });
         return res;
     }

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

@@ -1171,7 +1171,16 @@
                                         </#if>
                                     </td>
                                     <td class="text-c" width="100">${detect.productName!'暂无产品'}(${detect.colorName!'暂无颜色'})</td>
-                                    <td class="text-c" width="100">${(detect.phenomen.phenomenonName)!}</td>
+                                    <td class="text-c" width="100">
+                                        <#if (detect.phenomena)?? && (detect.phenomena?size > 0)>
+                                            <#list detect.phenomena as p>
+                                                <span class="label label-success radius">
+                                                    ${(p.dpName)!''};
+                                                </span>
+                                            </#list>
+                                        </#if>
+                                        <#--${(detect.phenomen.phenomenonName)!}-->
+                                    </td>
                                     <td class="text-c" width="100">
                                         <#if detect.isMaintenance??>
                                            <#if detect.isMaintenance == 1>
@@ -1218,7 +1227,13 @@
                                             </#if>
                                         </#if>
                                     </td>
-                                    <td class="text-c" width="100"><#if detect.detectOffer??>${detect.detectOffer/100}<#else>-</#if></td>
+                                    <td class="text-c" width="100">
+                                        <#if detect.detectOffer??>
+                                            <span style="color: red" title="最终向客户收费">${(detect.detectOffer/100)+20}</span>
+                                        <#else>
+                                            -
+                                        </#if>
+                                    </td>
                                     <td class="text-c" width="100"><div  title="${detect.detectContent!}">${detect.detectContent!'-'}</div></td>
                                     <td class="text-c" width="100">
                                         <#if detect.maintenanceResults??>