diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue
index fedc2b15..740b40ce 100644
--- a/src/views/neUser/auth/index.vue
+++ b/src/views/neUser/auth/index.vue
@@ -800,6 +800,7 @@ onMounted(() => {
ok-text="TXT"
ok-type="default"
@confirm="fnExportList('txt')"
+ :show-cancel="false"
cancel-text="CSV"
@cancel="fnExportList('csv')"
>
@@ -844,15 +845,15 @@ onMounted(() => {
:selected-keys="[tableState.size as string]"
@click="fnTableSize"
>
- {{
- t('common.size.default')
- }}
- {{
- t('common.size.middle')
- }}
- {{
- t('common.size.small')
- }}
+
+ {{ t('common.size.default') }}
+
+
+ {{ t('common.size.middle') }}
+
+
+ {{ t('common.size.small') }}
+
@@ -1064,9 +1065,7 @@ onMounted(() => {
@cancel="fnBatchModalCancel"
>
-
-
{
-
{
-
-
+ label="OPC"
+ name="opc"
+ v-bind="modalStateBatchFrom.validateInfos.opc"
+ >
+
+
-
-
@@ -1219,7 +1215,7 @@ onMounted(() => {
@upload="fnModalUploadImportUpload"
@close="fnModalUploadImportClose"
v-model:visible="uploadImportState.visible"
- :ext="['.csv', '.txt']"
+ :ext="['.txt']"
>
{
modalState.confirmLoading = true;
- const from = toRaw(modalState.from);
let ardArr = [0, 0, 0, 0, 0, 0, 0, 0];
let hplmnArr = [0, 0, 0, 0, 0, 0, 0, 0];
- let odbArr = [0, 0, 0, 0, 0, 0, 0, 0,0];
+ let odbArr = [0, 0, 0, 0, 0, 0, 0, 0, 0];
from.ard.forEach((item: any) => {
ardArr[item] = 1;
@@ -478,8 +479,6 @@ function fnModalOk() {
content: t('common.msgSuccess', { msg: modalState.title }),
duration: 3,
});
- modalState.visibleByEdit = false;
- modalStateFrom.resetFields();
fnGetList();
} else {
message.error({
@@ -490,6 +489,7 @@ function fnModalOk() {
})
.finally(() => {
hide();
+ fnModalCancel();
modalState.confirmLoading = false;
});
})
@@ -527,11 +527,12 @@ const modalStateBatchFrom = Form.useForm(
* 进行表达规则校验
*/
function fnBatchModalOk() {
+ const from = Object.assign({}, toRaw(modalState.BatchForm));
+
modalStateBatchFrom
.validate()
.then(e => {
modalState.confirmLoading = true;
- const from = toRaw(modalState.BatchForm);
let ardArr = [0, 0, 0, 0, 0, 0, 0, 0];
let hplmnArr = [0, 0, 0, 0, 0, 0, 0, 0];
let odbArr = [0, 0, 0, 0, 0, 0, 0, 0];
@@ -564,8 +565,6 @@ function fnBatchModalOk() {
content: t('common.msgSuccess', { msg: modalState.title }),
duration: 3,
});
- modalState.visibleByBatch = false;
- modalStateBatchFrom.resetFields();
fnGetList();
} else {
message.error({
@@ -575,11 +574,8 @@ function fnBatchModalOk() {
}
})
.finally(() => {
- 1;
hide();
- from.epsOdb = [];
- from.hplmnOdb = [];
- from.ard = [];
+ fnBatchModalCancel();
modalState.confirmLoading = false;
});
})
@@ -981,6 +977,7 @@ onMounted(() => {
ok-text="TXT"
ok-type="default"
@confirm="fnExportList('txt')"
+ :show-cancel="false"
cancel-text="CSV"
@cancel="fnExportList('csv')"
>
@@ -1027,15 +1024,15 @@ onMounted(() => {
:selected-keys="[tableState.size as string]"
@click="fnTableSize"
>
- {{
- t('common.size.default')
- }}
- {{
- t('common.size.middle')
- }}
- {{
- t('common.size.small')
- }}
+
+ {{ t('common.size.default') }}
+
+
+ {{ t('common.size.middle') }}
+
+
+ {{ t('common.size.small') }}
+
@@ -1751,7 +1748,7 @@ onMounted(() => {
@upload="fnModalUploadImportUpload"
@close="fnModalUploadImportClose"
v-model:visible="uploadImportState.visible"
- :ext="['.csv', '.txt']"
+ :ext="['.txt']"
>