From db582914c36d92de14098fff2274811a2696114d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 九月 2023 10:54:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
src/views/experiment/planAssignments/plan.vue | 101 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 69 insertions(+), 32 deletions(-)
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 0907cbc..0b9cb4f 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -44,16 +44,25 @@
<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-date-picker v-model="search.date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡" size="medium" 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>
+ <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>
</div>
<div class="thing">
<el-table :data="tableData" style="width: 100%;" row-key="code" default-expand-all
@@ -92,8 +101,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">
@@ -102,12 +113,12 @@
</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>
+ 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>
@@ -117,7 +128,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>
@@ -135,7 +146,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>
@@ -156,7 +167,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>
@@ -178,7 +189,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>
@@ -207,9 +218,9 @@
data() {
return {
search: {
- name: null,
+ code: null,
date: [],
- userName: null,
+ testValue: null,
},
tableData: [],
upDia: false,
@@ -228,7 +239,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 => {
@@ -251,18 +271,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
@@ -279,6 +305,9 @@
this.upDia = false
this.selectDataList()
})
+ },
+ selectChecker(){
+ // console.log(this.upData.checker);
},
openUpInsDia(row) {
this.upInsDia = true
@@ -331,7 +360,7 @@
submitUpData2() {
var data = []
this.upData.testValue.forEach(a => {
- if(a.number!=''&&a.number!=null){
+ if (a.number != '' && a.number != null) {
data.push(a.number)
}
})
@@ -341,15 +370,23 @@
}).then(res => {
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(() => {
- })
+ 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