From 0ca6e523743f8772acef18f8b2e42c2df5a093ad Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 26 十二月 2023 14:43:19 +0800
Subject: [PATCH] 1
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index 8b06d2c..019dd79 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -67,12 +67,25 @@
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
+
<div class="layui-inline">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
<div class="layui-colla-content" style="padding-left:82px">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃х墿鏂欑紪鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
@@ -108,7 +121,7 @@
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></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-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="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"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
@@ -213,7 +226,7 @@
}
function set_InitGrid() {
var columns = [
- { checkbox: true/*, fixed: true*/ }
+ { checkbox: true, fixed: 'left', totalRowText: '鍚堣'/*, fixed: true*/ }
, { field: 'sorderid', title: '搴忓彿', width: 80/*, fixed: true*/ }
, { field: 'hmainid', title: 'hmainid', sort: true/*, fixed: true*/, hide: true }
, { field: 'hsubid', title: 'hsubid', sort: true/*, fixed: true*/, hide: true }
@@ -231,10 +244,10 @@
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, sort: true }
- , { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', width: 100, sort: true }
- , { field: '鏈敓鎴愭潯鐮佹暟閲�', title: '鏈敓鎴愭潯鐮佹暟閲�', width: 100, sort: true }
- , { field: '鍚堟牸鏁伴噺', title: '鍚堟牸鏁伴噺', width: 100, sort: true }
- , { field: '涓嶅悎鏍兼暟閲�', title: '涓嶅悎鏍兼暟閲�', width: 100, sort: true }
+ , { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', width: 100, sort: true, totalRow: true }
+ , { field: '鏈敓鎴愭潯鐮佹暟閲�', title: '鏈敓鎴愭潯鐮佹暟閲�', width: 100, sort: true, totalRow: true }
+ , { field: '鍚堟牸鏁伴噺', title: '鍚堟牸鏁伴噺', width: 100, sort: true, totalRow: true }
+ , { field: '涓嶅悎鏍兼暟閲�', title: '涓嶅悎鏍兼暟閲�', width: 100, sort: true, totalRow: true }
, { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 100, sort: true, hide: true }
, { field: '閲戦', title: '閲戦', width: 100, sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 150, sort: true }
@@ -418,8 +431,10 @@
sqlWhere += " and 婧愬崟鍗曞彿 like ^^%" + $("#HBillNoFrom").val() + "%^^";
if ($("#HInnerBillNo").val() != "")
sqlWhere += " and 閫佽揣鍗曞彿 like ^^%" + $("#HInnerBillNo").val() + "%^^";
- //if ($("#HShortNumber").val() != "")
- // sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HShortNumber").val() + "%^^";
+ if ($("#HOldMaterNumber").val() != "")
+ sqlWhere += " and 鏃х墿鏂欑紪鐮� like ^^%" + $("#HOldMaterNumber").val() + "%^^";
+ if ($("#HMaterNumber").val() != "")
+ sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HMaterNumber").val() + "%^^";
if ($("#HNumber").val() != "")
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
@@ -457,11 +472,13 @@
InterID += data[i].hmainid.toString() + ",";
}
InterID = InterID.substring(0, InterID.length - 1);
+
+ var HBillNo = data[0].鍗曟嵁鍙�;
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
url: GetWEBURL() + "/AuditPOInStockBill",
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": "" },
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": HBillNo },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -470,7 +487,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- get_Display(sqlWhere);
+ get_Display(sql);
});
} else {
@@ -487,7 +504,7 @@
//鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
case 'btn-reload':
_cur_page = $(".layui-laypage-em").next().html();
- RoadHBillNo(sql);
+ get_Display(sql);
// });
break;
case 'btn-HideColumn':
--
Gitblit v1.9.1