将大部分页面的弹窗默认最大化，自适应窗口

erp_web/js/pages/materials/in_out.js

@@ -637,7 +637,7 @@
 			isShowMaterialTypeColumn = false; //显示
 		}
 		$('#materialData').datagrid({
-			height:245,
+			height:345,
 			rownumbers: false,
 			//动画效果
 			animate:false,
@@ -953,7 +953,7 @@
             isShowFinishColumn = false; //显示
         }
 		$('#materialDataShow').datagrid({
-			height:245,
+			height:345,
 			rownumbers: true,
 			//动画效果
 			animate:false,

erp_web/pages/financial/advance_in.html

@@ -45,10 +45,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="accountHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">付款会员</td>
                 <td style="padding:5px;width:170px;">
@@ -80,7 +80,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
@@ -98,9 +98,9 @@
     <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">付款会员：</td>
             <td style="padding:5px;width:140px;">
@@ -129,7 +129,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
         <tr>

erp_web/pages/financial/giro.html

@@ -45,10 +45,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="accountHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">经手人</td>
                 <td style="padding:5px;width:170px;">
@@ -79,7 +79,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
@@ -102,9 +102,9 @@
     <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">经手人：</td>
             <td style="padding:5px;width:130px;">
@@ -131,7 +131,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
         <tr>

erp_web/pages/financial/item_in.html

@@ -45,10 +45,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="accountHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">往来单位</td>
                 <td style="padding:5px;width:170px;">
@@ -80,7 +80,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
@@ -103,9 +103,9 @@
     <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">往来单位：</td>
             <td style="padding:5px;width:130px;">
@@ -134,7 +134,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
         <tr>

erp_web/pages/financial/item_out.html

@@ -45,10 +45,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="accountHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">往来单位</td>
                 <td style="padding:5px;width:170px;">
@@ -80,7 +80,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
@@ -103,9 +103,9 @@
     <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">往来单位：</td>
             <td style="padding:5px;width:130px;">
@@ -132,7 +132,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
         <tr>

erp_web/pages/financial/money_in.html

@@ -45,10 +45,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="accountHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">付款单位</td>
                 <td style="padding:5px;width:170px;">
@@ -80,7 +80,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
@@ -99,9 +99,9 @@
     <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">付款单位：</td>
             <td style="padding:5px;width:130px;">
@@ -130,7 +130,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
         <tr>

erp_web/pages/financial/money_out.html

@@ -45,10 +45,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="accountHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">收款单位</td>
                 <td style="padding:5px;width:170px;">
@@ -79,7 +79,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
@@ -98,9 +98,9 @@
     <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
+<div id="accountHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">收款单位：</td>
             <td style="padding:5px;width:130px;">
@@ -129,7 +129,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
         <tr>

erp_web/pages/manage/inOutItem.html

@@ -54,23 +54,31 @@
 <div id="inOutItemDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
      closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
     <form id="inOutItemFM" method="post" novalidate>
-        <div class="fitem" style="padding:5px">
+        <table>
-            <label id="nameLabel">名&nbsp;&nbsp;&nbsp;&nbsp;称</label>
+            <tr>
-            <input name="name" id="name" class="easyui-textbox"
+                <td>名&nbsp;&nbsp;&nbsp;&nbsp;称</td>
-                   data-options="required:true,validType:'length[2,30]'" style="width:230px;"/>
+                <td style="padding:5px">
-        </div>
+                    <input name="name" id="name" class="easyui-textbox"
-        <div class="fitem" style="padding:5px">
+                           data-options="required:true,validType:'length[2,30]'" style="width:230px;"/>
-            <label id="typeLabel">类&nbsp;&nbsp;&nbsp;&nbsp;型</label>
+                </td>
-            <select name="type" id="type" class="easyui-combobox"
+            </tr>
-                    data-options="panelHeight:'auto'" style="width:230px;">
+            <tr>
-                <option value="收入">收入</option>
+                <td>类&nbsp;&nbsp;&nbsp;&nbsp;型</td>
-                <option value="支出">支出</option>
+                <td style="padding:5px">
-            </select>
+                    <select name="type" id="type" class="easyui-combobox"
-        </div>
+                            data-options="panelHeight:'auto'" style="width:230px;">
-        <div class="fitem" style="padding:5px">
+                        <option value="收入">收入</option>
-            <label id="remarkLabel">备&nbsp;&nbsp;&nbsp;&nbsp;注</label>
+                        <option value="支出">支出</option>
-            <textarea name="remark" id="remark" class="easyui-textbox" data-options="multiline:true" style="width: 230px;height: 40px;"></textarea>
+                    </select>
-        </div>
+                </td>
+            </tr>
+            <tr>
+                <td>备&nbsp;&nbsp;&nbsp;&nbsp;注</td>
+                <td style="padding:5px">
+                    <textarea name="remark" id="remark" class="easyui-textbox" data-options="multiline:true" style="width: 230px;height: 40px;"></textarea>
+                </td>
+            </tr>
+        </table>
     </form>
 </div>
 <div id="dlg-buttons">

erp_web/pages/manage/role.html

@@ -44,9 +44,11 @@
     <form id="roleFM" method="post" novalidate>
         <table>
             <tr>
-                <td><label id="nameLabel">角色名称&nbsp;&nbsp;</label></td>
+                <td>角色名称&nbsp;&nbsp;</td>
-                <td style="padding:5px"><input name="name" id="name" class="easyui-textbox"
+                <td style="padding:5px">
-                data-options="required:true,validType:'length[2,30]'" style="width: 230px;"/></td>
+                    <input name="name" id="name" class="easyui-textbox"
+                data-options="required:true,validType:'length[2,30]'" style="width: 230px;"/>
+                </td>
             </tr>
         </table>
     </form>

erp_web/pages/manage/serialNumber.html

@@ -55,10 +55,10 @@
     <table id="serialNumberTableData" style="top:50px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="serialNumberDlg" class="easyui-dialog" style="width:860px;height:440px;padding:10px 20px"
+<div id="serialNumberDlg" class="easyui-dialog" style="padding:10px 20px" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
     <form id="serialNumberFM" method="post" novalidate>
-        <div id="tt" class="easyui-tabs" style="width:800px;height:320px;">
+        <div id="tt" class="easyui-tabs" style="width:100%;height: 520px">
             <div title="基本信息" style="padding:20px;">
                 <table>
                     <tr>
@@ -99,10 +99,10 @@
     <a href="javascript:void(0)" id="cancelSerialNumber" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#serialNumberDlg').dialog('close')">取消</a>
 </div>
-<div id="batAddSerialNumberDlg" class="easyui-dialog" style="width:860px;height:440px;padding:10px 20px"
+<div id="batAddSerialNumberDlg" class="easyui-dialog" style="padding:10px 20px" fit="true"
      closed="true" buttons="#bat-dlg-buttons" modal="true" collapsible="false" closable="true">
     <form id="batAddserialNumberFM" method="post" novalidate>
-        <div id="batAddtt" class="easyui-tabs" style="width:800px;height:320px;">
+        <div id="batAddtt" class="easyui-tabs" style="width: 100%; height: 520px">
             <div title="批量自定义序列号" style="padding:20px;">
                 <table>
                     <tr>

erp_web/pages/materials/allocation_out_list.html

@@ -54,13 +54,13 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">单据日期</td>
-                <td style="padding:5px;width:170px;">
+                <td style="padding:5px">
                     <input type="text" name="OperTime" id="OperTime"
                            onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
@@ -71,7 +71,7 @@
                            data-options="validType:'length[2,30]'" style="width:150px;" readonly/>
                 </td>
                 <td style="width:80px;"></td>
-                <td style="padding:5px;width:170px;"></td>
+                <td style="padding:5px;"></td>
                 <td style="width:70px;"></td>
                 <td style="padding:5px"></td>
                 <td style="width:100px;"></td>
@@ -85,7 +85,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
         </table>
@@ -97,9 +97,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:70px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">单据日期：</td>
             <td style="padding:5px;width:130px;">
@@ -124,7 +124,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
     </table>

erp_web/pages/materials/assemble_list.html

@@ -54,10 +54,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">单据日期</td>
                 <td style="padding:5px;width:170px;">
@@ -85,7 +85,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
         </table>
@@ -96,9 +96,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:70px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">单据日期：</td>
             <td style="padding:5px;width:130px;">

erp_web/pages/materials/disassemble_list.html

@@ -53,10 +53,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">单据日期</td>
                 <td style="padding:5px;width:170px;">
@@ -84,7 +84,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
         </table>
@@ -96,9 +96,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:70px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">单据日期：</td>
             <td style="padding:5px;width:130px;">
@@ -123,7 +123,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
     </table>

erp_web/pages/materials/material.html

@@ -64,12 +64,12 @@
     <table id="materialTableData" style="top:50px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="materialDlg" class="easyui-dialog" style="width:1200px;height:520px;padding:10px 20px"
+<div id="materialDlg" class="easyui-dialog" style="padding:10px 20px" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
     <form id="materialFM" method="post" novalidate>
-        <div id="tt" class="easyui-tabs" style="width:1150px;height:410px;">
+        <div id="tt" class="easyui-tabs" style="width:100%;height:520px;">
             <div title="基本信息" style="padding:20px;">
-                <table>
+                <table width="100%">
                     <tr>
                         <td style="width:80px; height:30px;">品名</td>
                         <td style="padding:5px;width:250px;">
@@ -131,16 +131,15 @@
                         <td style="text-align: left;"></td>
                     </tr>
                     <tr>
-                        <td style="height:30px;">备注</td>
+                        <td colspan="7" style="padding:5px 20px 10px 0; width: 1130px">
-                        <td style="padding:5px" colspan="5">
+                            <table id="materialExtendData" style="width:100%;border-bottom-color:#FFFFFF"></table>
-                            <textarea name="Remark" id="Remark" class="easyui-textbox" data-options="multiline:true" placeholder="暂无备注信息"
-                                      style="width: 925px; height:40px;"></textarea>
                         </td>
-                        <td></td>
                     </tr>
                     <tr>
-                        <td colspan="7">
+                        <td style="height:30px;">备注</td>
-                            <table id="materialExtendData" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                        <td style="padding:5px 20px 5px 5px" colspan="6">
+                            <textarea name="Remark" id="Remark" class="easyui-textbox" data-options="multiline:true" placeholder="暂无备注信息"
+                                      style="width: 100%; height:40px;"></textarea>
                         </td>
                     </tr>
                 </table>
@@ -1031,8 +1030,7 @@
         //商品价格扩展
         function initTableDataExtend(type,materialId){
             $('#materialExtendData').datagrid({
-                width:1000,
+                height:200,
-                height:150,
                 rownumbers: false,
                 //动画效果
                 animate:false,
@@ -1109,6 +1107,7 @@
                     $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
                 }
             });
+            dgResize();
         }
 
         //检查商品名称是否存在 ++ 重名无法提示问题需要跟进

erp_web/pages/materials/other_in_list.html

@@ -54,10 +54,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">供应商</td>
                 <td style="padding:5px;width:170px;">
@@ -94,7 +94,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width:100%; height:35px;"></textarea>
                 </td>
             </tr>
         </table>
@@ -105,9 +105,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:70px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">供应商：</td>
             <td style="padding:5px;width:130px;">
@@ -134,7 +134,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
     </table>

erp_web/pages/materials/other_out_list.html

@@ -54,10 +54,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">客户</td>
                 <td style="padding:5px;width:170px;">
@@ -88,7 +88,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width:100%; height:35px;"></textarea>
                 </td>
             </tr>
         </table>
@@ -99,9 +99,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:70px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">客户：</td>
             <td style="padding:5px;width:130px;">
@@ -128,7 +128,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width:100%; height:35px;"></span>
             </td>
         </tr>
     </table>

erp_web/pages/materials/purchase_back_list.html

@@ -54,10 +54,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">供应商</td>
                 <td style="padding:5px;width:170px;">
@@ -88,7 +88,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
@@ -141,9 +141,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">供应商：</td>
             <td style="padding:5px;width:130px;">
@@ -170,7 +170,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
         <tr>

erp_web/pages/materials/purchase_in_list.html

@@ -54,13 +54,13 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">供应商</td>
-                <td style="padding:5px;width:170px;">
+                <td style="padding:5px;">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>
                     </div>
@@ -95,7 +95,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
@@ -156,9 +156,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">供应商：</td>
             <td style="padding:5px;width:130px;">

erp_web/pages/materials/purchase_orders_list.html

@@ -54,10 +54,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">供应商</td>
                 <td style="padding:5px;width:170px;">
@@ -94,7 +94,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width:100%; height:35px;"></textarea>
                 </td>
             </tr>
         </table>
@@ -106,9 +106,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">供应商：</td>
             <td style="padding:5px;width:130px;">
@@ -135,7 +135,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width:100%; height:35px;"></span>
             </td>
         </tr>
     </table>

erp_web/pages/materials/retail_back_list.html

@@ -54,10 +54,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;height:50px;">会员卡号</td>
                 <td style="padding:5px;width:200px;">
@@ -126,7 +126,7 @@
             <tr>
                 <td colspan="8">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
         </table>
@@ -138,9 +138,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:50px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:70px;height:50px;">会员卡号：</td>
             <td style="padding:5px;width:200px;">

erp_web/pages/materials/retail_out_list.html

@@ -54,10 +54,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;height:50px;">会员卡号</td>
                 <td style="padding:5px;width:200px;">
@@ -136,7 +136,7 @@
             <tr>
                 <td colspan="8">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
         </table>
@@ -148,9 +148,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:50px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:70px;height:50px;">会员卡号：</td>
             <td style="padding:5px;width:200px;">

erp_web/pages/materials/sale_back_list.html

@@ -54,10 +54,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td>客户</td>
                 <td style="padding:5px">
@@ -87,7 +87,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
@@ -140,9 +140,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:70px;">客户：</td>
             <td style="padding:5px;width:130px;">
@@ -169,7 +169,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
         <tr>

erp_web/pages/materials/sale_orders_list.html

@@ -54,10 +54,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">客户</td>
                 <td style="padding:5px">
@@ -95,7 +95,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
         </table>
@@ -106,9 +106,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:60px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">客户：</td>
             <td style="padding:5px;width:130px;">
@@ -137,7 +137,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
     </table>

erp_web/pages/materials/sale_out_list.html

@@ -54,10 +54,10 @@
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
+<div id="depotHeadDlg" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
     <form id="depotHeadFM" method="post" novalidate>
-        <table>
+        <table width="100%">
             <tr>
                 <td style="width:70px;">客户</td>
                 <td style="padding:5px">
@@ -95,7 +95,7 @@
             <tr>
                 <td colspan="9">
                     <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
-                              style="width: 1130px; height:35px;"></textarea>
+                              style="width: 100%; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
@@ -154,9 +154,9 @@
     <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
 </div>
-<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
+<div id="depotHeadDlgShow" class="easyui-dialog" style="padding:10px 20px;" fit="true"
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
-    <table>
+    <table width="100%">
         <tr>
             <td style="width:60px;">客户：</td>
             <td style="padding:5px;width:130px;">
@@ -185,7 +185,7 @@
         <tr>
             <td style="width:60px;">单据备注：</td>
             <td colspan="8" style="height:35px;">
-                <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
+                <span id="RemarkShow" style="width: 100%; height:35px;"></span>
             </td>
         </tr>
         <tr>