diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index df46dddc..682fa61d 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -1,14 +1,8 @@
@@ -170,13 +160,14 @@ const setInterval = (val: any) => {
datePickerRef.value.setInterval(val)
}
-defineExpose({ onComSearch, areaRef, setDatePicker, setInterval, datePickerRef, showSelectChange})
+defineExpose({ onComSearch, areaRef, setDatePicker, setInterval, datePickerRef, showSelectChange })
+// }
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
index 7a874722..acf428a6 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue
@@ -104,8 +104,8 @@
@@ -118,7 +118,7 @@ import { ElMessage, genFileId, UploadProps, UploadRawFile, UploadUserFile } from
import { uploadFile, getFileNameAndFilePath } from '@/api/system-boot/file'
import { useDictData } from '@/stores/dictData'
import { addSurveyTest, updateSurveyTest, getTestById } from '@/api/supervision-boot/survey/test'
-
+const loading = ref(false)
const acceptType = ref('')
const tableStore = inject('tableStore') as TableStore
let uploadName = ref('')
@@ -254,7 +254,8 @@ const cancelFn = () => {
planAddition.value = false
}
// 提交
-const submitFn = (flag: boolean) => {
+const submitFn = async (flag: boolean) => {
+ loading.value = true
const subForm = JSON.parse(JSON.stringify(form.value))
subForm.otherReport = ''
@@ -270,7 +271,7 @@ const submitFn = (flag: boolean) => {
subForm.saveOrCheckflag = '1'
//新增,则组装业务数据提交后台
- addSurveyTest(subForm).then(res => {
+ await addSurveyTest(subForm).then(res => {
ElMessage.success('保存成功!')
tableStore.index()
planAddition.value = false
@@ -315,6 +316,9 @@ const submitFn = (flag: boolean) => {
}
})
}
+ await setTimeout(() => {
+ loading.value = false
+ }, 0)
}
const audit = (filePath: any) => {
if (title.value == '计划测试填报') {
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue
index e3af9e35..c814e06b 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue
@@ -166,8 +166,8 @@
@@ -200,6 +200,7 @@ const props = defineProps({
const rules = {
goToNetReport: [{ required: true, message: '请上传报告', trigger: 'blur' }]
}
+const loading = ref(false)
const emits = defineEmits(['onSubmit'])
const dictData = useDictData()
const dialogFormVisible = ref(false)
@@ -353,6 +354,7 @@ const choose = (e: any) => {
//提交
const confirmForm = (flag: boolean) => {
+ loading.value = true
if (flag) {
let data = {
type: props.bussType,
@@ -394,6 +396,9 @@ const confirmForm = (flag: boolean) => {
}
})
}
+ setTimeout(() => {
+ loading.value = false
+ }, 0)
}
defineExpose({ open })
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index ce936136..a2c51530 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -1,68 +1,35 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -73,74 +40,37 @@
-
+
-
-
+
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" autocomplete="off" placeholder="请输入用户协议容量">
MVA
-
-
+
+
-
+
-
+
@@ -157,106 +87,60 @@
-
+
-
+
-
+
-
+
-
-
+
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder="请输入基准短路容量">
MVA
-
-
+
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" autocomplete="off" placeholder="请选择系统最小短路容量">
MVA
-
-
+
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder="请输入PCC供电终端容量">
MVA
-
-
+
+.replace('-','$#$').replace(/\-/g,'').replace('$#$','-')" placeholder="请输入用户用电协议容量">
MVA
@@ -269,51 +153,23 @@
-
+
-
-
+
+
-
-
+ prop="nonlinearLoadType">
+
@@ -321,234 +177,108 @@
否
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
上传文件
-
+
上传文件
-
+
上传文件
-
-
+
+
上传文件
-
+
上传文件
-
-
+
+
上传文件
-
-
+
+
上传文件
-
-
+
+
上传文件
-
-
+
+
上传文件
@@ -559,8 +289,8 @@
@@ -620,6 +350,7 @@ const dialogFormVisible = ref(false)
// .doc,.docx,.xlsx,.xls,.pdf
const acceptType = ''
const form: any = ref({})
+const loading = ref(false)
const addUploadRef: any = ref()
const control: any = ref(true)
const controFlag: any = ref(false)
@@ -1126,10 +857,10 @@ const fileRaw = (row: any, key: string) => {
row[key][k].length == 0
? []
: [
- {
- name: row[key][k].split('/')[2]
- }
- ]
+ {
+ name: row[key][k].split('/')[2]
+ }
+ ]
} else {
form.value[k] = []
}
@@ -1153,7 +884,7 @@ const close = () => {
emits('onSubmit')
resetForm()
}
-onMounted(() => {})
+onMounted(() => { })
// 上传报告
const uploadRef = ref()
@@ -1245,7 +976,8 @@ const disabledDate = (time: any) => {
return false
}
//提交
-const confirmForm = (flag: boolean) => {
+const confirmForm = async (flag: boolean) => {
+ loading.value = true
if (flag) {
//整理上传文件的数据
// userType==0,1
@@ -1309,7 +1041,7 @@ const confirmForm = (flag: boolean) => {
if (!control.value) confirmFormData.dataType = 1
if (controFlag.value) confirmFormData.dataType = 1
if (props.normalizedControl) {
- addEditor(confirmFormData).then(res => {
+ await addEditor(confirmFormData).then(res => {
ElMessage({
message: '保存成功!',
type: 'success'
@@ -1320,7 +1052,7 @@ const confirmForm = (flag: boolean) => {
close()
})
} else {
- submitFormData(confirmFormData).then(res => {
+ await submitFormData(confirmFormData).then(res => {
ElMessage({
message: '保存成功!',
type: 'success'
@@ -1332,7 +1064,7 @@ const confirmForm = (flag: boolean) => {
})
}
} else {
- ruleFormRef.value.validate((valid: any) => {
+ await ruleFormRef.value.validate( async (valid: any) => {
if (valid) {
//整理上传文件的数据
// userType==0,1
@@ -1461,7 +1193,7 @@ const confirmForm = (flag: boolean) => {
confirmFormData.saveOrCheckflag = '2'
if (controFlag.value) confirmFormData.dataType = 1
if (title.value == '用户档案录入') {
- submitFormData(confirmFormData).then(res => {
+ await submitFormData(confirmFormData).then(res => {
ElMessage({
message: '新增成功',
type: 'success'
@@ -1474,12 +1206,11 @@ const confirmForm = (flag: boolean) => {
} else {
confirmFormData.id = resendId.value
if (controFlag.value) confirmFormData.dataType = 1
- console.log('🚀 ~ ruleFormRef.value.validate ~ controFlag.value:', controFlag.value)
- console.log(123123)
+
if (props.normalizedControl) {
if (title.value == '编辑') {
if (status.value != '') confirmFormData.status = status.value
- addEditor(confirmFormData).then(res => {
+ await addEditor(confirmFormData).then(res => {
ElMessage({
message: '发起成功',
type: 'success'
@@ -1490,7 +1221,7 @@ const confirmForm = (flag: boolean) => {
close()
})
} else {
- resend(confirmFormData).then(res => {
+ await resend(confirmFormData).then(res => {
ElMessage({
message: '重新发起成功',
type: 'success'
@@ -1501,7 +1232,7 @@ const confirmForm = (flag: boolean) => {
})
}
} else {
- updateFormData(confirmFormData).then(res => {
+ await updateFormData(confirmFormData).then(res => {
ElMessage({
message: '重新发起成功',
type: 'success'
@@ -1519,6 +1250,9 @@ const confirmForm = (flag: boolean) => {
}
})
}
+ await setTimeout(() => {
+ loading.value = false
+ }, 0)
}
// 过滤用户
@@ -1535,18 +1269,20 @@ const setcontroFlag = () => {
defineExpose({ open, filterUsers, setcontroFlag })