From fc69a1e9655df3e8a01dc36ea2742c99f4a651ed Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 17 一月 2024 13:22:08 +0800
Subject: [PATCH] 特批申请单：数据校验 销售订单：维护页面增加字段 销售出库关联数量、销售出库未关联数量、生产关联数量、生产未关联数量
---
WebTM/views/生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html | 332 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 267 insertions(+), 65 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
index 94a8a08..e0660f2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
@@ -1,7 +1,7 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鐢熶骇鍋滃伐鍗曞垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,7 +9,9 @@
<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/HideButton.js"></script>
+ <script src="../../../../layuiadmin/soulTable.slim.js"></script>
+
</head>
<body>
<div class="layui-fluid">
@@ -54,31 +56,55 @@
<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
</div>
</div>-->
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" style="display:none;" lay-filter="btnSearch" id="btnSearch">
<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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶇疆</button>
<div class="layui-colla-content">
- <div class="layui-inline">
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
<div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <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 class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
-
+
</div>
</div>
</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 layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" style="display:none;" id="btn-Print" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="btn-get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
</div>
</script>
</form>
@@ -102,7 +128,7 @@
base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
//#region 鍙傛暟
var $ = layui.$
, admin = layui.admin
@@ -112,9 +138,11 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , soulTable = layui.soulTable
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var option = [];
+ var HModName = "Sc_MESStopStepWorkBill";
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -151,6 +179,15 @@
//閫�鍑�
case 'get_Exit': Pub_Close(2);
break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ get_HideButton(btns, "3789", HModName, sessionStorage["HUserName"]);
+ break;
};
});
//鏌ヨ鎸夐挳
@@ -160,6 +197,31 @@
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
var HSource = $("#HSource").val();//鐢熶骇璧勬簮
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
if (HDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
}
@@ -181,6 +243,10 @@
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
+
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "3789", HModName, sessionStorage["HUserName"]);
+
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -199,6 +265,10 @@
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBillNo").val("");//鍗曟嵁鍙�
$("#HSource").val("");//鐢熶骇璧勬簮
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
$("#btnSearch").click();
});
//#endregion
@@ -211,7 +281,7 @@
set_InitGrid();
//鏌ヨ
get_Display(sWhere);
-
+ DisPlay_HideColumn();
}
@@ -219,26 +289,31 @@
function set_InitGrid() {
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
- option = {
+ option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true}
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true}
, {
- field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', templet: function (d) {
+ field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true, templet: function (d) {
if (d.鍗曟嵁绫诲瀷 == "3789") {
return "鍋滃伐鍗�";
}
}
}
, {
- field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160, templet: function (d) {
+ field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160, sort: true, templet: function (d) {
switch (d.HBillStatus) {
case 0:
return "鍒涘缓"
@@ -296,49 +371,49 @@
}
}
}
- , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
- , { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
- , { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: 'HProcID', title: 'HProcID', hide: true }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
- , { field: '浠诲姟鍗曟暟閲�', title: '浠诲姟鍗曟暟閲�' }
- , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
- , { field: '寮�濮嬪仠宸ユ椂闂�', title: '寮�濮嬪仠宸ユ椂闂�', templet: "<div>{{d.寮�濮嬪仠宸ユ椂闂� ==null ?'':layui.util.toDateString(d.寮�濮嬪仠宸ユ椂闂�, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '缁撴潫鍋滃伐鏃堕棿', title: '缁撴潫鍋滃伐鏃堕棿', templet: "<div>{{d.缁撴潫鍋滃伐鏃堕棿 ==null ?'':layui.util.toDateString(d.缁撴潫鍋滃伐鏃堕棿, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: 'HSourceID', title: 'HSourceID', hide: true }
- , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
- , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
- , { field: 'HGroupID', title: 'HGroupID', hide: true }
- , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜' }
- , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
- , { field: 'HDeptID', title: 'HDeptID', hide: true }
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜' }
- , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
- , { field: 'HEmpID', title: 'HEmpID', hide: true }
- , { field: '鐢宠鍋滃伐浜哄憳浠ｇ爜', title: '鐢宠鍋滃伐浜哄憳浠ｇ爜' }
- , { field: '鐢宠鍋滃伐浜哄憳', title: '鐢宠鍋滃伐浜哄憳' }
- , { field: '鍋滃伐鍘熷洜', title: '鍋滃伐鍘熷洜' }
- , { field: '鍋滃伐姹囨姤绫诲瀷', title: '鍋滃伐姹囨姤绫诲瀷' }
- , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
- , { field: '鏈哄櫒鍦板潃', title: '鏈哄櫒鍦板潃' }
- , { field: '鎵弿浜�', title: '鎵弿浜�' }
- , { field: '鎵弿鏃ユ湡', title: '鎵弿鏃ユ湡', templet: "<div>{{d.鎵弿鏃ユ湡 ==null ?'':layui.util.toDateString(d.鎵弿鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', sort: true }
+ , { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿', sort: true }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', sort: true }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
+ , { field: 'HProcID', title: 'HProcID', hide: true, sort: true }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', sort: true }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', sort: true }
+ , { field: '浠诲姟鍗曟暟閲�', title: '浠诲姟鍗曟暟閲�', sort: true }
+ , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺', sort: true }
+ , { field: '寮�濮嬪仠宸ユ椂闂�', title: '寮�濮嬪仠宸ユ椂闂�', templet: "<div>{{d.寮�濮嬪仠宸ユ椂闂� ==null ?'':layui.util.toDateString(d.寮�濮嬪仠宸ユ椂闂�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '缁撴潫鍋滃伐鏃堕棿', title: '缁撴潫鍋滃伐鏃堕棿', templet: "<div>{{d.缁撴潫鍋滃伐鏃堕棿 ==null ?'':layui.util.toDateString(d.缁撴潫鍋滃伐鏃堕棿, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: 'HSourceID', title: 'HSourceID', hide: true, sort: true }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', sort: true }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', sort: true }
+ , { field: 'HGroupID', title: 'HGroupID', hide: true, sort: true }
+ , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', sort: true }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', sort: true }
+ , { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', sort: true }
+ , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', sort: true }
+ , { field: 'HEmpID', title: 'HEmpID', hide: true, sort: true }
+ , { field: '鐢宠鍋滃伐浜哄憳浠ｇ爜', title: '鐢宠鍋滃伐浜哄憳浠ｇ爜', sort: true }
+ , { field: '鐢宠鍋滃伐浜哄憳', title: '鐢宠鍋滃伐浜哄憳', sort: true }
+ , { field: '鍋滃伐鍘熷洜', title: '鍋滃伐鍘熷洜', sort: true }
+ , { field: '鍋滃伐姹囨姤绫诲瀷', title: '鍋滃伐姹囨姤绫诲瀷', sort: true }
+ , { field: '鏉″舰鐮�', title: '鏉″舰鐮�', sort: true }
+ , { field: '鏈哄櫒鍦板潃', title: '鏈哄櫒鍦板潃', sort: true }
+ , { field: '鎵弿浜�', title: '鎵弿浜�', sort: true }
+ , { field: '鎵弿鏃ユ湡', title: '鎵弿鏃ユ湡', templet: "<div>{{d.鎵弿鏃ユ湡 ==null ?'':layui.util.toDateString(d.鎵弿鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '澶囨敞', title: '澶囨敞', sort: true }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200, sort: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200, sort: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 200, sort: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200, sort: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, sort: true }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
]]
};
}
@@ -355,6 +430,13 @@
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
+
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "3789", HModName, sessionStorage["HUserName"]);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -438,7 +520,7 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
type: "GET",
- url: GetWEBURL() + "Sc_MESStopStepWorkBill/DeltetMESStopWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MESStopStepWorkBill/DeltetMESStopWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"]},
success: function (result) {
if (result.count == 1) {
@@ -543,6 +625,126 @@
}
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ 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 = ["hmainid", "HProcID", "HMaterID", "HSourceID", "HGroupID", "HDeptID","HEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ 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 (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ 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);
+ }
+
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "3789", HModName, sessionStorage["HUserName"]);
+
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
--
Gitblit v1.9.1