From 28f295e0fcea7bf429cf8e3b79468e70e3a2d3ef Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 28 二月 2025 11:18:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/inspectionTask/index.vue | 53 ++++++++++++++---------------------------------------
1 files changed, 14 insertions(+), 39 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index c9639da..e10d812 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">
@@ -253,6 +254,7 @@
} from "@/api/business/inspectionTask.js";
import { mapGetters } from "vuex";
export default {
+ name: 'InspectionTask',
components: {
EditInspectionItem,
limsTable,
@@ -516,10 +518,18 @@
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 ''
+ }
},
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;
+ }
},
},
{
@@ -565,7 +575,6 @@
},
mounted() {
this.queryParams.userId = this.userId;
- // this.getPower();
this.refreshTable();
},
methods: {
@@ -625,40 +634,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 +682,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) {
--
Gitblit v1.9.3