From c1ca8a9ce9514d13a621e75115cb4fb936a2dbd5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 19 三月 2025 14:47:28 +0800
Subject: [PATCH] 生产汇报单、产量汇报单、生产质量汇报单 增加：三个自定义过滤；日期间隔；审核，反审核， 基本信息页签 和 制单信息页签， 选基础资料时，应该是已审核未禁用的资料（包括 单据型基础资料
---
WebTM/layuiadmin/SetColumn.js | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index e92ab7a..fed287b 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -5,6 +5,17 @@
colName += option.cols[0][i]["field"] + ",";
}
+
+ var contentUrl = "";
+
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
+
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
layer.open({
type: 2
@@ -14,7 +25,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: [contentUrl, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -80,7 +91,7 @@
}
//#endregion
//#region 鏄剧ず鍒楁暟鎹�
-function DisPlay_HideColumn(HModName, user, option) {
+function DisPlay_HideColumn(HModName, user, option, titleData) {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
@@ -89,7 +100,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = [];
+ /* var titleData = [];*/
var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
dataCol = data1.data[0].HGridString.split(',');
@@ -324,7 +335,7 @@
//#endregion
//#region 鏄剧ず鍒楁暟鎹紪杈戦〉闈�
-function DisPlay_HideColumnEdit(HModName, user, option,table) {
+function DisPlay_HideColumnEdit(HModName, user, option, table) {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
--
Gitblit v1.9.1