Skip to content

S
sunac_report
Commit 362cb994 by sunxin
Options

举报列表 跟踪 业务类型 类别相对变更

parent 77b9efc4
Showing with 281 additions and 117 deletions
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
...@@ -33,6 +33,16 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -33,6 +33,16 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String supplementTitle; //标题 private String supplementTitle; //标题
private String supplementType; //业务类型地产 物业 酒店 商业 private String supplementType; //业务类型地产 物业 酒店 商业
private String transferGroup; //移交部门所属集团 private String transferGroup; //移交部门所属集团
private String transferArea; //移交区域
public String getTransferArea() {
return transferArea;
}
public void setTransferArea(String transferArea) {
this.transferArea = transferArea;
}
private String transferDepartment;//移交部门 1 营销 2 工程 3 成本 4 招采 5人力 6物业 7投诉 private String transferDepartment;//移交部门 1 营销 2 工程 3 成本 4 招采 5人力 6物业 7投诉
private String supplementArea; //被举报区域 private String supplementArea; //被举报区域
private String supplementProject; //被举报项目 private String supplementProject; //被举报项目
......
src/main/resources/mappings/modules/report/ReportDao.xml
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
/*r.supplement_type AS "supplementType",*/ /*r.supplement_type AS "supplementType",*/
ct.name AS "transferDepartment", ct.name AS "transferDepartment",
b2.label AS "transferGroup", b2.label AS "transferGroup",
b3.name AS "transferArea",
/*r.supplement_area AS "supplementArea",*/ /*r.supplement_area AS "supplementArea",*/
r.supplement_project AS "supplementProject", r.supplement_project AS "supplementProject",
r.supplement_content AS "supplementContent", r.supplement_content AS "supplementContent",
...@@ -68,6 +69,7 @@ ...@@ -68,6 +69,7 @@
LEFT JOIN ct_bbtc_bus_type CT ON r.transfer_department = CT.id LEFT JOIN ct_bbtc_bus_type CT ON r.transfer_department = CT.id
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
/* LEFT JOIN ct_bbtc_bus_type CT /* LEFT JOIN ct_bbtc_bus_type CT
ON R.supplement_group = CT.supplement_group ON R.supplement_group = CT.supplement_group
...@@ -90,6 +92,7 @@ ...@@ -90,6 +92,7 @@
ON RL.ID = UR.ROLE_ID ON RL.ID = UR.ROLE_ID
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
LEFT JOIN ct_bbtc_region CR LEFT JOIN ct_bbtc_region CR
ON r.supplement_area = CR.id ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_bus_type CT LEFT JOIN ct_bbtc_bus_type CT
...@@ -178,6 +181,10 @@ ...@@ -178,6 +181,10 @@
AND r.transferGroup = #{transferGroup} AND r.transferGroup = #{transferGroup}
</if> </if>
<if test="transferArea != null and transferArea != ''">
AND r.transferArea = #{transferArea}
</if>
<if test="transferDepartment != null and transferDepartment != ''"> <if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if> <if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
...@@ -220,6 +227,7 @@ ...@@ -220,6 +227,7 @@
ON RL.ID = UR.ROLE_ID ON RL.ID = UR.ROLE_ID
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
LEFT JOIN ct_bbtc_region CR LEFT JOIN ct_bbtc_region CR
ON r.supplement_area = CR.id ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_bus_type CT LEFT JOIN ct_bbtc_bus_type CT
...@@ -247,6 +255,9 @@ ...@@ -247,6 +255,9 @@
<if test="transferGroup != null and transferGroup != ''"> <if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup} AND r.transferGroup = #{transferGroup}
</if> </if>
<if test="transferArea != null and transferArea != ''">
AND r.transferArea = #{transferArea}
</if>
<if test="transferDepartment != null and transferDepartment != ''"> <if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE AND r.transfer_department LIKE
...@@ -270,6 +281,7 @@ ...@@ -270,6 +281,7 @@
ON RL.ID = UR.ROLE_ID ON RL.ID = UR.ROLE_ID
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
LEFT JOIN ct_bbtc_region CR LEFT JOIN ct_bbtc_region CR
ON r.supplement_area = CR.id ON r.supplement_area = CR.id
LEFT JOIN ct_bbtc_bus_type CT LEFT JOIN ct_bbtc_bus_type CT
...@@ -387,6 +399,9 @@ ...@@ -387,6 +399,9 @@
<if test="transferGroup != null and transferGroup != ''"> <if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup} AND r.transferGroup = #{transferGroup}
</if> </if>
<if test="transferArea != null and transferArea != ''">
AND r.transferArea = #{transferArea}
</if>
<if test="transferDepartment != null and transferDepartment != ''"> <if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE AND r.transfer_department LIKE
...@@ -426,6 +441,7 @@ ...@@ -426,6 +441,7 @@
ON r.transfer_department = CT.id ON r.transfer_department = CT.id
LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group LEFT JOIN ct_bbtc_sys_dict b on b.id = r.supplement_group
LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP LEFT JOIN ct_bbtc_sys_dict b2 on b2.id = r.TRANSFERGROUP
LEFT JOIN ct_bbtc_region b3 on b3.id = r.transferArea
/* LEFT JOIN ct_bbtc_bus_type CT /* LEFT JOIN ct_bbtc_bus_type CT
ON R.supplement_group = CT.supplement_group ON R.supplement_group = CT.supplement_group
LEFT JOIN ct_bbtc_bus_category CC LEFT JOIN ct_bbtc_bus_category CC
...@@ -546,6 +562,7 @@ ...@@ -546,6 +562,7 @@
supplement_informant = #{supplementInformant}, supplement_informant = #{supplementInformant},
supplement_type = #{supplementType}, supplement_type = #{supplementType},
transferGroup=#{transferGroup}, transferGroup=#{transferGroup},
transferArea=#{transferArea},
transfer_department=#{transferDepartment}, transfer_department=#{transferDepartment},
supplement_area = #{supplementArea}, supplement_area = #{supplementArea},
supplement_project = #{supplementProject}, supplement_project = #{supplementProject},
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
...@@ -175,10 +175,6 @@ ...@@ -175,10 +175,6 @@
selectNode.empty();//每次需要将上一次的数据进行清空 selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>"); selectNode.append("<option value=''>请选择</option>");
var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
var ts_describe= $("#supplementGroup").val(); var ts_describe= $("#supplementGroup").val();
if(ts_describe != null && ts_describe != ''){ if(ts_describe != null && ts_describe != ''){
$.ajax({ $.ajax({
...@@ -188,12 +184,6 @@ ...@@ -188,12 +184,6 @@
success: function(returnedData) { success: function(returnedData) {
console.log(returnedData); console.log(returnedData);
var data1 = returnedData.ctBbtcRegionList; var data1 = returnedData.ctBbtcRegionList;
var data2 = returnedData.ctBbtcBusTypeList;
// console.log(data1[0].name);
// console.log(data2[0].name);
/* var selectNode = $("#supplementArea");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");*/
if (data1 != '') { if (data1 != '') {
var slsb=document.getElementById("supplementArea"); var slsb=document.getElementById("supplementArea");
for (var i = 0;i < data1.length;i++){ for (var i = 0;i < data1.length;i++){
...@@ -202,26 +192,48 @@ ...@@ -202,26 +192,48 @@
} }
} }
/* var selectNode = $("#supplementType"); },error:function(data){
selectNode.empty();//每次需要将上一次的数据进行清空 alert("系统错误");
selectNode.append("<option value=''>请选择</option>");*/ }
});
}else{
/*top.$.jBox.tip('请选择被举报集团', 'warning');*/
}
}
/*跟据 集团区域 查询类型*/
function getType(){
var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
var ts_describe1= $("#supplementGroup").val();
var ts_describe2= $("#supplementArea").val();
if(ts_describe1 != null && ts_describe1 != '' && ts_describe2 != null && ts_describe2 != '' ){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcBusType/getTypeList?groupId="+ts_describe1+"&area="+ts_describe2,
dataType: "json",
success: function(returnedData) {
var data2 = returnedData.ctBbtcTypeList;
if (data2 != '') { if (data2 != '') {
console.log(data2[0].name);
var slsb=document.getElementById("supplementType"); var slsb=document.getElementById("supplementType");
for (var i = 0;i < data2.length;i++){ for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].name,data2[i].id)); slsb.append(new Option(data2[i].typeName,data2[i].parentId));
} }
} }
},error:function(data){ },error:function(data){
alert("系统错误"); alert("系统错误");
} }
}); });
}else{ }else{
/*top.$.jBox.tip('请选择被举报集团', 'warning');*/ /*top.$.jBox.tip('请选择所属集团', 'warning');*/
} }
} }
/* /*
*联动查询类型下的类别 传多个id *联动查询类型下的类别 传多个id
*/ */
...@@ -259,28 +271,26 @@ ...@@ -259,28 +271,26 @@
} }
function getTransferDepartment(){ /*移交部门*/
function getDepartment(){
var selectNode = $("#transferDepartment"); var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空 selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>"); selectNode.append("<option value=''>请选择</option>");
var ts_describe= $("#transferGroup").val();
if(ts_describe != null && ts_describe != ''){ var ts_describe1= $("#transferGroup").val();
var ts_describe2= $("#transferArea").val();
if(ts_describe1 != null && ts_describe1 != '' && ts_describe2 != null && ts_describe2 != '' ){
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "${ctx}/report/ctBbtcRegion/getRegionList?groupId="+ts_describe, url: "${ctx}/report/ctBbtcBusType/getTypeList?groupId="+ts_describe1+"&area="+ts_describe2,
dataType: "json", dataType: "json",
success: function(returnedData) { success: function(returnedData) {
var data2 = returnedData.ctBbtcBusTypeList; var data2 = returnedData.ctBbtcTypeList;
/* //移交部门赋值
var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");*/
if (data2 != '') { if (data2 != '') {
console.log(data2[0].name);
var slsb=document.getElementById("transferDepartment"); var slsb=document.getElementById("transferDepartment");
for (var i = 0;i < data2.length;i++){ for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].name,data2[i].id)); slsb.append(new Option(data2[i].typeName,data2[i].parentId));
} }
} }
},error:function(data){ },error:function(data){
...@@ -288,9 +298,41 @@ ...@@ -288,9 +298,41 @@
} }
}); });
}else{ }else{
/*top.$.jBox.tip('请选择业务类型', 'warning');*/ /*top.$.jBox.tip('请选择所属集团', 'warning');*/
}
} }
/*获取移交区域*/
function getTranArea(){
var selectNode = $("#transferArea");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
var ts_describe= $("#transferGroup").val();
if(ts_describe != null && ts_describe != ''){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcRegion/getRegionList?groupId="+ts_describe,
dataType: "json",
success: function(returnedData) {
console.log(returnedData);
var data1 = returnedData.ctBbtcRegionList;
if (data1 != '') {
var slsb=document.getElementById("transferArea");
for (var i = 0;i < data1.length;i++){
slsb.append(new Option(data1[i].name,data1[i].id));
}
}
},error:function(data){
alert("系统错误");
}
});
}else{
/*top.$.jBox.tip('请选择移交集团', 'warning');*/
}
} }
</script> </script>
...@@ -447,7 +489,7 @@ ...@@ -447,7 +489,7 @@
&lt;%&ndash;<options items="${ctBbtcRegionList}" itemLabel="name" itemValue="id"&ndash;%&gt; &lt;%&ndash;<options items="${ctBbtcRegionList}" itemLabel="name" itemValue="id"&ndash;%&gt;
&lt;%&ndash;htmlEscape="false"/></select>&ndash;%&gt; &lt;%&ndash;htmlEscape="false"/></select>&ndash;%&gt;
</select>--%> </select>--%>
<form:select id="supplementArea" onchange="resetPageNo();" path="supplementArea" class="input-small required"> <form:select id="supplementArea" onchange="getType();" path="supplementArea" class="input-small required">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
</form:select> </form:select>
</li> </li>
...@@ -468,12 +510,21 @@ ...@@ -468,12 +510,21 @@
<%-- <form:select onchange="resetPageNo();" path="transferGroup" class="input-small" id="transferGroup" value="${report.transferGroup}"> <%-- <form:select onchange="resetPageNo();" path="transferGroup" class="input-small" id="transferGroup" value="${report.transferGroup}">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
</form:select>--%> </form:select>--%>
<form:select id="transferGroup" path="transferGroup" class="input-small required" onchange="getTransferDepartment()"> <form:select id="transferGroup" path="transferGroup" class="input-small required" onchange="getTranArea()">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id" <form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id"
htmlEscape="false"/> htmlEscape="false"/>
</form:select> </form:select>
</li> </li>
<li><label>移交区域：</label>
<form:select id="transferArea" path="transferArea" onchange="getDepartment()" class="input-small required" >
<form:option value="">请选择</form:option>
<%-- <form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"
htmlEscape="false"/>--%>
</form:select>
</li>
<li><label>移交部门：</label> <li><label>移交部门：</label>
<%-- <form:select onchange="resetPageNo();" path="transferDepartment" class="input-small" id="transferDepartment" value="${report.transferDepartment}"> <%-- <form:select onchange="resetPageNo();" path="transferDepartment" class="input-small" id="transferDepartment" value="${report.transferDepartment}">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
...@@ -633,13 +684,13 @@ ...@@ -633,13 +684,13 @@
<c:if test="${report.dealResult eq '7'}">转为线索</c:if> <c:if test="${report.dealResult eq '7'}">转为线索</c:if>
</td> </td>
<td align="center"> <td align="center">
${report.transferGroup}--${report.transferDepartment} ${report.transferGroup}-- ${report.transferArea}--${report.transferDepartment}
<%-- <c:if test="${report.transferGroup eq '30590306011301372591'}">集团本部--${report.transferDepartment}</c:if> <%-- <c:if test="${report.transferGroup eq '30590306011301372591'}">集团本部--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30676650749523023279'}">地产集团--${report.transferDepartment}</c:if> <c:if test="${report.transferGroup eq '30676650749523023279'}">地产集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30721878435509835919'}">服务集团--${report.transferDepartment}</c:if> <c:if test="${report.transferGroup eq '30721878435509835919'}">服务集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30795782242187242020'}">文化集团--${report.transferDepartment}</c:if> <c:if test="${report.transferGroup eq '30795782242187242020'}">文化集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30770202834994792595'}">文旅集团--${report.transferDepartment}</c:if>--%> <c:if test="${report.transferGroup eq '30770202834994792595'}">文旅集团--${report.transferDepartment}</c:if>--%>
<c:if test="${report.transferGroup eq null and report.transferDepartment eq null}">--</c:if> <c:if test="${report.transferGroup eq null and report.transferDepartment eq null and report.transferArea eq null}">--</c:if>
<%--<c:if test="${report.transferDepartment eq null}">--</c:if> <%--<c:if test="${report.transferDepartment eq null}">--</c:if>
<c:if test="${report.transferDepartment eq '1'}">营销</c:if> <c:if test="${report.transferDepartment eq '1'}">营销</c:if>
<c:if test="${report.transferDepartment eq '2'}">工程</c:if> <c:if test="${report.transferDepartment eq '2'}">工程</c:if>
......
src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp
...@@ -176,10 +176,6 @@ ...@@ -176,10 +176,6 @@
selectNode.empty();//每次需要将上一次的数据进行清空 selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>"); selectNode.append("<option value=''>请选择</option>");
var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
var ts_describe= $("#supplementGroup").val(); var ts_describe= $("#supplementGroup").val();
if(ts_describe != null && ts_describe != ''){ if(ts_describe != null && ts_describe != ''){
$.ajax({ $.ajax({
...@@ -189,29 +185,44 @@ ...@@ -189,29 +185,44 @@
success: function(returnedData) { success: function(returnedData) {
console.log(returnedData); console.log(returnedData);
var data1 = returnedData.ctBbtcRegionList; var data1 = returnedData.ctBbtcRegionList;
var data2 = returnedData.ctBbtcBusTypeList;
// console.log(data1[0].name);
// console.log(data2[0].name);
/* var selectNode = $("#supplementArea");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");*/
if (data1 != '') { if (data1 != '') {
console.log(data1[0].name); console.log(data1[0].name);
var slsb=document.getElementById("supplementArea"); var slsb=document.getElementById("supplementArea");
for (var i = 0;i < data1.length;i++){ for (var i = 0;i < data1.length;i++){
console.log(data1[i].name);
slsb.append(new Option(data1[i].name,data1[i].id)); slsb.append(new Option(data1[i].name,data1[i].id));
} }
} }
/* var selectNode = $("#supplementType"); },error:function(data){
selectNode.empty();//每次需要将上一次的数据进行清空 alert("系统错误");
selectNode.append("<option value=''>请选择</option>");*/ }
});
}else{
/*top.$.jBox.tip('请选择被举报集团', 'warning');*/
}
}
/*跟据 集团区域 查询类型*/
function getType(){
var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
var ts_describe1= $("#supplementGroup").val();
var ts_describe2= $("#supplementArea").val();
if(ts_describe1 != null && ts_describe1 != '' && ts_describe2 != null && ts_describe2 != '' ){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcBusType/getTypeList?groupId="+ts_describe1+"&area="+ts_describe2,
dataType: "json",
success: function(returnedData) {
var data2 = returnedData.ctBbtcTypeList;
if (data2 != '') { if (data2 != '') {
console.log(data2[0].name);
var slsb=document.getElementById("supplementType"); var slsb=document.getElementById("supplementType");
for (var i = 0;i < data2.length;i++){ for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].name,data2[i].id)); slsb.append(new Option(data2[i].typeName,data2[i].parentId));
} }
} }
},error:function(data){ },error:function(data){
...@@ -219,10 +230,12 @@ ...@@ -219,10 +230,12 @@
} }
}); });
}else{ }else{
/*top.$.jBox.tip('请选择被举报集团', 'warning');*/ /*top.$.jBox.tip('请选择所属集团', 'warning');*/
} }
} }
/* /*
*联动查询类型下的类别 *联动查询类型下的类别
*/ */
...@@ -260,28 +273,26 @@ ...@@ -260,28 +273,26 @@
} }
function getTransferDepartment(){ /*移交部门*/
function getDepartment(){
var selectNode = $("#transferDepartment"); var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空 selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>"); selectNode.append("<option value=''>请选择</option>");
var ts_describe= $("#transferGroup").val();
if(ts_describe != null && ts_describe != ''){ var ts_describe1= $("#transferGroup").val();
var ts_describe2= $("#transferArea").val();
if(ts_describe1 != null && ts_describe1 != '' && ts_describe2 != null && ts_describe2 != '' ){
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "${ctx}/report/ctBbtcRegion/getRegionList?groupId="+ts_describe, url: "${ctx}/report/ctBbtcBusType/getTypeList?groupId="+ts_describe1+"&area="+ts_describe2,
dataType: "json", dataType: "json",
success: function(returnedData) { success: function(returnedData) {
var data2 = returnedData.ctBbtcBusTypeList; var data2 = returnedData.ctBbtcTypeList;
//移交部门赋值
/* var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");*/
if (data2 != '') { if (data2 != '') {
console.log(data2[0].name);
var slsb=document.getElementById("transferDepartment"); var slsb=document.getElementById("transferDepartment");
for (var i = 0;i < data2.length;i++){ for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].name,data2[i].id)); slsb.append(new Option(data2[i].typeName,data2[i].parentId));
} }
} }
},error:function(data){ },error:function(data){
...@@ -289,11 +300,42 @@ ...@@ -289,11 +300,42 @@
} }
}); });
}else{ }else{
/* top.$.jBox.tip('请选择业务类型', 'warning');*/ /*top.$.jBox.tip('请选择所属集团', 'warning');*/
} }
} }
/*获取移交区域*/
function getTranArea(){
var selectNode = $("#transferArea");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
var ts_describe= $("#transferGroup").val();
if(ts_describe != null && ts_describe != ''){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcRegion/getRegionList?groupId="+ts_describe,
dataType: "json",
success: function(returnedData) {
console.log(returnedData);
var data1 = returnedData.ctBbtcRegionList;
if (data1 != '') {
var slsb=document.getElementById("transferArea");
for (var i = 0;i < data1.length;i++){
slsb.append(new Option(data1[i].name,data1[i].id));
}
}
},error:function(data){
alert("系统错误");
}
});
}else{
/*top.$.jBox.tip('请选择移交集团', 'warning');*/
}
}
function resetPageNo() { function resetPageNo() {
$("#pageNo").val(0); $("#pageNo").val(0);
...@@ -448,7 +490,7 @@ ...@@ -448,7 +490,7 @@
</li> </li>
<li><label>所属区域：</label> <li><label>所属区域：</label>
<form:select id="supplementArea" onchange="resetPageNo();" path="supplementArea" class="input-small"> <form:select id="supplementArea" onchange="getType();" path="supplementArea" class="input-small">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
</form:select> </form:select>
</li> </li>
...@@ -467,12 +509,20 @@ ...@@ -467,12 +509,20 @@
<%-- <form:select onchange="resetPageNo();" path="transferGroup" class="input-small" id="transferGroup" value="${report.transferGroup}"> <%-- <form:select onchange="resetPageNo();" path="transferGroup" class="input-small" id="transferGroup" value="${report.transferGroup}">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
</form:select>--%> </form:select>--%>
<form:select id="transferGroup" path="transferGroup" class="input-small required" onchange="getTransferDepartment()"> <form:select id="transferGroup" path="transferGroup" class="input-small required" onchange="getTranArea()">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id" <form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id"
htmlEscape="false"/> htmlEscape="false"/>
</form:select> </form:select>
</li> </li>
<li><label>移交区域：</label>
<form:select id="transferArea" path="transferArea" onchange="getDepartment()" class="input-small required" >
<form:option value="">请选择</form:option>
<%-- <form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"
htmlEscape="false"/>--%>
</form:select>
</li>
<li><label>移交部门：</label> <li><label>移交部门：</label>
<%-- <form:select onchange="resetPageNo();" path="transferDepartment" class="input-small" id="transferDepartment" value="${report.transferDepartment}"> <%-- <form:select onchange="resetPageNo();" path="transferDepartment" class="input-small" id="transferDepartment" value="${report.transferDepartment}">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
...@@ -628,13 +678,13 @@ ...@@ -628,13 +678,13 @@
<c:if test="${report.dealResult eq '7'}">转为线索</c:if> <c:if test="${report.dealResult eq '7'}">转为线索</c:if>
</td> </td>
<td align="center"> <td align="center">
${report.transferGroup}--${report.transferDepartment} ${report.transferGroup}-- ${report.transferArea}--${report.transferDepartment}
<%-- <c:if test="${report.transferGroup eq '30590306011301372591'}">集团本部--${report.transferDepartment}</c:if> <%-- <c:if test="${report.transferGroup eq '30590306011301372591'}">集团本部--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30676650749523023279'}">地产集团--${report.transferDepartment}</c:if> <c:if test="${report.transferGroup eq '30676650749523023279'}">地产集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30721878435509835919'}">服务集团--${report.transferDepartment}</c:if> <c:if test="${report.transferGroup eq '30721878435509835919'}">服务集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30795782242187242020'}">文化集团--${report.transferDepartment}</c:if> <c:if test="${report.transferGroup eq '30795782242187242020'}">文化集团--${report.transferDepartment}</c:if>
<c:if test="${report.transferGroup eq '30770202834994792595'}">文旅集团--${report.transferDepartment}</c:if>--%> <c:if test="${report.transferGroup eq '30770202834994792595'}">文旅集团--${report.transferDepartment}</c:if>--%>
<c:if test="${report.transferGroup eq null and report.transferDepartment eq null}">--</c:if> <c:if test="${report.transferGroup eq null and report.transferDepartment eq null and report.transferArea eq null}">--</c:if>
<%-- <c:if test="${report.transferDepartment eq null}">--</c:if> <%-- <c:if test="${report.transferDepartment eq null}">--</c:if>
<c:if test="${report.transferDepartment eq '1'}">营销</c:if> <c:if test="${report.transferDepartment eq '1'}">营销</c:if>
<c:if test="${report.transferDepartment eq '2'}">工程</c:if> <c:if test="${report.transferDepartment eq '2'}">工程</c:if>
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
...@@ -22,9 +22,11 @@ ...@@ -22,9 +22,11 @@
if (dealResult == "6") { if (dealResult == "6") {
$("#selectType").show(); $("#selectType").show();
$("#transferGroup").show(); $("#transferGroup").show();
$("#selectArea").show();
} else { } else {
$("#selectType").hide(); $("#selectType").hide();
$("#transferGroup").hide(); $("#transferGroup").hide();
$("#selectArea").hide();
} }
$("#selectDone").show(); $("#selectDone").show();
} else { } else {
...@@ -459,9 +461,11 @@ ...@@ -459,9 +461,11 @@
if (dealResult == "6") { if (dealResult == "6") {
$("#selectType").show(); $("#selectType").show();
$("#transferGroup").show(); $("#transferGroup").show();
$("#selectArea").show();
} else { } else {
$("#selectType").hide(); $("#selectType").hide();
$("#transferGroup").hide(); $("#transferGroup").hide();
$("#selectArea").hide();
} }
$("#selectDone").show(); $("#selectDone").show();
} else { } else {
...@@ -481,9 +485,6 @@ ...@@ -481,9 +485,6 @@
selectNode.empty();//每次需要将上一次的数据进行清空 selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>"); selectNode.append("<option value=''>请选择</option>");
var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
var ts_describe= $("#supplementGroup").val(); var ts_describe= $("#supplementGroup").val();
if(ts_describe != null && ts_describe != ''){ if(ts_describe != null && ts_describe != ''){
$.ajax({ $.ajax({
...@@ -493,12 +494,6 @@ ...@@ -493,12 +494,6 @@
success: function(returnedData) { success: function(returnedData) {
console.log(returnedData); console.log(returnedData);
var data1 = returnedData.ctBbtcRegionList; var data1 = returnedData.ctBbtcRegionList;
var data2 = returnedData.ctBbtcBusTypeList;
// console.log(data1[0].name);
// console.log(data2[0].name);
/* var selectNode = $("#supplementArea");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");*/
if (data1 != '') { if (data1 != '') {
var slsb=document.getElementById("supplementArea"); var slsb=document.getElementById("supplementArea");
...@@ -510,38 +505,6 @@ ...@@ -510,38 +505,6 @@
} }
} }
/*重置选中项==================================================*/
/*$("#supplementArea").val("");*/
/* $('#supplementArea').find("option").attr("selected", false);*/
/* $("#supplementArea option[text='请选择']").attr("selected", true);*/
/* $("#supplementArea option:first").prop("selected", 'selected');*/
/* $("#supplementArea").find("option").first().attr("selected", true);*/
/* $("#supplementArea").val("").trigger('chosen:updated');*/
/* $("#supplementArea").val('').trigger('liszt:updated');*/
/* $('#supplementArea')
.find('option:first-child').prop('selected', true)
.end().trigger('chosen:updated');*/
/* $('#supplementArea').options[0].selected = true;*/
/* $("#supplementArea").find("option:selected").text("请选择");*/
/* $("#supplementArea option[text='请选择']").attr("selected", true);*/
/* $('#supplementArea option:first').prop("selected","selected");*/
/*每次选中新的菜单 需要清除上一次的菜单栏*/
/* var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");*/
if (data2 != '') {
console.log(data2[0].name);
var slsb=document.getElementById("supplementType");
for (var i = 0;i < data2.length;i++){
/* if(i==0){
slsb.options[i] = new Option("请选择","");
}*/
slsb.append(new Option(data2[i].name,data2[i].id));
}
}
},error:function(data){ },error:function(data){
alert("系统错误"); alert("系统错误");
} }
...@@ -551,12 +514,77 @@ ...@@ -551,12 +514,77 @@
} }
} }
/*跟据集团 获取对应的业务类型 和业务类别 */
/*跟据 集团区域 查询类型*/
function getType(){
var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
var ts_describe1= $("#supplementGroup").val();
var ts_describe2= $("#supplementArea").val();
if(ts_describe1 != null && ts_describe1 != '' && ts_describe2 != null && ts_describe2 != '' ){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcBusType/getTypeList?groupId="+ts_describe1+"&area="+ts_describe2,
dataType: "json",
success: function(returnedData) {
var data2 = returnedData.ctBbtcTypeList;
if (data2 != '') {
var slsb=document.getElementById("supplementType");
for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].typeName,data2[i].parentId));
}
}
},error:function(data){
alert("系统错误");
}
});
}else{
/*top.$.jBox.tip('请选择所属集团', 'warning');*/
}
}
/*移交部门*/
function getDepartment(){ function getDepartment(){
var selectNode = $("#transferDepartment"); var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空 selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>"); selectNode.append("<option value=''>请选择</option>");
var ts_describe1= $("#transferGroupSelect").val();
var ts_describe2= $("#transferArea").val();
if(ts_describe1 != null && ts_describe1 != '' && ts_describe2 != null && ts_describe2 != '' ){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcBusType/getTypeList?groupId="+ts_describe1+"&area="+ts_describe2,
dataType: "json",
success: function(returnedData) {
var data2 = returnedData.ctBbtcTypeList;
if (data2 != '') {
var slsb=document.getElementById("transferDepartment");
for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].typeName,data2[i].parentId));
}
}
},error:function(data){
alert("系统错误");
}
});
}else{
/*top.$.jBox.tip('请选择所属集团', 'warning');*/
}
}
/*获取移交区域*/
function getTranArea(){
var selectNode = $("#transferArea");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
var ts_describe= $("#transferGroupSelect").val(); var ts_describe= $("#transferGroupSelect").val();
if(ts_describe != null && ts_describe != ''){ if(ts_describe != null && ts_describe != ''){
$.ajax({ $.ajax({
...@@ -565,15 +593,10 @@ ...@@ -565,15 +593,10 @@
dataType: "json", dataType: "json",
success: function(returnedData) { success: function(returnedData) {
console.log(returnedData); console.log(returnedData);
var data1 = returnedData.ctBbtcBusTypeList; var data1 = returnedData.ctBbtcRegionList;
// console.log(data1[0].name);
// console.log(data2[0].name);
/* var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");*/
if (data1 != '') { if (data1 != '') {
var slsb=document.getElementById("transferDepartment"); var slsb=document.getElementById("transferArea");
for (var i = 0;i < data1.length;i++){ for (var i = 0;i < data1.length;i++){
slsb.append(new Option(data1[i].name,data1[i].id)); slsb.append(new Option(data1[i].name,data1[i].id));
} }
...@@ -856,7 +879,7 @@ ...@@ -856,7 +879,7 @@
&lt;%&ndash;<options items="${ctBbtcRegionList}" itemLabel="name" itemValue="id"&ndash;%&gt; &lt;%&ndash;<options items="${ctBbtcRegionList}" itemLabel="name" itemValue="id"&ndash;%&gt;
&lt;%&ndash;htmlEscape="false"/></select>&ndash;%&gt; &lt;%&ndash;htmlEscape="false"/></select>&ndash;%&gt;
</select>--%> </select>--%>
<form:select id="supplementArea" path="supplementArea" class="input-small required" onchange="resetPageNo();" cssStyle="width: 280px"> <form:select id="supplementArea" path="supplementArea" class="input-small required" onchange="getType();" cssStyle="width: 280px">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
</form:select> </form:select>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
...@@ -949,7 +972,7 @@ ...@@ -949,7 +972,7 @@
<div id="transferGroup" class="control-group" style="display:none"> <div id="transferGroup" class="control-group" style="display:none">
<label class="control-label">移交集团:</label> <label class="control-label">移交集团:</label>
<div class="controls"> <div class="controls">
<form:select id="transferGroupSelect" path="transferGroup" class="input-small required" onchange="getDepartment()" cssStyle="width: 280px"> <form:select id="transferGroupSelect" path="transferGroup" class="input-small required" onchange="getTranArea()" cssStyle="width: 280px">
<form:option value="">请选择</form:option> <form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id" <form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id"
htmlEscape="false"/></form:select> htmlEscape="false"/></form:select>
...@@ -957,6 +980,19 @@ ...@@ -957,6 +980,19 @@
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>
<div id="selectArea" class="control-group" style="display:none">
<label class="control-label">移交区域:</label>
<div class="controls">
<form:select id="transferArea" path="transferArea" onchange="getDepartment()" class="input-small required" cssStyle="width: 280px">
<form:option value="">请选择</form:option>
<%-- <form:options items="${fns:getDictList('supplement_type')}" itemLabel="label" itemValue="value"
htmlEscape="false"/>--%>
</form:select>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div id="selectType" class="control-group" style="display:none"> <div id="selectType" class="control-group" style="display:none">
<label class="control-label">移交部门:</label> <label class="control-label">移交部门:</label>
<div class="controls"> <div class="controls">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment