From 32e6c7156dffa93aebaa4cc256397e801965684c Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期一, 17 一月 2022 09:11:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
index 3f1021f..62977fd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
@@ -35,9 +35,15 @@
</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" id="HDate" 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" id="HDate1" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -96,6 +102,7 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
var table = null;
@@ -122,12 +129,20 @@
var pageIndex = 1;//褰撳墠椤电爜鍊�
//#region 杩涘叆椤甸潰鏃㈠姞杞�
- //鍒濆鍖栬〃鍗曟彃浠�
- set_InitFrom();
//鍒濆鍖栫晫闈�
set_ClearBill(sWhere);
//#endregion
+ //#region 鍒濆鍖栬〃鍗�
+ function set_InitFrom() {
+ laydate.render({
+ elem: '#HDate'
+ });
+ laydate.render({
+ elem: '#HDate1'
+ });
+ }
+ //#endregion
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -176,17 +191,15 @@
get_FastQuery();
});
- //鍒濆鍖栬〃鍗�
- function set_InitFrom() {
- laydate.render({
- elem: '#HDate'
- });
- }
//鍒濆鍖栫晫闈�
function set_ClearBill(sWhere) {
resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
//鍒濆鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ get_FastQuery();
+
}
//鍔犺浇缃戞牸
function get_Display(sWhere) {
@@ -194,7 +207,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
type: "GET",
- data: { "sWhere": sWhere, "page": 1, "limit": 10 },
+ data: { "page": 1, "limit": 10, "sWhere": sWhere },
datatype: "json",
success: function (data1) {
console.log(data1);
@@ -209,6 +222,7 @@
}
//鍒濆鍖栬〃鏍�
function set_InitGrid(sWhere) {
+
//濉厖琛ㄦ牸澶存暟缁�
var data = resultTableHead;
cols_arr[0] = [];
@@ -221,22 +235,22 @@
switch (data[i].Type) {
//int
case 'Int32':
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 100 };
break;
//Decimal
case 'Decimal':
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true, width: 200 };
break;
default:
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 };
}
}
}
//濉厖琛ㄦ牸鏁版嵁
table.render({
elem: '#mainTable',
- url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
toolbar: '#toolbarDemo',
+ url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
title: '缁勬墭鍗曞垪琛�',
cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
id: 'mainTable', //琛ㄦ牸id
@@ -297,6 +311,7 @@
//蹇�熻繃婊�
function get_FastQuery() {
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HDepartName = $("#HDepartName").val();
var HMaterNumber = $("#HMaterNumber").val();
@@ -304,6 +319,9 @@
var HMakerMan = $("#HMakerMan").val();
if (HDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -320,19 +338,20 @@
if (HMakerMan) {
sWhere += " and 鍒跺崟浜� like '%" + HMakerMan + "%'";
}
- set_ClearBill(sWhere);
+ get_Display(sWhere);
sWhere = "";
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBillNo").val("");
$("#HDepartName").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
$("#HMakerMan").val("");
- sWhere = "";
- get_Display(sWhere);
+ sWhere = " ";
+ get_FastQuery();
}
//鍒锋柊
function set_Refresh() {
--
Gitblit v1.9.1