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 | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 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 8ee7d3f..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">
@@ -111,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 杩涘叆椤甸潰鍗冲姞杞�
@@ -178,7 +182,16 @@
table.on('rowDouble(mainTable)', function (obj) {
var data = [];
data.push(obj.data);
- parent.GetTechnologyParameterUnitValue(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);
});
@@ -280,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",
@@ -348,7 +362,6 @@
layer.close(wait);
}
//#endregion
-
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
@@ -601,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