From e841b95caeeb3ba3f512fab431976f64f1061a9e Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期五, 09 八月 2024 17:58:19 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/view/b1-inspect-order-plan.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 03204c7..998a99d 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -200,7 +200,7 @@
</span>
</el-dialog>
<div style="width: 100%;height: 100%;" v-if="activeFace >0">
- <Add :active="activeFace" :currentId="currentId"/>
+ <Add :active="activeFace" :currentId="currentId" :examine="examine"/>
</div>
<Inspection v-if="state>0" @goback="goback" :orderId="orderId" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
<el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="80%">
@@ -228,6 +228,7 @@
},
data() {
return {
+ examine: null,
alone: false,
sampleUserForm: {
entrustCode: null,
@@ -345,7 +346,7 @@
type: 'text',
method: 'claimFun',
disabFun: (row, index) => {
- return row.userName != null||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
+ return row.userName != null || row.checkName!=null
}
}
],
@@ -580,6 +581,7 @@
},
selectAllByOne(row) {
this.activeFace = 2;
+ this.examine = 1;
this.currentId = parseInt(row.id)
},
playOrder(num) {
--
Gitblit v1.9.3