高级搜索修改

yanshishuju
yewj 10 months ago
parent a812a77b9e
commit c64f066a1c

@ -11,16 +11,18 @@
<!-- </el-alert>--> <!-- </el-alert>-->
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc == '搜索' ? '单据号/业务类型/单据类型/收货方/发货方' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
@ -87,32 +89,35 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- label-width="100px">-->
<template v-for="(item, index) in queryList"> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- <template v-for="(item, index) in queryList">-->
class="query-form-item" <!-- <el-form-item-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
<el-input <!-- class="query-form-item"-->
v-model="filterQuery[item.columnName]" <!-- :label="item.columnDesc+`:`" :key="item.id">-->
:placeholder="item.columnDesc" <!-- <el-input-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- v-model="filterQuery[item.columnName]"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- :placeholder="item.columnDesc"-->
clearable <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
></el-input> <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
</el-form-item> <!-- clearable-->
</template> <!-- ></el-input>-->
</el-row> <!-- </el-form-item>-->
</el-form> <!-- </template>-->
</div> <!-- </el-row>-->
<!-- </el-form>-->
<!-- </div>-->
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"

@ -1,16 +1,18 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
@submit.native.prevent
size="mini" label-width="100px"> size="mini" label-width="100px">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc == '关键字搜索' ? '单据号/往来单位/来源系统' : item.columnDesc" :placeholder="item.columnDesc == '搜索' ? '单据号/单据类型/收货方/发货方' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
@ -78,35 +80,35 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"-->
label-width="100px"> <!-- label-width="100px">-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<template v-for="(item, index) in queryList"> <!-- <template v-for="(item, index) in queryList">-->
<el-form-item <!-- <el-form-item-->
v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
class="query-form-item" <!-- class="query-form-item"-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- :label="item.columnDesc+`:`" :key="item.id">-->
<el-input <!-- <el-input-->
style="width: 265px" <!-- v-model="filterQuery[item.columnName]"-->
v-model="filterQuery[item.columnName]" <!-- :placeholder="item.columnDesc"-->
:placeholder="item.columnDesc == '关键字搜索' ? '单据号/往来单位/来源系统/发货方/收货方' : item.columnDesc" <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- clearable-->
clearable <!-- ></el-input>-->
></el-input> <!-- </el-form-item>-->
</el-form-item> <!-- </template>-->
</template> <!-- </el-row>-->
</el-row> <!-- </el-form>-->
</el-form> <!-- </div>-->
</div>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -551,6 +553,9 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
this.$nextTick(() => {
console.log('组件已刷新');
});
}, },
onReset() { onReset() {
this.filterQuery = { this.filterQuery = {

@ -1,16 +1,17 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc == '搜索' ? '单据号/所属工位/业务名称' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
@ -77,32 +78,36 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- label-width="100px">-->
<template v-for="(item, index) in queryList"> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- <template v-for="(item, index) in queryList">-->
class="query-form-item" <!-- <el-form-item-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
<el-input <!-- class="query-form-item"-->
v-model="filterQuery[item.columnName]" <!-- :label="item.columnDesc+`:`" :key="item.id">-->
:placeholder="item.columnDesc" <!-- <el-input-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- v-model="filterQuery[item.columnName]"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- :placeholder="item.columnDesc"-->
clearable <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
></el-input> <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
</el-form-item> <!-- clearable-->
</template> <!-- ></el-input>-->
</el-row> <!-- </el-form-item>-->
</el-form> <!-- </template>-->
</div> <!-- </el-row>-->
<!-- </el-form>-->
<!-- </div>-->
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -657,7 +662,6 @@
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
@ -915,6 +919,9 @@ export default {
}, },
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
this.$nextTick(() => {
console.log('组件已刷新');
});
}, },
getBusType(_this) { getBusType(_this) {
let query = { let query = {
@ -1242,7 +1249,6 @@ export default {
}); });
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
if (res.data.paramValue === "0") { if (res.data.paramValue === "0") {

@ -1,16 +1,17 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc == '搜索' ? '产品通用名/规格/批次号' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
@ -77,32 +78,35 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- label-width="100px">-->
<template v-for="(item, index) in queryList"> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- <template v-for="(item, index) in queryList">-->
class="query-form-item" <!-- <el-form-item-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
<el-input <!-- class="query-form-item"-->
v-model="filterQuery[item.columnName]" <!-- :label="item.columnDesc+`:`" :key="item.id">-->
:placeholder="item.columnDesc" <!-- <el-input-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- v-model="filterQuery[item.columnName]"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- :placeholder="item.columnDesc"-->
clearable <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
></el-input> <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
</el-form-item> <!-- clearable-->
</template> <!-- ></el-input>-->
</el-row> <!-- </el-form-item>-->
</el-form> <!-- </template>-->
</div> <!-- </el-row>-->
<!-- </el-form>-->
<!-- </div>-->
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<!-- <el-col :span="20">--> <!-- <el-col :span="20">-->
@ -30,12 +30,13 @@
<!--</el-col>--> <!--</el-col>-->
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc == '搜索' ? '产品通用名/规格/批次号' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
@ -102,32 +103,35 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- label-width="100px">-->
<template v-for="(item, index) in queryList"> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- <template v-for="(item, index) in queryList">-->
class="query-form-item" <!-- <el-form-item-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
<el-input <!-- class="query-form-item"-->
v-model="filterQuery[item.columnName]" <!-- :label="item.columnDesc+`:`" :key="item.id">-->
:placeholder="item.columnDesc" <!-- <el-input-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- v-model="filterQuery[item.columnName]"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- :placeholder="item.columnDesc"-->
clearable <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
></el-input> <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
</el-form-item> <!-- clearable-->
</template> <!-- ></el-input>-->
</el-row> <!-- </el-form-item>-->
</el-form> <!-- </template>-->
</div> <!-- </el-row>-->
<!-- </el-form>-->
<!-- </div>-->
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"

@ -1,17 +1,18 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc == '搜索' ? '产品通用名/规格/批次号' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
@ -78,32 +79,35 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- label-width="100px">-->
<template v-for="(item, index) in queryList"> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- <template v-for="(item, index) in queryList">-->
class="query-form-item" <!-- <el-form-item-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
<el-input <!-- class="query-form-item"-->
v-model="filterQuery[item.columnName]" <!-- :label="item.columnDesc+`:`" :key="item.id">-->
:placeholder="item.columnDesc" <!-- <el-input-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- v-model="filterQuery[item.columnName]"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- :placeholder="item.columnDesc"-->
clearable <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
></el-input> <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
</el-form-item> <!-- clearable-->
</template> <!-- ></el-input>-->
</el-row> <!-- </el-form-item>-->
</el-form> <!-- </template>-->
</div> <!-- </el-row>-->
<!-- </el-form>-->
<!-- </div>-->
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -307,9 +311,7 @@ export default {
} }
}, },
components: { components: {},
},
methods: { methods: {
changePlace(_this, query) { changePlace(_this, query) {
_this.getWorkBindBusTypes(_this, query) _this.getWorkBindBusTypes(_this, query)

@ -1,16 +1,17 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc == '搜索' ? '产品通用名/规格/批次号' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
@ -77,32 +78,35 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- label-width="100px">-->
<template v-for="(item, index) in queryList"> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- <template v-for="(item, index) in queryList">-->
class="query-form-item" <!-- <el-form-item-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
<el-input <!-- class="query-form-item"-->
v-model="filterQuery[item.columnName]" <!-- :label="item.columnDesc+`:`" :key="item.id">-->
:placeholder="item.columnDesc" <!-- <el-input-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- v-model="filterQuery[item.columnName]"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- :placeholder="item.columnDesc"-->
clearable <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
></el-input> <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
</el-form-item> <!-- clearable-->
</template> <!-- ></el-input>-->
</el-row> <!-- </el-form-item>-->
</el-form> <!-- </template>-->
</div> <!-- </el-row>-->
<!-- </el-form>-->
<!-- </div>-->
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"

@ -1,16 +1,17 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc == '搜索' ? '产品通用名/规格/所属工位/业务名称' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
@ -77,34 +78,41 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- label-width="100px">-->
<template v-for="(item, index) in queryList"> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- <template v-for="(item, index) in queryList">-->
class="query-form-item" <!-- <el-form-item-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
<el-input <!-- class="query-form-item"-->
v-model="filterQuery[item.columnName]" <!-- :label="item.columnDesc+`:`" :key="item.id">-->
:placeholder="item.columnDesc" <!-- <el-input-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- v-model="filterQuery[item.columnName]"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- :placeholder="item.columnDesc"-->
clearable <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
></el-input> <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
</el-form-item> <!-- clearable-->
</template> <!-- ></el-input>-->
</el-row> <!-- </el-form-item>-->
</el-form> <!-- </template>-->
</div> <!-- </el-row>-->
<!-- </el-form>-->
<!-- </div>-->
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-s-unfold" type="primary" @click="createOrder('out')" v-if="splitType == 'out'"></el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button icon="el-icon-s-fold" type="primary" @click="createOrder('return')" v-if="splitType == 'return'">退</el-button> <el-button icon="el-icon-plus" type="primary" @click="createOrder('out')" v-if="splitType == 'out'">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> </el-button>
<el-button icon="el-icon-s-fold" type="primary" @click="createOrder('return')" v-if="splitType == 'return'">
工位退货
</el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -961,6 +969,9 @@ export default {
}, },
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
this.$nextTick(() => {
console.log('组件已刷新');
});
}, },
getBusType(_this) { getBusType(_this) {
let query = { let query = {

@ -1,16 +1,17 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc == '搜索' ? '单据号/单据类型/收货方/发货方' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
@ -77,32 +78,33 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<template v-for="(item, index) in queryList"> <!-- <template v-for="(item, index) in queryList">-->
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
class="query-form-item" <!-- class="query-form-item"-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- :label="item.columnDesc+`:`" :key="item.id">-->
<el-input <!-- <el-input-->
v-model="filterQuery[item.columnName]" <!-- v-model="filterQuery[item.columnName]"-->
:placeholder="item.columnDesc" <!-- :placeholder="item.columnDesc"-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</template> <!-- </template>-->
</el-row> <!-- </el-row>-->
</el-form> <!-- </el-form>-->
</div> <!-- </div>-->
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -349,7 +351,13 @@ export default {
}, },
components: { components: {
addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel, PanelOrderManuTagCode,PanelOrderAllDetail,PannelOrderDetail addOrder,
errOrder,
prescribeOriginPanel,
prescribeCodePanel,
PanelOrderManuTagCode,
PanelOrderAllDetail,
PannelOrderDetail
}, },
methods: { methods: {
changePlace(_this, query) { changePlace(_this, query) {
@ -416,6 +424,9 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
this.$nextTick(() => {
console.log('组件已刷新');
});
}, },
onReset() { onReset() {
this.filterQuery = {}; this.filterQuery = {};

@ -1,18 +1,19 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
size="mini" label-width="100px" size="mini" label-width="100px"
> >
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id" :label="item.columnDesc+`:`" :key="item.id"
> >
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc == '搜索' ? '单据号/单据类型/收货方/发货方' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
@ -85,32 +86,33 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<template v-for="(item, index) in queryList"> <!-- <template v-for="(item, index) in queryList">-->
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
class="query-form-item" <!-- class="query-form-item"-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- :label="item.columnDesc+`:`" :key="item.id">-->
<el-input <!-- <el-input-->
v-model="filterQuery[item.columnName]" <!-- v-model="filterQuery[item.columnName]"-->
:placeholder="item.columnDesc" <!-- :placeholder="item.columnDesc"-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</template> <!-- </template>-->
</el-row> <!-- </el-row>-->
</el-form> <!-- </el-form>-->
</div> <!-- </div>-->
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -361,7 +363,13 @@ export default {
}, },
components: { components: {
addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel, PanelOrderManuTagCode, CollectFinishOrderDetail,CollectFinishOrderBackupDetail addOrder,
errOrder,
prescribeCodePanel,
prescribeOriginPanel,
PanelOrderManuTagCode,
CollectFinishOrderDetail,
CollectFinishOrderBackupDetail
}, },
methods: { methods: {
changePlace(_this, query) { changePlace(_this, query) {
@ -412,6 +420,9 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch this.showSearch = !this.showSearch
this.$nextTick(() => {
console.log('组件已刷新');
});
}, },
onReset() { onReset() {
this.filterQuery = {} this.filterQuery = {}

@ -1,11 +1,12 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form"
size="mini" label-width="100px" size="mini" label-width="100px"
> >
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id" :label="item.columnDesc+`:`" :key="item.id"
@ -85,32 +86,33 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<template v-for="(item, index) in queryList"> <!-- <template v-for="(item, index) in queryList">-->
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
class="query-form-item" <!-- class="query-form-item"-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- :label="item.columnDesc+`:`" :key="item.id">-->
<el-input <!-- <el-input-->
v-model="filterQuery[item.columnName]" <!-- v-model="filterQuery[item.columnName]"-->
:placeholder="item.columnDesc" <!-- :placeholder="item.columnDesc"-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</template> <!-- </template>-->
</el-row> <!-- </el-row>-->
</el-form> <!-- </el-form>-->
</div> <!-- </div>-->
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -375,7 +377,13 @@ export default {
}, },
components: { components: {
addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel, PanelOrderManuTagCode, PanelOrderAllDetail,CollectFinishOrderBackupDetail addOrder,
errOrder,
prescribeCodePanel,
prescribeOriginPanel,
PanelOrderManuTagCode,
PanelOrderAllDetail,
CollectFinishOrderBackupDetail
}, },
methods: { methods: {
changePlace(_this, query) { changePlace(_this, query) {
@ -426,6 +434,9 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch this.showSearch = !this.showSearch
this.$nextTick(() => {
console.log('组件已刷新');
});
}, },
onReset() { onReset() {
this.filterQuery = {} this.filterQuery = {}
@ -519,7 +530,6 @@ export default {
}); });
} }
}, },

@ -1,10 +1,11 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <template v-for="(item, index) in queryList">
<div v-if="showSearch || item.isImport">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
class="query-form-item" class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
@ -77,32 +78,33 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="left-search" v-if="!showSearch"> <!-- <div class="left-search" v-if="!showSearch">-->
<!-- 关键字搜索 按需配置 --> <!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">-->
<el-row style=" display:flex; flex-wrap: wrap; "> <!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<template v-for="(item, index) in queryList"> <!-- <template v-for="(item, index) in queryList">-->
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'" <!-- <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
class="query-form-item" <!-- class="query-form-item"-->
:label="item.columnDesc+`:`" :key="item.id"> <!-- :label="item.columnDesc+`:`" :key="item.id">-->
<el-input <!-- <el-input-->
v-model="filterQuery[item.columnName]" <!-- v-model="filterQuery[item.columnName]"-->
:placeholder="item.columnDesc" <!-- :placeholder="item.columnDesc"-->
:disabled="executeEval(null,item.disabledFuc,false)" <!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)" <!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</template> <!-- </template>-->
</el-row> <!-- </el-row>-->
</el-form> <!-- </el-form>-->
</div> <!-- </div>-->
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch"></el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -595,6 +597,9 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
this.$nextTick(() => {
console.log('组件已刷新');
});
}, },
onReset() { onReset() {
this.filterQuery = { this.filterQuery = {
@ -758,7 +763,7 @@ export default {
this.filterQuery.workPlaceCode = this.$route.query.workplaceId this.filterQuery.workPlaceCode = this.$route.query.workplaceId
} }
this.findWorkPlace(this, ""); this.findWorkPlace(this, "");
getHead("prescribeDownload", "1").then((re) => { getHead("prescribeSelect", "1").then((re) => {
// //
this.tableObj = re.data; this.tableObj = re.data;
this.tableHeader = re.data.tableList; this.tableHeader = re.data.tableList;

@ -30,6 +30,12 @@
<span>{{ columnTypeMap[scope.row.columnType] }}</span> <span>{{ columnTypeMap[scope.row.columnType] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="isImport" label="是否常用">
<template slot-scope="scope">
<span>{{ upUerMap[scope.row.isImport] }}</span>
</template>
</el-table-column>
<el-table-column prop="number" label="排序"></el-table-column> <el-table-column prop="number" label="排序"></el-table-column>
<el-table-column prop="width" label="宽度"></el-table-column> <el-table-column prop="width" label="宽度"></el-table-column>
<el-table-column prop="lableRule" show-overflow-tooltip="true" label="字典替换规则"></el-table-column> <el-table-column prop="lableRule" show-overflow-tooltip="true" label="字典替换规则"></el-table-column>
@ -41,7 +47,8 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ isShowXxMap[scope.row.isShowXx] }}</span> <span>{{ isShowXxMap[scope.row.isShowXx] }}</span>
</template> </template>
</el-table-column>sss </el-table-column>
sss
<el-table-column label="操作" fixed="right" width="100"> <el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -58,7 +65,8 @@
<!--仓库编辑对话框--> <!--仓库编辑对话框-->
<el-dialog :title="formMap[formName]" :close-on-click-modal="false" <el-dialog :title="formMap[formName]" :close-on-click-modal="false"
:close-on-press-escape="false" :visible.sync="formVisible" :before-close="hideForm" width="60%" top="5vh"> :close-on-press-escape="false" :visible.sync="formVisible" :before-close="hideForm" width="60%"
top="5vh">
<el-form :model="subData" ref="dataForm" :rules="formRules" label-width="130px"> <el-form :model="subData" ref="dataForm" :rules="formRules" label-width="130px">
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
@ -86,6 +94,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="是否常用查询" prop="columnType">
<el-select v-model="subData.isImport" placeholder="请选择是否常用查询" style="width: 80%">
<el-option label="是" :value="true"/>
<el-option label="否" :value="false"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
@ -128,8 +146,10 @@
<el-form-item label="中文名" :prop="'lableList.' + i + '.name'"> <el-form-item label="中文名" :prop="'lableList.' + i + '.name'">
<el-input type="input" v-model="item.name" placeholder="请输入中文名"></el-input> <el-input type="input" v-model="item.name" placeholder="请输入中文名"></el-input>
</el-form-item> </el-form-item>
<i v-if="i === 0" @click="addLableList" style="font-size:20px;color:#25c4fe;margin:8px 0 0 10px;" class="el-icon-circle-plus"></i> <i v-if="i === 0" @click="addLableList" style="font-size:20px;color:#25c4fe;margin:8px 0 0 10px;"
<i @click="deleteLableList(i)" style="font-size:20px;color:#25c4fe;margin:8px 0 0 10px;" class="el-icon-remove"></i> class="el-icon-circle-plus"></i>
<i @click="deleteLableList(i)" style="font-size:20px;color:#25c4fe;margin:8px 0 0 10px;"
class="el-icon-remove"></i>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>

Loading…
Cancel
Save