From d9d78499cf3aaa6165bb1bc9fe3d8a9537e4d26a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 30 十月 2025 17:03:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/设备档案/Gy_EquipFileMainList.html | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
index 6ca8b63..c614e1a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
@@ -642,7 +642,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板鍣ㄥ叿妗ｆ鍒楄〃',
+ title: '鏂板璁惧妗ｆ鍒楄〃',
closeBtn: false,
shift: 2,
area: ['100%', '100%'],
@@ -667,7 +667,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫鍣ㄥ叿妗ｆ鍒楄〃'
+ , title: '缂栬緫璁惧妗ｆ鍒楄〃'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
@@ -694,7 +694,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫鍣ㄥ叿妗ｆ鍒楄〃'
+ , title: '缂栬緫璁惧妗ｆ鍒楄〃'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
@@ -916,7 +916,12 @@
function get_PrintReport() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length >= 1) {
+ var rows = [];
+ for (var i = 0; i < data.length; i++) {
+ rows.push(data[i].hmainid.toString());
+ }
+
layer.open({
type: 2
, area: ['50%', '50%']
@@ -924,12 +929,12 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HEquipFileMainBill', 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HEquipFileMainBill', 'yes']
, resize: false
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
}
}
@@ -1031,6 +1036,7 @@
$("#ColName1").val("0");
$("#Comparator1").val("0");
$("#HUSEORGID").val(sessionStorage["Organization"]);
+ form.render('select');
$("#btnSearch").click();
}
@@ -1054,7 +1060,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var addSWhere = "";
if (typeof (openType) != "undefined") {
- addSWhere = " and 鍏抽棴浜� = '' and 瀹℃牳浜� != ''";
+ addSWhere = " and isnull(鍏抽棴浜�,'') = '' and isnull(瀹℃牳浜�,'') != ''";
}
return addSWhere;
}
--
Gitblit v1.9.1