From 6841ec3bc454037266ddd8e759bf0a424d933ff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 17 Apr 2020 23:50:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/customer.html    | 40 +++++++++++++--------------
 erp_web/pages/manage/member.html      | 40 +++++++++++++--------------
 erp_web/pages/manage/vendor.html      | 40 +++++++++++++--------------
 erp_web/pages/materials/material.html | 32 ++++++++++++---------
 4 files changed, 79 insertions(+), 73 deletions(-)

diff --git a/erp_web/pages/manage/customer.html b/erp_web/pages/manage/customer.html
index f20cf430..aab67eef 100644
--- a/erp_web/pages/manage/customer.html
+++ b/erp_web/pages/manage/customer.html
@@ -153,29 +153,29 @@
 </div>
 
 <!-- 导入excel表格 -->
-<div id="importExcelDlg" style="padding:10px 20px">
+<div id="importExcelDlg" style="padding:10px 20px" buttons="#dlg-buttons5">
     <form id="importExcelFM" method="post" enctype="multipart/form-data"
           action="/supplier/importExcelCustomer">
-        <div class="fitem" style="padding:5px">
-            <label>文件名称&nbsp;&nbsp;</label>
-            <input name="supplierFile" id="supplierFile" type="file" style="width: 230px;height: 20px"/>
-        </div>
-        <div class="fitem" style="padding:5px">
-            <label><b>导入注意</b>&nbsp;&nbsp;</label><span>（预收款、期初应收、期初应付、税率均为数值且要大于0；另外期初应收、期初应付不能同时输入）</span>
-        </div>
-        <div class="fitem" style="padding:5px;display: none;">
-            <label>是否审查&nbsp;&nbsp;</label>
-            <select id="isCheck" name="isCheck" style="width: 230px;height: 20px">
-                <option value="0">是</option>
-                <option value="1" selected="selected">否</option>
-            </select>
-        </div>
-        <div id="dlg-buttons5">
-            <a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
-            <a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
-               onclick="javascript:$('#importExcelDlg').dialog('close')">取消</a>
-        </div>
+        <table>
+            <tr>
+                <td style="width:80px;">文件名称</td>
+                <td style="padding:5px">
+                    <input name="supplierFile" id="supplierFile" type="file" style="width: 230px;"/>
+                </td>
+            </tr>
+            <tr>
+                <td>导入注意</td>
+                <td style="padding:5px">
+                    <span>预收款、期初应收、期初应付、税率均为数值且要大于0；另外期初应收、期初应付不能同时输入</span>
+                </td>
+            </tr>
+        </table>
     </form>
 </div>
+<div id="dlg-buttons5">
+    <a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
+    <a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
+       onclick="javascript:$('#importExcelDlg').dialog('close')">取消</a>
+</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/manage/member.html b/erp_web/pages/manage/member.html
index b22c656d..ea8efd4a 100644
--- a/erp_web/pages/manage/member.html
+++ b/erp_web/pages/manage/member.html
@@ -153,29 +153,29 @@
 </div>
 
 <!-- 导入excel表格 -->
-<div id="importExcelDlg" style="padding:10px 20px">
+<div id="importExcelDlg" style="padding:10px 20px" buttons="#dlg-buttons5">
     <form id="importExcelFM" method="post" enctype="multipart/form-data"
           action="/supplier/importExcelMember">
-        <div class="fitem" style="padding:5px">
-            <label>文件名称&nbsp;&nbsp;</label>
-            <input name="supplierFile" id="supplierFile" type="file" style="width: 230px;height: 20px"/>
-        </div>
-        <div class="fitem" style="padding:5px">
-            <label><b>导入注意</b>&nbsp;&nbsp;</label><span>（预收款、期初应收、期初应付、税率均为数值且要大于0；另外期初应收、期初应付不能同时输入）</span>
-        </div>
-        <div class="fitem" style="padding:5px;display: none;">
-            <label>是否审查&nbsp;&nbsp;</label>
-            <select id="isCheck" name="isCheck" style="width: 230px;height: 20px">
-                <option value="0">是</option>
-                <option value="1" selected="selected">否</option>
-            </select>
-        </div>
-        <div id="dlg-buttons5">
-            <a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
-            <a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
-               onclick="javascript:$('#importExcelDlg').dialog('close')">取消</a>
-        </div>
+        <table>
+            <tr>
+                <td style="width:80px;">文件名称</td>
+                <td style="padding:5px">
+                    <input name="supplierFile" id="supplierFile" type="file" style="width: 230px;"/>
+                </td>
+            </tr>
+            <tr>
+                <td>导入注意</td>
+                <td style="padding:5px">
+                    <span>预收款、期初应收、期初应付、税率均为数值且要大于0；另外期初应收、期初应付不能同时输入</span>
+                </td>
+            </tr>
+        </table>
     </form>
 </div>
