From 07ea6a242b16b7ad61602915698a9852cc894246 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 08 八月 2024 22:07:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-inspect-order-plan.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index fb139d8..ea39299 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -303,14 +303,14 @@
font: '鏁版嵁鏌ョ湅',
type: 'text',
method: 'handleDataLook',
- /* disabFun: (row, index) => {
- const user = JSON.parse(localStorage.getItem('user'))
- let currentUserName = ''
- if(user){
- currentUserName = user.name
- }
- return row.userName!=currentUserName && row.checkName!=currentUserName
- } */
+ //disabFun: (row, index) => {
+ //const user = JSON.parse(localStorage.getItem('user'))
+ // let currentUserName = ''
+ // if(user){
+ // currentUserName = user.name
+ //}
+ //return row.userName.indexOf(currentUserName)<0 && row.checkName.indexOf(currentUserName)<0
+ //}
},{
id: '',
font: '妫�楠�',
@@ -452,7 +452,6 @@
}
},
changeCheckBox(val) {
- console.log(111,val)
this.componentData.entity.userId = val?0:null
this.refreshTable()
},
@@ -469,7 +468,7 @@
this.sampleUserForm = {
entrustCode: row.entrustCode,
insSampleId: row.id,
- sonLaboratory: this.componentData.entity.sonLaboratory,
+ sonLaboratory: row.sonLaboratory,
}
this.claimVisible = true
}
--
Gitblit v1.9.3