diff --git a/hxy-web/html/dataStatistics/header.html b/hxy-web/html/dataStatistics/header.html
index 8617e39..65c2aa5 100644
--- a/hxy-web/html/dataStatistics/header.html
+++ b/hxy-web/html/dataStatistics/header.html
@@ -101,7 +101,7 @@
-
+
diff --git a/hxy-web/html/wireManager/header.html b/hxy-web/html/wireManager/header.html
index 47eb8e3..a732349 100644
--- a/hxy-web/html/wireManager/header.html
+++ b/hxy-web/html/wireManager/header.html
@@ -68,17 +68,17 @@
-
-
-
diff --git a/hxy-web/js/wireManager/attendance/attendance.js b/hxy-web/js/wireManager/attendance/attendance.js
index 0dd6084..a99ba80 100644
--- a/hxy-web/js/wireManager/attendance/attendance.js
+++ b/hxy-web/js/wireManager/attendance/attendance.js
@@ -305,7 +305,6 @@ function initTable3(userName,proName,yjName,makeMonth){
* 详情
* */
function checkView(obj) {
- debugger
let height = '98%';
let width = '95%';
$.ajax({
diff --git a/hxy-web/js/wireManager/header.js b/hxy-web/js/wireManager/header.js
index 380d078..bba7adb 100644
--- a/hxy-web/js/wireManager/header.js
+++ b/hxy-web/js/wireManager/header.js
@@ -45,6 +45,20 @@ function init(){
iframeWindow.setData();
+ var viewResultFrame = $("#viewResultFrame")[0];
+ var viewResultWindow = viewResultFrame.contentWindow;
+ viewResultWindow.init();
+
+ var viewPlanFrame = $("#viewPlanFrame")[0];
+ var viewPlanWindow = viewPlanFrame.contentWindow;
+ viewPlanWindow.init();
+
+
+ var staffFrame = $("#staffFrame")[0];
+ var staffWindow = staffFrame.contentWindow;
+ staffWindow.init();
+
+
var projectFrame = $("#projectFrame")[0];
var projectWindow = projectFrame.contentWindow;
projectWindow.init();
diff --git a/hxy-web/js/wireManager/project/projectDetail.js b/hxy-web/js/wireManager/project/projectDetail.js
index 590c135..c2f5529 100644
--- a/hxy-web/js/wireManager/project/projectDetail.js
+++ b/hxy-web/js/wireManager/project/projectDetail.js
@@ -286,7 +286,11 @@ function initGmTableOne(){
skin: 'line', // 表格样式
cols: [[
{
- type: 'checkbox'
+ type: 'checkbox',
+ templet: function(d){
+ // 根据条件决定是否渲染多选框
+ return '
';
+ }
},
{
title: '序号',
@@ -298,7 +302,16 @@ function initGmTableOne(){
{field:'gtUserName', title: '护线员 (来源:人员合同)',align: 'center',},
]],
done: function(res,curr,count){
- //checkPermission();
+ //我这里是封装过talbe所以是res.rows,需要打印出自己的res是什么
+ for (var i in res.data) {
+ let item = res.data[i];
+ if(item.isTower == '1'){
+ // checkbox 根据条件设置不可选中
+ $('tr[data-index=' + i + '] input[type="checkbox"]').prop('disabled', true);
+ //重新渲染
+ form.render();
+ }
+ }
}
});
}
@@ -350,7 +363,16 @@ function initGmTableTwo(){
}
]],
done: function(res,curr,count){
- //checkPermission();
+ //我这里是封装过talbe所以是res.rows,需要打印出自己的res是什么
+ for (var i in res.data) {
+ let item = res.data[i];
+ if(item.isTower == '1'){
+ // checkbox 根据条件设置不可选中
+ $('tr[data-index=' + i + '] input[type="checkbox"]').prop('disabled', true);
+ //重新渲染
+ form.render();
+ }
+ }
}
});
}
diff --git a/hxy-web/js/wireManager/viewPlan/viewPlanList.js b/hxy-web/js/wireManager/viewPlan/viewPlanList.js
index 8a754cb..1a76433 100644
--- a/hxy-web/js/wireManager/viewPlan/viewPlanList.js
+++ b/hxy-web/js/wireManager/viewPlan/viewPlanList.js
@@ -52,6 +52,7 @@ function resetClick(){
* 初始化数据
*/
function init(){
+ var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
// 渲染表格
table.render({
id: 'layui_table',
@@ -59,7 +60,7 @@ function init(){
url: PATH_URL + '/inspectionPlan/getLineProjectListPage',
where: {
insMonth:$('#insMonth').val(),
- yjId:$(window.parent.document).find("input[id='taskSourceId']").attr("stationId")
+ yjId:yjId
},
page: true,
method:'post',