|
@@ -171,16 +171,17 @@
|
|
<p>{{rightIds.length?rightIds.length:0}}/{{rightTotal}}</p>
|
|
<p>{{rightIds.length?rightIds.length:0}}/{{rightTotal}}</p>
|
|
</div>
|
|
</div>
|
|
<div class="right-form-max-box">
|
|
<div class="right-form-max-box">
|
|
- <el-form :model="rightQueryParams" :inline="true" v-show="rightShowSearch"
|
|
|
|
|
|
+ <el-form :inline="true" v-show="rightShowSearch"
|
|
ref="queryForm" style="display: flex">
|
|
ref="queryForm" style="display: flex">
|
|
<el-form-item label="" prop="searchValue" >
|
|
<el-form-item label="" prop="searchValue" >
|
|
- <el-input placeholder="请输入实验室名称" style="width:288px;" v-model="rightQueryParams.searchValue" class="input-with-select">
|
|
|
|
- <el-button slot="append" icon="el-icon-search" @click="rightResetQuery"
|
|
|
|
|
|
+ <el-input placeholder="请输入实验室名称" style="width:288px;" v-model="inputNameText" class="input-with-select">
|
|
|
|
+ <el-button slot="append" icon="el-icon-search" @click="rightTableButton"
|
|
style="background:rgba(0,0,0,0);"></el-button>
|
|
style="background:rgba(0,0,0,0);"></el-button>
|
|
</el-input>
|
|
</el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
- <el-table ref="rightTable" v-loading="rightLoading" border :data="rightDataList" @selection-change="handleSelectionChangeRight" :row-key="getRowKeysRight">
|
|
|
|
|
|
+ <el-table ref="rightTable" v-loading="rightLoading" border @selection-change="handleSelectionChangeRight" :row-key="getRowKeysRight"
|
|
|
|
+ :data="rightDataList.filter((v) => inputType?v.name.indexOf(inputName) != -1:v.name)">
|
|
<el-table-column type="selection" width="80" align="left" :reserve-selection="true"/>
|
|
<el-table-column type="selection" width="80" align="left" :reserve-selection="true"/>
|
|
<el-table-column label="实验室" align="left" prop="name" show-overflow-tooltip/>
|
|
<el-table-column label="实验室" align="left" prop="name" show-overflow-tooltip/>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -267,7 +268,13 @@
|
|
addList:[],
|
|
addList:[],
|
|
reduceList:[],
|
|
reduceList:[],
|
|
//原始数据
|
|
//原始数据
|
|
- primitiveList:[]
|
|
|
|
|
|
+ primitiveList:[],
|
|
|
|
+ //搜索内容
|
|
|
|
+ inputNameText:'',
|
|
|
|
+ //搜索匹配内容
|
|
|
|
+ inputName:'',
|
|
|
|
+ //搜索状态开关
|
|
|
|
+ inputType:false,
|
|
}
|
|
}
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
@@ -280,6 +287,16 @@
|
|
|
|
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ //右侧查询过滤按钮
|
|
|
|
+ rightTableButton(){
|
|
|
|
+ if(this.inputNameText){
|
|
|
|
+ this.$set(this,'inputName',this.inputNameText);
|
|
|
|
+ this.$set(this,'inputType',true);
|
|
|
|
+ }else{
|
|
|
|
+ this.$set(this,'inputName','');
|
|
|
|
+ this.$set(this,'inputType',false);
|
|
|
|
+ }
|
|
|
|
+ },
|
|
//关联数据提交
|
|
//关联数据提交
|
|
joinsubButton(){
|
|
joinsubButton(){
|
|
let self = this;
|
|
let self = this;
|
|
@@ -387,8 +404,6 @@
|
|
this.$set(this,'addList',[]);
|
|
this.$set(this,'addList',[]);
|
|
this.$set(this,'reduceList',[]);
|
|
this.$set(this,'reduceList',[]);
|
|
this.$set(this,'primitiveList',[]);
|
|
this.$set(this,'primitiveList',[]);
|
|
- this.leftResetQuery();
|
|
|
|
- this.rightResetQuery();
|
|
|
|
getExhaustInfo(id).then( response => {
|
|
getExhaustInfo(id).then( response => {
|
|
for(let i=0;i<response.data.exhaustPeriodVoList.length;i++){
|
|
for(let i=0;i<response.data.exhaustPeriodVoList.length;i++){
|
|
if(response.data.exhaustPeriodVoList[i].customTime){
|
|
if(response.data.exhaustPeriodVoList[i].customTime){
|
|
@@ -396,6 +411,8 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
this.$set(this,'correlationData',response.data);
|
|
this.$set(this,'correlationData',response.data);
|
|
|
|
+ this.leftResetQuery();
|
|
|
|
+ this.rightResetQuery();
|
|
this.$set(this,'exhaustPageType',true);
|
|
this.$set(this,'exhaustPageType',true);
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -533,7 +550,8 @@
|
|
//右侧获取列表数据
|
|
//右侧获取列表数据
|
|
rightResetQuery(){
|
|
rightResetQuery(){
|
|
this.rightLoading = true;
|
|
this.rightLoading = true;
|
|
- getLabExhaustJoinSub(this.rightQueryParams).then( response => {
|
|
|
|
|
|
+ console.log('this.correlationData.id',this.correlationData.id)
|
|
|
|
+ getLabExhaustJoinSub({timedExhaustId:this.correlationData.id}).then( response => {
|
|
this.rightDataList = JSON.parse(JSON.stringify(response.data.list));
|
|
this.rightDataList = JSON.parse(JSON.stringify(response.data.list));
|
|
this.primitiveList = JSON.parse(JSON.stringify(response.data.list));
|
|
this.primitiveList = JSON.parse(JSON.stringify(response.data.list));
|
|
this.rightTotal = response.data.total;
|
|
this.rightTotal = response.data.total;
|