From cd26d9664032ff33ac806dc507577b2acaa88a6d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 八月 2024 15:31:38 +0800
Subject: [PATCH] 复核人过滤
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 6 +++---
src/components/view/b1-inspect-order-plan.vue | 9 ++++++++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 7511cec..7a81061 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -853,7 +853,7 @@
import file from '../../../util/file'
import excelFunction from '../../../util/excelFountion'
export default {
- props: ['sonLaboratory', 'orderId', 'state'],
+ props: ['sonLaboratory', 'orderId', 'state','inspectorList'],
components: {
ValueTable,
},
@@ -3169,9 +3169,9 @@
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
let data = []
- let userName = JSON.parse(localStorage.getItem("user")).name;
+ // let userName = JSON.parse(localStorage.getItem("user")).name;
res.data.forEach(a => {
- if(a.name !== userName) {
+ if(!this.inspectorList.includes(a.name)) {
data.push({
label: a.name,
value: a.id
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index ea39299..365c1a5 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -202,7 +202,7 @@
<div style="width: 100%;height: 100%;" v-if="activeFace >0">
<Add :active="activeFace" :currentId="currentId"/>
</div>
- <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
+ <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
<el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="80%">
<div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
<ValueTable ref="ValueTableDataLook" :url="$api.insOrder.selectSampleAndProductByOrderId"
@@ -228,6 +228,7 @@
},
data() {
return {
+ inspectorList: [],//妫�楠屼汉鍛樺垪琛�
alone: false,
sampleUserForm: {
entrustCode: null,
@@ -590,6 +591,12 @@
this.refreshTable('page')
},
handleInspection(row){
+ //褰撳墠妫�楠屼换鍔＄殑妫�楠屼汉鍒楄〃
+ let inspectorList = []
+ if(row.userName){
+ inspectorList = row.userName.split(',')
+ }
+ this.inspectorList = inspectorList
this.state = 1;
this.orderId = row.id
},
--
Gitblit v1.9.3