From c1ca8a9ce9514d13a621e75115cb4fb936a2dbd5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 19 三月 2025 14:47:28 +0800
Subject: [PATCH] 生产汇报单、产量汇报单、生产质量汇报单 增加：三个自定义过滤；日期间隔；审核，反审核， 基本信息页签 和 制单信息页签， 选基础资料时，应该是已审核未禁用的资料（包括 单据型基础资料
---
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 273 +++++++++++++++++++-----------------------------------
1 files changed, 95 insertions(+), 178 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index b345950..74042c1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -8,17 +8,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <!--<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
- <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<script src="../../../layuiadmin/Scripts/json2.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>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -150,21 +146,23 @@
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumnButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -191,8 +189,10 @@
var option = [];
var sWhere = "";
var HModName = "Gy_Process";
+ var HBillType = "Gy_Process";
+ var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HProcessID_K3", "HUSEORGID","HProcMulID"];
+ var titleData = ["HItemID", "HProcessID_K3", "HUSEORGID", "HProcMulID", "HCREATEORGID"];
var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
@@ -221,24 +221,26 @@
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//鏂板
case 'set_AddNew': set_AddNew();
- break;
- //淇濆瓨鏂规
- case 'set_SaveScheme': set_SaveScheme();
- break;
- //璇诲彇鏂规
- case 'set_ReadScheme': set_ReadScheme();
- break;
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
- //瀵煎叆
- case 'set_SouceExcel': set_SouceExcel();
- break;
+
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
@@ -261,12 +263,18 @@
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
- //瀵煎嚭excel
- case 'get_export':
- get_Export();
+ //淇濆瓨鏂规
+ case 'set_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'set_ReadScheme': set_ReadScheme();
break;
//鍒楄缃�
- case 'set_HideColumn': get_HideColumn();
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
break;
};
});
@@ -336,12 +344,12 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
-
+ Organ();//鍒濆鍖栫粍缁�
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
get_FastQuery(1);
- Organ();
+
}
//#endregion
@@ -450,7 +458,6 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_Process/list',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
@@ -504,15 +511,16 @@
, limits: [50, 500, 5000, 20000]
, limit: 50
, totalRow: true
- //, cellMinWidth: 90
, done: function (res, curr, count) {
soulTable.render(this);
}
}
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
ins = table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
@@ -522,7 +530,6 @@
get_DefaultModule();//鍔犺浇鏂规
}
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -537,11 +544,10 @@
//#endregion
//#region 蹇�熻繃婊�
- function get_FastQuery(number) {
-
- var HOrgID = "";
+ function get_FastQuery(number) {
var HNumber = $("#HNumber").val();//宸ュ簭浠ｇ爜
var HName = $("#HName").val();//宸ュ簭鍚嶇О
+ var HOrgID = $("#HOrgID").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -551,6 +557,7 @@
var ColName2 = $("#ColName2").val();//澶嶉�夋
var Comparator2 = $("#Comparator2").val()
var ColContent2 = $("#ColContent2").val();
+
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -595,7 +602,7 @@
}
if (ColName2 != 0 && Comparator2 != 0) {
var com2 = "";
- switch (Comparator) {
+ switch (Comparator2) {
case "7":
com2 = "like'%" + ColContent2 + "%'";
break;
@@ -614,13 +621,9 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
-
- if (number == 1) {
- HOrgID = sessionStorage["OrganizationID"];
- }
- else {
- HOrgID = $("#HOrgID").val();//缁勭粐
- }
+ if (HOrgID) {
+ sWhere += " and HUSEORGID = '" + HOrgID + "'";
+ }
if (HNumber) {
sWhere += " and 宸ュ簭浠ｇ爜 like '%" + HNumber + "%'";
@@ -646,15 +649,15 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
$("#ColContent2").val("");
$("#ColName2").val("0");
$("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
form.render('select');
-
sWhere = "";
+ $("#btnSearch").click();
}
//#endregion
@@ -670,7 +673,38 @@
, title: '宸ュ簭鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html?OperationType=1&linterid=&HSouceBillType='
+ , end: function () {
+ get_FastQuery(2);
+ }
})
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-宸ュ簭鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
}
//#endregion
@@ -687,6 +721,9 @@
, title: '宸ュ簭鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ ,end: function () {
+ get_FastQuery(2);
+ }
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -838,126 +875,6 @@
}
//#endregion
-
- //#region 闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: [contentUrl, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- //#endregion
- //#region 鏄剧ず鍒楁暟鎹�
- function DisPlay_HideColumn() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
-
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HProcessID_K3", "HUSEORGID"];
- dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option.cols[0].length - 2; i++) {
- if (dataCol[i]) {
- var dataCols = dataCol[i].split('|');
- }
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //璁剧疆鍒楀
- //if (data1.data[0].HColumnWidth != 0) {
- // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
- //} else {
- // option.cols[0][i + 1]["width"] = "";
- //}
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option.cols[0][i + 1]["align"] = "right";
- break;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i]["fixed"] != null) {
- option.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
- data1.data[0].HFixCols += 1;
- }
- option.cols[0][i + 1]["fixed"] = "left";
- }
- }
- table.render(option);
- } else {
- table.render(option);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
- }
- //#endregion
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
@@ -1189,8 +1106,8 @@
var params = getUrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
- if (typeof (openType) != "undefined") {
- return " and 鏄庣粏鏍囪 = 'Y' and 绂佺敤鏍囪 != 'Y'";
+ if (openType == "2") {
+ return " and 鏄庣粏鏍囪 = 'Y' and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != '' ";
}
return "";
}
--
Gitblit v1.9.1