From 4249263fc7683e18418b65ed6dd715ceeb785266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 9 Jun 2019 23:06:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=A4=A9=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E4=B8=8D=E5=88=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/in_out.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index bc319507..0b753791 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -2675,6 +2675,14 @@
 
 	function showDepotHeadDetails(pageNo,pageSize){
 		var materialParam = $.trim($("#searchMaterial").val());
+        var beginTime = $.trim($("#searchBeginTime").val());
+        var endTime = $.trim($("#searchEndTime").val());
+        if(beginTime) {
+            beginTime = beginTime + ' 00:00:00';
+        }
+        if(endTime) {
+            endTime = endTime + ' 23:59:59';
+        }
 		$.ajax({
 			type: "get",
 			url: "/depotHead/list",
@@ -2685,8 +2693,8 @@
 					subType: listSubType,
 					state: $.trim($("#searchState").val()),
 					number: $.trim($("#searchNumber").val()),
-					beginTime: $("#searchBeginTime").val(),
-					endTime: $("#searchEndTime").val(),
+                    beginTime: beginTime,
+                    endTime: endTime,
                     materialParam: materialParam,
                     depotIds: depotString
 				}),

From 6f7b3c00dc8b0431b3de017332ff654caee393a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 9 Jun 2019 23:24:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=98=E5=BD=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/financial/advance_in.html           | 2 +-
 erp_web/pages/financial/giro.html                 | 2 +-
 erp_web/pages/financial/item_in.html              | 2 +-
 erp_web/pages/financial/item_out.html             | 2 +-
 erp_web/pages/financial/money_in.html             | 2 +-
 erp_web/pages/financial/money_out.html            | 2 +-
 erp_web/pages/materials/allocation_out_list.html  | 2 +-
 erp_web/pages/materials/assemble_list.html        | 2 +-
 erp_web/pages/materials/disassemble_list.html     | 2 +-
 erp_web/pages/materials/other_in_list.html        | 2 +-
 erp_web/pages/materials/other_out_list.html       | 2 +-
 erp_web/pages/materials/purchase_back_list.html   | 2 +-
 erp_web/pages/materials/purchase_in_list.html     | 2 +-
 erp_web/pages/materials/purchase_orders_list.html | 2 +-
 erp_web/pages/materials/retail_back_list.html     | 2 +-
 erp_web/pages/materials/retail_out_list.html      | 2 +-
 erp_web/pages/materials/sale_back_list.html       | 2 +-
 erp_web/pages/materials/sale_orders_list.html     | 2 +-
 erp_web/pages/materials/sale_out_list.html        | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/erp_web/pages/financial/advance_in.html b/erp_web/pages/financial/advance_in.html
index 9cc28e0d..6ff0ef3d 100644
--- a/erp_web/pages/financial/advance_in.html
+++ b/erp_web/pages/financial/advance_in.html
@@ -56,7 +56,7 @@
     <form id="accountHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">付款会员：</td>
+                <td style="width:70px;">付款会员：</td>
                 <td style="padding:5px;width:170px;">
                     <select name="OrganId" id="OrganId" style="width:110px;"></select>
                 </td>
diff --git a/erp_web/pages/financial/giro.html b/erp_web/pages/financial/giro.html
index 4bda0463..6a8ac837 100644
--- a/erp_web/pages/financial/giro.html
+++ b/erp_web/pages/financial/giro.html
@@ -56,7 +56,7 @@
     <form id="accountHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">经手人：</td>
+                <td style="width:70px;">经手人：</td>
                 <td style="padding:5px;width:170px;">
                     <select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
                 </td>
diff --git a/erp_web/pages/financial/item_in.html b/erp_web/pages/financial/item_in.html
index 87451120..7fd17163 100644
--- a/erp_web/pages/financial/item_in.html
+++ b/erp_web/pages/financial/item_in.html
@@ -56,7 +56,7 @@
     <form id="accountHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">往来单位：</td>
+                <td style="width:70px;">往来单位：</td>
                 <td style="padding:5px;width:170px;">
                     <select name="OrganId" id="OrganId" style="width:130px;"></select>
                 </td>
diff --git a/erp_web/pages/financial/item_out.html b/erp_web/pages/financial/item_out.html
index cc7bdef3..2f925f90 100644
--- a/erp_web/pages/financial/item_out.html
+++ b/erp_web/pages/financial/item_out.html
@@ -56,7 +56,7 @@
     <form id="accountHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">往来单位：</td>
+                <td style="width:70px;">往来单位：</td>
                 <td style="padding:5px;width:170px;">
                     <select name="OrganId" id="OrganId" style="width:130px;"></select>
                 </td>
diff --git a/erp_web/pages/financial/money_in.html b/erp_web/pages/financial/money_in.html
index d1a07192..34937410 100644
--- a/erp_web/pages/financial/money_in.html
+++ b/erp_web/pages/financial/money_in.html
@@ -56,7 +56,7 @@
     <form id="accountHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">付款单位：</td>
+                <td style="width:70px;">付款单位：</td>
                 <td style="padding:5px;width:170px;">
                     <select name="OrganId" id="OrganId" style="width:130px;"></select>
                 </td>
diff --git a/erp_web/pages/financial/money_out.html b/erp_web/pages/financial/money_out.html
index cde020a1..f822f145 100644
--- a/erp_web/pages/financial/money_out.html
+++ b/erp_web/pages/financial/money_out.html
@@ -56,7 +56,7 @@
     <form id="accountHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">收款单位：</td>
+                <td style="width:70px;">收款单位：</td>
                 <td style="padding:5px;width:170px;">
                     <select name="OrganId" id="OrganId" style="width:130px;"></select>
                 </td>
diff --git a/erp_web/pages/materials/allocation_out_list.html b/erp_web/pages/materials/allocation_out_list.html
index 02924d24..e6e56094 100644
--- a/erp_web/pages/materials/allocation_out_list.html
+++ b/erp_web/pages/materials/allocation_out_list.html
@@ -61,7 +61,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">单据日期：</td>
+                <td style="width:70px;">单据日期：</td>
                 <td style="padding:5px;width:170px;">
                     <input type="text" name="OperTime" id="OperTime"
                            onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
diff --git a/erp_web/pages/materials/assemble_list.html b/erp_web/pages/materials/assemble_list.html
index 46ed61d4..fac8e03b 100644
--- a/erp_web/pages/materials/assemble_list.html
+++ b/erp_web/pages/materials/assemble_list.html
@@ -61,7 +61,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">单据日期：</td>
+                <td style="width:70px;">单据日期：</td>
                 <td style="padding:5px;width:170px;">
                     <input type="text" name="OperTime" id="OperTime"
                            onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
diff --git a/erp_web/pages/materials/disassemble_list.html b/erp_web/pages/materials/disassemble_list.html
index 556d3f80..b924e4d6 100644
--- a/erp_web/pages/materials/disassemble_list.html
+++ b/erp_web/pages/materials/disassemble_list.html
@@ -66,7 +66,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">单据日期：</td>
+                <td style="width:70px;">单据日期：</td>
                 <td style="padding:5px;width:170px;">
                     <input type="text" name="OperTime" id="OperTime"
                            onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
diff --git a/erp_web/pages/materials/other_in_list.html b/erp_web/pages/materials/other_in_list.html
index b521ed8d..79fecceb 100644
--- a/erp_web/pages/materials/other_in_list.html
+++ b/erp_web/pages/materials/other_in_list.html
@@ -61,7 +61,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">供应商：</td>
+                <td style="width:70px;">供应商：</td>
                 <td style="padding:5px;width:170px;">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>
diff --git a/erp_web/pages/materials/other_out_list.html b/erp_web/pages/materials/other_out_list.html
index f803864b..5b9b407f 100644
--- a/erp_web/pages/materials/other_out_list.html
+++ b/erp_web/pages/materials/other_out_list.html
@@ -61,7 +61,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">客户：</td>
+                <td style="width:70px;">客户：</td>
                 <td style="padding:5px;width:170px;">
                     <input id="OrganId" name="OrganId" style="width:130px;"/>
                 </td>
diff --git a/erp_web/pages/materials/purchase_back_list.html b/erp_web/pages/materials/purchase_back_list.html
index 1615d388..8a3b1e81 100644
--- a/erp_web/pages/materials/purchase_back_list.html
+++ b/erp_web/pages/materials/purchase_back_list.html
@@ -61,7 +61,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">供应商：</td>
+                <td style="width:70px;">供应商：</td>
                 <td style="padding:5px;width:170px;">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>
diff --git a/erp_web/pages/materials/purchase_in_list.html b/erp_web/pages/materials/purchase_in_list.html
index d6b6b5aa..fcf37597 100644
--- a/erp_web/pages/materials/purchase_in_list.html
+++ b/erp_web/pages/materials/purchase_in_list.html
@@ -61,7 +61,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">供应商：</td>
+                <td style="width:70px;">供应商：</td>
                 <td style="padding:5px;width:170px;">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>
diff --git a/erp_web/pages/materials/purchase_orders_list.html b/erp_web/pages/materials/purchase_orders_list.html
index af449d7e..273207ef 100644
--- a/erp_web/pages/materials/purchase_orders_list.html
+++ b/erp_web/pages/materials/purchase_orders_list.html
@@ -61,7 +61,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">供应商：</td>
+                <td style="width:70px;">供应商：</td>
                 <td style="padding:5px;width:170px;">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>
diff --git a/erp_web/pages/materials/retail_back_list.html b/erp_web/pages/materials/retail_back_list.html
index 5e733352..42f6b88e 100644
--- a/erp_web/pages/materials/retail_back_list.html
+++ b/erp_web/pages/materials/retail_back_list.html
@@ -61,7 +61,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;height:50px;">会员卡号：</td>
+                <td style="width:70px;height:50px;">会员卡号：</td>
                 <td style="padding:5px;width:200px;">
                     <input id="OrganId" name="OrganId" style="width:130px;"/>
                 </td>
diff --git a/erp_web/pages/materials/retail_out_list.html b/erp_web/pages/materials/retail_out_list.html
index 3f9131b7..c96227a3 100644
--- a/erp_web/pages/materials/retail_out_list.html
+++ b/erp_web/pages/materials/retail_out_list.html
@@ -61,7 +61,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;height:50px;">会员卡号：</td>
+                <td style="width:70px;height:50px;">会员卡号：</td>
                 <td style="padding:5px;width:200px;">
                     <div class="org-list">
                     <input id="OrganId" name="OrganId" style="width:130px;"/>
diff --git a/erp_web/pages/materials/sale_back_list.html b/erp_web/pages/materials/sale_back_list.html
index 27655db8..9e1bbe0a 100644
--- a/erp_web/pages/materials/sale_back_list.html
+++ b/erp_web/pages/materials/sale_back_list.html
@@ -146,7 +146,7 @@
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
     <table>
         <tr>
-            <td style="width:60px;">客户：</td>
+            <td style="width:70px;">客户：</td>
             <td style="padding:5px;width:130px;">
                 <span id="OrganIdShow"></span>
             </td>
diff --git a/erp_web/pages/materials/sale_orders_list.html b/erp_web/pages/materials/sale_orders_list.html
index 0b790973..8bb1be6e 100644
--- a/erp_web/pages/materials/sale_orders_list.html
+++ b/erp_web/pages/materials/sale_orders_list.html
@@ -61,7 +61,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">客户：</td>
+                <td style="width:70px;">客户：</td>
                 <td style="padding:5px">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>
diff --git a/erp_web/pages/materials/sale_out_list.html b/erp_web/pages/materials/sale_out_list.html
index fc63c71a..4e24ac49 100644
--- a/erp_web/pages/materials/sale_out_list.html
+++ b/erp_web/pages/materials/sale_out_list.html
@@ -61,7 +61,7 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:60px;">客户：</td>
+                <td style="width:70px;">客户：</td>
                 <td style="padding:5px">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>