From f1611c337675e1b0831550e95dad818be4b9ed07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 8 Apr 2020 23:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E9=80=82=E9=85=8D=E6=89=8B=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/in_out.js              | 2 +-
 erp_web/pages/materials/allocation_out_list.html  | 4 ++--
 erp_web/pages/materials/assemble_list.html        | 4 ++--
 erp_web/pages/materials/disassemble_list.html     | 4 ++--
 erp_web/pages/materials/material.html             | 8 ++++----
 erp_web/pages/materials/other_in_list.html        | 4 ++--
 erp_web/pages/materials/other_out_list.html       | 4 ++--
 erp_web/pages/materials/purchase_back_list.html   | 4 ++--
 erp_web/pages/materials/purchase_in_list.html     | 4 ++--
 erp_web/pages/materials/purchase_orders_list.html | 4 ++--
 erp_web/pages/materials/retail_back_list.html     | 4 ++--
 erp_web/pages/materials/retail_out_list.html      | 4 ++--
 erp_web/pages/materials/sale_back_list.html       | 4 ++--
 erp_web/pages/materials/sale_orders_list.html     | 4 ++--
 erp_web/pages/materials/sale_out_list.html        | 4 ++--
 15 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index a62dd10b..8472402e 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -1093,7 +1093,7 @@
     //订单转采购或销售
     function skipDepotHead(index){
         var res = $("#tableData").datagrid("getRows")[index];
-		if(status == "0" || status == "2") {
+		if(res.status == "0" || res.status == "2") {
             $.messager.alert('提示','未审核和已转的单据禁止操作！','warning');
         } else {
             sessionStorage.setItem("rowInfo", JSON.stringify(res)); //将单据信息存入缓存中
diff --git a/erp_web/pages/materials/allocation_out_list.html b/erp_web/pages/materials/allocation_out_list.html
index 755fd9a9..51ccd28e 100644
--- a/erp_web/pages/materials/allocation_out_list.html
+++ b/erp_web/pages/materials/allocation_out_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;">单据日期</td>
                 <td style="padding:5px">
@@ -99,7 +99,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:60px;">单据日期：</td>
             <td style="padding:5px;width:130px;">
diff --git a/erp_web/pages/materials/assemble_list.html b/erp_web/pages/materials/assemble_list.html
index 81956d71..76e3a0b1 100644
--- a/erp_web/pages/materials/assemble_list.html
+++ b/erp_web/pages/materials/assemble_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;">单据日期</td>
                 <td style="padding:5px;width:170px;">
@@ -98,7 +98,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:60px;">单据日期：</td>
             <td style="padding:5px;width:130px;">
diff --git a/erp_web/pages/materials/disassemble_list.html b/erp_web/pages/materials/disassemble_list.html
index 5a90acc1..b36c99a6 100644
--- a/erp_web/pages/materials/disassemble_list.html
+++ b/erp_web/pages/materials/disassemble_list.html
@@ -56,7 +56,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;">单据日期</td>
                 <td style="padding:5px;width:170px;">
@@ -98,7 +98,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:60px;">单据日期：</td>
             <td style="padding:5px;width:130px;">
diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 7edeef85..854d843a 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -69,9 +69,9 @@
     <form id="materialFM" method="post" novalidate>
         <div id="tt" class="easyui-tabs" style="width:100%;height:520px;">
             <div title="基本信息" style="padding:20px;">
-                <table width="100%">
+                <table width="100%" style="min-width:1150px;">
                     <tr>
-                        <td style="width:80px; height:30px;">品名</td>
+                        <td style="width:60px; height:30px;">品名</td>
                         <td style="padding:5px;width:250px;">
                             <input name="Name" id="Name" class="easyui-textbox"
                                    data-options="required:true,validType:'length[1,30]'"
@@ -93,7 +93,7 @@
                         <td style="width:250px"></td>
                     </tr>
                     <tr>
-                        <td style="width:80px;">型号</td>
+                        <td style="width:60px;">型号</td>
                         <td style="padding:5px;">
                             <input name="Model" id="Model" class="easyui-textbox"
                                    data-options="validType:'length[1,30]'" style="width: 180px;"/>
@@ -113,7 +113,7 @@
                         <td style="text-align: left;"></td>
                     </tr>
                     <tr>
-                        <td style="width:80px;">序列号</td>
+                        <td style="width:60px;">序列号</td>
                         <td style="padding:5px;">
                             <select name="EnableSerialNumber" id="EnableSerialNumber"
                                     style="width:180px;height: 30px;border: 1px solid #95B8E7;border-radius:5px;">
diff --git a/erp_web/pages/materials/other_in_list.html b/erp_web/pages/materials/other_in_list.html
index 18cf8f87..ffc47485 100644
--- a/erp_web/pages/materials/other_in_list.html
+++ b/erp_web/pages/materials/other_in_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;">供应商</td>
                 <td style="padding:5px;width:170px;">
@@ -107,7 +107,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:60px;">供应商：</td>
             <td style="padding:5px;width:130px;">
diff --git a/erp_web/pages/materials/other_out_list.html b/erp_web/pages/materials/other_out_list.html
index d8bd755b..00474b38 100644
--- a/erp_web/pages/materials/other_out_list.html
+++ b/erp_web/pages/materials/other_out_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;">客户</td>
                 <td style="padding:5px;width:170px;">
@@ -101,7 +101,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:60px;">客户：</td>
             <td style="padding:5px;width:130px;">
diff --git a/erp_web/pages/materials/purchase_back_list.html b/erp_web/pages/materials/purchase_back_list.html
index 5d6c3ee0..c6724bde 100644
--- a/erp_web/pages/materials/purchase_back_list.html
+++ b/erp_web/pages/materials/purchase_back_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;">供应商</td>
                 <td style="padding:5px;width:170px;">
@@ -143,7 +143,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:60px;">供应商：</td>
             <td style="padding:5px;width:130px;">
diff --git a/erp_web/pages/materials/purchase_in_list.html b/erp_web/pages/materials/purchase_in_list.html
index 022b0b6c..e7be421b 100644
--- a/erp_web/pages/materials/purchase_in_list.html
+++ b/erp_web/pages/materials/purchase_in_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;">供应商</td>
                 <td style="padding:5px;">
@@ -158,7 +158,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:60px;">供应商：</td>
             <td style="padding:5px;width:130px;">
diff --git a/erp_web/pages/materials/purchase_orders_list.html b/erp_web/pages/materials/purchase_orders_list.html
index 4b6b39df..4a4b6748 100644
--- a/erp_web/pages/materials/purchase_orders_list.html
+++ b/erp_web/pages/materials/purchase_orders_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;">供应商</td>
                 <td style="padding:5px;width:170px;">
@@ -108,7 +108,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:60px;">供应商：</td>
             <td style="padding:5px;width:130px;">
diff --git a/erp_web/pages/materials/retail_back_list.html b/erp_web/pages/materials/retail_back_list.html
index 5547d314..19e6f444 100644
--- a/erp_web/pages/materials/retail_back_list.html
+++ b/erp_web/pages/materials/retail_back_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;height:50px;">会员卡号</td>
                 <td style="padding:5px;width:200px;">
@@ -140,7 +140,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:70px;height:50px;">会员卡号：</td>
             <td style="padding:5px;width:200px;">
diff --git a/erp_web/pages/materials/retail_out_list.html b/erp_web/pages/materials/retail_out_list.html
index 8591445d..db16c3bb 100644
--- a/erp_web/pages/materials/retail_out_list.html
+++ b/erp_web/pages/materials/retail_out_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;height:50px;">会员卡号</td>
                 <td style="padding:5px;width:200px;">
@@ -150,7 +150,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:70px;height:50px;">会员卡号：</td>
             <td style="padding:5px;width:200px;">
diff --git a/erp_web/pages/materials/sale_back_list.html b/erp_web/pages/materials/sale_back_list.html
index f0a6e8d1..308c51ff 100644
--- a/erp_web/pages/materials/sale_back_list.html
+++ b/erp_web/pages/materials/sale_back_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td>客户</td>
                 <td style="padding:5px">
@@ -142,7 +142,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:70px;">客户：</td>
             <td style="padding:5px;width:130px;">
diff --git a/erp_web/pages/materials/sale_orders_list.html b/erp_web/pages/materials/sale_orders_list.html
index fddb36b6..28044c9f 100644
--- a/erp_web/pages/materials/sale_orders_list.html
+++ b/erp_web/pages/materials/sale_orders_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;">客户</td>
                 <td style="padding:5px">
@@ -108,7 +108,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:60px;">客户：</td>
             <td style="padding:5px;width:130px;">
diff --git a/erp_web/pages/materials/sale_out_list.html b/erp_web/pages/materials/sale_out_list.html
index 4fc6d165..6533c826 100644
--- a/erp_web/pages/materials/sale_out_list.html
+++ b/erp_web/pages/materials/sale_out_list.html
@@ -57,7 +57,7 @@
 <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 width="100%">
+        <table width="100%" style="min-width:1100px;">
             <tr>
                 <td style="width:70px;">客户</td>
                 <td style="padding:5px">
@@ -158,7 +158,7 @@
 </div>
 <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 width="100%">
+    <table width="100%" style="min-width:1100px;">
         <tr>
             <td style="width:60px;">客户：</td>
             <td style="padding:5px;width:130px;">