优化单据的界面样式，调整输入框的高度

2021-11-21 23:52:54 +08:00
parent 3db0519479
commit c1cfeadf17
61 changed files with 86 additions and 69 deletions
--- a/jshERP-web/src/assets/less/common.less
+++ b/jshERP-web/src/assets/less/common.less
@@ -1,4 +1,3 @@
-
 /*列表上方操作按钮区域*/
 .ant-card-body .table-operator {
  margin-bottom: 0px;
@@ -10,7 +9,6 @@
 .table-operator .ant-btn-group .ant-btn {
  margin: 0;
 }
-
 .table-operator .ant-btn-group .ant-btn:last-child {
  margin: 0 8px 8px 0;
 }
@@ -19,23 +17,44 @@
  padding-top: 15px;
  padding-bottom: 15px;
 }
-
 /*列表页面弹出modal*/
 .ant-modal-cust-warp {
  height: 100%
 }
-
 /*弹出modal Y轴滚动条*/
 .ant-modal-cust-warp .ant-modal-body {
+  padding: 24px 24px 12px 24px;
  height: calc(100% - 110px) !important;
  overflow-y: auto
 }
-
 /*弹出modal 先有content后有body 故滚动条控制在body上*/
 .ant-modal-cust-warp .ant-modal-content {
  height: 90%;
  overflow-y: hidden
 }
