From 6029d9cca9e132c4ba7a64cefe3db5eeaaecdf74 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 十一月 2025 09:24:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_EquipDotCheckBillList.html | 61 +++++++++---------------------
1 files changed, 19 insertions(+), 42 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
index e4bfdf4..741dcbc 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
@@ -11,8 +11,13 @@
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/soulTable.slim.js"></script>
<script src="../../layuiadmin/PageTitle.js"></script>
- <script src="../../../layuiadmin/SetColumn.js"></script>
- <script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../layuiadmin/SetColumn.js"></script>
+ <script src="../../layuiadmin/HideButton_New.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/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
@@ -32,29 +37,20 @@
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
- <div class="layui-input-block">
- <select name="HBillType" id="HBillType">
- <option value="">鎵�鏈�</option>
- <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
- <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
- </select>
- </div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
</div>
</div>
- <div class="layui-inline">
+
+ <!--<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HCreateBy" id="HCreateBy">
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
@@ -82,14 +78,7 @@
<div class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
</div>
- <div class="layui-colla-content">
- <div class="layui-row">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- </div>
+ <div class="layui-colla-content">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -177,16 +166,11 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_LookDown" id="btn_LookDown"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="ShowBill"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData" id="getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" id="reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" id="details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" id="generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
@@ -196,7 +180,6 @@
<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="btn-exit" id="exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_LookDown" id="btn_LookDown"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
</div>
</script>
</form>
@@ -204,12 +187,7 @@
</div>
</div>
</div>
- <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/PubCustom.js"></script>
- <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
<script>
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -245,7 +223,7 @@
var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
//#endregion
- var titleData = ["hmainid", "hsubid", "璁惧ID", "鍐呴儴鍗曟嵁鍙�", "鐐规椤圭洰ID", "璐熻矗浜篒D", "璁惧鐐规瑙勭▼ID", "HBillType","sorderid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "hsubid", "璁惧ID", "鍐呴儴鍗曟嵁鍙�", "鐐规椤圭洰ID", "璐熻矗浜篒D", "璁惧鐐规瑙勭▼ID", "HBillType", "sorderid","HShiftsID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#region 銆愯繃婊ゆ柟妗堛��
@@ -372,7 +350,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- //get_Display(sWhere);
+ get_FastQuery();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -560,6 +538,7 @@
$.ajax({
url: GetWEBURL() + '/Sb_EquipDotCheckBill/GetEquipDotCheckBillListPage',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
success: function (data1) {
option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -605,12 +584,10 @@
option.cols = [col];
option.data = data1.data;
option.totalRow = true;
+ ins = table.render(option);
laypage.render(optionPage);
//鍒楄缃�
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
-
- ////鍒锋柊琛ㄦ牸鏁版嵁
- ins = table.render(option);
layer.close(ajaxLoad);
if ($("#ColName option").length < 1) {
--
Gitblit v1.9.1