From cb341351c4934e7fea909d9854f6c608110c5676 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 21 十月 2024 11:17:53 +0800
Subject: [PATCH] 出门确认单报表：根据维度进行查询
---
WebTM/views/应收管理/报表分析/Xs_OutDoorBillReport.html | 105 +++++++++++++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 42 deletions(-)
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_OutDoorBillReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_OutDoorBillReport.html"
index 36fb637..ab0ab99 100644
--- "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_OutDoorBillReport.html"
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_OutDoorBillReport.html"
@@ -52,9 +52,24 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <label class="layui-form-label" style="width: 85px;">缁村害</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <select name="HOperationType" id="HOperationType" lay-filter="HOperationType" style="width: 180px; ">
+ <option style="color:blue;" selected="selected" value="1">閿�鍞嚭搴撳崟瀹℃牳鏃堕棿</option>
+ <option style="color:blue;" value="2">鍑洪棬纭鏃堕棿</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閿�鍞嚭搴撳崟鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍑洪棬纭鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo1" id="HBillNo1">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -145,32 +160,32 @@
</div>
<!--<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>-->
</div>
</div>
</div>
@@ -331,6 +346,7 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
+ ColFilter();
DisPlay_HideColumn();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -374,6 +390,7 @@
var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HOperationType = $("#HOperationType").val(); //鏁版嵁缁村害
//鍔ㄦ�佸垪-缂撳瓨鍒楄〃
$.ajax({
@@ -381,7 +398,7 @@
async: false,
type: "GET",
async: false,
- data: { "HBeginDate": HBeginDate, "HEndDate": HEndDate, "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "HBeginDate": HBeginDate, "HEndDate": HEndDate, "sWhere": sWhere, "user": sessionStorage["HUserName"], "HOperationType": HOperationType },
success: function (data1) {
if (data1.count == 1) {
@@ -418,12 +435,12 @@
}
option.data = data1.data[0];
- if (option.cols[0].length == 0) {
- option.cols = [col];
- }
+ option.cols = [col];
ins = table.render(option);
- //DisPlay_HideColumn();
-
+ DisPlay_HideColumn();
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "") {
+ ColFilter();
+ }
} else {
layer.alert(data1.count + data1.Message, { icon: 5 })
}
@@ -444,7 +461,8 @@
var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
- var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HBillNo = $("#HBillNo").val(); //閿�鍞嚭搴撳崟鍙�
+ var HBillNo1 = $("#HBillNo1").val(); //鍑洪棬纭鍗曞彿
var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
@@ -460,15 +478,19 @@
// HEndDate = HEndDate_u;
//}
- if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鍑洪棬纭鏃ユ湡, 20) >= ''" + HBeginDate + "''";
- }
- if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鍑洪棬纭鏃ユ湡, 20) <= ''" + HEndDate + "''";
- }
+ //if (HBeginDate) {
+ // sWhere += " and CONVERT(varchar(100),鍑洪棬纭鏃ユ湡, 20) >= ''" + HBeginDate + "''";
+ //}
+ //if (HEndDate) {
+ // sWhere += " and CONVERT(varchar(100),鍑洪棬纭鏃ユ湡, 20) <= ''" + HEndDate + "''";
+ //}
if (HBillNo != "") {
- sWhere += " and 鍗曟嵁鍙�=''" + HBillNo + "'' ";
+ sWhere += " and 閿�鍞嚭搴撳崟鍙�=''" + HBillNo + "'' ";
+ }
+
+ if (HBillNo1 != "") {
+ sWhere += " and 鍑洪棬纭鍗曞彿=''" + HBillNo1 + "'' ";
}
if (HMaterNumber != "") {
@@ -658,7 +680,6 @@
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
- ColFilter();
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
--
Gitblit v1.9.1