+/*文本框样式*/
+.ant-modal-cust-warp .ant-form-item {
+  margin-bottom: 12px;
+}
+/*商品-列表页面弹出modal*/
+.ant-modal-material-warp {
+  height: 100%
+}
+/*商品-弹出modal Y轴滚动条*/
+.ant-modal-material-warp .ant-modal-body {
+  padding: 12px 24px 12px 24px;
+  height: calc(100% - 110px) !important;
+  overflow-y: auto
+}
+/*商品-弹出modal 先有content后有body 故滚动条控制在body上*/
+.ant-modal-material-warp .ant-modal-content {
+  height: 90%;
+  overflow-y: hidden
+}
+/*商品-文本框样式*/
+.ant-modal-material-warp .ant-form-item {
+  margin-bottom: 12px;
+}
 /*列表中有图片的加这个样式 参考用户管理*/
 .anty-img-wrap {
  height: 25px;
@@ -47,11 +66,8 @@
 /*列表中范围查询样式*/
 .query-group-cust{width: calc(50% - 10px)}
 .query-group-split-cust:before{content:"~";width: 20px;display: inline-block;text-align: center}
-
-
 /*erp风格子表外框padding设置*/
 .ant-card-wider-padding.cust-erp-sub-tab>.ant-card-body{padding:5px 12px}
-
 /* 内嵌子表背景颜色 */
 .j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row {
  background-color: #FFFFFF;
--- a/jshERP-web/src/views/bill/AllocationOutList.vue
+++ b/jshERP-web/src/views/bill/AllocationOutList.vue
@@ -71,7 +71,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/AssembleList.vue
+++ b/jshERP-web/src/views/bill/AssembleList.vue
@@ -71,7 +71,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/DisassembleList.vue
+++ b/jshERP-web/src/views/bill/DisassembleList.vue
@@ -71,7 +71,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/OtherInList.vue
+++ b/jshERP-web/src/views/bill/OtherInList.vue
@@ -85,7 +85,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/OtherOutList.vue
+++ b/jshERP-web/src/views/bill/OtherOutList.vue
@@ -85,7 +85,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@@ -85,7 +85,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -85,7 +85,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -71,7 +71,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/RetailBackList.vue
+++ b/jshERP-web/src/views/bill/RetailBackList.vue
@@ -85,7 +85,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@@ -80,7 +80,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@@ -86,7 +86,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -72,7 +72,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -86,7 +86,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -69,7 +69,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -68,7 +68,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -68,7 +68,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -84,7 +84,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -84,7 +84,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -88,7 +88,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -95,7 +95,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -77,7 +77,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -128,7 +128,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -142,7 +142,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -88,7 +88,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -83,7 +83,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -96,7 +96,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="24" :md="24" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-              <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+              <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
            </a-form-item>
          </a-col>
        </a-row>
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -76,7 +76,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -67,7 +67,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -76,7 +76,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -76,7 +76,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -76,7 +76,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -76,7 +76,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(7)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -69,7 +69,7 @@
              <a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
              <a-menu-item key="4" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetMaterialCurrentStock()"><a-icon type="stock"/>修正库存</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -10,7 +10,7 @@
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭"
-    wrapClassName="ant-modal-cust-warp"
+    wrapClassName="ant-modal-material-warp"
    :id="prefixNo"
    style="top:5%;height: 100%;overflow-y: hidden">
    <template slot="footer">
@@ -177,6 +177,7 @@
                :loading="meTable.loading"
                :columns="meTable.columns"
                :dataSource="meTable.dataSource"
+                :height="300"
                :minWidth="1000"
                :maxHeight="300"
                :rowNumber="false"
@@ -196,7 +197,7 @@
            <a-row class="form-row" :gutter="24">
              <a-col :lg="24" :md="24" :sm="24">
                <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
-                  <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
+                  <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
                </a-form-item>
              </a-col>
            </a-row>
--- a/jshERP-web/src/views/system/AccountList.vue
+++ b/jshERP-web/src/views/system/AccountList.vue
@@ -39,7 +39,7 @@
            <a-menu slot="overlay">
              <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/system/CustomerList.vue
+++ b/jshERP-web/src/views/system/CustomerList.vue
@@ -50,7 +50,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/system/DepotList.vue
+++ b/jshERP-web/src/views/system/DepotList.vue
@@ -34,7 +34,7 @@
            <a-menu slot="overlay">
              <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/system/FunctionList.vue
+++ b/jshERP-web/src/views/system/FunctionList.vue
@@ -29,7 +29,7 @@
            <a-menu slot="overlay">
              <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/system/InOutItemList.vue
+++ b/jshERP-web/src/views/system/InOutItemList.vue
@@ -42,7 +42,7 @@
            <a-menu slot="overlay">
              <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/system/MemberList.vue
+++ b/jshERP-web/src/views/system/MemberList.vue
@@ -49,7 +49,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/system/PersonList.vue
+++ b/jshERP-web/src/views/system/PersonList.vue
@@ -38,7 +38,7 @@
            <a-menu slot="overlay">
              <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@@ -28,7 +28,7 @@
            <a-menu slot="overlay">
              <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/system/SystemConfigList.vue
+++ b/jshERP-web/src/views/system/SystemConfigList.vue
@@ -28,7 +28,7 @@
            <a-menu slot="overlay">
              <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/system/TenantList.vue
+++ b/jshERP-web/src/views/system/TenantList.vue
@@ -44,7 +44,7 @@
              <a-menu-item key="1" @click="batchSetStatus(1)"><a-icon type="check-square"/>启用</a-menu-item>
              <a-menu-item key="2" @click="batchSetStatus(0)"><a-icon type="close-square"/>禁用</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作
              <a-icon type="down"/>
            </a-button>
--- a/jshERP-web/src/views/system/UnitList.vue
+++ b/jshERP-web/src/views/system/UnitList.vue
@@ -28,7 +28,7 @@
            <a-menu slot="overlay">
              <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/system/UserList.vue
+++ b/jshERP-web/src/views/system/UserList.vue
@@ -34,7 +34,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(0)"><a-icon type="check-square"/>启用</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(2)"><a-icon type="close-square"/>禁用</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作
              <a-icon type="down"/>
            </a-button>
--- a/jshERP-web/src/views/system/VendorList.vue
+++ b/jshERP-web/src/views/system/VendorList.vue
@@ -49,7 +49,7 @@
              <a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
              <a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
            </a-menu>
-            <a-button style="margin-left: 8px">
+            <a-button>
              批量操作 <a-icon type="down" />
            </a-button>
          </a-dropdown>
--- a/jshERP-web/src/views/system/modules/AccountModal.vue
+++ b/jshERP-web/src/views/system/modules/AccountModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:15%;height: 80%;overflow-y: hidden">
+    style="top:20%;height: 60%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭
--- a/jshERP-web/src/views/system/modules/CustomerModal.vue
+++ b/jshERP-web/src/views/system/modules/CustomerModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+    style="top:15%;height: 70%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭
--- a/jshERP-web/src/views/system/modules/DepotModal.vue
+++ b/jshERP-web/src/views/system/modules/DepotModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 98%;overflow-y: hidden">
+    style="top:15%;height: 70%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭
--- a/jshERP-web/src/views/system/modules/FunctionModal.vue
+++ b/jshERP-web/src/views/system/modules/FunctionModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:10%;height: 100%;overflow-y: hidden">
+    style="top:10%;height: 90%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭
--- a/jshERP-web/src/views/system/modules/InOutItemModal.vue
+++ b/jshERP-web/src/views/system/modules/InOutItemModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:25%;height: 60%;overflow-y: hidden">
+    style="top:25%;height: 50%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭
--- a/jshERP-web/src/views/system/modules/MemberModal.vue
+++ b/jshERP-web/src/views/system/modules/MemberModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+    style="top:25%;height: 50%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭
--- a/jshERP-web/src/views/system/modules/PersonModal.vue
+++ b/jshERP-web/src/views/system/modules/PersonModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:25%;height: 50%;overflow-y: hidden">
+    style="top:30%;height: 40%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭
--- a/jshERP-web/src/views/system/modules/RoleModal.vue
+++ b/jshERP-web/src/views/system/modules/RoleModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 85%;overflow-y: hidden">
+    style="top:25%;height: 50%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭
--- a/jshERP-web/src/views/system/modules/SystemConfigModal.vue
+++ b/jshERP-web/src/views/system/modules/SystemConfigModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+    style="top:10%;height: 85%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭
--- a/jshERP-web/src/views/system/modules/TenantModal.vue
+++ b/jshERP-web/src/views/system/modules/TenantModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:15%;height: 70%;overflow-y: hidden">
+    style="top:20%;height: 60%;overflow-y: hidden">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="登录名称">
--- a/jshERP-web/src/views/system/modules/UnitModal.vue
+++ b/jshERP-web/src/views/system/modules/UnitModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:20%;height: 70%;overflow-y: hidden">
+    style="top:25%;height: 50%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭
--- a/jshERP-web/src/views/system/modules/UserModal.vue
+++ b/jshERP-web/src/views/system/modules/UserModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+    style="top:10%;height: 85%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭
--- a/jshERP-web/src/views/system/modules/VendorModal.vue
+++ b/jshERP-web/src/views/system/modules/VendorModal.vue
@@ -8,7 +8,7 @@
    @cancel="handleCancel"
    cancelText="关闭"
    wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 100%;overflow-y: hidden">
+    style="top:15%;height: 70%;overflow-y: hidden">
    <template slot="footer">
      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
        关闭