优化单据的高度

2021-10-13 23:22:19 +08:00
parent 6dc9f5acbb
commit 2c8510b007
35 changed files with 52 additions and 12 deletions
--- a/jshERP-web/src/views/bill/AllocationOutList.vue
+++ b/jshERP-web/src/views/bill/AllocationOutList.vue
@@ -89,6 +89,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/bill/AssembleList.vue
+++ b/jshERP-web/src/views/bill/AssembleList.vue
@@ -89,6 +89,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/bill/DisassembleList.vue
+++ b/jshERP-web/src/views/bill/DisassembleList.vue
@@ -89,6 +89,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/bill/OtherInList.vue
+++ b/jshERP-web/src/views/bill/OtherInList.vue
@@ -98,6 +98,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/bill/OtherOutList.vue
+++ b/jshERP-web/src/views/bill/OtherOutList.vue
@@ -98,6 +98,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@@ -98,6 +98,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -100,6 +100,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
@@ -210,7 +211,7 @@
          {
            title: '操作',
            dataIndex: 'action',
-            align:"center", width: 150,
+            align:"center", width: 160,
            scopedSlots: { customRender: 'action' },
          }
        ],
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -90,6 +90,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/bill/RetailBackList.vue
+++ b/jshERP-web/src/views/bill/RetailBackList.vue
@@ -98,6 +98,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@@ -98,6 +98,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@@ -99,6 +99,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -91,6 +91,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -101,6 +101,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
@@ -210,7 +211,7 @@
          {
            title: '操作',
            dataIndex: 'action',
-            align:"center", width: 150,
+            align:"center", width: 160,
            scopedSlots: { customRender: 'action' },
          }
        ],
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -94,6 +94,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -85,6 +85,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -94,6 +94,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -94,6 +94,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -95,6 +95,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -95,6 +95,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -210,13 +210,6 @@
      }
    },
    methods: {
-      initScroll() {
-        if (this.isMobile()) {
-          this.scroll.y = ''
-        } else {
-          this.scroll.y = document.documentElement.clientHeight-370
-        }
-      },
      loadTreeData(){
        let that = this;
        let params = {};
--- a/jshERP-web/src/views/system/AccountList.vue
+++ b/jshERP-web/src/views/system/AccountList.vue
@@ -54,6 +54,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/CustomerList.vue
+++ b/jshERP-web/src/views/system/CustomerList.vue
@@ -65,6 +65,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/DepotList.vue
+++ b/jshERP-web/src/views/system/DepotList.vue
@@ -49,6 +49,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/FunctionList.vue
+++ b/jshERP-web/src/views/system/FunctionList.vue
@@ -44,6 +44,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/InOutItemList.vue
+++ b/jshERP-web/src/views/system/InOutItemList.vue
@@ -57,6 +57,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/MemberList.vue
+++ b/jshERP-web/src/views/system/MemberList.vue
@@ -64,6 +64,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/PersonList.vue
+++ b/jshERP-web/src/views/system/PersonList.vue
@@ -53,6 +53,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/PluginList.vue
+++ b/jshERP-web/src/views/system/PluginList.vue
@@ -43,6 +43,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            @change="handleTableChange">
            <span slot="action" slot-scope="text, record">
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@@ -43,6 +43,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/SystemConfigList.vue
+++ b/jshERP-web/src/views/system/SystemConfigList.vue
@@ -43,6 +43,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/TenantList.vue
+++ b/jshERP-web/src/views/system/TenantList.vue
@@ -60,6 +60,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/UnitList.vue
+++ b/jshERP-web/src/views/system/UnitList.vue
@@ -43,6 +43,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/UserList.vue
+++ b/jshERP-web/src/views/system/UserList.vue
@@ -50,6 +50,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">
--- a/jshERP-web/src/views/system/VendorList.vue
+++ b/jshERP-web/src/views/system/VendorList.vue
@@ -64,6 +64,7 @@
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
+            :scroll="scroll"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange">