From 12996f5d1dbe483424b4aaac4118113293170e72 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 26 十一月 2024 09:33:08 +0800
Subject: [PATCH] 新增出库和入库汇总报表
---
WebTM/views/采购管理/采购报表/Cg_POOrderInStockSumReport.html | 236 ++++++++++++++++++++++++++++++++--------------
WebTM/views/销售管理/销售报表/Xs_SeOrderOutStockSumReport.html | 58 +++++++----
2 files changed, 197 insertions(+), 97 deletions(-)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderInStockSumReport.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderInStockSumReport.html"
index e0b1246..1c2763f 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderInStockSumReport.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderInStockSumReport.html"
@@ -34,31 +34,52 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
- <select name="txtHOrderProcNo" id="txtHOrderProcNo" lay-filter="txtHOrderProcNo" style="width:190px;"lay-search>
- <!--鍔ㄦ�佹覆鏌�-->
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</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="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">姹囨�荤被鍨�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
+ <select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
+ <option value="鍏ュ簱鍗曟眹鎬�" selected="selected">鍏ュ簱鍗曟眹鎬�</option>
+ <option value="鏀舵枡鍗曟眹鎬�">鏀舵枡鍗曟眹鎬�</option>
+ <option value="璋冩嫧鍗曟眹鎬�">璋冩嫧鍗曟眹鎬�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�</label>
+ <div class="layui-input-inline" style="width:440px">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-block">
- <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHWHID" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -144,6 +165,26 @@
break;
};
});
+
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ //get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
+
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -153,26 +194,43 @@
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
-
- //鐗╂枡
- form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
- get_btnHMaterID();
+ //閫夋嫨渚涘簲鍟嗘寜閽�
+ form.on('submit(HSupList)', function () {
+ get_checkSup();
});
-
+ //閫夋嫨浠撳簱
+ form.on('submit(btnHWHID)', function () {
+ get_btnHWHID();
+ });
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
//鍒濆鍖栫晫闈�
function set_ClearBill() {
- //鑾峰彇閿�鍞鍗曞彿
- HOrderBillNo()
+
+ setSelect_HInitTimeCycle()
+
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery();
+ //get_FastQuery();
//DisPlay_HideColumn();
-
+ table.render(option)
//ColFilter();
}
@@ -185,6 +243,20 @@
, totalRow: true
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, height: 'full-70'
+ , cols: [[ //瀛愯〃
+ { type: 'numbers', field: '搴忓彿', title: '搴忓彿', width: 100, }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 150, }//f7
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, }//f7
+ , { field: 'HQty', title: '鍏ュ簱鏁伴噺', width: 100, totalRow: true }
+ , { field: 'HPrice', title: '鍗曚环', width: 100 }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, }
+
+ ]]
+ , data: [[]]
};
}
@@ -349,70 +421,86 @@
sWhere = " ";
get_FastQuery();
}
- //閿�鍞鍗曚笅鎷夋
- function HOrderBillNo() {
- //鑾峰彇鐧诲綍椤电粍缁囧垪
- var HOrderBillNo = '<option style="color:blue;" value=""></option>';
- $.ajax({
- type: "get",
- url: GetWEBURL() + "/Mes_OrderProcFlowAllReport/getHSeOrderBillNo",
- async: false,
- data: { "sWhere": "", "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- for (var i = 0; i < data.length; i++) {
- HOrderBillNo += '<option style="color:blue;" value="' + data[i]["HSeOrderBillNo"] + '">' + data[i]["HSeOrderBillNo"] + '</option>';
- }
- $("#txtHOrderProcNo").append(HOrderBillNo);
- form.render('select');
- }
- layer.closeAll("loading");
- }
- })
- }
-
- //鍒楁槑鏄剧ず涓嬫媺妗�
- function ColFilter() {
- var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 1; i < option.cols[0].length; i++) {
- if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
- }
- }
- $("#ColName").empty();
- $("#ColName").append(Organization); $("#ColName1").empty();
- $("#ColName1").append(Organization); $("#ColName2").empty();
- $("#ColName2").append(Organization);
- form.render('select');
- }
//#endregion
- //鐗╂枡
- function get_btnHMaterID() {
+ //渚涘簲鍟�
+ function get_checkSup() {
+ var HOrgName = $(".layui-form-select input").val();
layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐗╂枡'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '渚涘簲鍟嗗垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?', 'yes']
, btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
-
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#txtHMaterNumber").val(checkStatus.data[0].HNumber);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+ $("#HSupID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
+ , btn2: function (index, layero) { }
})
}
+ //浠撳簱
+ function get_btnHWHID() {
+ var HOrgName = $(".layui-form-select input").val();
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+ $("#HWHID").val(checkStatus.data[0].HItemID);
+
+ //if (option.data.length > 0) {
+ // for (var i = 0; i < option.data.length; i++) {
+ // if (option.data[i]["HWHID"] == 0) {
+ // option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
+ // option.data[i]["HWHName"] = checkStatus.data[0].浠撳簱鍚嶇О;
+ // }
+ // }
+ //}
+ table.render(option);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("29");
+ }
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\350\241\250/Xs_SeOrderOutStockSumReport.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\350\241\250/Xs_SeOrderOutStockSumReport.html"
index fa4044c..00c5dec 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\350\241\250/Xs_SeOrderOutStockSumReport.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\350\241\250/Xs_SeOrderOutStockSumReport.html"
@@ -34,31 +34,25 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <select name="txtHOrderProcNo" id="txtHOrderProcNo" lay-filter="txtHOrderProcNo" style="width:190px;"lay-search>
- <!--鍔ㄦ�佹覆鏌�-->
- </select>
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" 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="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">姹囨�荤被鍨�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-block">
- <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
+ <select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
+ <option value="鍑哄簱鏃ユ湡娈垫煡璇�" selected="selected">鍑哄簱鏃ユ湡娈垫煡璇�</option>
+ <option value="椤圭洰宸ョ▼缁撶畻娓呭崟姹囨��">椤圭洰宸ョ▼缁撶畻娓呭崟姹囨��</option>
+ <option value="鍏ㄩ儴椤圭洰宸ョ▼鍑哄簱鍗曟垚鏈环鏌ヨ">鍏ㄩ儴椤圭洰宸ョ▼鍑哄簱鍗曟垚鏈环鏌ヨ</option>
+ </select>
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -165,12 +159,16 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
- //鑾峰彇閿�鍞鍗曞彿
- HOrderBillNo()
//鍒濆鍖栬〃鏍�
set_InitGrid();
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ table.render(option);
//鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery();
+ //get_FastQuery();
//DisPlay_HideColumn();
//ColFilter();
@@ -185,6 +183,20 @@
, totalRow: true
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, height: 'full-70'
+ , cols: [[ //瀛愯〃
+ { type: 'numbers', field: '搴忓彿', title: '搴忓彿', width: 100, }
+ , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 150, }//f7
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
+ , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, }//f7
+ , { field: 'HQty', title: '鍑哄簱鏁伴噺', width: 100, totalRow: true }
+ , { field: 'HPrice', title: '搴撳瓨鎴愭湰鍗曚环', width: 100 }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, }
+
+ ]]
+ , data: [[]]
};
}
--
Gitblit v1.9.1