From 12f860b99c61d0dc58a31a237bf8a912bd1da72f Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 25 三月 2025 09:21:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/公用基础资料/Gy_InspectValue.html | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 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_InspectValue.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_InspectValue.html"
index 3f7f71d..678a8e0 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_InspectValue.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_InspectValue.html"
@@ -341,25 +341,7 @@
, page: true
, limits: [50, 500, 5000, 20000]
, limit: 50
- , cellMinWidth: 90
- //, cols: [[
- // { type: 'checkbox', fixed: 'left' }
- // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- // , { field: '涓嶈壇鍘熷洜浠ｇ爜', title: '涓嶈壇鍘熷洜浠ｇ爜' }
- // , { field: '涓嶈壇鍘熷洜鍚嶇О', title: '涓嶈壇鍘熷洜鍚嶇О' }
- // , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
- // , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
- // , { field: '澶囨敞', title: '澶囨敞' }
- //]]
- //灏嗙鐢ㄧ殑鏁版嵁鏍囩孩
- //, done: function (res, cuur, count) {
- // for (var i = 0; i < res.data.length; i++)
- // {
- // if (res.data[i].绂佺敤鏍囪=='Y') {
- // $("table tbody tr").eq(i).css('color','red')
- // }
- // }
- //}
+ , cellMinWidth: 90
};
}
@@ -370,7 +352,6 @@
//妫�娴嬪�间唬鐮佽秴閾炬帴
if (obj.event == '妫�娴嬪�间唬鐮�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓�
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
@@ -435,7 +416,6 @@
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_BadReason/Gy_InspectValueList',
type: "GET",
async:false,
@@ -506,7 +486,6 @@
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -606,6 +585,7 @@
if (HUSEORGID) {
sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
}
+ addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -842,6 +822,17 @@
}
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ if (typeof (openType) != "undefined") {
+ sWhere += " and 绂佺敤鏍囪 = '鍚�' and 瀹℃牳浜� !='' ";
+ }
+ }
+ //#endregion
+
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
--
Gitblit v1.9.1