From 2f55e014a562ca2625e6ba3e3cc999c7d08c59c1 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 20 三月 2024 08:46:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index bd63193..6c12d6a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -84,15 +84,15 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID" id="HDeptID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓荤</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID" id="HMangerID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="width:190px;">
</div>
</div>
</div>
@@ -459,6 +459,7 @@
, { field: '閲戦', title: '閲戦', sort: true, totalRow: true }
, { field: '浠风◣鍚堣', title: '浠风◣鍚堣', sort: true, totalRow: true }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
+ , { field: '鍓╀綑璁㈤噾', title: '鍓╀綑璁㈤噾', sort: true, totalRow: true }
, { field: '鍏宠仈鏁伴噺', title: '閿�鍞嚭搴撳叧鑱旀暟閲�', sort: true, totalRow: true }
, { field: '鏈叧鑱旀暟閲�', title: '閿�鍞嚭搴撴湭鍏宠仈鏁伴噺', sort: true, totalRow: true }
, { field: '鐢熶骇鍏宠仈鏁伴噺', title: '鐢熶骇鍏宠仈鏁伴噺', sort: true, totalRow: true }
@@ -577,7 +578,8 @@
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
var HCusID = $("#HCusID").val();
- var HDeptID = $("#HDeptID").val();
+ var HHMaterNumber = $("#HMaterNumber").val();
+ var HMaterName = $("#HMaterName").val();
var HMangerID = $("#HMangerID").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -616,11 +618,11 @@
if (HCusID) {
sWhere += " and 瀹㈡埛 like '%" + HCusID + "%'";
}
- if (HDeptID) {
- sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
}
- if (HMangerID) {
- sWhere += " and 涓荤 like '%" + HMangerID + "%'";
+ if (HMaterName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
}
if (GetDataCols != "") {
sWhere += GetDataCols;
@@ -643,8 +645,8 @@
$("#HDate1").val("");//缁撴潫鏃ユ湡
$("#HBillNo").val("");//
$("#HCusID").val("");
- $("#HDeptID").val("");
- $("#HMangerID").val("");
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -830,7 +832,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- $("#btnSearch").trigger('click');
+ //$("#btnSearch").trigger('click');
}
, cancel: function () {
@@ -868,7 +870,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- $("#btnSearch").trigger('click');
+ //$("#btnSearch").trigger('click');
}
, cancel: function () {
@@ -907,7 +909,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- $("#btnSearch").trigger('click');
+ //$("#btnSearch").trigger('click');
}
, cancel: function () {
@@ -973,7 +975,7 @@
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
//鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
+ //$("#btnSearch").trigger('click');
}
})
} else {
@@ -1035,7 +1037,7 @@
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
//鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
+ //$("#btnSearch").trigger('click');
}
})
} else {
@@ -1097,7 +1099,7 @@
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
//鍒锋柊椤甸潰
- $("#btnSearch").trigger('click');
+ //$("#btnSearch").trigger('click');
}
})
} else {
--
Gitblit v1.9.1