UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

高级搜索修改

Browse Source
yanshishuju
yewj 7 months ago
parent c64f066a1c
commit e719a333c3
2 changed files with 99 additions and 95 deletions
Show Stats Download Patch File Download Diff File

192
src/views/collect/chooseDraftOrderDialog.vue
Unescape Escape View File

@ -1,91 +1,12 @@
<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">
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" <div v-if="showSearch || item.isImport">
class="query-form-item" <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"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
class="query-form-item"
:label="item.columnDesc+`:`">
<el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
class="query-form-item"
:label="item.columnDesc+`:`">
<el-select
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
<el-option
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
class="query-form-item"
:label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
class="query-form-item"
:label="item.columnDesc+`:`">
<el-date-picker
v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item>
</template>
</el-row>
</el-form>
<div class="left-search" v-if="!showSearch">
<!-- 关键字搜索 按需配置 -->
<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; ">
<template v-for="(item, index) in queryList">
<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
@ -96,13 +17,96 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
</template> <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
</el-row> class="query-form-item"
</el-form> :label="item.columnDesc+`:`">
</div> <el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
class="query-form-item"
:label="item.columnDesc+`:`">
<el-select
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
<el-option
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
class="query-form-item"
:label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
class="query-form-item"
:label="item.columnDesc+`:`">
<el-date-picker
v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item>
</div>
</template>
</el-row>
</el-form>
<!-- <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-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) && item.columnName == 'keywords'"-->
<!-- class="query-form-item"-->
<!-- :label="item.columnDesc+`:`" :key="item.id">-->
<!-- <el-input-->
<!-- v-model="filterQuery[item.columnName]"-->
<!-- :placeholder="item.columnDesc"-->
<!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
<!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- </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"
@ -197,7 +201,7 @@
:key="item.columnName" :key="item.columnName"
fixed="right" fixed="right"
> >
<template slot- ="scope"> <template slot-="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj" <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type" :type="buttonItem.type"
:size="buttonItem.size" :size="buttonItem.size"
@ -696,7 +700,7 @@ import {convertDate} from "@/utils/date";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import {getCodeList} from "@/api/inout/code"; import {getCodeList} from "@/api/inout/code";
import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage' import {listPage} from '@/api/basic/workPlace/sysWorkplaceManage'
export default { export default {
name: "chooseDraftOrderDialog", name: "chooseDraftOrderDialog",
@ -1189,15 +1193,15 @@ export default {
//选入 //选入
choose(){ choose() {
if (this.currentRow.billNo == null){ if (this.currentRow.billNo == null) {
return this.$message.error("请选择单据") return this.$message.error("请选择单据")
} }
this.closeChooseDialog() this.closeChooseDialog()
this.handleChoose(this.currentRow) this.handleChoose(this.currentRow)
}, },
//获取当前工位 //获取当前工位
findCurWorkPlaces(_this,val) { findCurWorkPlaces(_this, val) {
let query = { let query = {
key: val, key: val,
status: 1, status: 1,
@ -1213,7 +1217,7 @@ export default {
label: item.workplaceName label: item.workplaceName
}; };
}) })
if (_this.options.getWorkPlaceList .length == 1){ if (_this.options.getWorkPlaceList.length == 1) {
_this.filterQuery.workPlaceCode = _this.options.getWorkPlaceList[0].code; _this.filterQuery.workPlaceCode = _this.options.getWorkPlaceList[0].code;
} }
}) })
@ -1229,7 +1233,7 @@ export default {
created() { created() {
this.getInvList(this); this.getInvList(this);
this.getBusType(this); this.getBusType(this);
this.findCurWorkPlaces(this,""); this.findCurWorkPlaces(this, "");
this.splitType = this.$route.query.splitType; this.splitType = this.$route.query.splitType;
if (this.splitType == "search") { if (this.splitType == "search") {

2
src/views/collect/selectCollectOrderDialog.vue
Unescape Escape View File

@ -11,7 +11,7 @@
: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

Write Preview
Loading…
Cancel
Save