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-09 01:24:15 +08:00
parent e26e7991d9
commit f163150761
68 changed files with 9656 additions and 9452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-web/public/static/color.less
View File

@@ -5626,7 +5626,7 @@ form .ant-upload {
border-radius: 0 0 4px 4px;
}
.ant-modal-mask {
background-color: rgba(0, 0, 0, 0.65);
background-color: rgba(0, 0, 0, 0.1) !important;
}
.ant-confirm-body .ant-confirm-title {
color: rgba(0, 0, 0, 0.85);

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

@@ -19,6 +19,8 @@
}
/*列表页面弹出modal*/
.ant-modal-cust-warp {
margin-top: 101px;
margin-left: 151px;
height: 100%
}
/*弹出modal Y轴滚动条*/
@@ -38,6 +40,8 @@
}
/*商品-列表页面弹出modal*/
.ant-modal-material-warp {
margin-top: 101px;
margin-left: 151px;
height: 100%
}
/*商品-弹出modal Y轴滚动条*/
@@ -72,3 +76,7 @@
.j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row {
background-color: #FFFFFF;
}
.ant-modal-mask {
background-color: rgba(0, 0, 0, 0.1) !important;
}

4
jshERP-web/src/components/jeecg/JModal/index.vue
View File

@@ -1,9 +1,12 @@
<template>
<div ref="container">
<a-modal
ref="modal"
:class="getClass(modalClass)"
:style="getStyle(modalStyle)"
:visible="visible"
:maskStyle="{'top':'101px','left':'151px'}"
:getContainer="() => $refs.container"
v-bind="_attrs"
v-on="$listeners"
@ok="handleOk"
@@ -39,6 +42,7 @@
</template>
</a-modal>
</div>
</template>
<script>

2
jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
View File

@@ -6,7 +6,7 @@
@ok="handleSubmit"
@cancel="close"
cancelText="关闭"
style="top:5%;height: 100%;overflow-y: hidden"
style="top:5%;height: 90%;overflow-y: hidden"
wrapClassName="ant-modal-cust-warp"
>
<a-row :gutter="10" style="padding: 10px; margin: -10px">

2
jshERP-web/src/components/menu/SideMenu.vue
View File

@@ -1,7 +1,7 @@
<template>
<a-layout-sider
:class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
width="200px"
width="150px"
:collapsible="collapsible"
v-model="collapsed"
:trigger="null">

3
jshERP-web/src/components/menu/index.js
View File

