From 193bd433be6806ff917c24c63c109e79fd00a6da Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 25 三月 2024 16:02:49 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 055e15c..6c4eb71 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -85,7 +85,7 @@
}
</style>
<template>
- <div>
+ <div v-loading="loading">
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">妫�楠屽崟璇︽儏</el-col>
<el-col :span="12" style="text-align: right;">
@@ -118,7 +118,7 @@
<el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="褰撳墠鏍峰搧浣嶆暟:" >
- <span v-if="currentSample.index">{{ `NO.${currentSample.index}` }}</span>
+ <el-tag v-if="currentSample.index">{{ `NO.${currentSample.index}` }}</el-tag>
</el-form-item>
</el-form>
</div>
@@ -170,7 +170,7 @@
<el-drawer
title="浠诲姟鍒囨崲"
:visible.sync="taskVisible"
- size="45%">
+ :size="500">
<ValueTable class="value-table" ref="insOrderPlan"
:url="$api.insOrderPlan.selectInsOrderPlanList" :componentData="componentData"
:key="upIndex"/>
@@ -199,7 +199,7 @@
sonLaboratory: null,
userId: 0
},
- isIndex: true,
+ isIndex: false,
showSelect: true,
select: false,
selectMethod:'handleChangeTask',
@@ -226,6 +226,7 @@
urgentList:[],
currentSample:{},//褰撳墠鏍峰搧淇℃伅
tableList:[],
+ loading: false
}
},
created() {
@@ -238,6 +239,7 @@
},
watch:{
id(val){
+ this.loading = true
this.$axios.post(this.$api.insOrderPlan.doInsOrder,{
id: val
}).then(res=>{
@@ -249,6 +251,8 @@
})
this.sampleProduct = res.data.sampleProduct
this.currentSample = this.sampleProduct[0]
+ if(this.currentSample.index==undefined)this.currentSample['index'] = 1
+ this.loading = false
this.handleTableData()
})
}
@@ -260,7 +264,7 @@
this.sampleVisible = false;
},
handleChangeTask(row){
- this.id = row[0].id;
+ if(row.length > 0)this.id = row[0].id;
this.taskVisible = false;
},
getTypeDicts() {
--
Gitblit v1.9.3