purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整单据页面全屏的样式

Browse Source
This commit is contained in:
季圣华
2022-12-12 23:09:10 +08:00
parent d5d0a0b41f
commit 0bb9445ecd
12 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jshERP-web/src/assets/less/common.less
View File

@@ -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;

1
jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
View File

@@ -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() {

1
jshERP-web/src/views/financial/modules/AdvanceInModal.vue
View File

@@ -61,6 +61,7 @@
:loading="accountTable.loading"
:columns="accountTable.columns"
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
:rowSelection="true"

1
jshERP-web/src/views/financial/modules/GiroModal.vue
View File

@@ -53,6 +53,7 @@
:loading="accountTable.loading"
:columns="accountTable.columns"
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
:rowSelection="true"

1
jshERP-web/src/views/financial/modules/ItemInModal.vue
View File

@@ -61,6 +61,7 @@
:loading="accountTable.loading"
:columns="accountTable.columns"
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
:rowSelection="true"

1
jshERP-web/src/views/financial/modules/ItemOutModal.vue
View File

@@ -61,6 +61,7 @@
:loading="accountTable.loading"
:columns="accountTable.columns"
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
:rowSelection="true"

1
jshERP-web/src/views/financial/modules/MoneyInModal.vue
View File

@@ -79,6 +79,7 @@
:loading="accountTable.loading"
:columns="accountTable.columns"
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
:rowSelection="false"

1
jshERP-web/src/views/financial/modules/MoneyOutModal.vue
View File

@@ -79,6 +79,7 @@
:loading="accountTable.loading"
:columns="accountTable.columns"
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
:rowSelection="false"

4
jshERP-web/src/views/material/modules/MaterialModal.vue
View File

@@ -44,7 +44,7 @@
data-step="4" data-title="单位" data-intro="此处支持单个单位和多单位，勾选多单位就可以切换到多单位的下拉框，多单位需要先在【计量单位】页面进行录入。
比如牛奶有瓶和箱两种单位，12瓶=1箱，这就构成了多单位，多单位中有个换算比例">
<a-row class="form-row" :gutter="24">
<a-col :lg="14" :md="14" :sm="24">
<a-col :lg="15" :md="15" :sm="24">
<a-input placeholder="输入单位" v-if="!unitChecked" v-decorator.trim="[ 'unit', validatorRules.unit ]" @change="onlyUnitOnChange" />
<a-select :value="unitList" placeholder="选择多单位" v-decorator="[ 'unitId', validatorRules.unitId ]" @change="manyUnitOnChange"
showSearch optionFilterProp="children" v-if="unitChecked" :dropdownMatchSelectWidth="false">
@@ -60,7 +60,7 @@
</a-select-option>
</a-select>
</a-col>
<a-col :lg="10" :md="10" :sm="24">
<a-col :lg="9" :md="9" :sm="24">
<a-checkbox :checked="unitChecked" @change="unitOnChange">多单位</a-checkbox>
</a-col>
</a-row>

4
jshERP-web/src/views/report/modules/DebtAccountList.vue
View File

@@ -2,7 +2,7 @@
<div ref="container">
<a-modal
:title="title"
:width="1250"
:width="1200"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'89px','left':'151px'}"
@@ -127,7 +127,7 @@
}
},
{ title: '单据日期', dataIndex: 'operTimeStr',width:130},
{ title: '操作员', dataIndex: 'userName',width:60},
{ title: '操作员', dataIndex: 'userName',width:60, ellipsis:true},
{ title: '本单欠款', dataIndex: 'needDebt',width:70},
{ dataIndex: 'realNeedDebt',width:80,
slots: { title: 'customTitle' }

6
jshERP-web/src/views/report/modules/MaterialInOutList.vue
View File

@@ -2,7 +2,7 @@
<div ref="container">
<a-modal
:title="title"
:width="1250"
:width="1200"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'89px','left':'151px'}"
@@ -79,8 +79,8 @@
{ title: '条码', dataIndex: 'barCode', width: 100},
{ title: '名称', dataIndex: 'materialName', width: 200},
{ title: '仓库名称', dataIndex: 'depotName', width: 80},
{ title: '数量', dataIndex: 'basicNumber', width: 80},
{ title: '日期', dataIndex: 'operTime', width: 100}
{ title: '数量', dataIndex: 'basicNumber', width: 70},
{ title: '日期', dataIndex: 'operTime', width: 110}
],
labelCol: {
xs: { span: 1 },

2
jshERP-web/src/views/system/modules/VendorModal.vue
View File

@@ -12,7 +12,7 @@
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:100px; height: 80%;overflow-y: hidden">
style="top:10%;height: 80%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