From ecf3c9735379270912d16f37c486d085b36f4c8a Mon Sep 17 00:00:00 2001 From: cl <418351270@qq.com> Date: 星期二, 30 一月 2024 09:48:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- jcdm-ui/src/views/main/kb/repairMark/index.vue | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/jcdm-ui/src/views/main/kb/repairMark/index.vue b/jcdm-ui/src/views/main/kb/repairMark/index.vue index 34ccfa6..9952468 100644 --- a/jcdm-ui/src/views/main/kb/repairMark/index.vue +++ b/jcdm-ui/src/views/main/kb/repairMark/index.vue @@ -108,11 +108,15 @@ insertRepairRecordByIds } from "@/api/main/da/passingStationCollection/passingStationCollection"; import {noPagelist} from "@/api/main/rm/repairRecord/repairRecord"; +import {warning} from "@riophae/vue-treeselect/src/utils"; export default { name: "index", dicts: ['sys_normal_disable'], data(){ return{ + + loading: false,//鍒锋柊淇敼 + activeName: 'first', // 杩斾慨璁板綍琛ㄦ牸鏁版嵁 @@ -166,15 +170,23 @@ }, markComplete(){ if(this.ids.length === 0){ - this.$modal.msgSuccess('鏈�夋嫨'); + this.$message({ + message: '鏈爣璁帮紒', + type: 'warning' + }) }else { + this.loading = true; // 寮�濮嬪姞杞芥暟鎹� this.$modal.msgSuccess('鏍囪瀹屾垚'); + let queryParams = { ids: this.ids } this.repairRecordList = [] insertRepairRecordByIds(queryParams).then(response => { - + this.initRepairRecord(); // 鍒锋柊杩斾慨璁板綍 + this.loading = false; // 缁撴潫鍔犺浇鏁版嵁 + }).catch(() => { + this.loading = false; // 缁撴潫鍔犺浇鏁版嵁 }); // this.initRepairRecord() // this.getList(); @@ -216,7 +228,7 @@ type: 'warning' }); }else { - this.$modal.msgSuccess('鎼滅储'); + // this.$modal.msgSuccess('鎼滅储'); this.getList(); this.initRepairRecord(); } -- Gitblit v1.9.3