|
|
|
@ -2,10 +2,12 @@
|
|
|
|
|
<div>
|
|
|
|
|
<el-card class="el-card">
|
|
|
|
|
<div>
|
|
|
|
|
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="125px" v-show="showSearch">
|
|
|
|
|
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="125px"
|
|
|
|
|
v-show="showSearch">
|
|
|
|
|
<el-row style=" display:flex; flex-wrap: wrap; ">
|
|
|
|
|
<template v-for="(item, index) in queryList">
|
|
|
|
|
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
|
|
|
|
|
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`" :key="item.id">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="filterQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
@ -14,7 +16,8 @@
|
|
|
|
|
clearable
|
|
|
|
|
></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
|
|
|
|
|
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-select v-model="filterQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
@ -27,7 +30,8 @@
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
|
|
|
|
|
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="filterQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
@ -44,7 +48,8 @@
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
|
|
|
|
|
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="dateRange"
|
|
|
|
|
:style="`width:${item.width+'px'}`"
|
|
|
|
@ -57,7 +62,8 @@
|
|
|
|
|
:default-time="['00:00:00', '23:59:59']"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
|
|
|
|
|
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="filterQuery[item.columnName]"
|
|
|
|
|
:style="`width:${item.width+'px'}`"
|
|
|
|
@ -207,7 +213,9 @@
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
|
|
|
|
|
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
|
|
|
|
|
item.lableRuleObj[scope.row[item.columnName]]
|
|
|
|
|
}}</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
@ -220,8 +228,11 @@
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
|
|
|
|
|
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
|
|
|
|
|
<el-tag
|
|
|
|
|
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
|
|
|
|
|
<span>{{
|
|
|
|
|
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
|
|
|
|
|
}}</span>
|
|
|
|
|
</el-tag>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
@ -256,7 +267,9 @@
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
|
|
|
|
|
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
|
|
|
|
|
scope.row[item.columnName]
|
|
|
|
|
}}</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
@ -702,6 +715,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
checkCombine() {
|
|
|
|
|
debugger
|
|
|
|
|
if (isBlank(this.relId)) {
|
|
|
|
|
this.checkedUdi();
|
|
|
|
|
} else {
|
|
|
|
@ -717,6 +731,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
checkedUdi() {
|
|
|
|
|
debugger
|
|
|
|
|
let selectData = this.multipleUdiSelection;
|
|
|
|
|
let selected = null;
|
|
|
|
|
if (this.multipleUdiSelection.length == 0) {
|
|
|
|
@ -728,8 +743,7 @@ export default {
|
|
|
|
|
if (this.currentRow.check) {
|
|
|
|
|
selected = this.currentRow;
|
|
|
|
|
}
|
|
|
|
|
} else
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
selectData.forEach((obj) => {
|
|
|
|
|