From 7de00c5824ecfd39fec748386298ba0cedd4504e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 16 一月 2024 16:06:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html | 103 +++++++++++++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 40 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\274\200\345\267\245/Sc_MESBeginStepWorkBillList.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\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
index fb2368a..11cfb4b 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\274\200\345\267\245/Sc_MESBeginStepWorkBillList.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\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
@@ -9,6 +9,8 @@
<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>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -74,10 +76,10 @@
<input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
</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-row" style=" margin-top: 10px; margin-left: 70px;">
<div class="layui-inline">
@@ -112,14 +114,15 @@
<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" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></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>
@@ -143,7 +146,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
@@ -154,6 +157,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
+ , soulTable = layui.soulTable
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
@@ -196,6 +200,11 @@
//闅愯棌鍒楄缃�
case 'HideColumn':
get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ get_HideButton(btns, "3787", HModName, sessionStorage["HUserName"]);
break;
};
});
@@ -253,6 +262,10 @@
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
+
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "3787", HModName, sessionStorage["HUserName"]);
+
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -312,20 +325,23 @@
, 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: '鍗曟嵁ID', hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+ , { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true}
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true}
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160, sort: true}
, {
- field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, templet: function (d) {
+ field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, sort: true, templet: function (d) {
if (d.鍗曟嵁绫诲瀷 == "3787") {
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 "鍒涘缓"
@@ -383,30 +399,30 @@
}
}
}
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: 'HProcID', title: 'HProcID', width: 160, hide: true }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 160 }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 160 }
- , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115 }
- , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
- , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', width: 115 }
- , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', width: 200 }
- , { field: '璧勬簮浠ｇ爜', title: '璧勬簮浠ｇ爜', width: 115 }
- , { 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 }
- , { 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: '浜у搧浠ｇ爜', width: 160, sort: true}
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160, sort: true}
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160, sort: true}
+ , { field: 'HProcID', title: 'HProcID', width: 160, hide: true, sort: true}
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 160, sort: true}
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 160, sort: true}
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115, sort: true}
+ , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200, sort: true}
+ , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', width: 115, sort: true}
+ , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', width: 200, sort: true}
+ , { field: '璧勬簮浠ｇ爜', title: '璧勬簮浠ｇ爜', width: 115, 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, 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}
]]
};
}
@@ -433,6 +449,9 @@
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
+
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "3787", HModName, sessionStorage["HUserName"]);
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
@@ -727,6 +746,10 @@
} else {
table.render(option);
}
+
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "3787", HModName, sessionStorage["HUserName"]);
+
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
--
Gitblit v1.9.1