@@ -172,7 +172,8 @@ export default {
const props = {
mode: mode,
theme: theme,
openKeys: this.openKeys
openKeys: this.openKeys,
inlineIndent: 12,
}
const on = {
select: obj => {

2
jshERP-web/src/components/page/GlobalHeader.vue
View File

@@ -168,7 +168,7 @@
<style lang="less" scoped>
/* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/
@height: 59px;
@height: 49px;
.layout {

16
jshERP-web/src/components/page/GlobalLayout.vue
View File

@@ -9,7 +9,7 @@
@close="() => this.collapsed = false"
:closable="false"
:visible="collapsed"
width="200px"
width="150px"
>
<side-menu
mode="inline"
@@ -38,7 +38,7 @@
@close="() => this.collapsed = false"
:closable="false"
:visible="collapsed"
width="200px"
width="150px"
>
<side-menu
mode="inline"
@@ -52,7 +52,7 @@
<a-layout
:class="[layoutMode, `content-width-${contentWidth}`]"
:style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 200 : 80}px` : '0' }">
:style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 150 : 80}px` : '0' }">
<!-- layout header -->
<global-header
:mode="layoutMode"
@@ -65,7 +65,7 @@
/>
<!-- layout content -->
<a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }">
<a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '49px' : '0' }">
<slot></slot>
</a-layout-content>
@@ -292,7 +292,7 @@
transition: width .2s;
&.ant-header-side-opened {
width: calc(100% - 200px)
width: calc(100% - 150px)
}
&.ant-header-side-closed {
@@ -322,7 +322,7 @@
transition: all .3s;
height: 70%;
line-height: 46px;
line-height: 36px;
&.action-full {
height: 100%;
@@ -435,7 +435,7 @@
margin: auto;
padding: 0 20px 0 0;
display: flex;
height: 59px;
height: 49px;
.ant-menu.ant-menu-horizontal {
border: none;
@@ -474,7 +474,7 @@
.header-index-right {
float: right;
height: 59px;
height: 49px;
overflow: hidden;
.action:hover {
background-color: rgba(0, 0, 0, 0.05);

4
jshERP-web/src/components/tools/ImportFileModal.vue
View File

@@ -1,9 +1,12 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="500"
:visible="visible"
:confirm-loading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
@@ -31,6 +34,7 @@
</a-row>
</a-spin>
</a-modal>
</div>
</template>
<script>

2
jshERP-web/src/components/tools/Logo.vue
View File

@@ -26,7 +26,7 @@
</script>
<style lang="less" scoped>
/*缩小首页布 局顶部的高度*/
@height: 59px;
@height: 49px;
.sider {
box-shadow: none !important;

7
jshERP-web/src/components/tools/UserPassword.vue
View File

@@ -1,14 +1,18 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="modalWidth"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:25%;height: 50%;overflow-y: hidden">
style="top:20%;height: 50%;overflow-y: hidden">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-form-item label="旧密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -23,6 +27,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>

5
jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="500"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -26,6 +30,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

2
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -8,7 +8,7 @@
:forceRender="true"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button v-if="billPrintFlag" @click="handlePrint">三联打印预览</a-button>
<!--此处为解决缓存问题-->

7
jshERP-web/src/views/bill/dialog/BillPrintIframe.vue
View File

@@ -1,12 +1,16 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="width"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" @click="handleCancel">取消</a-button>
</template>
@@ -25,6 +29,7 @@
</template>
</a-form>
</a-modal>
</div>
</template>
<script>

7
jshERP-web/src/views/bill/dialog/HistoryBillList.vue
View File

@@ -1,12 +1,16 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="1250"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:50px;height: 90%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">关闭</a-button>
</template>
@@ -82,6 +86,7 @@
<!-- 表单区域 -->
<bill-detail ref="billDetail"></bill-detail>
</a-modal>
</div>
</template>
<script>

7
jshERP-web/src/views/bill/dialog/LinkBillList.vue
View File

@@ -1,13 +1,17 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="1250"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<!-- 查询区域 -->
<div class="table-page-search-wrapper" v-if="selectType === 'list'">
<!-- 搜索区域 -->
@@ -93,6 +97,7 @@
<!-- 表单区域 -->
<bill-detail ref="billDetail"></bill-detail>
</a-modal>
</div>
</template>
<script>

5
jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="650"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -62,6 +66,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

2
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View File

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/AssembleModal.vue
View File

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/DisassembleModal.vue
View File

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/OtherInModal.vue
View File

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/OtherOutModal.vue
View File

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View File

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -13,7 +13,7 @@
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
:id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View File

@@ -13,7 +13,7 @@
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
:id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/RetailOutModal.vue
View File

@@ -13,7 +13,7 @@
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
:id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/SaleOrderModal.vue
View File

@@ -13,7 +13,7 @@
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
:id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

2
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

@@ -13,7 +13,7 @@
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
:id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

5
jshERP-web/src/views/financial/dialog/DebtBillList.vue
View File

@@ -1,8 +1,12 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="1300"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -71,6 +75,7 @@
<!-- 表单区域 -->
<bill-detail ref="modalDetail"></bill-detail>
</a-modal>
</div>
</template>
<script>

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

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

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

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

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

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

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

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

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

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

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

@@ -10,7 +10,7 @@
switchFullscreen
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>

5
jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="1000"
:visible="visible"
:confirm-loading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
@@ -58,6 +62,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>

5
jshERP-web/src/views/material/modules/BatchSetPriceModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="500"
:visible="visible"
:confirm-loading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -22,6 +26,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>

5
jshERP-web/src/views/material/modules/BatchSetStockModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="500"
:visible="visible"
:confirm-loading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -22,6 +26,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>

7
jshERP-web/src/views/material/modules/MaterialAttributeModal.vue
View File

@@ -1,14 +1,18 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:20%;height: 50%;overflow-y: hidden">
style="top:100px;height: 50%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭
@@ -27,6 +31,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

8
jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
View File

@@ -1,4 +1,5 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
@@ -6,10 +7,14 @@
:visible="visible"
:confirmLoading="confirmLoading"
:okButtonProps="{ props: {disabled: disableSubmit} }"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:100px;height: 50%;overflow-y: hidden"
cancelText="关闭">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
@@ -33,6 +38,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>

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

@@ -13,7 +13,7 @@
cancelText="关闭"
wrapClassName="ant-modal-material-warp"
:id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭

5
jshERP-web/src/views/material/modules/MaterialPropertyModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -26,6 +30,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

7
jshERP-web/src/views/report/modules/AccountInOutList.vue
View File

@@ -1,12 +1,16 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="1000"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" @click="handleCancel">取消</a-button>
</template>
@@ -30,6 +34,7 @@
<bill-detail ref="billDetail"></bill-detail>
<financial-detail ref="financialDetail"></financial-detail>
</a-modal>
</div>
</template>
<script>
import BillDetail from '../../bill/dialog/BillDetail'

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

@@ -1,12 +1,16 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="1250"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" @click="handleCancel">取消</a-button>
</template>
@@ -62,6 +66,7 @@
<!-- 表单区域 -->
<bill-detail ref="modalDetail"></bill-detail>
</a-modal>
</div>
</template>
<script>

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

@@ -1,12 +1,16 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="1250"
:visible="visible"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" @click="handleCancel">取消</a-button>
</template>
@@ -29,6 +33,7 @@
<!-- 表单区域 -->
<bill-detail ref="billDetail"></bill-detail>
</a-modal>
</div>
</template>
<script>
import BillDetail from '../../bill/dialog/BillDetail'

5
jshERP-web/src/views/system/modules/AccountModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -37,6 +41,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/CustomerModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="1200"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -98,6 +102,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/DepotModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -44,6 +48,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/FunctionModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -51,6 +55,7 @@
</a-spin>
<function-tree-modal ref="functionTreeModal" @ok="functionTreeModalOk"></function-tree-modal>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/FunctionTreeModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="width"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
@@ -29,6 +33,7 @@
</a-col>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/InOutItemModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -34,6 +38,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/MemberModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="1200"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -58,6 +62,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

12
jshERP-web/src/views/system/modules/OrganizationModal.vue
View File

@@ -1,15 +1,20 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:ok=false
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
:okButtonProps="{ props: {disabled: disableSubmit} }"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭">
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:50px;height: 80%;overflow-y: hidden">
<a-spin :spinning="confirmLoading">
<a-form :form="form" id="organizationModal">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
@@ -33,6 +38,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
@@ -165,5 +171,5 @@
</script>
<style scoped>
@import '~@assets/less/common.less'
</style>

5
jshERP-web/src/views/system/modules/PersonModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -32,6 +36,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/PlatformConfigModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -20,6 +24,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/PluginAppModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -20,6 +24,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/PluginModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -20,6 +24,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/RoleFunctionModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="width"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -42,6 +46,7 @@
</a-col>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/RoleModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -45,6 +49,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/RolePushBtnModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="width"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -57,6 +61,7 @@
</div>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/TenantModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="600"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -33,6 +37,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

7
jshERP-web/src/views/system/modules/UnitModal.vue
View File

@@ -1,14 +1,18 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="700"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:25%; height:50%; overflow-y:hidden">
style="top:100px; height:50%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭
@@ -43,6 +47,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/UserCustomerModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -42,6 +46,7 @@
</a-col>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/UserDepotModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -42,6 +46,7 @@
</a-col>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

5
jshERP-web/src/views/system/modules/UserModal.vue
View File

@@ -1,9 +1,13 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="800"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
@@ -54,6 +58,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'

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

@@ -1,14 +1,18 @@
<template>
<div ref="container">
<a-modal
:title="title"
:width="1200"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:10%;height: 80%;overflow-y: hidden">
style="top:100px; height: 80%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭
@@ -98,6 +102,7 @@
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>
import pick from 'lodash.pick'