diff --git a/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html b/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html
index c7bc0d2..1c72e05 100644
--- a/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html
+++ b/hxy-web/html/wireManager/viewPlan/monthPlanDetails.html
@@ -213,6 +213,7 @@
+
总公司审核
@@ -224,6 +225,7 @@
+
diff --git a/hxy-web/html/wireManager/viewPlan/updateMonthPlan.html b/hxy-web/html/wireManager/viewPlan/updateMonthPlan.html
index bebdbb8..2a29b98 100644
--- a/hxy-web/html/wireManager/viewPlan/updateMonthPlan.html
+++ b/hxy-web/html/wireManager/viewPlan/updateMonthPlan.html
@@ -237,6 +237,7 @@
+
总公司审核
@@ -248,6 +249,7 @@
+
diff --git a/hxy-web/js/dataStatistics/viewPlan/monthPlanAudit.js b/hxy-web/js/dataStatistics/viewPlan/monthPlanAudit.js
index e97d0af..cc0ff18 100644
--- a/hxy-web/js/dataStatistics/viewPlan/monthPlanAudit.js
+++ b/hxy-web/js/dataStatistics/viewPlan/monthPlanAudit.js
@@ -102,7 +102,7 @@ function setAiDitStatus(status) {
text = '已通过';
color = '#19BE6B';
}
- if (status == '0') {
+ if (status == '0'|| status == '4') {
text = '待审核';
color = '#FF9900';
}
@@ -222,7 +222,6 @@ function pass() {
});
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
- reloading();
} else {
layer.alert(data.msg);
}
diff --git a/hxy-web/js/dataStatistics/viewPlan/monthPlanAuditTotal.js b/hxy-web/js/dataStatistics/viewPlan/monthPlanAuditTotal.js
index 0345168..e045a68 100644
--- a/hxy-web/js/dataStatistics/viewPlan/monthPlanAuditTotal.js
+++ b/hxy-web/js/dataStatistics/viewPlan/monthPlanAuditTotal.js
@@ -29,7 +29,7 @@ function setData(data, yjId, insMonth, id) {
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) {
@@ -102,7 +102,7 @@ function setAiDitStatus(status) {
text = '已通过';
color = '#19BE6B';
}
- if (status == '0') {
+ if (status == '0'|| status == '4') {
text = '待审核';
color = '#FF9900';
}
@@ -222,7 +222,6 @@ function pass() {
});
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
- reloading();
} else {
layer.alert(data.msg);
}
diff --git a/hxy-web/js/dataStatistics/viewPlan/monthPlanDetails.js b/hxy-web/js/dataStatistics/viewPlan/monthPlanDetails.js
index 0dfcc80..e510b2d 100644
--- a/hxy-web/js/dataStatistics/viewPlan/monthPlanDetails.js
+++ b/hxy-web/js/dataStatistics/viewPlan/monthPlanDetails.js
@@ -99,7 +99,12 @@ function setData(data, yjId, insMonth) {
element.classList.add('planAuditStatus4');
$('#aiDitStatuses').html("审核不通过");
- $('#noPassReason').html(data[0].auditReason);
+ var auditReason = data[0].auditReason;
+ if(auditReason.length > 13){
+ auditReason = auditReason.substring(0, 13) + '......'
+ }
+ $("#noPassReason").text(auditReason);
+ $("#noPassReason").attr('title', auditReason);
}
$('#auditUserName').html(data[0].auditUserName);
@@ -124,7 +129,14 @@ function setData(data, yjId, insMonth) {
element.classList.add('planAuditStatus4');
$('#aiDitStatusTotal').html("审核不通过");
- $('#noPassReasonTotal').html(data[0].auditReason);
+ var auditReason = data[0].auditReason;
+ if(auditReason.length > 13){
+ auditReason = auditReason.substring(0, 13) + '......'
+ }
+ $("#noPassReasonTotal").text(auditReason);
+ $("#noPassReasonTotal").attr('title', auditReason);
+
+
}
$('#auditUserNameTotal').html(data[0].auditUserNameTotal);
$('#auditTimeTotal').html(data[0].auditTimeTotal);
@@ -171,7 +183,7 @@ function setAiDitStatus(status) {
text = '已通过';
color = '#19BE6B';
}
- if (status == '0') {
+ if (status == '0' || status == '4') {
text = '待审核';
color = '#FF9900';
}
diff --git a/hxy-web/js/dataStatistics/viewPlan/noPassReason.js b/hxy-web/js/dataStatistics/viewPlan/noPassReason.js
index 34388fa..d24402b 100644
--- a/hxy-web/js/dataStatistics/viewPlan/noPassReason.js
+++ b/hxy-web/js/dataStatistics/viewPlan/noPassReason.js
@@ -79,4 +79,10 @@ function reloading() {
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
window.parent.location.reload();
+}
+
+//字数检测
+function wordCount(event){
+ var count = $("#revokeReason").val().length;
+ $("#wordCount").text(count);
}
\ No newline at end of file
diff --git a/hxy-web/js/dataStatistics/viewPlan/noPassReasonTotal.js b/hxy-web/js/dataStatistics/viewPlan/noPassReasonTotal.js
index 0d10bcf..46d0e8d 100644
--- a/hxy-web/js/dataStatistics/viewPlan/noPassReasonTotal.js
+++ b/hxy-web/js/dataStatistics/viewPlan/noPassReasonTotal.js
@@ -76,4 +76,10 @@ function reloading() {
var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
parent.layer.close(index); //再执行关闭
window.parent.location.reload();
+}
+
+//字数检测
+function wordCount(event){
+ var count = $("#revokeReason").val().length;
+ $("#wordCount").text(count);
}
\ No newline at end of file
diff --git a/hxy-web/js/dataStatistics/viewPlan/viewPlanList.js b/hxy-web/js/dataStatistics/viewPlan/viewPlanList.js
index 44ea1e4..e08a517 100644
--- a/hxy-web/js/dataStatistics/viewPlan/viewPlanList.js
+++ b/hxy-web/js/dataStatistics/viewPlan/viewPlanList.js
@@ -46,7 +46,7 @@ function resetClick() {
fgsName: "",
yjName: "",
insMonth: "",
- aiDitStatus: "",
+ aiDitStatus: "0",
}
})
}
@@ -183,7 +183,7 @@ function init() {
html +=
``
html +=
- ``
+ ``
html +=
``
}
@@ -263,8 +263,27 @@ function auditView(yjId, insMonth,id) {
var fnc = myIframe.setData(data.data, yjId, insMonth,id); //aaa()为子页面的方法
},
+ end:function(){
+ debugger;
+ $('#fgsName').val('');
+ $('#yjName').val('');
+ $('#insMonth').val('');
+ $('#aiDitStatus').val('0');
+ var subComId = $(window.parent.document).find("select[id='subComId']").val();
+ form.render();
+ table.reload('layui_table', {
+ where: {
+ fgsId: subComId,
+ fgsName: "",
+ yjName: "",
+ insMonth: "",
+ aiDitStatus: "0",
+ }
+ })
+ }
});
- }
+ },
+
})
}
@@ -294,8 +313,26 @@ function auditTotalView(yjId, insMonth,id) {
var fnc = myIframe.setData(data.data, yjId, insMonth,id); //aaa()为子页面的方法
},
+ end:function(){
+ $('#fgsName').val('');
+ $('#yjName').val('');
+ $('#insMonth').val('');
+ $('#aiDitStatus').val('0');
+ var subComId = $(window.parent.document).find("select[id='subComId']").val();
+ form.render();
+ table.reload('layui_table', {
+ where: {
+ fgsId: subComId,
+ fgsName: "",
+ yjName: "",
+ insMonth: "",
+ aiDitStatus: "0",
+ }
+ })
+ }
});
- }
+ },
+
})
}
diff --git a/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js b/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js
index 5f84638..6013b1b 100644
--- a/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js
+++ b/hxy-web/js/wireManager/viewPlan/monthPlanDetails.js
@@ -107,7 +107,14 @@ function setData(data, yjId, insMonth) {
element.classList.add('planAuditStatus4');
$('#aiDitStatuses').html("审核不通过");
- $('#noPassReason').html(data[0].auditReason);
+ // $('#noPassReason').html(data[0].auditReason);
+
+ var auditReason = data[0].auditReason;
+ if(auditReason.length > 13){
+ auditReason = auditReason.substring(0, 13) + '......'
+ }
+ $("#noPassReason").text(auditReason);
+ $("#noPassReason").attr('title', auditReason);
}
$('#auditUserName').html(data[0].auditUserName);
@@ -135,7 +142,14 @@ function setData(data, yjId, insMonth) {
element.classList.add('planAuditStatus4');
$('#aiDitStatusTotal').html("审核不通过");
- $('#noPassReasonTotal').html(data[0].auditReason);
+ var auditReason = data[0].auditReason;
+ if(auditReason.length > 13){
+ auditReason = auditReason.substring(0, 13) + '......'
+ }
+ $("#noPassReasonTotal").text(auditReason);
+ $("#noPassReasonTotal").attr('title', auditReason);
+
+ // $('#noPassReasonTotal').html(data[0].auditReason);
}
$('#auditUserNameTotal').html(data[0].auditUserNameTotal);
$('#auditTimeTotal').html(data[0].auditTimeTotal);
@@ -180,7 +194,7 @@ function setAiDitStatus(status) {
text = '已通过';
color = '#19BE6B';
}
- if (status == '0') {
+ if (status == '0' || status == '4') {
text = '待审核';
color = '#FF9900';
}
diff --git a/hxy-web/js/wireManager/viewPlan/updateMonthPlan.js b/hxy-web/js/wireManager/viewPlan/updateMonthPlan.js
index dd00e15..72818da 100644
--- a/hxy-web/js/wireManager/viewPlan/updateMonthPlan.js
+++ b/hxy-web/js/wireManager/viewPlan/updateMonthPlan.js
@@ -336,7 +336,29 @@ 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("审核不通过");
+
+ var auditReason = data[0].auditReason;
+ if(auditReason.length > 13){
+ auditReason = auditReason.substring(0, 13) + '......'
+ }
+ $("#noPassReason").text(auditReason);
+ $("#noPassReason").attr('title', auditReason);
+ }
+
+ $('#auditUserName').html(data[0].auditUserName);
+ $('#auditTime').html(data[0].auditTime);
+
+
$('#auditUserName').html(data[0].auditUserName);
$('#auditTime').html(data[0].auditTime);
} else {
@@ -347,7 +369,24 @@ 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("审核不通过");
+
+ var auditReason = data[0].auditReason;
+ if(auditReason.length > 13){
+ auditReason = auditReason.substring(0, 13) + '......'
+ }
+ $("#noPassReasonTotal").text(auditReason);
+ $("#noPassReasonTotal").attr('title', auditReason);
+ }
$('#auditUserNameTotal').html(data[0].auditUserNameTotal);
$('#auditTimeTotal').html(data[0].auditTimeTotal);
} else {
@@ -393,7 +432,7 @@ function setAiDitStatus(status) {
text = '已通过';
color = '#19BE6B';
}
- if (status == '0') {
+ if (status == '0' || status == '4') {
text = '待审核';
color = '#FF9900';
}
diff --git a/hxy-web/js/wireManager/viewPlan/viewPlanList.js b/hxy-web/js/wireManager/viewPlan/viewPlanList.js
index 880b21b..aeaa5de 100644
--- a/hxy-web/js/wireManager/viewPlan/viewPlanList.js
+++ b/hxy-web/js/wireManager/viewPlan/viewPlanList.js
@@ -86,6 +86,7 @@ function init(){
width: '10%',
templet: function(d){
var status = d.aiDitStatus;
+ console.log(status)
var text;
var color;
var html = "";