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

高级搜索修改

Browse Source
yanshishuju
yewj 10 months ago
parent a812a77b9e
commit c64f066a1c
13 changed files with 1862 additions and 1764 deletions
Show Stats Download Patch File Download Diff File

51
src/views/collect/CollectOrderAllotCardComponents.vue
Unescape Escape View File

@ -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"

57
src/views/collect/CollectOrderNew.vue
Unescape Escape View File

@ -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 = {

70
src/views/collect/IoDestroyLog.vue
Unescape Escape View File

@ -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>
@ -678,9 +682,9 @@ import {
import {convertDate} from "@/utils/date"; import {convertDate} from "@/utils/date";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace' import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
import { desOrderPage,getBizDetailList,getCodeList } from '@/api/collect/IoDestroy' import {desOrderPage, getBizDetailList, getCodeList} from '@/api/collect/IoDestroy'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage' import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
export default { export default {
name: "IoDestroyLog1", name: "IoDestroyLog1",
@ -859,8 +863,8 @@ export default {
addOrder, errOrder addOrder, errOrder
}, },
methods: { methods: {
changePlace(_this,query) { changePlace(_this, query) {
_this.getWorkBindBusTypes(_this,query) _this.getWorkBindBusTypes(_this, query)
}, },
getWorkBindBusTypes(_this, query) { getWorkBindBusTypes(_this, query) {
_this.busQuery.workplaceCode = query _this.busQuery.workplaceCode = query
@ -896,7 +900,7 @@ export default {
limit: 10, limit: 10,
startTime: null, startTime: null,
endTime: null, endTime: null,
keywords:null, keywords: null,
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
}; };
this.actDateRange = []; this.actDateRange = [];
@ -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 = {
@ -1041,7 +1048,7 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
findWorkPlace(_this,val){ findWorkPlace(_this, val) {
let query = { let query = {
// chargeUser: _this.$store.getters.userId, // chargeUser: _this.$store.getters.userId,
userIdFlag: true, userIdFlag: true,
@ -1214,7 +1221,7 @@ export default {
created() { created() {
this.getInvList(this); this.getInvList(this);
this.getBusType(this); this.getBusType(this);
this.findWorkPlace(this,""); this.findWorkPlace(this, "");
getHead("IoDestroyLog", "1").then((re) => { getHead("IoDestroyLog", "1").then((re) => {
@ -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") {

56
src/views/collect/IoDestroyOrder.vue
Unescape Escape View File

@ -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"
@ -270,7 +274,7 @@ import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
import {executeFuc, getHead} from '@/utils/customConfig' import {executeFuc, getHead} from '@/utils/customConfig'
import {getSplitCode} from '@/api/collect/collectOrder' import {getSplitCode} from '@/api/collect/collectOrder'
import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments'
import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage' import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
export default { export default {
name: 'IoDestroyOrder', name: 'IoDestroyOrder',
@ -445,7 +449,7 @@ export default {
this.destroyOutDialogVisible = false this.destroyOutDialogVisible = false
this.getList() this.getList()
}, },
findWorkPlace(_this,val){ findWorkPlace(_this, val) {
let query = { let query = {
// chargeUser: _this.$store.getters.userId, // chargeUser: _this.$store.getters.userId,
userIdFlag: true, userIdFlag: true,
@ -476,7 +480,7 @@ export default {
this.filterQuery.workPlaceCode = this.$route.query.workplaceId this.filterQuery.workPlaceCode = this.$route.query.workplaceId
this.showType = 2 this.showType = 2
} }
this.findWorkPlace(this,"") this.findWorkPlace(this, "")
getHead("ioSplitCode", "1").then((re) => { getHead("ioSplitCode", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据

108
src/views/collect/IoSplitFifoCodePanel.vue
Unescape Escape View File

@ -1,22 +1,22 @@
<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">-->
<!-- <el-form-item prop="code" label="扫码查询:">--> <!-- <el-form-item prop="code" label="扫码查询:">-->
<!-- <el-input--> <!-- <el-input-->
<!-- id="inputer"--> <!-- id="inputer"-->
<!-- @focus="getInputFocus($event)"--> <!-- @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="enterKey($event)"--> <!-- @keypress.enter.native="enterKey($event)"-->
<!-- ref="inputRef"--> <!-- ref="inputRef"-->
<!-- style="ime-mode: disabled"--> <!-- style="ime-mode: disabled"-->
<!-- type="tel"--> <!-- type="tel"-->
<!-- v-model="filterQuery.code"--> <!-- v-model="filterQuery.code"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!--<el-col :span="20">--> <!--<el-col :span="20">-->
<!-- <el-form-item prop="code" label="查询:">--> <!-- <el-form-item prop="code" label="查询:">-->
<!-- <el-input--> <!-- <el-input-->
@ -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"
@ -688,12 +692,12 @@ import {convertDate} from "@/utils/date";
import {materialCodePage, materialPrescribePage, splitFifoDetail} from "@/api/inout/splitCode"; import {materialCodePage, materialPrescribePage, splitFifoDetail} from "@/api/inout/splitCode";
import {splitFifoPage} from "@/api/inout/splitInv"; import {splitFifoPage} from "@/api/inout/splitInv";
import {getInvListByUserOptimize} from "@/api/system/invWarehouse"; import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
import { getBasicUnitMaintainsOptimize } from '@/api/basic/basicUnitMaintain' import {getBasicUnitMaintainsOptimize} from '@/api/basic/basicUnitMaintain'
import { filterWorkOptimize, listPage } from '@/api/basic/workPlace/sysWorkplaceManage' import {filterWorkOptimize, listPage} from '@/api/basic/workPlace/sysWorkplaceManage'
import ioSplitFifoCodeRemindSetDialog from "./ioSplitFifoCodeRemindSetDialog.vue"; import ioSplitFifoCodeRemindSetDialog from "./ioSplitFifoCodeRemindSetDialog.vue";
import destroyOutDialog from "./destroyOutDialog.vue"; import destroyOutDialog from "./destroyOutDialog.vue";
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
import { getSplitCode } from '@/api/collect/collectOrder' import {getSplitCode} from '@/api/collect/collectOrder'
export default { export default {
@ -783,10 +787,10 @@ export default {
} }
}, },
components: {ioSplitFifoCodeRemindSetDialog,destroyOutDialog}, components: {ioSplitFifoCodeRemindSetDialog, destroyOutDialog},
methods: { methods: {
changePlace(_this,query) { changePlace(_this, query) {
_this.getWorkBindBusTypes(_this,query) _this.getWorkBindBusTypes(_this, query)
}, },
getWorkBindBusTypes(_this, query) { getWorkBindBusTypes(_this, query) {
_this.busQuery.workplaceCode = query _this.busQuery.workplaceCode = query
@ -916,9 +920,9 @@ export default {
}) })
}, },
getSplitCodeDetail(){ getSplitCodeDetail() {
getSplitCode(this.codeQuery).then(res => { getSplitCode(this.codeQuery).then(res => {
if (res.code == 20000){ if (res.code == 20000) {
// this.loading = false // this.loading = false
this.apartDetailList = res.data.list || [] this.apartDetailList = res.data.list || []
this.apartTotal = res.data.total || 0 this.apartTotal = res.data.total || 0
@ -930,7 +934,7 @@ export default {
this.apartTotal = res.data.total || 0 this.apartTotal = res.data.total || 0
}) })
}, },
onCodeResultSubmit(){ onCodeResultSubmit() {
this.codeQuery = { this.codeQuery = {
code: this.codeQuery.code, code: this.codeQuery.code,
relId: this.currentRow.relId, relId: this.currentRow.relId,
@ -941,7 +945,7 @@ export default {
} }
this.getSplitCodeDetail() this.getSplitCodeDetail()
}, },
onCodeResultReset(){ onCodeResultReset() {
this.codeQuery = { this.codeQuery = {
relId: this.currentRow.relId, relId: this.currentRow.relId,
batchNo: this.currentRow.batchNo, batchNo: this.currentRow.batchNo,
@ -987,7 +991,7 @@ export default {
}); });
}, },
invRemindSet(_this,row) { invRemindSet(_this, row) {
_this.prescribeData = row _this.prescribeData = row
_this.addInvRemindSetDialogVisible = true; _this.addInvRemindSetDialogVisible = true;
}, },
@ -997,17 +1001,17 @@ export default {
this.getList(); this.getList();
}, },
//损耗出库 //损耗出库
destroyOut(_this,row){ destroyOut(_this, row) {
_this.prescribeData = row _this.prescribeData = row
_this.destroyType = 1 _this.destroyType = 1
_this.destroyOutDialogVisible = true; _this.destroyOutDialogVisible = true;
}, },
closeDialog(){ closeDialog() {
this.destroyOutDialogVisible = false this.destroyOutDialogVisible = false
this.getList() this.getList()
this.detailClick(this,this.prescribeData) this.detailClick(this, this.prescribeData)
}, },
destroyOutByCode(_this,row){ destroyOutByCode(_this, row) {
_this.prescribeData = row _this.prescribeData = row
_this.destroyType = 2 _this.destroyType = 2
_this.destroyOutDialogVisible = true; _this.destroyOutDialogVisible = true;
@ -1020,7 +1024,7 @@ export default {
this.viewType = 1 this.viewType = 1
this.isLinkDisabled = true this.isLinkDisabled = true
} }
this.findWorkPlace(this,"") this.findWorkPlace(this, "")
// console.log(this.panelType) // console.log(this.panelType)
getHead("ioSplitFifoCode", "1").then((re) => { getHead("ioSplitFifoCode", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据

64
src/views/collect/IoSplitFifoRemind.vue
Unescape Escape View File

@ -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"
@ -235,7 +239,7 @@ import {executeFuc, getHead} from "@/utils/customConfig";
import {convertDate} from "@/utils/date"; import {convertDate} from "@/utils/date";
import {splitFifoPage} from "@/api/inout/splitInv"; import {splitFifoPage} from "@/api/inout/splitInv";
import {getInvListByUserOptimize} from "@/api/system/invWarehouse"; import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
import { filterWorkOptimize, listPage } from '@/api/basic/workPlace/sysWorkplaceManage' import {filterWorkOptimize, listPage} from '@/api/basic/workPlace/sysWorkplaceManage'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default { export default {
@ -307,12 +311,10 @@ export default {
} }
}, },
components: { components: {},
},
methods: { methods: {
changePlace(_this,query) { changePlace(_this, query) {
_this.getWorkBindBusTypes(_this,query) _this.getWorkBindBusTypes(_this, query)
}, },
getWorkBindBusTypes(_this, query) { getWorkBindBusTypes(_this, query) {
_this.busQuery.workplaceCode = query _this.busQuery.workplaceCode = query
@ -412,7 +414,7 @@ export default {
enterKey(_this, event) { enterKey(_this, event) {
_this.onSubmit(); _this.onSubmit();
}, },
findWorkPlace(_this,val){ findWorkPlace(_this, val) {
let query = { let query = {
// chargeUser: _this.$store.getters.userId, // chargeUser: _this.$store.getters.userId,
userIdFlag: true, userIdFlag: true,
@ -441,7 +443,7 @@ export default {
this.viewType = 1 this.viewType = 1
this.isLinkDisabled = true this.isLinkDisabled = true
} }
this.findWorkPlace(this,"") this.findWorkPlace(this, "")
getHead("ioSplitFifoRemind", "1").then((re) => { getHead("ioSplitFifoRemind", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据
this.tableObj = re.data; this.tableObj = re.data;

68
src/views/collect/IoSplitFinishCode.vue
Unescape Escape View File

@ -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"
@ -709,7 +713,7 @@ import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import {getCodeList} from "@/api/inout/code"; import {getCodeList} from "@/api/inout/code";
import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace' import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage' import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
export default { export default {
name: "IoSplitFinishCode", name: "IoSplitFinishCode",
@ -892,8 +896,8 @@ export default {
addOrder, errOrder addOrder, errOrder
}, },
methods: { methods: {
changePlace(_this,query) { changePlace(_this, query) {
_this.getWorkBindBusTypes(_this,query) _this.getWorkBindBusTypes(_this, query)
}, },
getWorkBindBusTypes(_this, query) { getWorkBindBusTypes(_this, query) {
_this.busQuery.workplaceCode = query _this.busQuery.workplaceCode = query
@ -929,7 +933,7 @@ export default {
limit: 10, limit: 10,
startTime: null, startTime: null,
endTime: null, endTime: null,
keywords:null, keywords: null,
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
}; };
this.actDateRange = []; this.actDateRange = [];
@ -1074,15 +1078,15 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
getWorkPlaceList(_this){ getWorkPlaceList(_this) {
getUserBindWork({ getUserBindWork({
autoUserId: 1, autoUserId: 1,
page: 1, page: 1,
limit: 200, limit: 200,
}).then((response) => { }).then((response) => {
let getWorkPlaceList = [] let getWorkPlaceList = []
if(response.code == 20000 && response.data.list.length > 0){ if (response.code == 20000 && response.data.list.length > 0) {
response.data.list.forEach( item => { response.data.list.forEach(item => {
let post = { let post = {
code: item.workplaceId, code: item.workplaceId,
label: item.workplaceName label: item.workplaceName
@ -1235,7 +1239,7 @@ export default {
this.resultTotal = 0; this.resultTotal = 0;
}); });
}, },
findWorkPlace(_this,val){ findWorkPlace(_this, val) {
let query = { let query = {
// chargeUser: _this.$store.getters.userId, // chargeUser: _this.$store.getters.userId,
userIdFlag: true, userIdFlag: true,
@ -1267,7 +1271,7 @@ export default {
created() { created() {
this.getInvList(this); this.getInvList(this);
this.getBusType(this); this.getBusType(this);
this.findWorkPlace(this,""); this.findWorkPlace(this, "");
this.splitType = this.$route.query.splitType; this.splitType = this.$route.query.splitType;
if (this.splitType == "search") { if (this.splitType == "search") {

81
src/views/collect/IoSplitOperateCode.vue
Unescape Escape View File

@ -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"
@ -711,11 +719,11 @@ import {getCodeList} from "@/api/inout/code";
import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace' import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
import IoCreateOrder from '@/views/collect/IoCreateOrder.vue' import IoCreateOrder from '@/views/collect/IoCreateOrder.vue'
import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage' import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
export default { export default {
props:{ props: {
fromSplitType:{ fromSplitType: {
type: Object type: Object
} }
}, },
@ -898,16 +906,16 @@ export default {
}; };
}, },
components: { components: {
addOrder, errOrder,IoCreateOrder addOrder, errOrder, IoCreateOrder
}, },
methods: { methods: {
createOrder(splitType){ createOrder(splitType) {
this.splitType = splitType this.splitType = splitType
this.idQuery = {}; this.idQuery = {};
this.addOrderVisible = true; this.addOrderVisible = true;
}, },
changePlace(_this,query) { changePlace(_this, query) {
_this.getWorkBindBusTypes(_this,query) _this.getWorkBindBusTypes(_this, query)
}, },
getWorkBindBusTypes(_this, query) { getWorkBindBusTypes(_this, query) {
_this.busQuery.workplaceCode = query _this.busQuery.workplaceCode = query
@ -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 = {
@ -1091,7 +1102,7 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
findWorkPlace(_this,val){ findWorkPlace(_this, val) {
let query = { let query = {
// chargeUser: _this.$store.getters.userId, // chargeUser: _this.$store.getters.userId,
userIdFlag: true, userIdFlag: true,
@ -1264,7 +1275,7 @@ export default {
created() { created() {
this.getInvList(this); this.getInvList(this);
this.getBusType(this); this.getBusType(this);
this.findWorkPlace(this,""); this.findWorkPlace(this, "");
this.splitType = this.$route.query.splitType; this.splitType = this.$route.query.splitType;
if (this.splitType == "search") { if (this.splitType == "search") {
@ -1311,7 +1322,7 @@ export default {
} }
}) })
if (this.fromSplitType != null){ if (this.fromSplitType != null) {
this.splitType = this.fromSplitType this.splitType = this.fromSplitType
} }

111
src/views/collect/PanelOrderDeal.vue
Unescape Escape View File

@ -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"
@ -234,33 +236,33 @@
:prescribeData="curRow" :prescribeData="curRow"
></PannelOrderDetail> ></PannelOrderDetail>
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="扫码明细">--> <!-- <el-tab-pane label="扫码明细">-->
<!-- <PanelOrderManuTagCode--> <!-- <PanelOrderManuTagCode-->
<!-- v-if="panelALive"--> <!-- v-if="panelALive"-->
<!-- :fifoSplit="3"--> <!-- :fifoSplit="3"-->
<!-- :prescribeData="curRow"--> <!-- :prescribeData="curRow"-->
<!-- ></PanelOrderManuTagCode>--> <!-- ></PanelOrderManuTagCode>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="拆零详情">--> <!-- <el-tab-pane label="拆零详情">-->
<!-- <prescribeCodePanel--> <!-- <prescribeCodePanel-->
<!-- v-if="panelALive"--> <!-- v-if="panelALive"-->
<!-- :prescribeData="curRow"--> <!-- :prescribeData="curRow"-->
<!-- :fifoSplit="1"--> <!-- :fifoSplit="1"-->
<!-- ></prescribeCodePanel>--> <!-- ></prescribeCodePanel>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="整取详情">--> <!-- <el-tab-pane label="整取详情">-->
<!-- <prescribeCodePanel--> <!-- <prescribeCodePanel-->
<!-- v-if="panelALive"--> <!-- v-if="panelALive"-->
<!-- :prescribeData="curRow"--> <!-- :prescribeData="curRow"-->
<!-- :fifoSplit="2"--> <!-- :fifoSplit="2"-->
<!-- ></prescribeCodePanel>--> <!-- ></prescribeCodePanel>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="整单详情">--> <!-- <el-tab-pane label="整单详情">-->
<!-- <PanelOrderAllDetail--> <!-- <PanelOrderAllDetail-->
<!-- v-if="panelALive"--> <!-- v-if="panelALive"-->
<!-- :prescribeData="curRow"--> <!-- :prescribeData="curRow"-->
<!-- ></PanelOrderAllDetail>--> <!-- ></PanelOrderAllDetail>-->
<!-- </el-tab-pane>--> <!-- </el-tab-pane>-->
</el-tabs> </el-tabs>
</div> </div>
@ -277,7 +279,7 @@ import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
import prescribeCodePanel from "@/views/collect/PanelOrderTagCode"; import prescribeCodePanel from "@/views/collect/PanelOrderTagCode";
import {deleteByOrder, orderPage} from "@/api/collect/collectOrder"; import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
import PanelOrderManuTagCode from "./PanelOrderManuTagCode"; import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage' import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default { export default {
@ -349,11 +351,17 @@ 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) {
_this.getWorkBindBusTypes(_this,query) _this.getWorkBindBusTypes(_this, query)
}, },
getWorkBindBusTypes(_this, query) { getWorkBindBusTypes(_this, query) {
_this.busQuery.workplaceCode = query _this.busQuery.workplaceCode = 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 = {};
@ -524,7 +535,7 @@ export default {
.then((response) => { .then((response) => {
_this.loading = false; _this.loading = false;
_this.options.findWorkPlace = response.data || []; _this.options.findWorkPlace = response.data || [];
if (_this.options.findWorkPlace .length == 1){ if (_this.options.findWorkPlace.length == 1) {
_this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code; _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
_this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode) _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
} }
@ -544,7 +555,7 @@ export default {
this.queryList = re.data.queryList; this.queryList = re.data.queryList;
this.fromList = re.data.fromList; this.fromList = re.data.fromList;
this.getList(); this.getList();
this.findWorkPlace(this,""); this.findWorkPlace(this, "");
}); });
this.timerAuto() this.timerAuto()
}, },

73
src/views/collect/PanelOrderEndSearch.vue
Unescape Escape View File

@ -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"
@ -276,16 +278,16 @@
<script> <script>
import addOrder from '@/views/inout/DialogCreateOrder' import addOrder from '@/views/inout/DialogCreateOrder'
import errOrder from '@/views/inout/IoCreateErrorOrder' import errOrder from '@/views/inout/IoCreateErrorOrder'
import { executeFuc, getHead } from '@/utils/customConfig' import {executeFuc, getHead} from '@/utils/customConfig'
import { convertDate } from '@/utils/date' import {convertDate} from '@/utils/date'
import prescribeCodePanel from './PanelOrderTagCode' import prescribeCodePanel from './PanelOrderTagCode'
import PanelOrderManuTagCode from './PanelOrderManuTagCode' import PanelOrderManuTagCode from './PanelOrderManuTagCode'
import prescribeOriginPanel from '@/views/collect/PannelOrderBiz' import prescribeOriginPanel from '@/views/collect/PannelOrderBiz'
import CollectFinishOrderDetail from '@/views/collect/CollectFinishOrderDetail' import CollectFinishOrderDetail from '@/views/collect/CollectFinishOrderDetail'
import CollectFinishOrderBackupDetail from "./CollectFinishOrderBackupDetail" import CollectFinishOrderBackupDetail from "./CollectFinishOrderBackupDetail"
import { orderFinish, orderPage } from '@/api/collect/collectOrder' import {orderFinish, orderPage} from '@/api/collect/collectOrder'
import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage' import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default { export default {
@ -334,7 +336,7 @@ export default {
page: 1, page: 1,
limit: 10 limit: 10
}, },
defaultSort: { prop: 'createTime', order: 'desc' }, defaultSort: {prop: 'createTime', order: 'desc'},
loading: false, loading: false,
list: [], list: [],
total: 0, total: 0,
@ -361,11 +363,17 @@ 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) {
_this.getWorkBindBusTypes(_this,query) _this.getWorkBindBusTypes(_this, query)
}, },
getWorkBindBusTypes(_this, query) { getWorkBindBusTypes(_this, query) {
_this.busQuery.workplaceCode = query _this.busQuery.workplaceCode = 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 = {}

80
src/views/collect/PanelOrderUpload.vue
Unescape Escape View File

@ -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"
@ -276,16 +278,16 @@
<script> <script>
import addOrder from '@/views/inout/DialogCreateOrder' import addOrder from '@/views/inout/DialogCreateOrder'
import errOrder from '@/views/inout/IoCreateErrorOrder' import errOrder from '@/views/inout/IoCreateErrorOrder'
import { executeFuc, getHead } from '@/utils/customConfig' import {executeFuc, getHead} from '@/utils/customConfig'
import { convertDate } from '@/utils/date' import {convertDate} from '@/utils/date'
import prescribeCodePanel from './PanelOrderTagCode' import prescribeCodePanel from './PanelOrderTagCode'
import PanelOrderManuTagCode from './PanelOrderManuTagCode' import PanelOrderManuTagCode from './PanelOrderManuTagCode'
import prescribeOriginPanel from '@/views/collect/PannelOrderBiz' import prescribeOriginPanel from '@/views/collect/PannelOrderBiz'
import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail' import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail'
import CollectFinishOrderBackupDetail from "./CollectFinishOrderBackupDetail" import CollectFinishOrderBackupDetail from "./CollectFinishOrderBackupDetail"
import { orderFinish, orderPage, orderUpload } from '@/api/collect/collectOrder' import {orderFinish, orderPage, orderUpload} from '@/api/collect/collectOrder'
import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage' import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default { export default {
@ -349,7 +351,7 @@ export default {
page: 1, page: 1,
limit: 10 limit: 10
}, },
defaultSort: { prop: 'createTime', order: 'desc' }, defaultSort: {prop: 'createTime', order: 'desc'},
loading: false, loading: false,
list: [], list: [],
total: 0, total: 0,
@ -375,11 +377,17 @@ 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) {
_this.getWorkBindBusTypes(_this,query) _this.getWorkBindBusTypes(_this, query)
}, },
getWorkBindBusTypes(_this, query) { getWorkBindBusTypes(_this, query) {
_this.busQuery.workplaceCode = query _this.busQuery.workplaceCode = 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 = {}
@ -488,7 +499,7 @@ export default {
_this.options.findWorkPlace = [] _this.options.findWorkPlace = []
}) })
}, },
orderUpload(_this, row){ orderUpload(_this, row) {
let params = row; let params = row;
_this.$confirm("该订单将上传到外部系统，是否继续?", "提示", { _this.$confirm("该订单将上传到外部系统，是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -496,7 +507,7 @@ export default {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
orderUpload({billNo:params.billNo}) orderUpload({billNo: params.billNo})
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
_this.getList(); _this.getList();
@ -519,18 +530,17 @@ export default {
}); });
} }
}, },
created() { created() {
this.filterQuery.tagStatus = this.tagStatus this.filterQuery.tagStatus = this.tagStatus
this.filterQuery.uploadStatus = this.uploadStatus.toString() this.filterQuery.uploadStatus = this.uploadStatus.toString()
if (this.uploadStatus == 2){ if (this.uploadStatus == 2) {
this.filterQuery.uploadStatusName = '已上传' this.filterQuery.uploadStatusName = '已上传'
} }
if (this.$route.query.workplaceId != null) { if (this.$route.query.workplaceId != null) {
this.isLinkDisabled=true this.isLinkDisabled = true
this.filterQuery.workPlaceCode = this.$route.query.workplaceId this.filterQuery.workPlaceCode = this.$route.query.workplaceId
this.showType = 2 this.showType = 2
} }

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

@ -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;

104
src/views/system/customConfig/configQueryDetail.vue
Unescape Escape View File

@ -18,7 +18,7 @@
style="width: 100%"> style="width: 100%">
<el-table-column label="序号" type="index" ref="dataForm"></el-table-column> <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
<el-table-column prop="columnDesc" label="标题"></el-table-column> <el-table-column prop="columnDesc" label="标题"></el-table-column>
<el-table-column prop="columnName" label="字段"> </el-table-column> <el-table-column prop="columnName" label="字段"></el-table-column>
<el-table-column prop="isShow" label="是否展示"> <el-table-column prop="isShow" label="是否展示">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ isShowMap[scope.row.isShow] }}</span> <span>{{ isShowMap[scope.row.isShow] }}</span>
@ -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">
@ -80,8 +88,18 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="是否展示" prop="columnType"> <el-form-item label="是否展示" prop="columnType">
<el-select v-model="subData.isShow" placeholder="请选择是否展示" style="width: 80%"> <el-select v-model="subData.isShow" placeholder="请选择是否展示" style="width: 80%">
<el-option label="显示" value="1" /> <el-option label="显示" value="1"/>
<el-option label="隐藏" value="2" /> <el-option label="隐藏" value="2"/>
</el-select>
</el-form-item>
</el-col>
</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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -91,11 +109,11 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="列类型" prop="columnType"> <el-form-item label="列类型" prop="columnType">
<el-select v-model="subData.columnType" placeholder="请选择列类型" style="width: 80%"> <el-select v-model="subData.columnType" placeholder="请选择列类型" style="width: 80%">
<el-option label="输入框" value="input" /> <el-option label="输入框" value="input"/>
<el-option label="下拉框" value="select" /> <el-option label="下拉框" value="select"/>
<el-option label="远程搜索" value="selectServer" /> <el-option label="远程搜索" value="selectServer"/>
<el-option label="区间时间选择框" value="datePicker" /> <el-option label="区间时间选择框" value="datePicker"/>
<el-option label="单时间选择框" value="data" /> <el-option label="单时间选择框" value="data"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -122,14 +140,16 @@
<el-col :span="20" class="el-col"> <el-col :span="20" class="el-col">
<el-form-item label="字典替换规则" class="query-form-item"> <el-form-item label="字典替换规则" class="query-form-item">
<div style="display:flex" :key="i" v-for="(item, i) in conditionForm.lableList"> <div style="display:flex" :key="i" v-for="(item, i) in conditionForm.lableList">
<el-form-item label="值" :prop="'lableList.' + i + '.value'" > <el-form-item label="值" :prop="'lableList.' + i + '.value'">
<el-input type="input" v-model="item.value" placeholder="请输入值"></el-input> <el-input type="input" v-model="item.value" placeholder="请输入值"></el-input>
</el-form-item> </el-form-item>
<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>
@ -175,8 +195,8 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="下拉框显示内容" prop="columnType"> <el-form-item label="下拉框显示内容" prop="columnType">
<el-select v-model="subData.isShowXx" placeholder="请选择下拉框显示内容" style="width: 80%"> <el-select v-model="subData.isShowXx" placeholder="请选择下拉框显示内容" style="width: 80%">
<el-option label="默认" value="2" /> <el-option label="默认" value="2"/>
<el-option label="显示code" value="1" /> <el-option label="显示code" value="1"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -192,18 +212,18 @@
</template> </template>
<script> <script>
import { import {
list, list,
saveCustomConfig, saveCustomConfig,
devCustomConfig devCustomConfig
} from "@/api/system/sysCustomConfigDetail"; } from "@/api/system/sysCustomConfigDetail";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import { import {
isBlank isBlank
} from "@/utils/strUtil"; } from "@/utils/strUtil";
export default { export default {
name: "info", name: "info",
props: { props: {
info: { info: {
@ -251,12 +271,12 @@
formVisible: false, formVisible: false,
subData: {}, subData: {},
formRules: { formRules: {
columnName: [{ required: true, message: "请输入列名", trigger: "blur" }], columnName: [{required: true, message: "请输入列名", trigger: "blur"}],
columnDesc: [ columnDesc: [
{ required: true, message: "请输入列名", trigger: "blur" }, {required: true, message: "请输入列名", trigger: "blur"},
], ],
columnType: [ columnType: [
{ required: true, message: "请选择类型", trigger: "blur" }, {required: true, message: "请选择类型", trigger: "blur"},
], ],
}, },
isExpandAll: true, isExpandAll: true,
@ -265,11 +285,11 @@
1: "列表", 1: "列表",
2: "表单", 2: "表单",
}, },
upUerMap:{ upUerMap: {
true: "是", true: "是",
false: "否", false: "否",
}, },
isShowXxMap:{ isShowXxMap: {
"1": "带code", "1": "带code",
"2": "默认", "2": "默认",
}, },
@ -282,7 +302,7 @@
"select": "下拉框", "select": "下拉框",
"data": "单时间选择框", "data": "单时间选择框",
"datePicker": "区间时间选择框", "datePicker": "区间时间选择框",
"selectServer":"远程搜索", "selectServer": "远程搜索",
}, },
}; };
}, },
@ -313,8 +333,8 @@
if (isBlank(this.info.configId)) { if (isBlank(this.info.configId)) {
return; return;
} }
this.query.configId=this.info.configId; this.query.configId = this.info.configId;
this.query.type=this.type; this.query.type = this.type;
this.loading = true; this.loading = true;
this.list = []; this.list = [];
list(this.query) list(this.query)
@ -340,13 +360,13 @@
this.subData.configId = this.info.configId, this.subData.configId = this.info.configId,
this.subData.type = this.type; this.subData.type = this.type;
this.formVisible = true; this.formVisible = true;
if("edit" == formName){ if ("edit" == formName) {
const lableRule = this.subData.lableRule; const lableRule = this.subData.lableRule;
var lableList = [{name: '', value: ''}] var lableList = [{name: '', value: ''}]
if(lableRule){ if (lableRule) {
var jsonObj = JSON.parse(lableRule); var jsonObj = JSON.parse(lableRule);
var lableList = [] var lableList = []
for(var index in jsonObj){ for (var index in jsonObj) {
lableList.push({ lableList.push({
name: jsonObj[index], name: jsonObj[index],
value: index, value: index,
@ -407,12 +427,12 @@
forSubmit() { forSubmit() {
var lableRule = {}; var lableRule = {};
this.conditionForm.lableList.forEach(obj => { this.conditionForm.lableList.forEach(obj => {
if(obj.name != ""){ if (obj.name != "") {
lableRule[`${obj.value}`] = obj.name; lableRule[`${obj.value}`] = obj.name;
} }
}) })
this.subData.lableRule = ""; this.subData.lableRule = "";
if(JSON.stringify(lableRule) != "{}"){ if (JSON.stringify(lableRule) != "{}") {
this.subData.lableRule = JSON.stringify(lableRule); this.subData.lableRule = JSON.stringify(lableRule);
} }
@ -436,18 +456,18 @@
}); });
}, },
// 新增 // 新增
addLableList () { addLableList() {
this.conditionForm.lableList.push({ this.conditionForm.lableList.push({
name: '', name: '',
value: '' value: ''
}) })
}, },
// 删除 // 删除
deleteLableList (index) { deleteLableList(index) {
this.conditionForm.lableList.splice(index, 1) this.conditionForm.lableList.splice(index, 1)
}, },
// 新增 // 新增
addColorList () { addColorList() {
this.conditionForm.colorList.push({ this.conditionForm.colorList.push({
type: '', type: '',
value: '', value: '',
@ -455,11 +475,11 @@
}) })
}, },
// 删除 // 删除
deleteColorList (index) { deleteColorList(index) {
this.conditionForm.colorList.splice(index, 1) this.conditionForm.colorList.splice(index, 1)
}, },
// 新增 // 新增
addButtonList () { addButtonList() {
this.conditionForm.buttonList.push({ this.conditionForm.buttonList.push({
type: '', type: '',
size: '', size: '',
@ -469,9 +489,9 @@
}) })
}, },
// 删除 // 删除
deleteButtonList (index) { deleteButtonList(index) {
this.conditionForm.buttonList.splice(index, 1) this.conditionForm.buttonList.splice(index, 1)
}, },
}, },
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save