From 65d05e5e4332a23af2f0eaf7019b38f085b1688b Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 11 九月 2024 10:29:59 +0800
Subject: [PATCH] 销售订单条码出入库详情报表：第一个任意字段过滤报错
---
WebTM/views/应收管理/报表分析/Xs_SeOrderBarCodeInAndOutStockDetailReport.html | 164 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 111 insertions(+), 53 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_SeOrderBarCodeInAndOutStockDetailReport.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_SeOrderBarCodeInAndOutStockDetailReport.html"
index 1e6f630..a190d44 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_SeOrderBarCodeInAndOutStockDetailReport.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_SeOrderBarCodeInAndOutStockDetailReport.html"
@@ -35,40 +35,75 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">閿�鍞鍗曞彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-input-block" style="margin-left: 120px;width:130px;">
<input type="text" class="layui-input ForFilteringSchemes" name="HSeOrderBillNo" id="HSeOrderBillNo">
</div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏄惁鍑哄簱</label>
+ </div>
+ <div class="layui-inline">
+ <select name="HIsOutStock" id="HIsOutStock" class="ForFilteringSchemes" lay-filter="HIsOutStock">
+ <option value="" selected="selected" style="width:10px;"></option>
+ <option value="鏄�" style="width:10px;">鏄�</option>
+ <option value="鍚�" style="width:10px;">鍚�</option>
+ </select>
</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>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍏ュ簱浠舵暟</label>
+ <div class="layui-input-block" style="margin-left: 120px;width:60px;">
+ <input type="text" class="layui-input" name="SumHPieceQty_inStock" id="SumHPieceQty_inStock" disabled="disabled">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍏ュ簱绫虫暟</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 100px;">
+ <input type="text" class="layui-input" name="SumHQty_inStock" id="SumHQty_inStock" disabled="disabled">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍑哄簱浠舵暟</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 60px;">
+ <input type="text" class="layui-input" name="SumHPieceQty_outStock" id="SumHPieceQty_outStock" disabled="disabled">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍑哄簱绫虫暟</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 100px;">
+ <input type="text" class="layui-input" name="SumHQty_outStock" id="SumHQty_outStock" disabled="disabled">
+ </div>
+ </div>
+
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<!--<div class="layui-row" style="margin-top:10px;">-->
- <!--鍏朵粬鏉′欢-->
- <!--<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="HMaterNumber" id="HMaterNumber">
- </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="HProductName" id="HProductName">
- </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="HProductModel" id="HProductModel">
- </div>
- </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="HMaterNumber" id="HMaterNumber">
+ </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="HProductName" id="HProductName">
+ </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="HProductModel" id="HProductModel">
+ </div>
+ </div>
+ </div>-->
<div class="layui-row" style="margin:10px 0px">
<div class="layui-inline">
@@ -127,32 +162,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>
@@ -162,8 +197,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>-->
</div>
</script>
</form>
@@ -281,7 +316,7 @@
get_FastQuery();
DisPlay_HideColumn();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- get_DefaultModule();
+ //get_DefaultModule();
}
//鍒楁槑鏄剧ず涓嬫媺妗�
@@ -347,13 +382,31 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>" });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
}
}
}
+
+ var SumHPieceQty_inStock = 0;
+ var SumHQty_inStock = 0;
+ var SumHPieceQty_outStock = 0;
+ var SumHQty_outStock = 0;
+ var data_temp = data1.data[0];
+ for (var i = 0; i < data_temp.length; i++) {
+ SumHPieceQty_inStock++;
+ SumHQty_inStock += data_temp[i].鍏ュ簱绫虫暟;
+ if (data_temp[i].鏄惁鍑哄簱 == "鏄�") {
+ SumHPieceQty_outStock++;
+ SumHQty_outStock += data_temp[i].鍏ュ簱绫虫暟;
+ }
+ }
+ $("#SumHPieceQty_inStock").val(SumHPieceQty_inStock);
+ $("#SumHQty_inStock").val(SumHQty_inStock.toFixed(1));
+ $("#SumHPieceQty_outStock").val(SumHPieceQty_outStock);
+ $("#SumHQty_outStock").val(SumHQty_outStock.toFixed(1));
option.data = data1.data[0];
option.cols = [col];
@@ -377,9 +430,14 @@
//蹇�熻繃婊�
function get_FastQuery() {
var HSeOrderBillNo = $("#HSeOrderBillNo").val(); //閿�鍞鍗曞崟鎹彿
+ var HIsOutStock = $("#HIsOutStock").val(); //鏄惁鍑哄簱
if (HSeOrderBillNo != "") {
- sWhere += " and 閿�鍞鍗曞彿='" + HSeOrderBillNo + "' ";
+ sWhere += " and 閿�鍞鍗曞彿 like '%" + HSeOrderBillNo + "%' ";
+ }
+
+ if (HIsOutStock != "") {
+ sWhere += " and 鏄惁鍑哄簱 like '%" + HIsOutStock + "%' ";
}
//浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
@@ -412,7 +470,7 @@
com = "not like '%" + ColContent + "%' ";
break;
default:
- com = "" + Comparator + " ''" + ColContent + "'' ";
+ com = "" + Comparator + " '" + ColContent + "' ";
break;
}
sWhere += " and " + ColName + " " + com;
--
Gitblit v1.9.1