From 5eb1499c02ac96f5d58fabfd17e36103d35a675c Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 九月 2023 14:01:26 +0800
Subject: [PATCH] modified: src/views/experiment/nonConformingFeedback/index.vue modified: src/views/experiment/planAssignments/plan.vue modified: src/views/login/index.vue modified: src/views/standardLibrary/index.vue
---
src/views/experiment/planAssignments/plan.vue | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 4be59d6..34a94cc 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -44,20 +44,26 @@
<template>
<div class="plan">
<div class="title">
- <span>鐢宠鍗曠紪鍙凤細</span>
- <el-input v-model="search.code" size="medium" style="width: 200px;margin-right: 20px;"></el-input>
- <span>妫�楠屾椂闂达細</span>
- <el-date-picker v-model="search.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡" size="medium" value-format="yyyy-MM-dd" style="margin-right: 20px;">
- </el-date-picker>
- <span>妫�楠岀粨鏋滐細</span>
- <el-select v-model="search.testValue" size="medium" style="width: 200px;margin-right: 20px;">
- <el-option label="鍏ㄩ儴" :value="null"></el-option>
- <el-option label="鍚堟牸" :value="1"></el-option>
- <el-option label="涓嶅悎鏍�" :value="0"></el-option>
- </el-select>
+ <el-form :model="search" :inline="true" label-position="left">
+ <el-form-item prop="code" label="鐢宠鍗曠紪鍙凤細" width="200" style="margin: 20px 10px;">
+ <el-input v-model="search.code" size="small" ></el-input>
+ </el-form-item>
+ <el-form-item prop="date" label="妫�楠屾椂闂达細" width="200" style="margin: 20px 10px;">
+ <el-date-picker v-model="search.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡" size="small" value-format="yyyy-MM-dd" style="margin-right: 20px;">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item prop="testValue" label="妫�楠岀粨鏋滐細" width="200" style="margin: 20px 10px;">
+ <el-select v-model="search.testValue" size="small">
+ <el-option label="鍏ㄩ儴" :value="null"></el-option>
+ <el-option label="鍚堟牸" :value="1"></el-option>
+ <el-option label="涓嶅悎鏍�" :value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
<el-button size="small" type="primary" @click="selectDataList">鏌ヨ</el-button>
<el-button size="small" @click="cleanBtn">閲嶇疆</el-button>
+ <el-checkbox style="margin-left: 10px;" @change="selectDataList" v-model="isLookMe">鍙湅鎴�</el-checkbox>
</div>
<div class="thing">
<el-table :data="tableData" style="width: 100%;" row-key="code" default-expand-all
@@ -96,8 +102,10 @@
</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" effect="dark" v-if="scope.row.children!=undefined&&scope.row.testState!=null">宸蹭笂鎶�</el-tag>
+ <el-tag type="danger" effect="dark" v-else-if="scope.row.children!=undefined&&scope.row.testState==null">鏈笂鎶�</el-tag>
+ <el-tag type="success" v-else-if="scope.row.children==undefined&&scope.row.testState!=null">宸叉楠�</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.children==undefined&&scope.row.testState==null">鏈楠�</el-tag>
</template>
</el-table-column>
<el-table-column prop="startTime" label="妫�楠屽紑濮�" width="100px">
@@ -109,9 +117,9 @@
<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>
+ v-if="scope.row.orderNum=='02'&&scope.row.children==undefined&&scope.row.testState==null">鍒嗛厤</el-button>
<el-button size="mini" type="text" @click="openUpInsDia(scope.row)"
- v-if="scope.row.orderNum=='02'">妫�楠�</el-button>
+ v-if="scope.row.orderNum=='02'&&scope.row.children==undefined&&scope.row.testState==null">妫�楠�</el-button>
</template>
</el-table-column>
</el-table>
@@ -121,7 +129,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>
@@ -160,7 +168,7 @@
<el-col :span="7">{{upData.internal}}</el-col>
</el-row>
<el-row style="line-height: 46px;">
- <el-col :span="5" style="font-size: 14px;text-align: right;">妫�楠岀姸鎬侊細</el-col>
+ <el-col :span="5" style="font-size: 14px;text-align: right;">妫�楠岀粨鏋滐細</el-col>
<el-col :span="7">
<el-tag type="success" v-if="upData.testState==1">鍚堟牸</el-tag>
<el-tag type="danger" v-else-if="upData.testState==0">涓嶅悎鏍�</el-tag>
@@ -222,7 +230,8 @@
upInsDia: false,
upIndex2: 0,
users: [],
- devices: []
+ devices: [],
+ isLookMe: false
}
},
mounted() {
@@ -234,6 +243,7 @@
selectDataList() {
var str = {}
str.code = this.search.code
+ str.isLookMe=this.isLookMe
str.status = this.search.testValue
try {
if (this.search.date.length != 0) {
@@ -268,15 +278,20 @@
.children.length
},
openUpDia(row) {
- console.log(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
@@ -294,6 +309,9 @@
this.selectDataList()
})
},
+ selectChecker(){
+ // console.log(this.upData.checker);
+ },
openUpInsDia(row) {
this.upInsDia = true
this.upData = this.HaveJson(row)
--
Gitblit v1.9.3