From b34c4bfb96b9517ca489982e94abf66e3d7c4b66 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 17 三月 2025 11:14:32 +0800
Subject: [PATCH] 检验任务代码迁移
---
src/views/business/inspectionTask/index.vue | 62 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 329d4e4..26c8223 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -211,7 +211,7 @@
</span>
</el-dialog>
<el-dialog title="妫�楠屼氦鎺�" :visible.sync="connectVisible" width="400px">
- <div class="search_thing">
+ <div class="search_thing" style="width: 100%">
<div class="search_label" style="width: 90px">
<span class="required-span">* </span>浜ゆ帴浜哄憳锛�
</div>
@@ -241,7 +241,7 @@
</el-select>
</div>
</div>
- <div class="search_thing">
+ <div class="search_thing" style="width: 100%">
<div class="search_label" style="width: 90px">
<span class="required-span">* </span>璇曢獙瀹わ細
</div>
@@ -269,9 +269,6 @@
>
</span>
</el-dialog>
- <div style="width: 100%; height: 100%" v-if="activeFace > 0">
- <Add :active="activeFace" :currentId="currentId" :examine="examine" />
- </div>
<Inspection
v-if="state > 0"
@goback="goback"
@@ -288,14 +285,14 @@
width="100%"
fullscreen
>
- <!-- <div
+ <div
style="width: 100%; text-align: right; margin-bottom: 10px"
v-if="premissionReviewFun()"
>
<el-button type="primary" size="small" @click="goReview(currentRow)"
>鍓嶅線澶嶆牳</el-button
>
- </div> -->
+ </div>
<lims-table
ref="dataLookTable"
highlightCurrentRow
@@ -741,6 +738,17 @@
},
computed: {
...mapGetters(["permissions", "nickName"]),
+ title() {
+ return this.selectTab + "妫�楠岀粨鏋滄樉绀�";
+ },
+ isLeader() {
+ const power = JSON.parse(sessionStorage.getItem("power"));
+ if (power) {
+ const filterList = power.filter((ele) => ele.menuMethod == "leader");
+ return filterList.length > 0;
+ }
+ return false;
+ },
},
data() {
return {
@@ -895,7 +903,7 @@
row.userName == null ||
row.insState == 3 ||
row.insState == 5 ||
- (row.userName && !row.userName.includes(this.nickName))
+ (row.userName && !this.hasExistUserName(row.userName))
);
},
},
@@ -911,7 +919,7 @@
row.insState == 5 ||
row.insState == 3 ||
(row.userName &&
- !row.userName.includes(this.nickName) &&
+ !this.hasExistUserName(row.userName) &&
!this.isLeader)
);
},
@@ -926,7 +934,7 @@
return (
row.userName == null ||
row.insState != 3 ||
- (row.checkName && !row.checkName.includes(this.nickName))
+ (row.checkName && !this.hasExistUserName(row.userName))
);
},
},
@@ -1313,20 +1321,11 @@
});
},
},
- computed: {
- title() {
- return this.selectTab + "妫�楠岀粨鏋滄樉绀�";
- },
- isLeader() {
- const power = JSON.parse(sessionStorage.getItem("power"));
- if (power) {
- const filterList = power.filter((ele) => ele.menuMethod == "leader");
- return filterList.length > 0;
- }
- return false;
- },
- },
methods: {
+ //鍒ゆ柇妫�楠屼汉涓槸鍚﹀寘鍚綋鍓嶇敤鎴�
+ hasExistUserName(userName) {
+ return userName.includes(this.nickName);
+ },
pagination({ page, limit }) {
this.page.current = page;
this.page.size = limit;
@@ -1876,9 +1875,20 @@
inspectorList = row.userName.split(",");
}
inspectorList.push(this.nickName);
- this.inspectorList = inspectorList;
- this.state = 1;
- this.orderId = row.id;
+ this.$router.push({
+ name: "inspection",
+ params: {
+ inspectorList: inspectorList,
+ state: 1,
+ orderId: row.id,
+ sonLaboratory: this.queryParams.sonLaboratory,
+ handover: this.personList,
+ },
+ });
+
+ // this.inspectorList = inspectorList;
+ // this.state = 1;
+ // this.orderId = row.id;
},
handleConnect(row) {
this.orderId = row.id;
--
Gitblit v1.9.3