业务提交数据 查询功能优化

src/main/webapp/WEB-INF/templates/market/communeExt/activeCustomerList.ftl

@@ -16,13 +16,13 @@ $("#communeBtn").click(function(){
 var openInNewTab = function(url) {
 var openInNewTab = function(url) {
     var a = document.createElement("a");
     var a = document.createElement("a");
     a.setAttribute("href", url);
     a.setAttribute("href", url);
-    a.setAttribute("target", "testNewWindow");
+    a.setAttribute("target", "_blank");
     document.body.appendChild(a);
     document.body.appendChild(a);
    a.click();
    a.click();
 }
 }
 
 
 function updateState(id,state){
 function updateState(id,state){
-	if(state==2||state==4 ||(state == 99 && confirm("您确定要驳回该请求吗?"))){
+	if(state==2||state==4 ||(state == 128 && confirm("您确定要驳回该请求吗?"))){
 		var params = {id:id,auditState:state}
 		var params = {id:id,auditState:state}
        	//ajax请求
        	//ajax请求
        	sendRequest(params);
        	sendRequest(params);
@@ -115,27 +115,40 @@ $('#communeNoModal').on('hidden.bs.modal', function (e) {
 				<#elseif item.sex == 'F'>女
 				<#elseif item.sex == 'F'>女
 				</#if>
 				</#if>
 			</td>
 			</td>
-        	<td>${item.saleName!}</td>
+        	<td>${item.saleName!} </td>
         	<td>${item.saleMobile!}</td>
         	<td>${item.saleMobile!}</td>
         	<td><#if item.createTime??>${item.createTime?string("yyyy-MM-dd hh:mm:ss")}</#if></td>
         	<td><#if item.createTime??>${item.createTime?string("yyyy-MM-dd hh:mm:ss")}</#if></td>
-        	<td>
-				<#if item.auditState == 1>未审批
-				<#elseif item.auditState == 2>已确认
-				<#elseif item.auditState == 4>已录入公社
-				<#elseif item.auditState == 99>驳回
+        	<td>${item.auditState} 
+				<#if (((item.auditState/128)?floor) %2) == 1>驳回
+				<#elseif item.auditState == 1>未审批
+				<#else>
+				  <#if (((item.auditState/2)?floor) %2) == 0>未确认</#if>
+				  <#if (((item.auditState/4)?floor) %2) == 0>未录公社</#if>
+				  <#if (((item.auditState/4)?floor) %2) == 1 &&  (((item.auditState/2)?floor) %2) == 1>审批完成</#if>
+
+
 				</#if>
 				</#if>
 			</td>
 			</td>
         	<td>${item.auditUser!}</td>
         	<td>${item.auditUser!}</td>
         	<td>
         	<td>
-        		<a href="${item.picUrl!}" target="_blank">查看凭据</a>&nbsp;
-        		<#if item.auditState == 1>
+        		<a href="${item.picUrl!}" target="_blank">凭据</a>&nbsp;
+        		<#if (((item.auditState/128)?floor) %2) == 1>
+				<#elseif item.auditState == 1>
 	        		<a href="#" onclick="updateState('${item.id!}',2);">确认收款</a>&nbsp;
 	        		<a href="#" onclick="updateState('${item.id!}',2);">确认收款</a>&nbsp;
-	        		<a href="#" onclick="updateState('${item.id!}',99);">驳回</a>
-        		<#elseif item.auditState == 2>
 	        		<a href="#" onclick="add2Commune('${item.id!}',4);">录入公社</a>&nbsp;
 	        		<a href="#" onclick="add2Commune('${item.id!}',4);">录入公社</a>&nbsp;
-	        		<a href="#" onclick="updateState('${item.id!}',99);">驳回</a>
-        		
+	        		<a href="#" onclick="updateState('${item.id!}',128);">驳回</a>
+				<#else>
+				  <#if (((item.auditState/2)?floor) %2) == 0>
+	        		<a href="#" onclick="updateState('${item.id!}',2);">确认收款</a>&nbsp;
+	        		<a href="#" onclick="updateState('${item.id!}',128);">驳回</a></#if>
+				  <#if (((item.auditState/4)?floor) %2) == 0>
+	        		<a href="#" onclick="add2Commune('${item.id!}',4);">录入公社</a>&nbsp;
+	        		<a href="#" onclick="updateState('${item.id!}',128);">驳回</a></#if>
+				  <#if (((item.auditState/4)?floor) %2) == 1 &&  (((item.auditState/2)?floor) %2) == 1>
+				  </#if>
 				</#if>
 				</#if>
+        		
+        		
         	</td>
         	</td>
         </tr>
         </tr>
         </#list>
         </#list>