From a0eb3c8e9f2d145e94d8b6b8374d8233dcea86c2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 14:53:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/views/experiment/planAssignments/plan.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 5eb0f53..4be59d6 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -96,8 +96,8 @@
</el-table-column>
<el-table-column prop="testState" label="妫�楠岀姸鎬�" width="100px">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.testState==1">鍚堟牸</el-tag>
- <el-tag type="danger" v-else-if="scope.row.testState==0">涓嶅悎鏍�</el-tag>
+ <el-tag type="success" v-if="scope.row.testState==1">宸叉姤妫�</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.testState==0">鏈姤妫�</el-tag>
</template>
</el-table-column>
<el-table-column prop="startTime" label="妫�楠屽紑濮�" width="100px">
@@ -106,7 +106,7 @@
</el-table-column>
<el-table-column label="鎿嶄綔" width="150">
<template slot-scope="scope">
- <el-button size="mini" type="primary" v-if="isIfReport(scope.row)"
+ <el-button size="mini" :disabled="!isIfReport(scope.row)" type="primary" v-if="scope.row.orderNum == '01'"
@click="addReported(scope.row.id)">涓婃姤</el-button>
<el-button size="mini" type="text" @click="openUpDia(scope.row)"
v-if="scope.row.orderNum=='02'">鍒嗛厤</el-button>
@@ -139,7 +139,7 @@
<el-button @click="upDia = false">鍙� 娑�</el-button>
</span>
</el-dialog>
- <el-dialog title="妫�楠�" :visible.sync="upInsDia" width="500px">
+ <el-dialog title="妫�楠�" :visible.sync="upInsDia" width="600px">
<div class="body" style="max-height: 50vh;overflow-y: auto;">
<el-row style="line-height: 46px;">
<el-col :span="5" style="font-size: 14px;text-align: right;">鐢宠鍗曠紪鐮侊細</el-col>
@@ -182,7 +182,7 @@
</el-input>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="60">
+ <el-table-column label="鎿嶄綔" width="80">
<template slot-scope="scope">
<el-button size="mini" type="text"
@click.native.prevent="deleteRow(scope.$index, upData.testValue)">鍒犻櫎</el-button>
@@ -264,10 +264,11 @@
row.children.forEach(a => {
if (a.testState != null && a.testState != undefined) count++
})
- return row.testState == undefined && row.orderNum == '01' && count == row
+ return row.testState == undefined && count == row
.children.length
},
openUpDia(row) {
+ console.log(row);
this.upDia = true
this.upData = {
id: row.code,
@@ -355,7 +356,7 @@
this.upInsDia = false
this.selectDataList()
this.$confirm(
- `<p style="line-height: 80px">鎮ㄧ殑椤圭洰(${this.upData.name})妫�楠岀粨鏋滀负锛�<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'鍚堟牸':'涓嶅悎鏍�'}</span></p>`,
+ `<p style="line-height: 80px">鎮ㄧ殑椤圭洰锛�${this.upData.name}锛夋楠岀粨鏋滀负锛�<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'鍚堟牸':'涓嶅悎鏍�'}</span></p>`,
'鎻愪氦鎴愬姛', {
confirmButtonText: '纭畾',
cancelButtonText: '鍏抽棴',
--
Gitblit v1.9.3