From 87fc641cd082a2b10ce1370fd4431654e21f1178 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 12 十月 2023 15:02:14 +0800
Subject: [PATCH] 领料统计报表修改调整
---
WebTM/views/车间管理/报表分析/Kf_MateOutSumReport_QiaoYi.html | 94 ++++++++++++++++++++++------------------------
1 files changed, 45 insertions(+), 49 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MateOutSumReport_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MateOutSumReport_QiaoYi.html"
index 7386ff6..3e8646d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MateOutSumReport_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MateOutSumReport_QiaoYi.html"
@@ -30,38 +30,51 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ <div class="layui-inline" style="width:200px;">
+ <label class="layui-form-label" style="width:35px;">鏃ユ湡</label>
+ <div class="layui-input-block" style="position:relative; left:-45px;">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:140px;">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ <div class="layui-inline" style="width:200px;">
+ <label class="layui-form-label" style="width:5px;">-</label>
+ <div class="layui-input-block" style="position:relative; left:-70px;">
+ <input type="date" class="layui-input" id="HEndDate" style="width:140px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:140px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:190px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="width:140px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
+ <label class="layui-form-label">鏌撴枡鎬婚噺</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSumRLQty" id="HSumRLQty" style="width:120px;" readonly>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width:30px;">鍏枻</label>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍔╁墏鎬婚噺</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSumZJQty" id="HSumZJQty" style="width:120px;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width:10px;">鍚�</label>
+ </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>
</div>
@@ -69,7 +82,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>鏌ヨ</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Query" id="Query"><i class="layui-icon layui-icon-search"></i>鏌ヨ</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>榛樿鍒楀</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -117,37 +130,10 @@
//鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- //鑾峰彇缁勭粐
- Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
get_Display(sWhere);
- }
- //#endregion
-
- //#region 鑾峰彇缁勭粐
- function Organ() {
- //鑾峰彇鐧诲綍椤电粍缁囧垪
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Web/GetOrganizations",
- async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- success: function (result) {
- var Organization = "";
- Organization += '<option style="color:blue;" value="鍏ㄩ儴">鍏ㄩ儴</option>';
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- for (var i = 0; i < data.length; i++) {
- Organization += '<option style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
- }
- $("#HStockOrgID").append(Organization);
- $("#HStockOrgID").val(sessionStorage["Organization"])
- form.render('select');
- }
- layer.closeAll("loading");
- }
- })
}
//#endregion
@@ -307,6 +293,11 @@
}
//#endregion
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_Display();
+ });
+
//#region 鏌ヨ
function get_Display() {
var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
@@ -338,7 +329,7 @@
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -350,11 +341,12 @@
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>", width: 200 });
break;
default:
- if (data[i].name == '鍏嬮噸') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
- } else {
- 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 });
+ //if (data[i].name == '鍏嬮噸') {
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ //} else {
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ //}
}
}
}
@@ -376,6 +368,10 @@
option.totalRow = true;
table.render(option);
ins = table.render(option);
+
+
+ $("#HSumRLQty").val(data1.data[0].HSumRLQty);
+ $("#HSumZJQty").val(data1.data[0].HSumZJQty);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
layer.close(ajaxLoad);
--
Gitblit v1.9.1