From cb57bc6b4abf45dbb0605c94359c63e3b31b4b87 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 10 九月 2024 15:55:57 +0800
Subject: [PATCH] 优化报告生成、修改电路下单传参
---
src/components/view/b1-inspect-order-plan.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 5e0dd6f..ba7325f 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -201,7 +201,7 @@
width="100px"
>
<template slot-scope="scope">
- <el-tag :type="typeList.find(m=>m.value==scope.row.insState).type" size="small">{{ typeList.find(m=>m.value==scope.row.insState).label }}</el-tag>
+ <el-tag :type="insStateList.find(m=>m.value==scope.row.insState).type" size="small">{{ insStateList.find(m=>m.value==scope.row.insState).label }}</el-tag>
</template></el-table-column>
<el-table-column
prop="userName"
@@ -298,7 +298,7 @@
<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" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
+ <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state" :orderStateId="orderStateId" :version="version"/>
<el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="80%">
<div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
<ValueTable ref="ValueTableDataLook" :rowKey="'insProductId'" :url="$api.insOrder.selectSampleAndProductByOrderId"
@@ -324,6 +324,8 @@
},
data() {
return {
+ orderStateId:null,
+ version:null,
examine: null,
inspectorList: [],//妫�楠屼汉鍛樺垪琛�
alone: false,
@@ -502,7 +504,7 @@
loading:false,
currentTime: null,
sonLaboratoryList:[],
- tableData: null,
+ tableData: [],
page:{
current:1,
size:20,
@@ -790,8 +792,10 @@
inspectorList.push(user.name)
}
this.inspectorList = inspectorList
- this.state = 1;
this.orderId = row.id
+ this.version = row.version
+ this.orderStateId = row.orderStateId
+ this.state = 1;
},
handleConnect(row){
this.orderId = row.id
@@ -841,6 +845,8 @@
handleReview(row){
this.state = 2;
this.orderId = row.id
+ this.version = row.version
+ this.orderStateId = row.orderStateId
},
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
--
Gitblit v1.9.3