diff --git a/src/views/neUser/pcf/index.vue b/src/views/neUser/pcf/index.vue index ad16c73f..cae378e7 100644 --- a/src/views/neUser/pcf/index.vue +++ b/src/views/neUser/pcf/index.vue @@ -253,26 +253,11 @@ function fnModalOk() { from.neId = queryParams.neId || '-'; from.rfsp = Number(from.rfsp) || 0; - // 根据类型选择函数 - let result: any = null; let validateArr = ['imsi', 'msisdn']; if (modalState.isBatch) { validateArr.push('num'); - if (modalState.type === 'add') { - result = batchAddRule(from); - } - if (modalState.type === 'update') { - result = batchUpdateRule(from); - } if (modalState.type === 'delete') { - result = batchDelRule(from); - } - } else { - if (modalState.type === 'add') { - result = addRule(from); - } - if (modalState.type === 'update') { - result = updateRule(from); + validateArr = ['num', 'imsi']; } } @@ -280,8 +265,29 @@ function fnModalOk() { .validate(validateArr) .then(e => { modalState.confirmLoading = true; - const hide = message.loading({ content: t('common.loading') }); + + // 根据类型选择函数 + let result: any = null; + if (modalState.isBatch) { + if (modalState.type === 'add') { + result = batchAddRule(from); + } + if (modalState.type === 'update') { + result = batchUpdateRule(from); + } + if (modalState.type === 'delete') { + result = batchDelRule(from); + } + } else { + if (modalState.type === 'add') { + result = addRule(from); + } + if (modalState.type === 'update') { + result = updateRule(from); + } + } + result .then((res: any) => { if (res.code === RESULT_CODE_SUCCESS) { @@ -775,7 +781,11 @@ onMounted(() => { name="imsi" v-bind="modalStateFrom.validateInfos.imsi" > - +