From 3dfe7dfe993869c8a44e9ccf177849abe98ca8d0 Mon Sep 17 00:00:00 2001
From: wangbin <lan@DESKTOP-MG88OFJ>
Date: 星期一, 08 七月 2024 10:12:25 +0800
Subject: [PATCH] 1
---
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 77 insertions(+), 6 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index 847b770..3d0bda8 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -67,9 +67,20 @@
</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="HSourceBillNo" id="HSourceBillNo">
+ </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="HMaterName" id="HMaterName">
+ </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="HMaterNumber" id="HMaterNumber">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -173,6 +184,8 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-reload" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></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-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" 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="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -231,7 +244,7 @@
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
break;
- case 'btn-Delete':
+ case 'btn-Delete':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length == 0 || checkStatus.data.length > 300) {
@@ -274,7 +287,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- })
+ })
break;
case 'btn-print':
var checkStatus = table.checkStatus('mainTable')
@@ -304,8 +317,16 @@
case 'btn-reload':
$("#HBarCode").val("");
$("#HMaterName").val("");
+ $("#HSourceBillNo").val("");
+ $("#HMaterNumber").val("");
sWhere = "";
get_Display(sWhere);
+ break;
+ //浣滃簾鎸夐挳
+ case 'set_Drop': set_DropBill(0);
+ break;
+ //鍙嶄綔搴熸寜閽�
+ case 'set_DeDrop': set_DropBill(1);
break;
//閫�鍑烘寜閽�
case 'btn-exit': Pub_Close(2);
@@ -355,7 +376,9 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBarCode").val("");
+ $("#HSourceBillNo").val("");
$("#HMaterName").val("");
+ $("#HMaterNumber").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -376,7 +399,9 @@
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBarCode = $("#HBarCode").val();
+ var HSourceBillNo = $("#HSourceBillNo").val();
var HMaterName = $("#HMaterName").val();
+ var HMaterNumber = $("#HMaterNumber").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -450,17 +475,24 @@
sWhere += " and " + ColName2 + " " + com2;
}
if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) <= '" + HEndDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
}
if (HBarCode) {
- sWhere += " and 鏉＄爜缂栧彿 like '" + HBarCode + "'";
+ sWhere += " and 鏉＄爜缂栧彿 like '%" + HBarCode + "%'";
}
if (HMaterName) {
- sWhere += " and 鐗╂枡鍚嶇О like'" + HMaterName + "'";
+ sWhere += " and 鐗╂枡鍚嶇О like'%" + HMaterName + "%'";
}
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like'%" + HMaterNumber + "%'";
+ }
+ if (HSourceBillNo) {
+ sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
@@ -663,6 +695,45 @@
DisPlay_HideColumn();
}
+ //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+ function set_DropBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_BarCodeBillList/DeleteGy_BarCodeBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+ }
+ }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
--
Gitblit v1.9.1