diff --git a/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue b/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue index 302ce454..748863cc 100644 --- a/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue +++ b/jshERP-web/src/views/material/modules/BatchSetInfoModal.vue @@ -12,6 +12,8 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" + cancelText="取消" + okText="保存" style="top:20%;height: 45%;"> diff --git a/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue b/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue index bda970df..949b847b 100644 --- a/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue +++ b/jshERP-web/src/views/material/modules/BatchSetPriceModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:30%;height: 30%;"> diff --git a/jshERP-web/src/views/material/modules/BatchSetStockModal.vue b/jshERP-web/src/views/material/modules/BatchSetStockModal.vue index 48207c0d..68449fd9 100644 --- a/jshERP-web/src/views/material/modules/BatchSetStockModal.vue +++ b/jshERP-web/src/views/material/modules/BatchSetStockModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:30%;height: 30%;"> diff --git a/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue b/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue index 6b6724cb..3685bce8 100644 --- a/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue +++ b/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:100px;height: 50%;"> diff --git a/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue b/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue index 60cc1064..4fe711f7 100644 --- a/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue +++ b/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue @@ -15,7 +15,8 @@ @ok="handleOk" @cancel="handleCancel" style="top:100px;height: 50%;" - cancelText="关闭"> + cancelText="取消" + okText="保存"> diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue index b6d488f1..457af289 100644 --- a/jshERP-web/src/views/material/modules/MaterialModal.vue +++ b/jshERP-web/src/views/material/modules/MaterialModal.vue @@ -11,8 +11,8 @@ :id="prefixNo" :style="modalStyle"> diff --git a/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue b/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue index a0b34d2a..87a3cf52 100644 --- a/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue +++ b/jshERP-web/src/views/material/modules/MaterialPropertyModal.vue @@ -12,7 +12,7 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" style="top:10%;height: 70%;"> diff --git a/jshERP-web/src/views/system/modules/AccountModal.vue b/jshERP-web/src/views/system/modules/AccountModal.vue index a9f1472a..8058416f 100644 --- a/jshERP-web/src/views/system/modules/AccountModal.vue +++ b/jshERP-web/src/views/system/modules/AccountModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:15%;height: 55%;"> diff --git a/jshERP-web/src/views/system/modules/CustomerModal.vue b/jshERP-web/src/views/system/modules/CustomerModal.vue index 20aa56af..435699c2 100644 --- a/jshERP-web/src/views/system/modules/CustomerModal.vue +++ b/jshERP-web/src/views/system/modules/CustomerModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:10%;height: 80%;"> diff --git a/jshERP-web/src/views/system/modules/DepotModal.vue b/jshERP-web/src/views/system/modules/DepotModal.vue index 12f04ad3..c0aa6e62 100644 --- a/jshERP-web/src/views/system/modules/DepotModal.vue +++ b/jshERP-web/src/views/system/modules/DepotModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:10%;height: 70%;"> diff --git a/jshERP-web/src/views/system/modules/FunctionModal.vue b/jshERP-web/src/views/system/modules/FunctionModal.vue index 0bebb2b9..c78b3fff 100644 --- a/jshERP-web/src/views/system/modules/FunctionModal.vue +++ b/jshERP-web/src/views/system/modules/FunctionModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:5%;height: 90%;"> diff --git a/jshERP-web/src/views/system/modules/FunctionTreeModal.vue b/jshERP-web/src/views/system/modules/FunctionTreeModal.vue index dd42cd41..238d4b48 100644 --- a/jshERP-web/src/views/system/modules/FunctionTreeModal.vue +++ b/jshERP-web/src/views/system/modules/FunctionTreeModal.vue @@ -11,11 +11,12 @@ :mask="isDesktop()" :maskClosable="false" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:5%;height: 90%;"> diff --git a/jshERP-web/src/views/system/modules/InOutItemModal.vue b/jshERP-web/src/views/system/modules/InOutItemModal.vue index 368f9f40..109280da 100644 --- a/jshERP-web/src/views/system/modules/InOutItemModal.vue +++ b/jshERP-web/src/views/system/modules/InOutItemModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:20%;height: 50%;"> diff --git a/jshERP-web/src/views/system/modules/MemberModal.vue b/jshERP-web/src/views/system/modules/MemberModal.vue index 06b02af5..197735b1 100644 --- a/jshERP-web/src/views/system/modules/MemberModal.vue +++ b/jshERP-web/src/views/system/modules/MemberModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:15%;height: 60%;"> diff --git a/jshERP-web/src/views/system/modules/OrganizationModal.vue b/jshERP-web/src/views/system/modules/OrganizationModal.vue index ee0985f9..5ebcff93 100644 --- a/jshERP-web/src/views/system/modules/OrganizationModal.vue +++ b/jshERP-web/src/views/system/modules/OrganizationModal.vue @@ -14,7 +14,8 @@ :okButtonProps="{ props: {disabled: disableSubmit} }" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:50px;height: 80%;"> diff --git a/jshERP-web/src/views/system/modules/PersonModal.vue b/jshERP-web/src/views/system/modules/PersonModal.vue index 622c9f01..9960db95 100644 --- a/jshERP-web/src/views/system/modules/PersonModal.vue +++ b/jshERP-web/src/views/system/modules/PersonModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:20%;height: 45%;"> diff --git a/jshERP-web/src/views/system/modules/PlatformConfigModal.vue b/jshERP-web/src/views/system/modules/PlatformConfigModal.vue index 295d422f..4ba9af25 100644 --- a/jshERP-web/src/views/system/modules/PlatformConfigModal.vue +++ b/jshERP-web/src/views/system/modules/PlatformConfigModal.vue @@ -12,7 +12,8 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:25%;height: 40%;"> diff --git a/jshERP-web/src/views/system/modules/PluginAppModal.vue b/jshERP-web/src/views/system/modules/PluginAppModal.vue index d2e47e32..4e0ff8e4 100644 --- a/jshERP-web/src/views/system/modules/PluginAppModal.vue +++ b/jshERP-web/src/views/system/modules/PluginAppModal.vue @@ -12,7 +12,8 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:20%;height: 50%;"> diff --git a/jshERP-web/src/views/system/modules/PluginModal.vue b/jshERP-web/src/views/system/modules/PluginModal.vue index 489b0496..2e0cb790 100644 --- a/jshERP-web/src/views/system/modules/PluginModal.vue +++ b/jshERP-web/src/views/system/modules/PluginModal.vue @@ -12,7 +12,8 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:20%;height: 50%;"> diff --git a/jshERP-web/src/views/system/modules/RoleFunctionModal.vue b/jshERP-web/src/views/system/modules/RoleFunctionModal.vue index f48e85a6..b57a243b 100644 --- a/jshERP-web/src/views/system/modules/RoleFunctionModal.vue +++ b/jshERP-web/src/views/system/modules/RoleFunctionModal.vue @@ -12,7 +12,8 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:5%;height: 95%;">
diff --git a/jshERP-web/src/views/system/modules/RoleModal.vue b/jshERP-web/src/views/system/modules/RoleModal.vue index 26eabee1..68667b23 100644 --- a/jshERP-web/src/views/system/modules/RoleModal.vue +++ b/jshERP-web/src/views/system/modules/RoleModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:15%;height: 60%;"> diff --git a/jshERP-web/src/views/system/modules/RolePushBtnModal.vue b/jshERP-web/src/views/system/modules/RolePushBtnModal.vue index 98b1e031..4fa0fc9b 100644 --- a/jshERP-web/src/views/system/modules/RolePushBtnModal.vue +++ b/jshERP-web/src/views/system/modules/RolePushBtnModal.vue @@ -12,7 +12,8 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:5%;height: 95%;">
diff --git a/jshERP-web/src/views/system/modules/TenantModal.vue b/jshERP-web/src/views/system/modules/TenantModal.vue index aefa7f45..5581c2f8 100644 --- a/jshERP-web/src/views/system/modules/TenantModal.vue +++ b/jshERP-web/src/views/system/modules/TenantModal.vue @@ -12,7 +12,8 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:15%;height: 60%;"> diff --git a/jshERP-web/src/views/system/modules/UnitModal.vue b/jshERP-web/src/views/system/modules/UnitModal.vue index 5b28751a..52bf622d 100644 --- a/jshERP-web/src/views/system/modules/UnitModal.vue +++ b/jshERP-web/src/views/system/modules/UnitModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:100px; height:55%;"> diff --git a/jshERP-web/src/views/system/modules/UserCustomerModal.vue b/jshERP-web/src/views/system/modules/UserCustomerModal.vue index f30181b0..7bf2f191 100644 --- a/jshERP-web/src/views/system/modules/UserCustomerModal.vue +++ b/jshERP-web/src/views/system/modules/UserCustomerModal.vue @@ -12,7 +12,8 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:5%;height: 95%;">
diff --git a/jshERP-web/src/views/system/modules/UserDepotModal.vue b/jshERP-web/src/views/system/modules/UserDepotModal.vue index 1048bf98..065fd3d8 100644 --- a/jshERP-web/src/views/system/modules/UserDepotModal.vue +++ b/jshERP-web/src/views/system/modules/UserDepotModal.vue @@ -12,7 +12,8 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:5%;height: 95%;">
diff --git a/jshERP-web/src/views/system/modules/UserModal.vue b/jshERP-web/src/views/system/modules/UserModal.vue index b814f8fb..7f074fac 100644 --- a/jshERP-web/src/views/system/modules/UserModal.vue +++ b/jshERP-web/src/views/system/modules/UserModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:5%;height: 85%;"> diff --git a/jshERP-web/src/views/system/modules/VendorModal.vue b/jshERP-web/src/views/system/modules/VendorModal.vue index 5dddb6e8..02d6cc90 100644 --- a/jshERP-web/src/views/system/modules/VendorModal.vue +++ b/jshERP-web/src/views/system/modules/VendorModal.vue @@ -12,11 +12,12 @@ :maskClosable="false" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭" + cancelText="取消" + okText="保存" style="top:10%;height: 80%;">