From 5a41caded26a3b4a5aeb9cbcd83ba4fcf60fd3ee Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 10 十一月 2025 16:56:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/设备报表/Sb_EquipResumeCheckQuery.html | 181 ++++++++++++++++++++++++++++++---------------
1 files changed, 121 insertions(+), 60 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 f82dbd3..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"
@@ -10,6 +10,7 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
@@ -19,6 +20,7 @@
.layui-tree-set-active > .layui-tree-entry .layui-tree-main {
background: #aef0f7;
}
+
.my-btn-container {
min-width: 380px; /* 璁剧疆鏈�灏忓搴� */
/* 鍏朵粬闇�瑕佺殑鏍峰紡 */
@@ -35,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">
@@ -61,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>
@@ -78,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({
@@ -95,10 +106,20 @@
, soulTable = layui.soulTable
, tree = layui.tree
var sWhere = "";
+ var HNumber = "";
+ var HName = "";
var option = [];
var optionResume = [];
var titleData = ["HInterID", "HBillType"];
var treeId;
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ HNumber = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇
+ HName = params[params[3]]; //浠庡弬鏁颁腑鑾峰彇
+ HNumber = decodeURI(HNumber);
+ HName = decodeURI(HName);
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -113,10 +134,10 @@
case 'get_Refresh': get_Refresh();
break;
//閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
+ case 'get_Exit': get_Exit();
break;
- //閫�鍑烘寜閽�
- case 'get_Search': get_DisplayResume();
+ //鏌ヨ灞ュ巻鎸夐挳
+ case 'get_Search': get_DisplayLV();
break;
};
});
@@ -161,9 +182,21 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
- //鏌ヨ
- get_Display(sWhere);
+ if (OperationType == 3) {
+ $("#HNumber").val(HNumber);
+ $("#HName").val(HName);
+ get_FastQuery();
+ get_DisplayResume(linterid)
+ } else if (OperationType == 1) {
+ $("#HNumber").val(HEquipNumber);
+ $("#HName").val(HEquipName);
+ get_FastQuery();
+ get_DisplayResume(HEquipID)
+ }
+ else {
+ //鏌ヨ
+ get_Display(sWhere);
+ }
//鏌ヨ璁惧鍒嗙被
get_Display_Tree();
}
@@ -295,64 +328,71 @@
}
//鏌ヨ灞ュ巻
- function get_DisplayResume(HInterID) {
+ 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.code == 1) {
+ var data = [];
+ var col = [];
+ var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦", "璁″垝閲戦"];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //娣诲姞璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ optionResume.cols = [col];
+ optionResume.data = data1.data;
+
+ table.render(optionResume);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+ //鍏ㄧ▼鎶ヨ〃璺宠浆鍚�,鍦ㄩ〉闈㈢偣鍑绘煡璇㈠饱鍘嗘柟娉�
+ function get_DisplayLV() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].hmainid.toString();
- 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) {
- var data = [];
- var col = [];
- var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦", "璁″垝閲戦"];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) { //娣诲姞璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
- optionResume.cols = [col];
- optionResume.data = data1.data;
-
- table.render(optionResume);
- layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ get_DisplayResume(HInterID);
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡璇紒');
- }
-
+ return;
+ }
+
}
//蹇�熻繃婊�
@@ -470,6 +510,27 @@
$("#btnSearch").click();
}
+ //閫�鍑�
+ function get_Exit() {
+ if (OperationType != 3 || OperationType != 1) {
+ Pub_Close(2);
+ } else {
+ Pub_Close(1);
+ }
+ }
+
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
--
Gitblit v1.9.1