From 2bf4ff2ba42a6b68de0b298f9b701e6d6338dfdb Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 05 十一月 2025 16:54:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/设备报表/Sb_EquipResumeCheckQuery.html | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 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\212\245\350\241\250/Sb_EquipResumeCheckQuery.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
index 8a1d346..b699816 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
@@ -37,7 +37,7 @@
<div class="layui-col-xs2 layui-inline" style="">
<div id="TreeTable" class="demo-tree demo-tree-box" style=""></div>
</div>
- <div class="layui-col-xs3 layui-inline" style="padding-left: 10px;">
+ <div class="layui-col-xs4 layui-inline" style="padding-left: 10px;">
<div class="layui-collapse">
<div class="layui-colla-item">
<div class="layui-inline">
@@ -63,7 +63,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
- <div class="layui-col-xs7 layui-inline">
+ <div class="layui-col-xs6 layui-inline">
<table class="" id="mainTableResume" lay-filter="mainTableResume"></table>
</div>
</div>
@@ -80,6 +80,15 @@
</div>
</div>
<script>
+ //鑾峰彇鍙傛暟
+ var HEquipID = ""; //璁惧id
+ var HEquipNumber = ""; //璁惧缂栫爜
+ var HEquipName = ""; //璁惧鍚嶇О
+ var edit = function (data) {
+ HEquipID = data[0].HEquipID;
+ HEquipNumber = data[0].HEquipNumber;
+ HEquipName = data[0].HEquipName;
+ }
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -127,8 +136,8 @@
//閫�鍑烘寜閽�
case 'get_Exit': get_Exit();
break;
- //閫�鍑烘寜閽�
- case 'get_Search': get_DisplayResume();
+ //鏌ヨ灞ュ巻鎸夐挳
+ case 'get_Search': get_DisplayLV();
break;
};
});
@@ -178,7 +187,13 @@
$("#HName").val(HName);
get_FastQuery();
get_DisplayResume(linterid)
- } else {
+ } else if (OperationType == 1) {
+ $("#HNumber").val(HEquipNumber);
+ $("#HName").val(HEquipName);
+ get_FastQuery();
+ get_DisplayResume(HEquipID)
+ }
+ else {
//鏌ヨ
get_Display(sWhere);
}
@@ -313,24 +328,14 @@
}
//鏌ヨ灞ュ巻
- function get_DisplayResume(HInterID) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (OperationType!=3) {
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].hmainid.toString();
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
- return;
- }
- }
+ function get_DisplayResume(HInterID) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Gy_EquipFileMain/GetResumeList',
type: "GET",
data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
success: function (data1) {
- if (data1.count == 1) {
+ if (data1.code == 1) {
var data = [];
var col = [];
var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦", "璁″垝閲戦"];
@@ -374,6 +379,20 @@
}
});
+ }
+
+ //鍏ㄧ▼鎶ヨ〃璺宠浆鍚�,鍦ㄩ〉闈㈢偣鍑绘煡璇㈠饱鍘嗘柟娉�
+ function get_DisplayLV() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].hmainid.toString();
+ get_DisplayResume(HInterID);
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
+ return;
+ }
+
}
//蹇�熻繃婊�
@@ -493,7 +512,7 @@
//閫�鍑�
function get_Exit() {
- if (OperationType != 3) {
+ if (OperationType != 3 || OperationType != 1) {
Pub_Close(2);
} else {
Pub_Close(1);
--
Gitblit v1.9.1