From b630fdda258de5577005291c3bc23866e9172c76 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 06 三月 2025 09:49:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/productOrder/index.vue | 2 +-
src/views/business/inspectionTask/index.vue | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index d9ded15..d7df57a 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -376,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: "妫�楠岀被鍨�",
@@ -394,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;
@@ -566,7 +568,7 @@
// 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
};
},
- created() {
+ mounted() {
this.getAuthorizedPerson();
this.currentTime = getYearAndMonthAndDays();
this.getDicts("urgency_level").then((response) => {
@@ -576,8 +578,6 @@
this.inspectionTaskState = this.dictToValue(response.data);
});
this.refreshTable();
- },
- mounted() {
this.queryParams.userId = this.userId;
},
activated() {
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index f24e85a..61af313 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -685,7 +685,7 @@
label: '寰呭鏍�',
value: 0
}, {
- label: '寰呮楠�',
+ label: '妫�楠屼腑',
value: 1
},
{
--
Gitblit v1.9.3