From df33895b6a072ce2963dc8b0688ebfd0989eef2c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 22 八月 2024 14:06:53 +0800
Subject: [PATCH] 变更检验下单
---
src/components/view/b1-inspect-order-plan.vue | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index ea64308..53ece84 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -200,12 +200,12 @@
</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"/>
+ <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"
+ <ValueTable ref="ValueTableDataLook" :rowKey="'insProductId'" :url="$api.insOrder.selectSampleAndProductByOrderId"
:componentData="componentDataDataLook"/>
</div>
</el-dialog>
@@ -228,6 +228,8 @@
},
data() {
return {
+ examine: null,
+ inspectorList: [],//妫�楠屼汉鍛樺垪琛�
alone: false,
sampleUserForm: {
entrustCode: null,
@@ -263,6 +265,10 @@
value: 0,
label: '涓嶅悎鏍�',
type: 'danger'
+ },{
+ value: 3,
+ label: '涓嶅垽瀹�',
+ type: ''
}]
}
},
@@ -303,14 +309,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: '妫�楠�',
@@ -345,7 +351,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 +586,7 @@
},
selectAllByOne(row) {
this.activeFace = 2;
+ this.examine = 1;
this.currentId = parseInt(row.id)
},
playOrder(num) {
@@ -590,6 +597,16 @@
this.refreshTable('page')
},
handleInspection(row){
+ //褰撳墠妫�楠屼换鍔＄殑妫�楠屼汉鍒楄〃
+ let inspectorList = []
+ if(row.userName){
+ inspectorList = row.userName.split(',')
+ }
+ let user = JSON.parse(localStorage.getItem('user'))
+ if(user){
+ inspectorList.push(user.name)
+ }
+ this.inspectorList = inspectorList
this.state = 1;
this.orderId = row.id
},
--
Gitblit v1.9.3