+<div id="dlg-buttons5">
+    <a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
+    <a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
+       onclick="javascript:$('#importExcelDlg').dialog('close')">取消</a>
+</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/manage/vendor.html b/erp_web/pages/manage/vendor.html
index 7a79edd4..780aa197 100644
--- a/erp_web/pages/manage/vendor.html
+++ b/erp_web/pages/manage/vendor.html
@@ -153,30 +153,30 @@
 </div>
 
 <!-- 导入excel表格 -->
-<div id="importExcelDlg" style="padding:10px 20px">
+<div id="importExcelDlg" style="padding:10px 20px" buttons="#dlg-buttons5">
     <form id="importExcelFM" method="post" enctype="multipart/form-data"
           action="/supplier/importExcelVendor">
-        <div class="fitem" style="padding:5px">
-            <label>文件名称&nbsp;&nbsp;</label>
-            <input name="supplierFile" id="supplierFile" type="file" style="width: 230px;height: 20px"/>
-        </div>
-        <div class="fitem" style="padding:5px">
-            <label><b>导入注意</b>&nbsp;&nbsp;</label><span>（预收款、期初应收、期初应付、税率均为数值且要大于0；另外期初应收、期初应付不能同时输入）</span>
-        </div>
-        <div class="fitem" style="padding:5px;display: none;">
-            <label>是否审查&nbsp;&nbsp;</label>
-            <select id="isCheck" name="isCheck" style="width: 230px;height: 20px">
-                <option value="0">是</option>
-                <option value="1" selected="selected">否</option>
-            </select>
-        </div>
-        <div id="dlg-buttons5">
-            <a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
-            <a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
-               onclick="javascript:$('#importExcelDlg').dialog('close')">取消</a>
-        </div>
+        <table>
+            <tr>
+                <td style="width:80px;">文件名称</td>
+                <td style="padding:5px">
+                    <input name="supplierFile" id="supplierFile" type="file" style="width: 230px;"/>
+                </td>
+            </tr>
+            <tr>
+                <td>导入注意</td>
+                <td style="padding:5px">
+                    <span>预收款、期初应收、期初应付、税率均为数值且要大于0；另外期初应收、期初应付不能同时输入</span>
+                </td>
+            </tr>
+        </table>
     </form>
 </div>
+<div id="dlg-buttons5">
+    <a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
+    <a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
+       onclick="javascript:$('#importExcelDlg').dialog('close')">取消</a>
+</div>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 854d843a..345f8af4 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -193,21 +193,27 @@
 <div id="importExcelDlg" class="easyui-dialog" style="width:450px; padding:10px 20px;"
      closed="true" buttons="#dlg-buttons5" modal="true" collapsible="false" closable="true">
     <form id="importExcelFM" method="post" enctype="multipart/form-data" action="/material/importExcel">
-        <div class="fitem" style="padding:5px">
-            <label>表格模板&nbsp;&nbsp;</label>
-            <span><a href="/upload/excels/goods_template.xls"><b>Excel模板下载</b></a></span>
-        </div>
-        <div class="fitem" style="padding:5px">
-            <label>文件名称&nbsp;&nbsp;</label>
-            <input name="materialFile" id="materialFile" type="file" style="width: 230px;height: 20px"/>
-        </div>
-        <div id="dlg-buttons5">
-            <a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
-            <a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
-               onclick="javascript:$('#importExcelDlg').dialog('close')">取消</a>
-        </div>
+        <table>
+            <tr>
+                <td style="width:80px;">表格模板</td>
+                <td style="padding:5px">
+                    <span><a href="/upload/excels/goods_template.xls"><b>Excel模板下载</b></a></span>
+                </td>
+            </tr>
+            <tr>
+                <td>文件名称</td>
+                <td style="padding:5px">
+                    <input name="materialFile" id="materialFile" type="file" style="width: 230px;"/>
+                </td>
+            </tr>
+        </table>
     </form>
 </div>
+<div id="dlg-buttons5">
+    <a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
+    <a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
+       onclick="javascript:$('#importExcelDlg').dialog('close')">取消</a>
+</div>
 
 <div id="forSelectMaterialCategoryDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:50px;"
      closed="true" modal="true" cache="false" collapsible="false" closable="true">