-
审核通过
+
diff --git a/hxy-web/js/dataStatistics/viewPlan/monthPlanAuditTotal.js b/hxy-web/js/dataStatistics/viewPlan/monthPlanAuditTotal.js
index 614de13..0345168 100644
--- a/hxy-web/js/dataStatistics/viewPlan/monthPlanAuditTotal.js
+++ b/hxy-web/js/dataStatistics/viewPlan/monthPlanAuditTotal.js
@@ -212,7 +212,7 @@ function pass() {
"insMonth": insMonths,
"yjId": yjIds,
"id": ids,
- "auditStatus": 4
+ "auditStatus": 2
}),
success: function(data) {
layer.close(loadingMsg); // 关闭提示层
@@ -245,12 +245,21 @@ function noPass() {
var index = layer.open({
title: ['审核不通过', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
type: 2,
- content: './noPassReason.html',
+ content: './noPassReasonTotal.html',
area: [width, height],
maxmin: false,
success: function(layero, index) {
var myIframe = window[layero.find('iframe')[0]['name']];
var fnc = myIframe.setData(yjIds, insMonths, ids); //aaa()为子页面的方法
},
+ end: function(){
+ var noPassTotal = localStorage.getItem("noPassTotal");
+ if(noPassTotal =="1"){
+ parent.layer.msg("添加成功", { icon: 1 });
+ var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+ parent.layer.close(index); //再执行关闭
+ window.parent.location.reload();
+ }
+ }
});
}
\ No newline at end of file
diff --git a/hxy-web/js/dataStatistics/viewPlan/monthPlanDetails.js b/hxy-web/js/dataStatistics/viewPlan/monthPlanDetails.js
index dbda604..0dfcc80 100644
--- a/hxy-web/js/dataStatistics/viewPlan/monthPlanDetails.js
+++ b/hxy-web/js/dataStatistics/viewPlan/monthPlanDetails.js
@@ -92,7 +92,7 @@ function setData(data, yjId, insMonth) {
var element = document.getElementById('aiDitStatuses');
// 移除旧的类
element.classList.remove('planAuditStatus3');
- if(data[0].aiDitStatuses == 2){
+ if(data[0].aiDitStatuses == 2 || data[0].aiDitStatuses == 4){
element.classList.add('planAuditStatus2');
$('#aiDitStatuses').html("审核通过");
}else if(data[0].aiDitStatuses == 3){
diff --git a/hxy-web/js/dataStatistics/viewPlan/noPassReason.js b/hxy-web/js/dataStatistics/viewPlan/noPassReason.js
index 80426d8..34388fa 100644
--- a/hxy-web/js/dataStatistics/viewPlan/noPassReason.js
+++ b/hxy-web/js/dataStatistics/viewPlan/noPassReason.js
@@ -48,7 +48,7 @@ function addData(){
"insMonth": insMonths,
"yjId": yjIds,
"id": ids,
- "auditStatus": 4,
+ "auditStatus": 3,
"auditReason":revokeReason
}),
success: function(data) {
diff --git a/hxy-web/js/dataStatistics/viewPlan/noPassReasonTotal.js b/hxy-web/js/dataStatistics/viewPlan/noPassReasonTotal.js
index 47b95a8..0d10bcf 100644
--- a/hxy-web/js/dataStatistics/viewPlan/noPassReasonTotal.js
+++ b/hxy-web/js/dataStatistics/viewPlan/noPassReasonTotal.js
@@ -19,57 +19,57 @@ function setData(yjId, insMonth, id) {
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
});
- $("#searchBt").click(function() {
- // 加载提示
- let loadingMsg = layer.msg('数据上传中,请稍候...', {
- icon: 16,
- scrollbar: false,
- time: 0,
- shade: [0.8, '#393D49']
- });
- // form请求地址
- let formUrl = PATH_URL + "/inspectionPlan/updateTotalExamine";
-
- let revokeReason = $("#revokeReason").val();
- $.ajax({
- type: 'POST',
- url: formUrl, // 请求地址
- contentType: "application/json; charset=utf-8",
- data: JSON.stringify({
- "insMonth": insMonths,
- "yjId": yjIds,
- "id": ids,
- "auditStatus": 2,
- "auditReason":revokeReason
- }),
- success: function(data) {
- layer.close(loadingMsg); // 关闭提示层
- if (data.code == 200) {
- parent.layer.msg("审核成功", {
- icon: 1
- });
- var index = parent.layer.getFrameIndex(window
- .name); //先得到当前 iframe层的索引
- parent.layer.close(index); //再执行关闭
- reloading();
- } else {
- layer.alert(data.msg);
- }
- },
- error: function(XMLHttpRequest, textStatus, e) {
- layer.close(loadingMsg);
- layer.msg('数据请求发生异常,请稍后重试', {
- icon: 16,
- scrollbar: false
- });
- }
- });
-
+ // 验证成功后才会执行下面的操作
+ form.on('submit(formDemo)', function (data) {
+ addData();
});
});
}
-
+function addData(){
+ // 加载提示
+ let loadingMsg = layer.msg('数据上传中,请稍候...', {
+ icon: 16,
+ scrollbar: false,
+ time: 0,
+ shade: [0.8, '#393D49']
+ });
+ // form请求地址
+ let formUrl = PATH_URL + "/inspectionPlan/updateTotalExamine";
+
+ let revokeReason = $("#revokeReason").val();
+ $.ajax({
+ type: 'POST',
+ url: formUrl, // 请求地址
+ contentType: "application/json; charset=utf-8",
+ data: JSON.stringify({
+ "insMonth": insMonths,
+ "yjId": yjIds,
+ "id": ids,
+ "auditStatus": 3,
+ "auditReason":revokeReason
+ }),
+ success: function(data) {
+ layer.close(loadingMsg); // 关闭提示层
+ if (data.code == 200) {
+ parent.layer.msg("添加成功", { icon: 1 });
+ var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+ parent.layer.close(index); //再执行关闭
+ // reloading();
+ localStorage.setItem("noPassTotal","1");
+ } else {
+ layer.alert(data.msg);
+ }
+ },
+ error: function(XMLHttpRequest, textStatus, e) {
+ layer.close(loadingMsg);
+ layer.msg('数据请求发生异常,请稍后重试', {
+ icon: 16,
+ scrollbar: false
+ });
+ }
+ });
+}
//设置弹窗关闭
function reloading() {
diff --git a/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js b/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js
index 55baafc..5f84638 100644
--- a/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js
+++ b/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js
@@ -96,7 +96,24 @@ function setData(data, yjId, insMonth) {
//分公司
if (data[0].aiDitStatuses) {
- $('#aiDitStatuses').html(data[0].aiDitStatuses);
+ // 获取元素
+ var element = document.getElementById('aiDitStatuses');
+ // 移除旧的类
+ element.classList.remove('planAuditStatus3');
+ if(data[0].aiDitStatuses == 2 || data[0].aiDitStatuses == 4){
+ element.classList.add('planAuditStatus2');
+ $('#aiDitStatuses').html("审核通过");
+ }else if(data[0].aiDitStatuses == 3){
+ element.classList.add('planAuditStatus4');
+ $('#aiDitStatuses').html("审核不通过");
+
+ $('#noPassReason').html(data[0].auditReason);
+ }
+
+ $('#auditUserName').html(data[0].auditUserName);
+ $('#auditTime').html(data[0].auditTime);
+
+
$('#auditUserName').html(data[0].auditUserName);
$('#auditTime').html(data[0].auditTime);
} else {
@@ -107,7 +124,19 @@ function setData(data, yjId, insMonth) {
//总公司
if (data[0].aiDitStatusTotal) {
- $('#aiDitStatusTotal').html(data[0].aiDitStatusTotal);
+ // 获取元素
+ var element = document.getElementById('aiDitStatusTotal');
+ // 移除旧的类
+ element.classList.remove('planAuditStatus3');
+ if(data[0].aiDitStatusTotal == 2){
+ element.classList.add('planAuditStatus2');
+ $('#aiDitStatusTotal').html("审核通过");
+ }else if(data[0].aiDitStatusTotal == 3){
+ element.classList.add('planAuditStatus4');
+ $('#aiDitStatusTotal').html("审核不通过");
+
+ $('#noPassReasonTotal').html(data[0].auditReason);
+ }
$('#auditUserNameTotal').html(data[0].auditUserNameTotal);
$('#auditTimeTotal').html(data[0].auditTimeTotal);
} else {
diff --git a/hxy-web/js/wireManager/viewPlan/viewPlanList.js b/hxy-web/js/wireManager/viewPlan/viewPlanList.js
index 04d1167..880b21b 100644
--- a/hxy-web/js/wireManager/viewPlan/viewPlanList.js
+++ b/hxy-web/js/wireManager/viewPlan/viewPlanList.js
@@ -129,7 +129,7 @@ function init(){
html += `
`
html += `
`
}
- if(status == '0'){
+ if(status == '0' ){
//待审核
html += `
`
html += `
`
@@ -149,6 +149,11 @@ function init(){
html += `
`
html += `
`
}
+ if(status == '4'){
+ //待审核
+ html += `
`
+ html += `
`
+ }
return html;
},