客诉列表修改

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

@@ -289,7 +289,9 @@
     cc.procMethodName as procMethodName,
     cc.procTypeId as procTypeId,
     cc.procTypeName as procTypeName,
-    cc.customerIsSolve as customerIsSolve
+    cc.customerIsSolve as customerIsSolve,
+    cc.procMethodIsBack as procMethodIsBack,
+    cc.procMethodIsSend as procMethodIsSend
     FROM
     tb_rst_cm_customer_info c
     LEFT JOIN (
@@ -312,7 +314,9 @@
         tb_rst_cm_proc_method.proc_method_id AS procMethodId,
         tb_rst_cm_proc_method.proc_method_name AS procMethodName,
         tb_rst_cm_proc_type.proc_type_id AS procTypeId,
-        tb_rst_cm_proc_type.proc_type_name AS procTypeName
+        tb_rst_cm_proc_type.proc_type_name AS procTypeName,
+        tb_rst_cm_proc_method.proc_method_is_back AS procMethodIsBack,
+        tb_rst_cm_proc_method.proc_method_is_send AS procMethodIsSend
         FROM
         tb_rst_cm_relation
         LEFT JOIN tb_rst_cm_proc_method ON tb_rst_cm_proc_method.proc_method_id = tb_rst_cm_relation.proc_method_id

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

@@ -226,7 +226,8 @@
                                 </#if>
                             </td>
                             <td id="txt_customerIsSolve">
-                                <#if customer.backLogisticsNo??>
+                                <#if customer.procMethodIsBack?? && customer.procMethodIsSend??>
+                                <#if customer.procMethodIsBack == 1 || customer.procMethodIsSend == 1>
                                 ${customer.procMethodName!''}(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateRelation(${customer.customerId!''})">
                                         <font color=#06c>
@@ -250,25 +251,12 @@
                                                     已收货
                                                 </#if>
                                             </#if>
-                                        <#--,
-                                        <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
-                                            <#list customer.complaintDetectList as complaintDetect>
-                                                <#if (complaintDetect_index = 0)>
-                                                    <#if complaintDetect.detectState == 1>
-                                                        待仓库转入
-                                                    <#elseif complaintDetect.detectState == 2>
-                                                        正在检查
-                                                    <#elseif complaintDetect.detectState == 3>
-                                                        检查通过
-                                                    <#elseif complaintDetect.detectState == 4>
-                                                        检查未通过
-                                                    </#if>
-                                                </#if>
-                                            </#list>
-                                        </#if>-->
                                         </font>
                                     </a>
                                     )
+                                    <#else>
+                                    ${customer.procMethodName!''}
+                                    </#if>
                                 <#else>
                                 ${customer.procMethodName!''}
                                 </#if>