邮费转账列表

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

@@ -70,7 +70,7 @@ public class AdminPostageController {
             if(loginAdmin.getAdminManager() == 2){
                 operationPermissions = 2;
             }
-        }else if(loginAdmin.getAdminDept() == 4 && loginAdmin.getAdminManager() == 2){
+        }else if(loginAdmin.getAdminDept() == 5 && loginAdmin.getAdminManager() == 2){
             operationPermissions = 3;
         }else if(loginAdmin.getAdminDept() == 1 && loginAdmin.getAdminManager() == 2){
             operationPermissions = 4;

watero-rst-web/src/main/webapp/WEB-INF/views/cm/postage/postage_list.ftl

@@ -145,7 +145,33 @@
                             <td>${postage.postageAmount!''}</td>
                             <td>${postage.postageAlipay!''}</td>
                             <td>${postage.postageAlipayName!''}</td>
-                            <td></td>
+                            <td>
+                                <#if (operationPermissions ==1) || (operationPermissions ==2)>
+                                    <#if postage.postageCustomerStatus == 1>
+                                        <a onclick="updateCustomerStatus(${postage.postageId!''},2,1);">申请通过</a>
+                                    </#if>
+                                </#if>
+                                <#if operationPermissions == 2>
+                                    <#if postage.postageManagerStatus == 1>
+                                        <a onclick="updateCustomerStatus(${postage.postageId!''},2,2);">通过</a>
+                                        <a onclick="updateCustomerStatus(${postage.postageId!''},3,2);">驳回</a>
+                                    </#if>
+                                </#if>
+                                <#if operationPermissions == 3>
+                                    <#if postage.postageFinanceStatus == 1>
+                                        <a onclick="updateCustomerStatus(${postage.postageId!''},2,3);">通过</a>
+                                        <a onclick="updateCustomerStatus(${postage.postageId!''},3,3);">驳回</a>
+                                    </#if>
+                                    <#if postage.postageFinanceStatus == 2>
+                                        <a >已转账</a>
+                                    </#if>
+                                </#if><#--
+                                <a onclick="updateCustomerStatus(${postage.postageId!''},2,1);">申请通过</a><br>
+                                <a onclick="updateCustomerStatus(${postage.postageId!''},2,2);">通过</a>
+                                <a onclick="updateCustomerStatus(${postage.postageId!''},3,2);">驳回</a><br>
+                                <a onclick="updateCustomerStatus(${postage.postageId!''},2,3);">通过</a>
+                                <a onclick="updateCustomerStatus(${postage.postageId!''},3,3);">驳回</a>-->
+                            </td>
                         </tr>
                     </#list>
             <#else>
@@ -174,11 +200,13 @@
                 async: false,
                 success: function(data){
                     if (data.returnCode == 200) {
-                        layer.msg(data.resultMsg,{icon: 1,time:1000});
+                        layer.msg(data.resultMsg,{icon: 1,time:1000},function () {
+                            location.replace(location.href);
+                        });
                     } else {
                         layer.msg(data.resultMsg,{icon: 5,time:1000});
                     }
-                    location.replace(location.href);
+
                 },
                 error: function(XmlHttpRequest, textStatus, errorThrown){
                 }