From 626fb9760756fee5f5fa53a1d860100cc7c500ee Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 26 十二月 2023 17:16:11 +0800
Subject: [PATCH] 不良类型 基础资料 完善 常规功能按钮； 禁用 反禁用 审核 反审核 列设置 按钮设置 导出EXCEL 打印列表 自定义过滤功能；
---
WebTM/views/基础资料/生产基础资料/Gy_BadType.html | 114 +++++++++++++++++++---
WebTM/views/grf/不良类型.grf | 164 ++++++++++++++++++++++++++++++++
WebTM/WebTM.csproj | 1
3 files changed, 264 insertions(+), 15 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 007e054..bbd67d3 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -564,6 +564,7 @@
<Content Include="views\grf\閿�鍞嚭搴撳崟2.grf" />
<Content Include="views\grf\閿�鍞鍗�2.grf" />
<Content Include="views\grf\閿�鍞鍗曞彉鏇村崟2.grf" />
+ <Content Include="views\grf\涓嶈壇绫诲瀷.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
diff --git "a/WebTM/views/grf/\344\270\215\350\211\257\347\261\273\345\236\213.grf" "b/WebTM/views/grf/\344\270\215\350\211\257\347\261\273\345\236\213.grf"
new file mode 100644
index 0000000..08c1ef7
--- /dev/null
+++ "b/WebTM/views/grf/\344\270\215\350\211\257\347\261\273\345\236\213.grf"
@@ -0,0 +1,164 @@
+锘縶
+ "Version":"6.5.0.0",
+ "Title":"1a.绠�鍗曡〃鏍�",
+ "Author":"閿愭氮鎶ヨ〃杞欢",
+ "Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "LeftMargin":1,
+ "TopMargin":1,
+ "RightMargin":1,
+ "BottomMargin":1
+ },
+ "DetailGrid":{
+ "FixCols":20,
+ "AppendBlankRow":true,
+ "AppendBlankRowAtLast":true,
+ "AppendBlankCol":true,
+ "AppendBlankColWidth":40,
+ "GrowToBottom":true,
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鏉＄爜缂栧彿"
+ },
+ {
+ "Name":"涓嶈壇绫诲瀷浠ｇ爜"
+ },
+ {
+ "Name":"涓嶈壇绫诲瀷鍚嶇О"
+ },
+ {
+ "Name":"澶囨敞"
+ },
+ {
+ "Name":"鐝粍鍚嶇О"
+ },
+ {
+ "Name":"鐝粍浠ｇ爜"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"Column1",
+ "Width":3.175
+ },
+ {
+ "Name":"Column2",
+ "Width":3.59833
+ },
+ {
+ "Name":"Column3",
+ "Width":5.00063
+ },
+ {
+ "Name":"Column4",
+ "Width":3.38667
+ },
+ {
+ "Name":"Column5",
+ "Width":3.01625
+ }
+ ],
+ "ColumnContent":{
+ "Height":0.608542,
+ "ColumnContentCell":[
+ {
+ "Column":"Column1",
+ "TextAlign":"MiddleCenter",
+ "DataField":"涓嶈壇绫诲瀷浠ｇ爜"
+ },
+ {
+ "Column":"Column2",
+ "TextAlign":"MiddleCenter",
+ "DataField":"涓嶈壇绫诲瀷鍚嶇О"
+ },
+ {
+ "Column":"Column3",
+ "TextAlign":"MiddleRight",
+ "DataField":"澶囨敞"
+ },
+ {
+ "Column":"Column4",
+ "TextAlign":"MiddleRight",
+ "DataField":"鐝粍鍚嶇О"
+ },
+ {
+ "Column":"Column5",
+ "TextAlign":"MiddleCenter",
+ "DataField":"鐝粍浠ｇ爜"
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "Height":0.608542,
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"Column1",
+ "TextAlign":"TopCenter",
+ "Text":"浠ｇ爜\r\n"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column2",
+ "TextAlign":"TopCenter",
+ "Text":"鍚嶇О\r\n"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column3",
+ "TextAlign":"TopCenter",
+ "Text":"澶囨敞"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column4",
+ "TextAlign":"TopCenter",
+ "Text":"鐝粍鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column5",
+ "TextAlign":"TopCenter",
+ "Text":"鐝粍浠ｇ爜"
+ }
+ ]
+ }
+ },
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader2",
+ "Height":2.01083,
+ "Control":[
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Left":7.99042,
+ "Top":0.396875,
+ "Width":2.80458,
+ "Height":0.608542,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":157500,
+ "Weight":400,
+ "Charset":134
+ },
+ "Text":"涓嶈壇绫诲瀷"
+ }
+ ]
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":1.5875
+ }
+ ]
+}
\ No newline at end of file
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_BadType.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_BadType.html"
index a3e3bcd..9e0906b 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_BadType.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_BadType.html"
@@ -9,7 +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/grwebapp.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -38,10 +39,10 @@
<input type="text" class="layui-input" name="HName" id="HName">
</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="display: none; padding: 0 5px ;">閲嶇疆</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
@@ -76,14 +77,18 @@
<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="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></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="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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></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-form"></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="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="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display: none;" 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" style="display: none;" 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" style="display: none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-radio"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="set_HideColumn" id="set_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>
+ <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -97,6 +102,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -114,6 +120,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var ins;
var HModName = "Gy_BadType";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID"];
@@ -157,6 +164,21 @@
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ get_HideButton(btns, "Gy_BadType", HModName, sessionStorage["HUserName"]);
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Close':
+ parent.layui.admin.events.closeThisTabs();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': get_Export();
+ break;
+ //鎵撳嵃
+ case 'btn-print': get_PrintReport();
break;
};
});
@@ -258,6 +280,7 @@
, cellMinWidth: 90
}
table.render(option);
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -424,7 +447,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_BadReason/AuditGy_BadReason", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Gy_BadReason/AuditGy_BadType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -460,7 +483,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_BadReason/StopGy_BadReason", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Gy_BadReason/StopGy_BadType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -488,12 +511,16 @@
//#endregion
+ //瀵煎嚭Execel
+ function get_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
@@ -524,6 +551,54 @@
})
}
//#endregion
+
+ //鎵撳嵃
+ function get_PrintReport() {
+
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length != 0) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=0&MyMsg=0&Type=Gy_BadType', 'yes']
+ , resize: false
+ , end: function () {
+ if (OptionData.length > 0) {
+ var GrfName = OptionData[0].HName;
+
+ var dataPrint = [];
+ for (var i = 0; i < data.length; i++) {
+ dataPrint.push(data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "preview",
+ //showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/" + GrfName + ".grf"),
+ data: Customer
+ };
+
+ webapp_ws_ajax_run(args);
+ OptionData = [];
+ }
+
+ }
+ })
+ } else {
+ layer.msg("璇烽�夋嫨鏁版嵁杩涜鎵撳嵃!");
+ }
+
+ }
+
//#region 鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
@@ -538,7 +613,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
@@ -600,6 +675,10 @@
} else {
table.render(option);
}
+
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "Gy_BadType", HModName, sessionStorage["HUserName"]);
+
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
@@ -623,6 +702,11 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+
+ //鍙屽嚮杩斿洖鐢熶骇璧勬簮
+ function ReportPrint(data) {
+ OptionData = data
+ }
</script>
</body>
--
Gitblit v1.9.1