From 256282c21ac2c41c5e6d4f668b54f8d297a2ed32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 11 Dec 2022 23:41:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E5=B8=83?=
=?UTF-8?q?=E5=B1=80=EF=BC=88=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jshERP-web/src/assets/less/common.less | 4 ++--
.../src/components/jeecg/JModal/index.vue | 2 +-
jshERP-web/src/components/layouts/TabLayout.vue | 6 +++---
.../src/components/tools/ImportFileModal.vue | 4 ++--
.../src/components/tools/UserPassword.vue | 2 +-
jshERP-web/src/mixins/JeecgListMixin.js | 2 +-
.../src/views/bill/dialog/BatchSetDepot.vue | 2 +-
jshERP-web/src/views/bill/dialog/BillDetail.vue | 15 +++++++++------
.../src/views/bill/dialog/BillPrintIframe.vue | 17 ++++++++++-------
.../src/views/bill/dialog/HistoryBillList.vue | 2 +-
.../src/views/bill/dialog/LinkBillList.vue | 2 +-
.../src/views/bill/dialog/ManyAccountModal.vue | 2 +-
.../src/views/financial/dialog/DebtBillList.vue | 2 +-
.../views/financial/dialog/FinancialDetail.vue | 15 +++++++++------
.../material/modules/BatchSetInfoModal.vue | 4 ++--
.../material/modules/BatchSetPriceModal.vue | 4 ++--
.../material/modules/BatchSetStockModal.vue | 4 ++--
.../material/modules/MaterialAttributeModal.vue | 2 +-
.../material/modules/MaterialCategoryModal.vue | 2 +-
.../views/material/modules/MaterialModal.vue | 11 +++++++----
.../material/modules/MaterialPropertyModal.vue | 2 +-
.../views/report/modules/AccountInOutList.vue | 2 +-
.../views/report/modules/DebtAccountList.vue | 2 +-
.../views/report/modules/MaterialInOutList.vue | 2 +-
.../src/views/system/modules/AccountModal.vue | 4 ++--
.../src/views/system/modules/CustomerModal.vue | 2 +-
.../src/views/system/modules/DepotModal.vue | 4 ++--
.../src/views/system/modules/FunctionModal.vue | 2 +-
.../views/system/modules/FunctionTreeModal.vue | 2 +-
.../src/views/system/modules/InOutItemModal.vue | 4 ++--
.../src/views/system/modules/MemberModal.vue | 4 ++--
.../views/system/modules/OrganizationModal.vue | 2 +-
.../src/views/system/modules/PersonModal.vue | 4 ++--
.../system/modules/PlatformConfigModal.vue | 2 +-
.../src/views/system/modules/PluginAppModal.vue | 2 +-
.../src/views/system/modules/PluginModal.vue | 2 +-
.../views/system/modules/RoleFunctionModal.vue | 2 +-
.../src/views/system/modules/RoleModal.vue | 4 ++--
.../views/system/modules/RolePushBtnModal.vue | 2 +-
.../src/views/system/modules/TenantModal.vue | 2 +-
.../src/views/system/modules/UnitModal.vue | 2 +-
.../views/system/modules/UserCustomerModal.vue | 2 +-
.../src/views/system/modules/UserDepotModal.vue | 2 +-
.../src/views/system/modules/UserModal.vue | 4 ++--
.../src/views/system/modules/VendorModal.vue | 2 +-
45 files changed, 90 insertions(+), 78 deletions(-)
diff --git a/jshERP-web/src/assets/less/common.less b/jshERP-web/src/assets/less/common.less
index 089ad387..d7b276db 100644
--- a/jshERP-web/src/assets/less/common.less
+++ b/jshERP-web/src/assets/less/common.less
@@ -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%
}
diff --git a/jshERP-web/src/components/jeecg/JModal/index.vue b/jshERP-web/src/components/jeecg/JModal/index.vue
index cb8d87ea..b4cae8f7 100644
--- a/jshERP-web/src/components/jeecg/JModal/index.vue
+++ b/jshERP-web/src/components/jeecg/JModal/index.vue
@@ -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"
diff --git a/jshERP-web/src/components/layouts/TabLayout.vue b/jshERP-web/src/components/layouts/TabLayout.vue
index fd9f4943..5b61760c 100644
--- a/jshERP-web/src/components/layouts/TabLayout.vue
+++ b/jshERP-web/src/components/layouts/TabLayout.vue
@@ -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;
}
}
diff --git a/jshERP-web/src/components/tools/ImportFileModal.vue b/jshERP-web/src/components/tools/ImportFileModal.vue
index 2e0664f9..58f007ae 100644
--- a/jshERP-web/src/components/tools/ImportFileModal.vue
+++ b/jshERP-web/src/components/tools/ImportFileModal.vue
@@ -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">
取消
diff --git a/jshERP-web/src/components/tools/UserPassword.vue b/jshERP-web/src/components/tools/UserPassword.vue
index 87b49665..dca45683 100644
--- a/jshERP-web/src/components/tools/UserPassword.vue
+++ b/jshERP-web/src/components/tools/UserPassword.vue
@@ -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"
diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index c55121f7..c08b6bba 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -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 -- ')
diff --git a/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue b/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
index 1134d087..1eb8105f 100644
--- a/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
+++ b/jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
@@ -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"
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 38fe16c0..e54ca253 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -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">
三联打印预览
@@ -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) => {
diff --git a/jshERP-web/src/views/bill/dialog/BillPrintIframe.vue b/jshERP-web/src/views/bill/dialog/BillPrintIframe.vue
index 275406cc..92ba7d06 100644
--- a/jshERP-web/src/views/bill/dialog/BillPrintIframe.vue
+++ b/jshERP-web/src/views/bill/dialog/BillPrintIframe.vue
@@ -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">
取消
@@ -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 = ''
}
}
}
diff --git a/jshERP-web/src/views/bill/dialog/HistoryBillList.vue b/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
index 34e42b88..8ae18b91 100644
--- a/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
@@ -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="关闭"
diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
index 0bf42c87..1f2419da 100644
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@@ -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"
diff --git a/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue b/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
index 6cdb23c7..8ff7a3a1 100644
--- a/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
+++ b/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/financial/dialog/DebtBillList.vue b/jshERP-web/src/views/financial/dialog/DebtBillList.vue
index 7070b20a..65abe222 100644
--- a/jshERP-web/src/views/financial/dialog/DebtBillList.vue
+++ b/jshERP-web/src/views/financial/dialog/DebtBillList.vue
@@ -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"
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index 267ae5bd..bb19c8d2 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -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">
打印
@@ -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 = ''
},
}
}
diff --git a/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue b/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
index 8132ca33..6a4d216e 100644
--- a/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
+++ b/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
@@ -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">
diff --git a/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue b/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue
index fb00256a..7d153b61 100644
--- a/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue
+++ b/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue
@@ -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">
关闭
diff --git a/jshERP-web/src/views/material/modules/BatchSetStockModal.vue b/jshERP-web/src/views/material/modules/BatchSetStockModal.vue
index 57c37252..dbfdac2a 100644
--- a/jshERP-web/src/views/material/modules/BatchSetStockModal.vue
+++ b/jshERP-web/src/views/material/modules/BatchSetStockModal.vue
@@ -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">
关闭
diff --git a/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue b/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue
index 0d3a2719..5aa6b6b8 100644
--- a/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue b/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
index 551225f4..afad3829 100644
--- a/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index 1bb3db7c..8d1d54a4 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -13,7 +13,7 @@
cancelText="关闭"
wrapClassName="ant-modal-material-warp"
:id="prefixNo"
- style="top:20px;height: 95%;overflow-y: hidden">
+ :style="modalStyle">
关闭
@@ -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
diff --git a/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue b/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue
index 18f65cc1..19df6c57 100644
--- a/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/report/modules/AccountInOutList.vue b/jshERP-web/src/views/report/modules/AccountInOutList.vue
index 2f53c28c..0af2392d 100644
--- a/jshERP-web/src/views/report/modules/AccountInOutList.vue
+++ b/jshERP-web/src/views/report/modules/AccountInOutList.vue
@@ -5,7 +5,7 @@
:width="1000"
:visible="visible"
:getContainer="() => $refs.container"
- :maskStyle="{'top':'101px','left':'151px'}"
+ :maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
cancelText="关闭"
diff --git a/jshERP-web/src/views/report/modules/DebtAccountList.vue b/jshERP-web/src/views/report/modules/DebtAccountList.vue
index ceaa9003..900324b7 100644
--- a/jshERP-web/src/views/report/modules/DebtAccountList.vue
+++ b/jshERP-web/src/views/report/modules/DebtAccountList.vue
@@ -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="关闭"
diff --git a/jshERP-web/src/views/report/modules/MaterialInOutList.vue b/jshERP-web/src/views/report/modules/MaterialInOutList.vue
index b469fd99..de559dbc 100644
--- a/jshERP-web/src/views/report/modules/MaterialInOutList.vue
+++ b/jshERP-web/src/views/report/modules/MaterialInOutList.vue
@@ -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="关闭"
diff --git a/jshERP-web/src/views/system/modules/AccountModal.vue b/jshERP-web/src/views/system/modules/AccountModal.vue
index c30e7374..dc1267fc 100644
--- a/jshERP-web/src/views/system/modules/AccountModal.vue
+++ b/jshERP-web/src/views/system/modules/AccountModal.vue
@@ -6,13 +6,13 @@
:visible="visible"
:confirmLoading="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:20%;height: 65%;overflow-y: hidden">
+ style="top:15%;height: 65%;overflow-y: hidden">
关闭
diff --git a/jshERP-web/src/views/system/modules/CustomerModal.vue b/jshERP-web/src/views/system/modules/CustomerModal.vue
index affafb7f..c38fd3d6 100644
--- a/jshERP-web/src/views/system/modules/CustomerModal.vue
+++ b/jshERP-web/src/views/system/modules/CustomerModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/system/modules/DepotModal.vue b/jshERP-web/src/views/system/modules/DepotModal.vue
index 9a04ac25..62a5997c 100644
--- a/jshERP-web/src/views/system/modules/DepotModal.vue
+++ b/jshERP-web/src/views/system/modules/DepotModal.vue
@@ -6,13 +6,13 @@
:visible="visible"
:confirmLoading="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:15%;height: 70%;overflow-y: hidden">
+ style="top:10%;height: 70%;overflow-y: hidden">
关闭
diff --git a/jshERP-web/src/views/system/modules/FunctionModal.vue b/jshERP-web/src/views/system/modules/FunctionModal.vue
index ebe134f2..3323605c 100644
--- a/jshERP-web/src/views/system/modules/FunctionModal.vue
+++ b/jshERP-web/src/views/system/modules/FunctionModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/system/modules/FunctionTreeModal.vue b/jshERP-web/src/views/system/modules/FunctionTreeModal.vue
index 7a99e6c7..a0ee82f5 100644
--- a/jshERP-web/src/views/system/modules/FunctionTreeModal.vue
+++ b/jshERP-web/src/views/system/modules/FunctionTreeModal.vue
@@ -6,7 +6,7 @@
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
- :maskStyle="{'top':'101px','left':'151px'}"
+ :maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
cancelText="关闭"
diff --git a/jshERP-web/src/views/system/modules/InOutItemModal.vue b/jshERP-web/src/views/system/modules/InOutItemModal.vue
index 02efe4b2..a0aa1da6 100644
--- a/jshERP-web/src/views/system/modules/InOutItemModal.vue
+++ b/jshERP-web/src/views/system/modules/InOutItemModal.vue
@@ -6,13 +6,13 @@
:visible="visible"
:confirmLoading="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:25%;height: 50%;overflow-y: hidden">
+ style="top:20%;height: 50%;overflow-y: hidden">
关闭
diff --git a/jshERP-web/src/views/system/modules/MemberModal.vue b/jshERP-web/src/views/system/modules/MemberModal.vue
index 77d00fe7..0266b143 100644
--- a/jshERP-web/src/views/system/modules/MemberModal.vue
+++ b/jshERP-web/src/views/system/modules/MemberModal.vue
@@ -6,13 +6,13 @@
:visible="visible"
:confirmLoading="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:20%;height: 60%;overflow-y: hidden">
+ style="top:15%;height: 60%;overflow-y: hidden">
关闭
diff --git a/jshERP-web/src/views/system/modules/OrganizationModal.vue b/jshERP-web/src/views/system/modules/OrganizationModal.vue
index bf6a0d56..f778d51a 100644
--- a/jshERP-web/src/views/system/modules/OrganizationModal.vue
+++ b/jshERP-web/src/views/system/modules/OrganizationModal.vue
@@ -7,7 +7,7 @@
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
- :maskStyle="{'top':'101px','left':'151px'}"
+ :maskStyle="{'top':'89px','left':'151px'}"
:maskClosable="false"
:okButtonProps="{ props: {disabled: disableSubmit} }"
@ok="handleOk"
diff --git a/jshERP-web/src/views/system/modules/PersonModal.vue b/jshERP-web/src/views/system/modules/PersonModal.vue
index 1ceec392..76854eaa 100644
--- a/jshERP-web/src/views/system/modules/PersonModal.vue
+++ b/jshERP-web/src/views/system/modules/PersonModal.vue
@@ -6,13 +6,13 @@
:visible="visible"
:confirmLoading="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:30%;height: 45%;overflow-y: hidden">
+ style="top:20%;height: 45%;overflow-y: hidden">
关闭
diff --git a/jshERP-web/src/views/system/modules/PlatformConfigModal.vue b/jshERP-web/src/views/system/modules/PlatformConfigModal.vue
index 2cc17437..86bae093 100644
--- a/jshERP-web/src/views/system/modules/PlatformConfigModal.vue
+++ b/jshERP-web/src/views/system/modules/PlatformConfigModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/system/modules/PluginAppModal.vue b/jshERP-web/src/views/system/modules/PluginAppModal.vue
index 13eb9fa1..c5935e5d 100644
--- a/jshERP-web/src/views/system/modules/PluginAppModal.vue
+++ b/jshERP-web/src/views/system/modules/PluginAppModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/system/modules/PluginModal.vue b/jshERP-web/src/views/system/modules/PluginModal.vue
index 615ede97..d66c42d4 100644
--- a/jshERP-web/src/views/system/modules/PluginModal.vue
+++ b/jshERP-web/src/views/system/modules/PluginModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/system/modules/RoleFunctionModal.vue b/jshERP-web/src/views/system/modules/RoleFunctionModal.vue
index a9b0e77f..62109c19 100644
--- a/jshERP-web/src/views/system/modules/RoleFunctionModal.vue
+++ b/jshERP-web/src/views/system/modules/RoleFunctionModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/system/modules/RoleModal.vue b/jshERP-web/src/views/system/modules/RoleModal.vue
index 2d37b054..93969f8c 100644
--- a/jshERP-web/src/views/system/modules/RoleModal.vue
+++ b/jshERP-web/src/views/system/modules/RoleModal.vue
@@ -6,13 +6,13 @@
:visible="visible"
:confirmLoading="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:20%;height: 60%;overflow-y: hidden">
+ style="top:15%;height: 60%;overflow-y: hidden">
关闭
diff --git a/jshERP-web/src/views/system/modules/RolePushBtnModal.vue b/jshERP-web/src/views/system/modules/RolePushBtnModal.vue
index 99065316..a6959fa2 100644
--- a/jshERP-web/src/views/system/modules/RolePushBtnModal.vue
+++ b/jshERP-web/src/views/system/modules/RolePushBtnModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/system/modules/TenantModal.vue b/jshERP-web/src/views/system/modules/TenantModal.vue
index d6b66c2c..413da0fc 100644
--- a/jshERP-web/src/views/system/modules/TenantModal.vue
+++ b/jshERP-web/src/views/system/modules/TenantModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/system/modules/UnitModal.vue b/jshERP-web/src/views/system/modules/UnitModal.vue
index c15b93b6..b0c198de 100644
--- a/jshERP-web/src/views/system/modules/UnitModal.vue
+++ b/jshERP-web/src/views/system/modules/UnitModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/system/modules/UserCustomerModal.vue b/jshERP-web/src/views/system/modules/UserCustomerModal.vue
index ae0c7e88..a8ff5be0 100644
--- a/jshERP-web/src/views/system/modules/UserCustomerModal.vue
+++ b/jshERP-web/src/views/system/modules/UserCustomerModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/system/modules/UserDepotModal.vue b/jshERP-web/src/views/system/modules/UserDepotModal.vue
index cf4fc779..7d9025b0 100644
--- a/jshERP-web/src/views/system/modules/UserDepotModal.vue
+++ b/jshERP-web/src/views/system/modules/UserDepotModal.vue
@@ -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"
diff --git a/jshERP-web/src/views/system/modules/UserModal.vue b/jshERP-web/src/views/system/modules/UserModal.vue
index 833c45e1..e55aea7e 100644
--- a/jshERP-web/src/views/system/modules/UserModal.vue
+++ b/jshERP-web/src/views/system/modules/UserModal.vue
@@ -6,13 +6,13 @@
:visible="visible"
:confirmLoading="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:10%;height: 85%;overflow-y: hidden">
+ style="top:5%;height: 85%;overflow-y: hidden">
关闭
diff --git a/jshERP-web/src/views/system/modules/VendorModal.vue b/jshERP-web/src/views/system/modules/VendorModal.vue
index 33502895..f15b1731 100644
--- a/jshERP-web/src/views/system/modules/VendorModal.vue
+++ b/jshERP-web/src/views/system/modules/VendorModal.vue
@@ -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"