diff --git a/api/init.json b/api/init.json
index 78a032f..33f2cd0 100644
--- a/api/init.json
+++ b/api/init.json
@@ -21,12 +21,6 @@
"icon": "fa fa-cog",
"target": "_self",
"child": [
- {
- "title": "标段工程",
- "href": "page/system/bid_pro_list.html",
- "icon": "fa fa-list-ul",
- "target": "_self"
- },
{
"title": "安全用品物资类型",
"href": "page/aq_basic/type_list.html",
diff --git a/js/aq_demand_plan/apply_plan_list.js b/js/aq_demand_plan/apply_plan_list.js
index d4d9763..705b64d 100644
--- a/js/aq_demand_plan/apply_plan_list.js
+++ b/js/aq_demand_plan/apply_plan_list.js
@@ -207,7 +207,7 @@ function getCheckStatus(statusType, status) {
if(statusType === '0' && status === '0'){
return "●已撤回";
}
- if (statusType === '1') {
+ if (statusType === '1' && status != '3') {
return "●审核通过";
} else if (statusType === '2') {
company = "分公司";
@@ -247,4 +247,4 @@ function applyPlanDetail(obj) {
function showHelp(type){
openIframeByParamObj("show_help", "功能说明", "../show_help.html", "50%", "75%", type);
-}
\ No newline at end of file
+}
diff --git a/js/aq_demand_plan/child/audit_form.js b/js/aq_demand_plan/child/audit_form.js
index d464adf..d0f912b 100644
--- a/js/aq_demand_plan/child/audit_form.js
+++ b/js/aq_demand_plan/child/audit_form.js
@@ -14,9 +14,11 @@ function setParams(params) {
if (data.value === '2') { // 通过
$('#auditRemark').removeAttr('lay-verify');
$('#auditRemarksLabel').removeClass('required');
+ $('#auditRemark').val('审核通过'); // 自动填充审核通过意见
} else if (data.value === '3') { // 不通过
$('#auditRemark').attr('lay-verify', 'required');
$('#auditRemarksLabel').addClass('required');
+ $('#auditRemark').val('审核不通过'); // 自动填充审核不通过意见
}
});
form.render();
@@ -78,4 +80,4 @@ function closePage(type) {
window.parent.closePage();
}
parent.layer.close(index); // 再执行关闭
-}
\ No newline at end of file
+}
diff --git a/js/aq_inventory/project_material_statistics.js b/js/aq_inventory/project_material_statistics.js
index 8d6db01..8bc5876 100644
--- a/js/aq_inventory/project_material_statistics.js
+++ b/js/aq_inventory/project_material_statistics.js
@@ -106,7 +106,7 @@ function initTable() {
if (a.proName > b.proName) return 1;
return 0;
});
-
+
return {
"code": 0, // 解析接口状态
"msg": '获取成功', // 解析提示文本
@@ -126,7 +126,7 @@ function initTable() {
},
{
field: "proName",
- width: '9%',
+ width: '8%',
title: "工程名称",
unresize: true,
align: "center",
@@ -166,7 +166,7 @@ function initTable() {
},
{
field: "needNum",
- width: '6%',
+ width: '7%',
title: "需用量",
unresize: true,
align: "center",
@@ -177,7 +177,7 @@ function initTable() {
},
{
field: "totalCg",
- width: '6%',
+ width: '7%',
title: "采购量",
unresize: true,
align: "center",
@@ -189,7 +189,7 @@ function initTable() {
{
field: "totalLk",
title: "利库量",
- width: '6%',
+ width: '7%',
unresize: true,
align: "center",
sort: true,
@@ -203,7 +203,7 @@ function initTable() {
},
{
field: "price",
- width: '6%',
+ width: '5%',
title: "单价",
unresize: true,
align: "center",
@@ -229,7 +229,7 @@ function initTable() {
},
{
field: "totalPrice",
- width: '6%',
+ width: '5%',
title: "总价",
unresize: true,
align: "center",
@@ -291,7 +291,7 @@ function initTable() {
done: function (res, curr, count) {
pageNum = tableIns.config.page.curr;
table.resize("currentTableId");
-
+
// 延迟执行合并操作，确保表格完全渲染
setTimeout(function() {
mergeProNameCells();
@@ -308,29 +308,29 @@ function mergeProNameCells() {
console.error('找不到表格元素');
return;
}
-
+
// 获取表格的tbody
let tbody = tableElem.nextElementSibling.querySelector('.layui-table-body tbody');
if (!tbody) {
console.error('找不到表格tbody元素');
return;
}
-
+
// 获取所有行
let rows = tbody.querySelectorAll('tr');
if (rows.length <= 1) return;
-
+
console.log('开始合并工程名称相同的单元格，共' + rows.length + '行');
-
+
let startRow = 0;
let mergeCount = 1;
let currentProName = getProNameFromRow(rows[0]);
-
+
for (let i = 1; i < rows.length; i++) {
let nextProName = getProNameFromRow(rows[i]);
-
+
console.log('比较行 ' + i + '：当前=' + currentProName + '，下一个=' + nextProName);
-
+
if (currentProName === nextProName) {
mergeCount++;
console.log('行 ' + i + ' 与前一行工程名称相同，合并计数：' + mergeCount);
@@ -340,20 +340,20 @@ function mergeProNameCells() {
console.log('合并行 ' + startRow + ' 到 ' + (i - 1) + '，共 ' + mergeCount + ' 行');
mergeCells(rows, startRow, 1, mergeCount); // 工程名称在第2列（索引1）
}
-
+
// 重置计数
startRow = i;
mergeCount = 1;
currentProName = nextProName;
}
}
-
+
// 合并最后一组
if (mergeCount > 1) {
console.log('合并最后一组：行 ' + startRow + ' 到 ' + (rows.length - 1) + '，共 ' + mergeCount + ' 行');
mergeCells(rows, startRow, 1, mergeCount); // 工程名称在第2列（索引1）
}
-
+
console.log('单元格合并完成');
}
@@ -370,14 +370,14 @@ function getProNameFromRow(row) {
// 合并单元格
function mergeCells(rows, startRow, colIndex, rowspan) {
if (startRow < 0 || startRow >= rows.length) return;
-
+
// 获取起始行的单元格
let startCell = rows[startRow].querySelectorAll('td')[colIndex];
if (!startCell) return;
-
+
// 设置rowspan
startCell.rowSpan = rowspan;
-
+
// 隐藏被合并的单元格
for (let i = 1; i < rowspan; i++) {
let cell = rows[startRow + i].querySelectorAll('td')[colIndex];
diff --git a/page/aq_inventory/project_material_statistics.html b/page/aq_inventory/project_material_statistics.html
index 68ce11e..314914e 100644
--- a/page/aq_inventory/project_material_statistics.html
+++ b/page/aq_inventory/project_material_statistics.html
@@ -125,7 +125,6 @@
-
@@ -141,4 +140,4 @@
-