From 2ef92e67e6d0ea80cf893b8d4938f27549192513 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 26 七月 2022 16:11:59 +0800
Subject: [PATCH] #
---
src/main/webapp/views/salesOrder/salesOrder.html | 29 ++++++++++++--
src/main/webapp/static/js/salesOrder/salsesOrder.js | 40 +++++++++++++++++--
2 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/static/js/salesOrder/salsesOrder.js b/src/main/webapp/static/js/salesOrder/salsesOrder.js
index 2508d00..3618842 100644
--- a/src/main/webapp/static/js/salesOrder/salsesOrder.js
+++ b/src/main/webapp/static/js/salesOrder/salsesOrder.js
@@ -17,10 +17,16 @@
, {field: 'inQty', align: 'center', title: '鍏ュ簱鏁伴噺', width: 110}
, {field: 'disQty', align: 'center', title: '閫氱煡鍗�', width: 110}
, {field: 'outQty', align: 'center', title: '鍑哄簱鏁伴噺', width: 110}
- , {field: 'invoiceQty', align: 'center', title: '寮�绁ㄦ暟閲�'}
- , {field: 'unInvoiceQty', align: 'center', title: '鏈紑绁ㄦ暟閲�'}
- , {field: 'deliveryDate', align: 'center', title: '浜よ揣鏃ユ湡'}
- , {field: 'personName', align: 'center', title: '涓氬姟鍛�'}
+ , {field: 'invoiceQty', align: 'center', title: '寮�绁ㄦ暟閲�', width: 110}
+ , {field: 'unInvoiceQty', align: 'center', title: '鏈紑绁ㄦ暟閲�', width: 110}
+ , {field: 'deliveryDate', align: 'center', title: '浜よ揣鏃ユ湡', width: 110}
+ , {field: 'personName', align: 'center', title: '涓氬姟鍛�', width: 110}
+ , {field: 'outDate', align: 'center', title: '鍑哄簱鏃ユ湡', width: 110}
+ , {field: 'outPrice', align: 'center', title: '鍑哄簱鍗曚环', width: 110}
+ , {field: 'outAmount', align: 'center', title: '鍑哄簱閲戦', width: 110}
+ , {field: 'invoiceDate', align: 'center', title: '寮�绁ㄦ棩鏈�', width: 110}
+ , {field: 'invoiceAmount', align: 'center', title: '寮�绁ㄩ噾棰�', width: 110}
+ , {field: 'custName', align: 'center', title: '瀹㈡埛鍚嶇О', width: 110}
);
return cols;
}
@@ -88,10 +94,26 @@
// 鏃堕棿閫夋嫨鍣�
layDate.render({
- elem: '.layui-laydate-range'
+ elem: '#orderTimeRange'
,style: 'width: 150px'
, range: true
});
+ layDate.render({
+ elem: '#orderTimeDeliveryRange'
+ ,style: 'width: 150px'
+ , range: true
+ });
+ layDate.render({
+ elem: '#orderTimeOutRange'
+ ,style: 'width: 150px'
+ , range: true
+ });
+
+ // layDate.render({
+ // elem: '.layui-laydate-range'
+ // ,style: 'width: 150px'
+ // , range: true
+ // });
});
/* 琛ㄦ牸鏁版嵁閲嶈浇 */
@@ -103,6 +125,14 @@
searchData.startTime = this.value.substring(0, 10);
searchData.endTime = this.value.substring(13, this.value.length);
}
+ if (this.name == 'orderTimeDelivery') {
+ searchData.startTimeDelivery = this.value.substring(0, 10);
+ searchData.endTimeDelivery = this.value.substring(13, this.value.length);
+ }
+ if (this.name == 'orderTimeOut') {
+ searchData.startTimeOut = this.value.substring(0, 10);
+ searchData.endTimeOut = this.value.substring(13, this.value.length);
+ }
});
(child ? parent.tableIns : tableIns).reload({
where: searchData,
diff --git a/src/main/webapp/views/salesOrder/salesOrder.html b/src/main/webapp/views/salesOrder/salesOrder.html
index 6c2c355..c3d6e5b 100644
--- a/src/main/webapp/views/salesOrder/salesOrder.html
+++ b/src/main/webapp/views/salesOrder/salesOrder.html
@@ -10,6 +10,11 @@
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<link rel="stylesheet" href="../../static/css/print.css" media="all">
+<!-- <style>-->
+<!-- .layui-table-body.layui-table-main {-->
+<!-- overflow: scroll;-->
+<!-- }-->
+<!-- </style>-->
</head>
<style>
#search-box {
@@ -37,7 +42,7 @@
width: 300px;
}
.layui-table-body.layui-table-main{
- overflow: auto;
+ overflow: scroll;
}
</style>
<body>
@@ -72,17 +77,31 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input" type="text" name="custName" placeholder="瀹㈡埛" autocomplete="off">
</div>
</div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="orderTime" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input layui-laydate-range" id="orderTimeRange" name="orderTime" type="text" placeholder="璁㈠崟鏃ユ湡" autocomplete="off" style="width: 300px">
</div>
</div>
-
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" id="orderTimeDeliveryRange" name="orderTimeDelivery" type="text" placeholder="浜よ揣鏃ユ湡" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" id="orderTimeOutRange" name="orderTimeOut" type="text" placeholder="鍑哄簱鏃ユ湡" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
<!--<div class="layui-inline" style="width: 150px">-->
<!--<select id="orderState" name="orderState">-->
<!--<option value="">璁㈠崟鐘舵��</option>-->
@@ -102,7 +121,7 @@
</div>
<!-- 琛ㄦ牸 -->
- <div class="layui-form">
+ <div class="layui-form" style="width: 100%">
<table class="layui-hide" id="salesOrder" lay-filter="salesOrder"></table>
</div>
--
Gitblit v1.9.1