Skip to content
GitLab
Commit 256282c2 authored by 季圣华's avatar 季圣华
Browse files

调整页面布局（继续优化）

parent f1631507
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/assets/less/common.less
View file @ 256282c2
......@@ -19,7 +19,7 @@
}
/*列表页面弹出modal*/
.ant-modal-cust-warp {
margin-top: 101px;
margin-top: 89px;
margin-left: 151px;
height: 100%
}
......@@ -40,7 +40,7 @@
}
/*商品-列表页面弹出modal*/
.ant-modal-material-warp {
margin-top: 101px;
margin-top: 89px;
margin-left: 151px;
height: 100%
}
......
jshERP-web/src/components/jeecg/JModal/index.vue
View file @ 256282c2
......@@ -5,7 +5,7 @@
:class="getClass(modalClass)"
:style="getStyle(modalStyle)"
:visible="visible"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:getContainer="() => $refs.container"
v-bind="_attrs"
v-on="$listeners"
......
jshERP-web/src/components/layouts/TabLayout.vue
View file @ 256282c2
......@@ -6,7 +6,6 @@
v-if="multipage"
:active-key="activePage"
class="tab-layout-tabs"
style="height:52px"
:hide-add="true"
type="editable-card"
@change="changePage"
......@@ -401,7 +400,7 @@
/*美化弹出Tab样式*/
.ant-tabs-nav-container {
margin-top: 4px;
margin-top: 0px;
}
/* 修改 ant-tabs 样式 */
......@@ -412,7 +411,7 @@
padding: 0 20px;
.ant-tabs-bar {
margin: 4px 0 0;
margin: 0px;
border: none;
}
......@@ -452,6 +451,7 @@
border-bottom: 1px solid transparent !important;
}
.ant-tabs-tab-active {
height: 35px !important;
border-color: @primary-color!important;
}
}
......
jshERP-web/src/components/tools/ImportFileModal.vue
View file @ 256282c2
......@@ -6,11 +6,11 @@
:visible="visible"
:confirm-loading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:25%;height: 45%;overflow-y: hidden">
style="top:20%;height: 45%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" @click="handleCancel">取消</a-button>
</template>
......
jshERP-web/src/components/tools/UserPassword.vue
View file @ 256282c2
......@@ -6,7 +6,7 @@
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
......
jshERP-web/src/mixins/JeecgListMixin.js
View file @ 256282c2
......@@ -64,7 +64,7 @@ export const JeecgListMixin = {
},
created() {
if(this.isDesktop()) {
this.cardStyle = 'height:' + (document.documentElement.clientHeight-125) + 'px'
this.cardStyle = 'height:' + (document.documentElement.clientHeight-100) + 'px'
}
if(!this.disableMixinCreated){
//console.log(' -- mixin created -- ')
......
jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
View file @ 256282c2
......@@ -6,7 +6,7 @@
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
......
jshERP-web/src/views/bill/dialog/BillDetail.vue
View file @ 256282c2
......@@ -6,9 +6,9 @@
:maskClosable="false"
:keyboard="false"
:forceRender="true"
:style="modalStyle"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:20px;height: 95%;overflow-y: hidden">
wrapClassName="ant-modal-cust-warp">
<template slot="footer">
<a-button v-if="billPrintFlag" @click="handlePrint">三联打印预览</a-button>
<!--此处为解决缓存问题-->
......@@ -1019,6 +1019,7 @@
title: "详情",
width: '1600px',
visible: false,
modalStyle: '',
model: {},
isCanBackCheck: true,
billType: '',
......@@ -1456,8 +1457,9 @@
this.billType = type
//附件下载
this.fileList = record.fileName
this.visible = true;
this.model = Object.assign({}, record);
this.visible = true
this.modalStyle = 'top:20px;height: 95%;'
this.model = Object.assign({}, record)
if(this.model.backAmount) {
this.model.getAmount = (this.model.changeAmount + this.model.backAmount).toFixed(2)
} else {
......@@ -1523,8 +1525,9 @@
this.close()
},
close() {
this.$emit('close');
this.visible = false;
this.$emit('close')
this.visible = false
this.modalStyle = ''
},
myHandleDetail(billNumber) {
findBillDetailByNumber({ number: billNumber }).then((res) => {
......
jshERP-web/src/views/bill/dialog/BillPrintIframe.vue
View file @ 256282c2
......@@ -5,12 +5,12 @@
:width="width"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
:style="modalStyle"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:20px;height: 95%;overflow-y: hidden">
wrapClassName="ant-modal-cust-warp">
<template slot="footer">
<a-button key="back" @click="handleCancel">取消</a-button>
</template>
......@@ -41,6 +41,7 @@
title: "三联打印预览",
width: '1000px',
visible: false,
modalStyle: '',
billPrintUrl: '',
height: "",
model: {},
......@@ -54,8 +55,9 @@
show(record, billPrintUrl, billPrintHeight) {
this.height = billPrintHeight
this.billPrintUrl = billPrintUrl
this.visible = true;
this.model = Object.assign({}, record);
this.visible = true
this.modalStyle = 'top:20px;height: 95%;'
this.model = Object.assign({}, record)
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'id'))
});
......@@ -65,8 +67,9 @@
},
close() {
this.billPrintUrl = ''
this.$emit('close');
this.visible = false;
this.$emit('close')
this.visible = false
this.modalStyle = ''
}
}
}
......
jshERP-web/src/views/bill/dialog/HistoryBillList.vue
View file @ 256282c2
......@@ -5,7 +5,7 @@
:width="1250"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
cancelText="关闭"
......
jshERP-web/src/views/bill/dialog/LinkBillList.vue
View file @ 256282c2
......@@ -5,7 +5,7 @@
:width="1250"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
......
jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
View file @ 256282c2
......@@ -6,7 +6,7 @@
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
......
jshERP-web/src/views/financial/dialog/DebtBillList.vue
View file @ 256282c2
......@@ -5,7 +5,7 @@
:width="1300"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
......
jshERP-web/src/views/financial/dialog/FinancialDetail.vue
View file @ 256282c2
......@@ -6,9 +6,9 @@
:maskClosable="false"
:keyboard="false"
:forceRender="true"
:style="modalStyle"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
wrapClassName="ant-modal-cust-warp">
<template slot="footer">
<!--此处为解决缓存问题-->
<a-button v-if="financialType === '收预付款'" v-print="'#advanceInPrint'" ghost type="primary">打印</a-button>
......@@ -410,6 +410,7 @@
title: "详情",
width: '1600px',
visible: false,
modalStyle: '',
model: {},
isCanBackCheck: true,
financialType: '',
......@@ -478,8 +479,9 @@
this.financialType = type
//附件下载
this.fileList = record.fileName
this.visible = true;
this.model = Object.assign({}, record);
this.visible = true
this.modalStyle = 'top:20px;height: 95%;'
this.model = Object.assign({}, record)
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'id'))
});
......@@ -525,8 +527,9 @@
this.close()
},
close() {
this.$emit('close');
this.visible = false;
this.$emit('close')
this.visible = false
this.modalStyle = ''
},
}
}
......
jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
View file @ 256282c2
......@@ -6,12 +6,12 @@
:visible="visible"
:confirm-loading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:25%;height: 45%;overflow-y: hidden">
style="top:20%;height: 45%;overflow-y: hidden">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
......
jshERP-web/src/views/material/modules/BatchSetPriceModal.vue
View file @ 256282c2
......@@ -6,13 +6,13 @@
:visible="visible"
:confirm-loading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:35%;height: 30%;overflow-y: hidden">
style="top:30%;height: 30%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭
......
jshERP-web/src/views/material/modules/BatchSetStockModal.vue
View file @ 256282c2
......@@ -6,13 +6,13 @@
:visible="visible"
:confirm-loading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:35%;height: 30%;overflow-y: hidden">
style="top:30%;height: 30%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭
......
jshERP-web/src/views/material/modules/MaterialAttributeModal.vue
View file @ 256282c2
......@@ -6,7 +6,7 @@
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
......
jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
View file @ 256282c2
......@@ -8,7 +8,7 @@
:confirmLoading="confirmLoading"
:okButtonProps="{ props: {disabled: disableSubmit} }"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
......
jshERP-web/src/views/material/modules/MaterialModal.vue
View file @ 256282c2
......@@ -13,7 +13,7 @@
cancelText="关闭"
wrapClassName="ant-modal-material-warp"
:id="prefixNo"
style="top:20px;height: 95%;overflow-y: hidden">
:style="modalStyle">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭
......@@ -295,6 +295,7 @@
return {
title:"操作",
visible: false,
modalStyle: '',
categoryTree: [],
unitList: [],
depotList: [],
......@@ -436,10 +437,10 @@
this.getAllTable().then(editableTables => {
editableTables[0].add()
})
this.edit({});
this.edit({})
this.$nextTick(() => {
handleIntroJs('material', 11)
});
})
},
edit (record) {
this.form.resetFields();
......@@ -450,6 +451,7 @@
this.manySkuStatus = false
this.maxBarCodeInfo = ''
this.visible = true
this.modalStyle = 'top:20px;height: 95%;'
if(JSON.stringify(record) === '{}') {
this.fileList = []
} else {
......@@ -517,8 +519,9 @@
})
},
close () {
this.$emit('close');
this.$emit('close')
this.visible = false
this.modalStyle = ''
this.unitStatus = false
this.manyUnitStatus = true
this.unitChecked = false
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment