From 4c8e4d61ef06250b54a7cd0c7b14ca9ea3412b0f Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 20 三月 2025 15:50:29 +0800
Subject: [PATCH] 下拉表格更新，欠料运算页面更新
---
WebTM/views/设备管理/Sb_EquipMaintainBillList_PDA.html | 77 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 23 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
index 513af48..3fb4225 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_PDA.html"
@@ -6,14 +6,14 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <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/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>
+ <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/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 {
padding-right: 0;
@@ -38,6 +38,26 @@
<div class="layui-inline">
<input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
</div>
+
+ <div class="layui-inline" style="margin-top:2px;">
+ <label class="layui-form-label" style="width: 60px;">璁惧缂栫爜</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEqNumber" lay-verify="HEqNumber" id="HEqNumber">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-top:2px;">
+ <label class="layui-form-label" style="width: 60px;">璁惧鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEqName" lay-verify="HEqName" id="HEqName">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-top:2px;">
+ <label class="layui-form-label" style="width: 60px;">鍗� 鎹� 鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="width:125px;">
+ </div>
+ </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -59,7 +79,7 @@
<script>
layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
@@ -78,7 +98,8 @@
var sWhere = "";
var option = [];
var HModName = "Sb_EquipMaintainBillList_PDA";
-
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "璁惧ID", "鐐规椤圭洰ID", "璐熻矗浜篒D", "hsubid","閰嶄欢ID","鍗曚綅ID","hmaterid","HBillType","HEquipMaintainRuleInterID","婧愬崟涓诲唴鐮�","婧愬崟瀛愬唴鐮�"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -103,7 +124,10 @@
case 'btnDel': btnDel();
break;
//閫�鍑�
- case 'btn-exit': Pub_Close(2);
+ case 'btn-exit':
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile.html";
+ });
break;
//闅愯棌鍒楄缃�
case 'HideColumn':
@@ -174,7 +198,7 @@
url: GetWEBURL() + "/Web/GetEquipmentBillsList",
type: "GET",
async: false,
- data: { "sWhere": sWhere, "Type": "BY" },
+ data: { "sWhere": sWhere, "Type": "BY", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -189,7 +213,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
@@ -213,7 +237,7 @@
, height: 'full-70'
, totalRow: false //寮�鍚悎璁�
, cols: [col]
- , data: data1.data
+ , data: data1.data == null ? [] : data1.data
};
table.render(option);
@@ -237,12 +261,23 @@
function get_FastQuery() {
var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HEqNumber = $("#HEqNumber").val(); //璁惧浠ｇ爜
+ var HEqName = $("#HEqName").val(); //璁惧鍚嶇О
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
if (HBeginDate != "" && HEndDate != "") {
sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
}
-
+ if (HEqNumber != "") {
+ sWhere += " and 璁惧浠ｇ爜 like '%" + HEqNumber + "%'"
+ }
+ if (HEqName != "") {
+ sWhere += " and 璁惧鍚嶇О like '%" + HEqName + "%'"
+ }
+ if (HBillNo != "") {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+ }
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
@@ -255,12 +290,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HMaterNumber").val("");
$("#HBillNo").val("");
- $("#HProductName").val("");
- $("#HProductModel").val("");
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- ColFilter();
+ $("#HEqNumber").val(""); //璁惧浠ｇ爜
+ $("#HEqName").val(""); //璁惧鍚嶇О
sWhere = "";
}
@@ -274,9 +305,9 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + '/ProcessCheck/DelProcessCheckBill',
+ url: GetWEBURL() + '/Sb_EquipMaintainBill/DeltetEquipMaintainBillList',
type: "GET",
- data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
--
Gitblit v1.9.1