From 437b40045ce48b28e2817b0f9f9998d3a881ebe1 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 05 九月 2023 16:39:02 +0800
Subject: [PATCH] modified: src/components/experiment/template_testReport/index.vue modified: src/utils/GlobalClickMixin.js modified: src/views/experiment/passRateStatistics/index.vue modified: src/views/experiment/planAssignments/plan.vue modified: src/views/laboratory/measure/index.vue modified: src/views/laboratory/personnel/index.vue modified: src/views/standardLibrary/index.vue
---
src/views/experiment/planAssignments/plan.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 8ec2c74..05d0439 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -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>
@@ -121,7 +121,7 @@
<el-row style="line-height: 50px;">
<el-col :span="4" style="font-size: 14px;text-align: right;">浜哄憳:</el-col>
<el-col :span="16" :offset="1">
- <el-select v-model="upData.checker" size="medium" clearable style="width: 100%;">
+ <el-select @change="selectChecker" v-model="upData.checker" size="medium" clearable style="width: 100%;">
<el-option v-for="(a, ai) in users" :key="ai" :label="a.name" :value="a.id"></el-option>
</el-select>
</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,18 +264,24 @@
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,
checker: null,
device: null
}
+ this.upData.checker=row.uId
+ this.upData.device=row.isuId
},
submitUpData() {
+ // console.log(this.upData.device);
+ // console.log(this.devices);
+ // return;
if (this.upData.checker == null || this.upData.checker == '') {
this.$message.error('浜哄憳鏈垎閰�')
return
@@ -293,6 +299,9 @@
this.selectDataList()
})
},
+ selectChecker(){
+ // console.log(this.upData.checker);
+ },
openUpInsDia(row) {
this.upInsDia = true
this.upData = this.HaveJson(row)
--
Gitblit v1.9.3