diff --git a/src/api/business/index.js b/src/api/business/index.js index 69b24d36..3c74a75a 100644 --- a/src/api/business/index.js +++ b/src/api/business/index.js @@ -73,7 +73,7 @@ export function getUseringData(query) { // 领用申请提交-新增 export function receiveSubmit(data) { return request({ - url: '/material/directRotation/submit', + url: '/material/directRotation/submitNew', method: 'post', data }) diff --git a/src/views/business/businessHandling/directApply.vue b/src/views/business/businessHandling/directApply.vue index c43be92c..ac3bbdb9 100644 --- a/src/views/business/businessHandling/directApply.vue +++ b/src/views/business/businessHandling/directApply.vue @@ -232,7 +232,7 @@ @click="handleSave" v-if="!isDetail" > - {{ isEdit ? '保存' : '发起申请' }} + {{ isEdit ? '保存' : '发起提交' }} 0) { this.$refs['maForm'].validate(valid => { if (valid) { - this.$modal.confirm('是否确认申请').then(async () => { + this.$modal.confirm('是否确认提交').then(async () => { const isPass = this.multipleSelection.every(item => { return item.directNum }) diff --git a/src/views/material/ma/device/index.vue b/src/views/material/ma/device/index.vue index 17921c18..0f0873d0 100644 --- a/src/views/material/ma/device/index.vue +++ b/src/views/material/ma/device/index.vue @@ -971,6 +971,7 @@ export default { //同步 synchSubmit() { + const loading = this.$loading({ text: '同步中...' }) const params = { checkTimeSynch: this.dataSynch.checkTimeSynch, nextCheckTimeSynch: this.dataSynch.nextCheckTimeSynch, @@ -990,9 +991,15 @@ export default { pdfName: '' } this.dataSynch = {} + loading.close() } - this.getList() }) + .finally(() => { + // 4. 无论成功或失败,最后都要关闭 loading + loading.close(); + // 5. 刷新列表 + this.getList(); + }); } // handleExport() {