From e6f29116c0bb60b71b806de17b0ec114f87e0970 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 06 三月 2025 11:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/inspectionTask/index.vue | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 2e094e1..d7df57a 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -196,7 +196,7 @@
鏂板
</el-button>
</div>
- <el-table :data="bindTableData" style="width: 100%" height="70vh">
+ <el-table :data="bindTableData" style="width: 100%" height="70vh" v-loading="bindTableDataLoading">
<el-table-column prop="inspectionItemClass" label="妫�楠岄」鍒嗙被" width="150">
</el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" width="150">
@@ -268,6 +268,7 @@
InspectionKey: 1,
bindDialogVisible: false,
bindAddDialogVisible: false,
+ bindTableDataLoading: false,
bindTableData: [],
bindAddTableData: [],
chooseBindAddList: [],
@@ -375,6 +376,9 @@
formatData: (params) => {
return this.urgencyLevel.find((m) => m.value == params).label;
},
+ formatType: (params) => {
+ return this.urgencyLevel.find((m) => m.value == params).type;
+ },
},
{
label: "妫�楠岀被鍨�",
@@ -393,8 +397,7 @@
prop: "insState",
dataType: "tag",
formatData: (params) => {
- return this.inspectionTaskState.find((m) => m.value == params)
- .label;
+ return this.inspectionTaskState.find((m) => m.value == params).label;
},
formatType: (params) => {
return this.inspectionTaskState.find((m) => m.value == params).type;
@@ -565,7 +568,7 @@
// 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
};
},
- created() {
+ mounted() {
this.getAuthorizedPerson();
this.currentTime = getYearAndMonthAndDays();
this.getDicts("urgency_level").then((response) => {
@@ -575,8 +578,6 @@
this.inspectionTaskState = this.dictToValue(response.data);
});
this.refreshTable();
- },
- mounted() {
this.queryParams.userId = this.userId;
},
activated() {
@@ -953,10 +954,6 @@
})
.then((res) => {
this.loading = false;
- if (res.code == 201) {
- this.$message.error("缁戝畾澶辫触");
- return;
- }
this.$message.success("缁戝畾鎴愬姛");
this.bindAddDialogVisible = false;
this.getBinding(this.bindCurrentInfo);
@@ -971,17 +968,14 @@
cancelButtonText: "鍙栨秷",
type: "warning",
}).then(async () => {
- delProductTreeByProductId({ productId: row.id })
- .then((res) => {
- if (res.coe == 201) {
- // this.$message.error('鏈粦瀹氭楠岄」')
- return;
- }
- this.getBinding(this.bindCurrentInfo);
- })
- .catch((error) => {
- console.error(error);
- });
+ this.bindTableDataLoading = true
+ delProductTreeByProductId({ productId: row.id }).then((res) => {
+ this.bindTableDataLoading = false
+ this.getBinding(this.bindCurrentInfo);
+ }).catch((error) => {
+ this.bindTableDataLoading = false
+ console.error(error);
+ });
});
},
},
--
Gitblit v1.9.3