diff --git a/jshERP-web/src/assets/less/common.less b/jshERP-web/src/assets/less/common.less index d7b276db..875b2d4a 100644 --- a/jshERP-web/src/assets/less/common.less +++ b/jshERP-web/src/assets/less/common.less @@ -38,6 +38,12 @@ .ant-modal-cust-warp .ant-form-item { margin-bottom: 12px; } +/*全屏模式*/ +.ant-modal-cust-warp .fullscreen .ant-modal-body { + padding: 24px 24px 12px 24px; + height: calc(100% - 200px) !important; + overflow-y: auto +} /*商品-列表页面弹出modal*/ .ant-modal-material-warp { margin-top: 89px; @@ -59,6 +65,12 @@ .ant-modal-material-warp .ant-form-item { margin-bottom: 12px; } +/*全屏模式*/ +.ant-modal-material-warp .fullscreen .ant-modal-body { + padding: 24px 24px 12px 24px; + height: calc(100% - 200px) !important; + overflow-y: auto +} /*列表中有图片的加这个样式 参考用户管理*/ .anty-img-wrap { height: 25px; diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js index 41ba81a7..b9a0a9d1 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js @@ -38,6 +38,7 @@ export const FinancialModalMixin = { this.isTenant = userInfo.id === userInfo.tenantId? true:false let realScreenWidth = window.screen.width this.width = realScreenWidth<1500?'1200px':'1550px' + this.minWidth = realScreenWidth<1500?1150:1500 }, computed: { readOnly: function() { diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue index b4d049f5..3ea43f1b 100644 --- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue +++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue @@ -61,6 +61,7 @@ :loading="accountTable.loading" :columns="accountTable.columns" :dataSource="accountTable.dataSource" + :minWidth="minWidth" :maxHeight="300" :rowNumber="false" :rowSelection="true" diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue index e9d7168c..827b4af3 100644 --- a/jshERP-web/src/views/financial/modules/GiroModal.vue +++ b/jshERP-web/src/views/financial/modules/GiroModal.vue @@ -53,6 +53,7 @@ :loading="accountTable.loading" :columns="accountTable.columns" :dataSource="accountTable.dataSource" + :minWidth="minWidth" :maxHeight="300" :rowNumber="false" :rowSelection="true" diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue index a49c83db..84750181 100644 --- a/jshERP-web/src/views/financial/modules/ItemInModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue @@ -61,6 +61,7 @@ :loading="accountTable.loading" :columns="accountTable.columns" :dataSource="accountTable.dataSource" + :minWidth="minWidth" :maxHeight="300" :rowNumber="false" :rowSelection="true" diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue index 22af3ea9..361ebf29 100644 --- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue @@ -61,6 +61,7 @@ :loading="accountTable.loading" :columns="accountTable.columns" :dataSource="accountTable.dataSource" + :minWidth="minWidth" :maxHeight="300" :rowNumber="false" :rowSelection="true" diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue index 67379c5e..fdcb7633 100644 --- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue @@ -79,6 +79,7 @@ :loading="accountTable.loading" :columns="accountTable.columns" :dataSource="accountTable.dataSource" + :minWidth="minWidth" :maxHeight="300" :rowNumber="false" :rowSelection="false" diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue index f0cd499b..b13f5935 100644 --- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue @@ -79,6 +79,7 @@ :loading="accountTable.loading" :columns="accountTable.columns" :dataSource="accountTable.dataSource" + :minWidth="minWidth" :maxHeight="300" :rowNumber="false" :rowSelection="false" diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue index df1466ae..646a2f86 100644 --- a/jshERP-web/src/views/material/modules/MaterialModal.vue +++ b/jshERP-web/src/views/material/modules/MaterialModal.vue @@ -44,7 +44,7 @@ data-step="4" data-title="单位" data-intro="此处支持单个单位和多单位,勾选多单位就可以切换到多单位的下拉框,多单位需要先在【计量单位】页面进行录入。 比如牛奶有瓶和箱两种单位,12瓶=1箱,这就构成了多单位,多单位中有个换算比例"> - + @@ -60,7 +60,7 @@ - + 多单位 diff --git a/jshERP-web/src/views/report/modules/DebtAccountList.vue b/jshERP-web/src/views/report/modules/DebtAccountList.vue index 900324b7..a9bec884 100644 --- a/jshERP-web/src/views/report/modules/DebtAccountList.vue +++ b/jshERP-web/src/views/report/modules/DebtAccountList.vue @@ -2,7 +2,7 @@
+ style="top:10%;height: 80%;overflow-y: hidden">