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

添加回车搜索

Browse Source
yanshishuju
yewj 1 year ago
parent dce1da43cf
commit b30a92b8c2
13 changed files with 463 additions and 418 deletions
Show Stats Download Patch File Download Diff File

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

@ -125,7 +125,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -421,10 +421,10 @@ import bindWorkDialog from "@/views/collect/bindWorkDialog";
import prescribeOriginPanel from "./PannelOrderBiz"; import prescribeOriginPanel from "./PannelOrderBiz";
import CollectOrderAllotDetail from "./CollectOrderAllotDetail"; import CollectOrderAllotDetail from "./CollectOrderAllotDetail";
import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage"; import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
import { getUserBindWork } from '@/api/basic/collectPoint/userWorkplace' import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
import { decideOrder, deleteByOrder, orderPage, orderTop } from '@/api/collect/collectOrder' import {decideOrder, deleteByOrder, orderPage, orderTop} from '@/api/collect/collectOrder'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
import { isBlank } from '@/utils/strUtil' import {isBlank} from '@/utils/strUtil'
export default { export default {
name: "prescribePanel", name: "prescribePanel",
@ -524,7 +524,7 @@ export default {
getBusType: [], getBusType: [],
}, },
showType: 1, showType: 1,
routerParam:this.$route.query.routerParam routerParam: this.$route.query.routerParam
} }
}, },
@ -532,8 +532,8 @@ export default {
addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, CollectOrderAllotDetail addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, CollectOrderAllotDetail
}, },
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
@ -592,12 +592,12 @@ export default {
// return _this.$message.error("请先绑定工位") // return _this.$message.error("请先绑定工位")
// } 2处理中 // } 2处理中
let query = { let query = {
workPlaceCode : row.workPlaceCode, workPlaceCode: row.workPlaceCode,
billNo: row.billNo, billNo: row.billNo,
tagStatus: 2 tagStatus: 2
} }
decideOrder(query).then(res => { decideOrder(query).then(res => {
if (res.code == 20000){ if (res.code == 20000) {
//当前工位没有正在处理单据 //当前工位没有正在处理单据
if (row != null && row.invAlert == 2) { if (row != null && row.invAlert == 2) {
_this.$confirm("该订单目前工位存量不足，是否继续处理?", "提示", { _this.$confirm("该订单目前工位存量不足，是否继续处理?", "提示", {
@ -611,19 +611,17 @@ export default {
}) })
.catch(() => { .catch(() => {
}); });
}else { } else {
let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo + "&busType=" + row.busType let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo + "&busType=" + row.busType
window.open(url, '_blank'); window.open(url, '_blank');
} }
}else { } else {
return _this.$message.error(res.message) return _this.$message.error(res.message)
} }
}) })
.catch() .catch()
}, },
//置顶 //置顶
orderTop(_this, row) { orderTop(_this, row) {
@ -700,9 +698,12 @@ export default {
this.bindWorkPlaceVisible = false; this.bindWorkPlaceVisible = false;
this.getList(); this.getList();
}, },
onSubmit() { onSubmit(_this) {
this.filterQuery.page = 1; debugger
this.getList(); if (_this == null)
_this = this
_this.filterQuery.page = 1;
_this.getList();
}, },
getList() { getList() {

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

@ -84,28 +84,28 @@
</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;--> <!-- &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-->
<!-- 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>
@ -115,7 +115,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -397,7 +397,7 @@ import {
deleteByOrder, deleteByOrder,
importOrder, importOrder,
downloadOrder, downloadOrder,
errorHandle,errorHandleSubmit,deleteOriginOrder errorHandle, errorHandleSubmit, deleteOriginOrder
} from "@/api/collect/collectOrder"; } from "@/api/collect/collectOrder";
import { import {
orderPage, orderPage,
@ -469,7 +469,7 @@ export default {
showSearch: false, showSearch: false,
filterQuery: { filterQuery: {
// tagStatus: this.tagStatus, // // tagStatus: this.tagStatus, //
tagStatusList: [0,1,2], // tagStatusList: [0, 1, 2], //
billNo: null, billNo: null,
busType: null, busType: null,
workPlaceCode: null, workPlaceCode: null,
@ -559,7 +559,7 @@ export default {
}, },
onReset() { onReset() {
this.filterQuery = { this.filterQuery = {
tagStatusList: [0,1,2], tagStatusList: [0, 1, 2],
billNo: null, billNo: null,
busType: null, busType: null,
workPlaceCode: null, workPlaceCode: null,
@ -636,10 +636,12 @@ export default {
this.getErrorList(this); this.getErrorList(this);
} }
, ,
onSubmit() { onSubmit(_this) {
this.filterQuery.page = 1; if (_this == null)
this.getList(); _this = this
this.getErrorList(this); _this.filterQuery.page = 1;
_this.getList();
_this.getErrorList(_this);
} }
, ,

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

@ -84,7 +84,7 @@
</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;--> <!-- &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">-->
@ -115,7 +115,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -907,16 +907,18 @@ export default {
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
onSubmit() { onSubmit(_this) {
if (this.actDateRange !== null) { if (_this == null)
this.filterQuery.startTime = this.actDateRange[0]; _this = this
this.filterQuery.endTime = this.actDateRange[1]; if (_this.actDateRange !== null) {
_this.filterQuery.startTime = _this.actDateRange[0];
_this.filterQuery.endTime = _this.actDateRange[1];
} else { } else {
this.filterQuery.startTime = null; _this.filterQuery.startTime = null;
this.filterQuery.endTime = null; _this.filterQuery.endTime = null;
} }
this.filterQuery.page = 1; _this.filterQuery.page = 1;
this.getList(); _this.getList();
}, },
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;

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

@ -82,7 +82,7 @@
</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;--> <!-- &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">-->
@ -113,7 +113,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -409,16 +409,18 @@ export default {
this.actDateRange = []; this.actDateRange = [];
// this.getList(); // this.getList();
}, },
onSubmit() { onSubmit(_this) {
if (this.actDateRange !== null) { if (_this == null)
this.filterQuery.startTime = this.actDateRange[0]; _this = this
this.filterQuery.endTime = this.actDateRange[1]; if (_this.actDateRange !== null) {
_this.filterQuery.startTime = _this.actDateRange[0];
_this.filterQuery.endTime = _this.actDateRange[1];
} else { } else {
this.filterQuery.startTime = null; _this.filterQuery.startTime = null;
this.filterQuery.endTime = null; _this.filterQuery.endTime = null;
} }
this.filterQuery.page = 1; _this.filterQuery.page = 1;
this.getList(); _this.getList();
}, },
getList() { getList() {
getSplitCode(this.filterQuery).then(res => { getSplitCode(this.filterQuery).then(res => {

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

@ -139,7 +139,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -860,9 +860,11 @@ export default {
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
onSubmit() { onSubmit(_this) {
this.filterQuery.page = 1; if (_this == null)
this.getList(); _this = this
_this.filterQuery.page = 1;
_this.getList();
}, },
getList() { getList() {

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

@ -83,7 +83,7 @@
</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;--> <!-- &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">-->
@ -114,7 +114,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -384,9 +384,11 @@ export default {
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
onSubmit() { onSubmit(_this) {
this.filterQuery.page = 1; if (_this == null)
this.getList(); _this = this
_this.filterQuery.page = 1;
_this.getList();
}, },
getList() { getList() {

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

@ -113,7 +113,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -939,16 +939,18 @@ export default {
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
onSubmit() { onSubmit(_this) {
if (this.actDateRange !== null) { if (_this == null)
this.filterQuery.startTime = this.actDateRange[0]; _this = this
this.filterQuery.endTime = this.actDateRange[1]; if (_this.actDateRange !== null) {
_this.filterQuery.startTime = _this.actDateRange[0];
_this.filterQuery.endTime = _this.actDateRange[1];
} else { } else {
this.filterQuery.startTime = null; _this.filterQuery.startTime = null;
this.filterQuery.endTime = null; _this.filterQuery.endTime = null;
} }
this.filterQuery.page = 1; _this.filterQuery.page = 1;
this.getList(); _this.getList();
}, },
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;

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

@ -119,7 +119,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -956,16 +956,18 @@ export default {
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
onSubmit() { onSubmit(_this) {
if (this.actDateRange !== null) { if (_this == null)
this.filterQuery.startTime = this.actDateRange[0]; _this = this
this.filterQuery.endTime = this.actDateRange[1]; if (_this.actDateRange !== null) {
_this.filterQuery.startTime = _this.actDateRange[0];
_this.filterQuery.endTime = _this.actDateRange[1];
} else { } else {
this.filterQuery.startTime = null; _this.filterQuery.startTime = null;
this.filterQuery.endTime = null; _this.filterQuery.endTime = null;
} }
this.filterQuery.page = 1; _this.filterQuery.page = 1;
this.getList(); _this.getList();
}, },
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;

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

@ -112,7 +112,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -430,7 +430,13 @@ export default {
}); });
}, },
onReset() { onReset() {
this.filterQuery = {}; this.filterQuery = {
busType: null,
billNo: null,
tagStatusList: [-1, 2],
page: 1,
limit: 10,
};
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
@ -450,9 +456,11 @@ export default {
this.bindWorkPlaceVisible = false; this.bindWorkPlaceVisible = false;
this.getList(); this.getList();
}, },
onSubmit() { onSubmit(_this) {
this.filterQuery.page = 1; if (_this == null)
this.getList(); _this = this
_this.filterQuery.page = 1;
_this.getList();
}, },
getList() { getList() {

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

@ -120,7 +120,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -426,13 +426,22 @@ export default {
}); });
}, },
onReset() { onReset() {
this.filterQuery = {} this.filterQuery = {
busType: null,
tagStatus: 3,
billNo: null,
workPlaceCode: null,
page: 1,
limit: 10
}
this.actDateRange = [] this.actDateRange = []
this.getList() this.getList()
}, },
onSubmit() { onSubmit(_this) {
this.filterQuery.page = 1 if (_this == null)
this.getList() _this = this
_this.filterQuery.page = 1
_this.getList()
}, },
getList() { getList() {

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

@ -119,7 +119,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -439,13 +439,22 @@ export default {
}); });
}, },
onReset() { onReset() {
this.filterQuery = {} this.filterQuery = {
busType: null,
tagStatus: null,
billNo: null,
workPlaceCode: null,
page: 1,
limit: 10
}
this.actDateRange = [] this.actDateRange = []
this.getList() this.getList()
}, },
onSubmit() { onSubmit(_this) {
this.filterQuery.page = 1 if (_this == null)
this.getList() _this = this
_this.filterQuery.page = 1
_this.getList()
}, },
getList() { getList() {

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

@ -113,7 +113,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -913,16 +913,18 @@ export default {
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },
onSubmit() { onSubmit(_this) {
if (this.actDateRange !== null) { if (_this == null)
this.filterQuery.startTime = this.actDateRange[0]; _this = this
this.filterQuery.endTime = this.actDateRange[1]; if (_this.actDateRange !== null) {
_this.filterQuery.startTime = _this.actDateRange[0];
_this.filterQuery.endTime = _this.actDateRange[1];
} else { } else {
this.filterQuery.startTime = null; _this.filterQuery.startTime = null;
this.filterQuery.endTime = null; _this.filterQuery.endTime = null;
} }
this.filterQuery.page = 1; _this.filterQuery.page = 1;
this.getList(); _this.getList();
}, },
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;

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

@ -112,7 +112,7 @@
@click="onReset" @click="onReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
>查询 >查询
</el-button </el-button
> >
@ -615,11 +615,13 @@ export default {
closeDialog() { closeDialog() {
this.getList(); this.getList();
}, },
onSubmit() { onSubmit(_this) {
this.filterQuery.page = 1; if (_this == null)
this.getList(); _this = this
this.getDraftList(); _this.filterQuery.page = 1;
this.getOtherList(); _this.getList();
_this.getDraftList();
_this.getOtherList();
}, },

Write Preview
Loading…
Cancel
Save