From 9b0a40a9b2918dd0e92161edaff4a3f61b510141 Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期三, 05 三月 2025 10:32:35 +0800 Subject: [PATCH] 优化下单 --- src/views/business/inspectionTask/index.vue | 84 ++++++++++++++--------------------------- 1 files changed, 29 insertions(+), 55 deletions(-) diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue index c9639da..d9ded15 100644 --- a/src/views/business/inspectionTask/index.vue +++ b/src/views/business/inspectionTask/index.vue @@ -138,7 +138,8 @@ </el-row> </div> <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading" - :height="'calc(100vh - 300px)'" @pagination="pagination" key="tableData0"></lims-table> + :rowClassName="rowClassName" :height="'calc(100vh - 300px)'" @pagination="pagination" + key="tableData0"></lims-table> </div> </div> <el-dialog :visible.sync="claimVisible" title="鎻愮ず" width="400px"> @@ -195,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"> @@ -253,6 +254,7 @@ } from "@/api/business/inspectionTask.js"; import { mapGetters } from "vuex"; export default { + name: 'InspectionTask', components: { EditInspectionItem, limsTable, @@ -266,6 +268,7 @@ InspectionKey: 1, bindDialogVisible: false, bindAddDialogVisible: false, + bindTableDataLoading: false, bindTableData: [], bindAddTableData: [], chooseBindAddList: [], @@ -516,10 +519,20 @@ prop: "insResult", dataType: "tag", formatData: (params) => { - return this.insResultList.find((m) => m.value == params).label; + let obj = this.insResultList.find((m) => m.value == params) + if (obj) { + return this.insResultList.find((m) => m.value == params).label; + } else { + return null + } }, formatType: (params) => { - return this.insResultList.find((m) => m.value == params).type; + let obj = this.insResultList.find((m) => m.value == params) + if (obj) { + return this.insResultList.find((m) => m.value == params).type; + } else { + return null + } }, }, { @@ -562,10 +575,12 @@ this.getDicts("inspection_task_state").then((response) => { this.inspectionTaskState = this.dictToValue(response.data); }); + this.refreshTable(); }, mounted() { this.queryParams.userId = this.userId; - // this.getPower(); + }, + activated() { this.refreshTable(); }, methods: { @@ -625,40 +640,6 @@ this.lookInfo = row; this.getLookList(); }, - // 鏉冮檺鍒嗛厤 - getPower(radio) { - let power = JSON.parse(sessionStorage.getItem("power")); - let inspection = false; - let connect = false; - let review = false; - let claim = false; - for (var i = 0; i < power.length; i++) { - if (power[i].menuMethod == "doInsOrder") { - inspection = true; - } - if (power[i].menuMethod == "upPlanUser") { - connect = true; - } - if (power[i].menuMethod == "verifyPlan") { - review = true; - } - if (power[i].menuMethod == "claimInsOrderPlan") { - claim = true; - } - } - if (!claim) { - this.componentData.do.splice(3, 1); - } - if (!review) { - this.componentData.do.splice(2, 1); - } - if (!connect) { - this.componentData.do.splice(1, 1); - } - if (!inspection) { - this.componentData.do.splice(0, 1); - } - }, changeCheckBox(val) { this.queryParams.userId = val ? 0 : null; this.refreshTable(); @@ -707,7 +688,7 @@ this.loading = false; }); }, - changeRowClass({ row, rowIndex }) { + rowClassName({ row, rowIndex }) { if (this.currentTime == row.appointed) { return "highlight-warning-row-border"; } else if (this.currentTime > row.appointed) { @@ -973,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); @@ -991,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