From 53ec31f86cf00a9f8b90edc0a601f99e5e7dfd81 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期六, 15 三月 2025 23:02:50 +0800
Subject: [PATCH] 采购订单:列表页面 同一个单据,只有第一条记录显示第一行记录的主表数据
---
WebTM/views/销售管理/销售报表/Xs_SeOrderOutStockSumReport.html | 242 +++++++++--------------------------------------
1 files changed, 48 insertions(+), 194 deletions(-)
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..81ff738 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">鐗╂枡浠g爜</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">
@@ -154,26 +148,22 @@
get_FastQuery();
});
- //鐗╂枡
- form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
- get_btnHMaterID();
- });
-
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
//鍒濆鍖栫晫闈�
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();
- //DisPlay_HideColumn();
-
- //ColFilter();
}
//鍒濆鍖栬〃鏍�
@@ -185,6 +175,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: [[]]
};
}
@@ -192,18 +196,20 @@
function get_Display(sWhere) {
var wait = layer.load();//閬僵
$.ajax({
- url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList',
+ url: GetWEBURL() + '/Xs_SeOrderOutStockSumReport/Xs_SeOrderOutStockSumReportList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
var col = [];
if (data1.count == 1) {
- var totalArray = ["寮傚父璇勫娆℃暟", "璁″垝鏁伴噺", "鎺ュ彈宸ュ簭鏁伴噺1", "姹囨姤宸ュ簭鏁伴噺1", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�1", "鎺ユ敹宸ュ簭鏁伴噺2", "姹囨姤宸ュ簭鏁伴噺2", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�2", "鎺ユ敹宸ュ簭鏁伴噺3", "姹囨姤宸ュ簭鏁伴噺3", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�3", "鎺ユ敹宸ュ簭鏁伴噺4","姹囨姤宸ュ簭鏁伴噺4","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�4","鎺ユ敹宸ュ簭鏁伴噺5","姹囨姤宸ュ簭鏁伴噺5","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�5","鎺ユ敹宸ュ簭鏁伴噺6","姹囨姤宸ュ簭鏁伴噺6","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�6","鎺ユ敹宸ュ簭鏁伴噺7","姹囨姤宸ュ簭鏁伴噺7","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�7"];
+ var totalArray = [];
var data = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲簭鍙峰垪
+ col.push({ type: 'numbers', fixed: 'left', field: '搴忓彿', title: '搴忓彿' });
//鍒ゆ柇鏄惁鏄函鑻辨枃
var patrn = new RegExp("[\u4E00-\u9FA5]+");
for (var i = 0; i < data.length; i++) {
@@ -241,89 +247,11 @@
//蹇�熻繃婊�
function get_FastQuery() {
- var txtHOrderProcNo = $("#txtHOrderProcNo").val();//璁㈠崟璺熻釜鍙�
- var txtHMaterNumber = $("#txtHMaterNumber").val(); //鐗╂枡
- var txtHDeptName = $("#txtHDeptName").val(); //鐗╂枡
- var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//澶嶉�夋
- var check = "";
- if (chkHShowUnFinish) {
- check = "Y";
- }
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
-
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
- sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'" ;
+ var HBeginDate = $("#HBeginDate").val();//璁㈠崟璺熻釜鍙�
+ var HEndDate = $("#HEndDate").val(); //鐗╂枡
+ var HPriceType = $("#HPriceType").val(); //鐗╂枡
+
+ sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HPriceType + "'";
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
@@ -331,92 +259,18 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#txtHOrderProcNo").val("");
- $("#txtHMaterNumber").val("");
- $("#txtHDeptName").val("");
- $("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
- form.render('select');
-
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
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() {
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐗╂枡'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
- }
- $("#txtHMaterNumber").val(checkStatus.data[0].HNumber);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
- }
- })
- }
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["field"] + ",";
}
@@ -475,7 +329,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
--
Gitblit v1.9.1