From 02af6ea33f505e4e06dc91785154898a801b267d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 14 四月 2025 12:21:56 +0800
Subject: [PATCH] 修复出站单 第三个自定义过滤没有数据显示，完善生产质量汇报单 复制一行不显示，修复不良原因查询在其他页面打开报错，性能散点报表 增加生产资源过滤，设备工艺参数点检表 完善 初始化点检人 id未赋值
---
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterUnitList.html | 137 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 30 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterUnitList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterUnitList.html"
index 9566413..01d9858 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterUnitList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterUnitList.html"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -20,7 +21,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
-
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">宸ュ崟浠ｇ爜</label>
<div class="layui-input-block">
@@ -37,31 +42,33 @@
<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>
- <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="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <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="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <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="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
</select>
</div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <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="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
</div>
@@ -105,6 +112,9 @@
var HModName = "Gy_TechnologyParameterUnitList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID"];
+ var params = get_UrlVars();
+ var Type = params[params[0]] == null ? "HTechParamUnit" : params[params[0]];
+ var OperationType = params[params[1]] == null ? 1 : params[params[1]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡鎵撳紑鍩虹璧勬枡鍒楄〃
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -166,6 +176,25 @@
set_ClearQuery();
});
+ //#endregion
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ switch (Type) {
+ case "HTechParamUnit": //琛ㄥご鍙屽嚮杩斿洖
+ parent.GetTechnologyParameterUnitValue(data);
+ break;
+ case "HTechParamUnitList": //鍒楄〃鍙屽嚮杩斿洖
+ var dataList = obj.data;
+ //杩斿洖鏂规硶
+ parent.GetTechnologyParameterUnitListValue(dataList);
+ break;
+ }
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
//#endregion
//#region 閲嶇疆杩囨护鏉′欢
@@ -238,9 +267,9 @@
, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
- , cellMinWidth: 90
+ , limits: [50, 500, 5000, 50000]
, limit: 50
- , limits: [50, 500, 5000, 20000]
+ , cellMinWidth: 90
//, cols: [[
// { type: 'checkbox', fixed: 'left' }
// , { field: 'HItemID', title: 'HItemID', hide: true }
@@ -264,7 +293,8 @@
//#region 鍔犺浇缃戠粶
function get_Display(sWhere) {
var wait = layer.load();//閬僵
- var ajaxLoad = layer.load();
+ var ajaxLoad = layer.load();
+ //sWhere += addSWhereByOpenType();//娣诲姞鍗曟嵁妯″潡閫夋嫨鍩虹璧勬枡鏃剁殑杩囨护鏉′欢锛屽凡瀹℃牳鏈叧闂�
//鍔犺浇鏁版嵁鍒扮綉鏍�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
@@ -304,11 +334,11 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-80'
, page: true
- , cellMinWidth: 90
+ , limits: [50, 500, 5000, 50000]
, limit: 50
- , limits: [50, 500, 5000, 20000]
+ , cellMinWidth: 90
}
table.render(option);
@@ -331,6 +361,27 @@
});
layer.close(wait);
}
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
//#endregion
//#region 鏂板
@@ -563,6 +614,32 @@
}
//#endregion
+ //#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
+
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ //function addSWhereByOpenType() {
+ // //鑾峰彇鍙傛暟
+ // var params = getUrlVars();
+ // var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ // var addSWhere = "";
+ // if (typeof (openType) != "undefined") {
+ // addSWhere = " and isnull(鍏抽棴浜�,'') = '' and 瀹℃牳浜� != ''";
+ // }
+ // return addSWhere;
+ //}
+ //#endregion
+
//#region 瀹℃牳
//function set_CheckBill() {
//}
--
Gitblit v1.9.1