From e6a79f899f356f0090bd3385c0bb0aaca7a93a4f Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 14 三月 2024 11:28:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/设备基础资料/Gy_CardAddressList.html | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddressList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddressList.html"
index ff6c8af..8c4f645 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddressList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\350\256\276\345\244\207\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CardAddressList.html"
@@ -74,14 +74,14 @@
<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" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AbandonCheck" ><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_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_AddNew" 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="set_ShowBill" 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="set_DeleteBill" 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-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="AbandonCheck" ><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Stop" id="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="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><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>
</div>
</script>
@@ -197,7 +197,7 @@
table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "Gy_Unit";
+ var HBillType = "Gy_CardAddress";
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -252,7 +252,7 @@
//鎸夐挳璁剧疆
case 'set_HideButton':
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "Gy_Unit";
+ var HBillType = "Gy_CardAddress";
get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
break;
};
@@ -267,6 +267,9 @@
, title: '璧勪骇浣嶇疆-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../璁惧鍩虹璧勬枡/Gy_CardAddress.html?OperationType=1&linterid=&HSouceBillType='
+ , end: function () {
+ get_FastQuery();
+ }
})
}
//#endregion
@@ -284,6 +287,9 @@
, title: '璧勪骇浣嶇疆鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../璁惧鍩虹璧勬枡/Gy_CardAddress.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ get_FastQuery();
+ }
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -335,6 +341,9 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
+ //鍒濆鍖栬繃婊ゆ潯浠�
+ sWhere = "";
+
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
var ColName = $("#ColName").val();//澶嶉�夋
@@ -500,6 +509,12 @@
} else {
table.render(option);
}
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Gy_CardAddress";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
@@ -534,11 +549,11 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var InterID = data[0].HItemID.toString();
+ var InterID = data[0].hmainid.toString();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_Unit/AuditGy_Unit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Gy_CardAddress/AuditGy_CardAddress", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -570,11 +585,11 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var InterID = data[0].HItemID.toString();
+ var InterID = data[0].hmainid.toString();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_Unit/StopGy_Unit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Gy_CardAddress/StopGy_CardAddress", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
--
Gitblit v1.9.1