From 47f822f2e7cee19970b426922bbe384a1eceecfd Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 01 四月 2026 14:14:51 +0800
Subject: [PATCH] 模具档案 添加 模具树选择列高度显示 其他入库单 修复 列设置时，可能出现未定义导致不生效的问题
---
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 186 ++++++++++++++++++++++++++++------------------
1 files changed, 113 insertions(+), 73 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index 3b90407..1ac11ea 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鍣ㄥ叿妗ｆ</title>
@@ -18,11 +19,13 @@
<script src="../../../layuiadmin/HideButton_New.js"></script>
<style>
/*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
- .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ .layui-tree-set-active>.layui-tree-entry .layui-tree-main {
background: #aef0f7;
}
+
/* 纭繚body鍙粴鍔� */
- html, body {
+ html,
+ body {
height: 100%;
overflow: auto;
}
@@ -41,9 +44,9 @@
::-webkit-scrollbar-track {
background: #f5f5f5;
}
-
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -61,31 +64,37 @@
<div class="layui-inline">
<label class="layui-form-label">妯″叿缂栧彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber"
+ id="HNumber">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">妯″叿鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName"
+ id="HName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> *
+ </label></label>
<div class="layui-input-block" style="margin-left: 120px; width: 300px;">
<select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
@@ -93,19 +102,25 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName" id="ColName" lay-filter="ColName"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator"
+ style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -113,26 +128,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -140,26 +162,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2"
+ style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -167,18 +196,20 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
</div>
</div>
<div class="layui-row" style="padding:10px 0">
- <div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div class="layui-col-xs2 layui-inline" id="TreeTableOuter"
+ style="border: solid 1.5px #e0d6d64d;">
<div id="TreeTable" class="demo-tree demo-tree-box"></div>
</div>
- <div class="layui-col-xs9 layui-inline" style="padding-left: 5px; width: 82%">
- <div>
+ <div class="layui-col-xs9 layui-inline" style="padding-left: 5px; width: 82%" >
+ <div id="mainTableOuter">
<table class="" id="mainTable" lay-filter="mainTable"></table>
<div id="page"></div>
</div>
@@ -235,7 +266,7 @@
var sWhere = "";
var option = [];
var sql = "";
- var titleData = ["hmainid", "HMouldTypeID", "HBillStatus", "褰撳墠浠撳簱ID", "褰撳墠浠撲綅ID", "HMaterID", "HMouldType", "HUnitID", "HDeptID", "HSupID", "HWhID", "HMouldMaintainRuleInterID", "HMouldDotCheckRuleInterID", "HSPID", "hsubid", "HBillType", "HMadeSupID", "HUserID","HUSEORGID"];
+ var titleData = ["hmainid", "HMouldTypeID", "HBillStatus", "褰撳墠浠撳簱ID", "褰撳墠浠撲綅ID", "HMaterID", "HMouldType", "HUnitID", "HDeptID", "HSupID", "HWhID", "HMouldMaintainRuleInterID", "HMouldDotCheckRuleInterID", "HSPID", "hsubid", "HBillType", "HMadeSupID", "HUserID", "HUSEORGID"];
var HModName = "Gy_MouldFileList"
var HBillType = "3899";
@@ -266,7 +297,7 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '妯″叿缂栧彿') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid;
+ var linterid = data.hmainid;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -281,11 +312,13 @@
location.reload();
}
, cancel: function () {
-
+
}
})
}
});
+
+
//#region 椤甸潰鎸夐挳鐐规浜嬩欢瑙﹀彂
table.on('toolbar(mainTable)', function (obj) {
@@ -414,11 +447,17 @@
DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery();
+
//鏌ヨ鍣ㄥ叿鍒嗙被
get_Display_Tree();
get_DefaultModule();
+
+ var mainTableHeight = $("#mainTableOuter").height()
+ $("#TreeTableOuter").css("overflow", "auto")
+ $("#TreeTableOuter").css("height", mainTableHeight+"px")
+
}
//#region 瀵煎嚭Execel
@@ -428,8 +467,7 @@
//#endregion
//鍒濆鍖栬〃鏍�
- function set_InitGrid()
- {
+ function set_InitGrid() {
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -443,16 +481,17 @@
soulTable.render(this);
}
, cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>",sort:true}
+ , { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
, { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', sort: true }
, { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿', sort: true }
, {
field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿', sort: true, event: '妯″叿缂栧彿', templet: function (d) {
return '<span style="color: blue;">' + d.妯″叿缂栧彿 + '</span>'
- }, style: 'cursor: pointer;' }
+ }, style: 'cursor: pointer;'
+ }
, { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', sort: true }
, { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', sort: true }
, { field: '妯″叿鍝佺被', title: '鍣ㄥ叿鍝佺被', sort: true }
@@ -486,14 +525,14 @@
, { field: '铏氭嫙浠�', title: '铏氭嫙浠�', sort: true }
, { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠鍣ㄥ叿瑙勬牸', sort: true }
, { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆鍣ㄥ叿瑙勬牸', sort: true }
- , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡', sort: true, totalRow: true}
- , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡', sort: true, totalRow: true}
+ , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡', sort: true, totalRow: true }
+ , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡', sort: true, totalRow: true }
, { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', sort: true, totalRow: true }
, { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', sort: true, totalRow: true }
- , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�', sort: true, totalRow: true}
+ , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�', sort: true, totalRow: true }
, { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�', sort: true, totalRow: true }
, { field: '澶囨敞', title: '澶囨敞', sort: true }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true, totalRow: true}
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true, totalRow: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true }
@@ -564,13 +603,13 @@
//#region 鏌ヨ(涓昏〃)-鍒嗛〉
function get_DisplayPage(sWhere) {
var ajaxLoad = layer.load();//閬僵
- var ModRightNameSelect = 'Gy_MouldFileList';
+ var ModRightNameSelect = 'Gy_MouldFileList';
sWhere += addSWhereByOpenType();//娣诲姞鍗曟嵁妯″潡閫夋嫨鍩虹璧勬枡鏃剁殑杩囨护鏉′欢锛屽凡瀹℃牳鏈叧闂�
$.ajax({
url: GetWEBURL() + '/Gy_Mould/page',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"],"page": optionPage.curr, "size": optionPage.limit },
+ data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.code == 1) {
@@ -614,11 +653,11 @@
}
}
}
-
+
option.cols = [col];
option.data = data1.data;
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
- laypage.render(optionPage);
+ laypage.render(optionPage);
//鍒楄缃�
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
////鍒锋柊琛ㄦ牸鏁版嵁
@@ -634,6 +673,7 @@
laypage.render(optionPage);
option.data = [];
table.render(option);
+
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
@@ -809,8 +849,7 @@
}
//淇敼
- function set_ShowBill()
- {
+ function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
@@ -892,12 +931,12 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
- var HInterID = data[0].hmainid.toString();
+ var HInterID = data[0].hmainid.toString();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID,"IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -1175,29 +1214,29 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].hmainid.toString();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + '/Gy_Material/InitializeProdInBill',
- data: { "hmainid": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/Gy_Material/InitializeProdInBill',
+ data: { "hmainid": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
}
- });
- }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
@@ -1279,7 +1318,7 @@
var params = getUrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var addSWhere = "";
- if (typeof(openType) != "undefined") {
+ if (typeof (openType) != "undefined") {
addSWhere = " and 浣滃簾浜� = '' and 鍏抽棴浜� = '' and 瀹℃牳浜� <> ''";
}
return addSWhere;
@@ -1512,7 +1551,7 @@
//#endregion
-
+
//浠ヤ笂鏄痩ayui妯″潡
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
@@ -1559,4 +1598,5 @@
</script>
</body>
+
</html>
\ No newline at end of file
--
Gitblit v1.9.1