From 8eef54d67522f078266a54f0c0596b67c012e6d6 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 29 八月 2023 14:34:05 +0800
Subject: [PATCH] bug
---
src/views/experiment/planAssignments/plan.vue | 62 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index c616156..5eb0f53 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -44,23 +44,27 @@
<template>
<div class="plan">
<div class="title">
- <span>椤圭洰鍚嶇О锛�</span>
- <el-input v-model="search.name" size="medium" style="width: 200px;margin-right: 20px;"></el-input>
+ <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" style="margin-right: 20px;">
+ end-placeholder="缁撴潫鏃ユ湡" size="medium" value-format="yyyy-MM-dd" style="margin-right: 20px;">
</el-date-picker>
- <span>妫�楠屼汉锛�</span>
- <el-input v-model="search.userName" size="medium" style="width: 200px;margin-right: 20px;"></el-input>
- <el-button size="small" type="primary">鏌ヨ</el-button>
- <el-button size="small">閲嶇疆</el-button>
+ <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-button size="small" type="primary" @click="selectDataList">鏌ヨ</el-button>
+ <el-button size="small" @click="cleanBtn">閲嶇疆</el-button>
</div>
<div class="thing">
<el-table :data="tableData" style="width: 100%;" row-key="code" default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :key="upIndex">
<el-table-column type="index" width="50" label="搴忓彿">
</el-table-column>
- <el-table-column prop="code" label="鐢宠鍗曞彿" width="200px">
+ <el-table-column prop="code" label="鐢宠鍗曞彿" width="250px">
<template slot-scope="scope">
<div style="display: flex;">
<div v-if="scope.row.orderNum=='01'" style="color: #3caaff;background-color: #eff5ff;" class="order_num">
@@ -76,7 +80,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="name" label="鍚嶇О">
+ <el-table-column prop="name" label="鍚嶇О" width="200px">
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅">
</el-table-column>
@@ -88,9 +92,9 @@
</el-table-column>
<el-table-column prop="checker" label="鎵ц浜�">
</el-table-column>
- <el-table-column prop="instrumentname" label="妫�楠屾棩鏈�">
+ <el-table-column prop="instrumentname" label="妫�楠岃澶�">
</el-table-column>
- <el-table-column prop="testState" label="妫�楠岀姸鎬�">
+ <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>
@@ -207,9 +211,9 @@
data() {
return {
search: {
- name: null,
+ code: null,
date: [],
- userName: null,
+ testValue: null,
},
tableData: [],
upDia: false,
@@ -228,7 +232,16 @@
},
methods: {
selectDataList() {
- get(this.$url.selectAllPlan).then(res => {
+ var str = {}
+ str.code = this.search.code
+ str.status = this.search.testValue
+ try {
+ if (this.search.date.length != 0) {
+ str.beginTime = this.search.date[0]
+ str.endTime = this.search.date[1]
+ }
+ } catch (e) {}
+ get(this.$url.selectAllPlan, str).then(res => {
this.tableData = JSON.parse(JSON.stringify(res.data).replaceAll('pid', 'code').replaceAll('samplename',
'name').replaceAll('inspectionStatus', 'testState'))
this.tableData.forEach(a => {
@@ -331,16 +344,33 @@
submitUpData2() {
var data = []
this.upData.testValue.forEach(a => {
- data.push(a.number)
+ if (a.number != '' && a.number != null) {
+ data.push(a.number)
+ }
})
wpost(this.$url.check, {
id: this.upData.code,
value: data.toString()
}).then(res => {
- this.$message.success('鎻愪氦鎴愬姛')
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>`,
+ '鎻愪氦鎴愬姛', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍏抽棴',
+ dangerouslyUseHTMLString: true,
+ type: `${res.data==1?'success':'error'}`
+ }).then(() => {}).catch(() => {})
})
+ },
+ cleanBtn(){
+ this.search = {
+ code: null,
+ date: [],
+ testValue: null,
+ }
+ this.selectDataList()
}
}
}
--
Gitblit v1.9.3