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

添加回车搜索

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

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

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

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

@ -84,28 +84,28 @@
</template>
</el-row>
</el-form>
<!-- <div class="left-search" v-if="!showSearch">-->
<!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"-->
<!-- label-width="100px">-->
<!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<!-- <template v-for="(item, index) in queryList">-->
<!-- <el-form-item-->
<!-- v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
<!-- class="query-form-item"-->
<!-- :label="item.columnDesc+`:`" :key="item.id">-->
<!-- <el-input-->
<!-- v-model="filterQuery[item.columnName]"-->
<!-- :placeholder="item.columnDesc"-->
<!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
<!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- </div>-->
<!-- <div class="left-search" v-if="!showSearch">-->
<!-- &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
<!-- <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"-->
<!-- label-width="100px">-->
<!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
<!-- <template v-for="(item, index) in queryList">-->
<!-- <el-form-item-->
<!-- v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"-->
<!-- class="query-form-item"-->
<!-- :label="item.columnDesc+`:`" :key="item.id">-->
<!-- <el-input-->
<!-- v-model="filterQuery[item.columnName]"-->
<!-- :placeholder="item.columnDesc"-->
<!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
<!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </template>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- </div>-->
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
@ -115,7 +115,7 @@
@click="onReset"
>重置
</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
>
@ -397,7 +397,7 @@ import {
deleteByOrder,
importOrder,
downloadOrder,
errorHandle,errorHandleSubmit,deleteOriginOrder
errorHandle, errorHandleSubmit, deleteOriginOrder
} from "@/api/collect/collectOrder";
import {
orderPage,
@ -469,7 +469,7 @@ export default {
showSearch: false,
filterQuery: {
// tagStatus: this.tagStatus, //
tagStatusList: [0,1,2], //
tagStatusList: [0, 1, 2], //
billNo: null,
busType: null,
workPlaceCode: null,
@ -559,19 +559,19 @@ export default {
},
onReset() {
this.filterQuery = {
tagStatusList: [0,1,2],
tagStatusList: [0, 1, 2],
billNo: null,
busType: null,
workPlaceCode: null,
page: 1,
limit: 10,
};
this.errQuery = {
this.errQuery = {
tagStatusList: [4], //
page: 1,
limit: 10,
},
this.actDateRange = [];
this.actDateRange = [];
this.getList();
this.getErrorList(this);
},
@ -636,10 +636,12 @@ export default {
this.getErrorList(this);
}
,
onSubmit() {
this.filterQuery.page = 1;
this.getList();
this.getErrorList(this);
onSubmit(_this) {
if (_this == null)
_this = 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-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">-->
@ -115,7 +115,7 @@
@click="onReset"
>重置
</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
>
@ -907,16 +907,18 @@ export default {
this.actDateRange = [];
this.getList();
},
onSubmit() {
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
onSubmit(_this) {
if (_this == null)
_this = this
if (_this.actDateRange !== null) {
_this.filterQuery.startTime = _this.actDateRange[0];
_this.filterQuery.endTime = _this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
_this.filterQuery.startTime = null;
_this.filterQuery.endTime = null;
}
this.filterQuery.page = 1;
this.getList();
_this.filterQuery.page = 1;
_this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;

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

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

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

@ -36,11 +36,11 @@
class="query-form-item"
:label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc == '模糊查询' ? '产品通用名/规格/批次号' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc == '模糊查询' ? '产品通用名/规格/批次号' : item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
@ -51,10 +51,10 @@
:disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
@ -62,19 +62,19 @@
class="query-form-item"
:label="item.columnDesc+`:`">
<el-select
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
<el-option
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
/>
</el-select>
</el-form-item>
@ -82,26 +82,26 @@
class="query-form-item"
:label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
class="query-form-item"
:label="item.columnDesc+`:`">
<el-date-picker
v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item>
</div>
@ -134,12 +134,12 @@
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
type="primary"
icon="el-icon-refresh"
@click="onReset"
>重置
</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
>
@ -154,36 +154,36 @@
@sort-change="handleSortChange">
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
@ -192,17 +192,17 @@
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
@ -210,12 +210,12 @@
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
@ -231,13 +231,13 @@
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
@ -248,11 +248,11 @@
</template>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
@ -265,11 +265,11 @@
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="resultQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
v-model="resultQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
@ -279,54 +279,54 @@
:disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select
v-model="resultQuery[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
v-model="resultQuery[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
<el-option
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker
v-model="resultQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
v-model="resultQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item>
</template>
@ -334,9 +334,9 @@
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onResultReset"
type="primary"
icon="el-icon-refresh"
@click="onResultReset"
>重置
</el-button>
<el-button type="primary" @click="onResultSubmit"
@ -353,36 +353,36 @@
>
<template v-for="(item, index) in tableHeader4">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
@ -391,17 +391,17 @@
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
@ -409,12 +409,12 @@
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
@ -430,13 +430,13 @@
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
@ -447,11 +447,11 @@
</template>
</el-table>
<pagination
v-show="resultTotal>0"
:total="resultTotal"
:page.sync="resultQuery.page"
:limit.sync="resultQuery.limit"
@pagination="getResultDetailList"
v-show="resultTotal>0"
:total="resultTotal"
:page.sync="resultQuery.page"
:limit.sync="resultQuery.limit"
@pagination="getResultDetailList"
/>
</el-tab-pane>
<el-tab-pane>
@ -463,11 +463,11 @@
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="codeQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
v-model="codeQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
@ -477,54 +477,54 @@
:disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select
v-model="codeQuery[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
v-model="codeQuery[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
<el-option
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker
v-model="codeQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
v-model="codeQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item>
</template>
@ -532,9 +532,9 @@
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onCodeResultReset"
type="primary"
icon="el-icon-refresh"
@click="onCodeResultReset"
>重置
</el-button>
<el-button type="primary" @click="onCodeResultSubmit"
@ -551,36 +551,36 @@
>
<template v-for="(item, index) in tableHeader5">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
@ -589,17 +589,17 @@
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
@ -607,12 +607,12 @@
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
@ -628,13 +628,13 @@
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
@ -645,41 +645,41 @@
</template>
</el-table>
<pagination
v-show="apartTotal>0"
:total="apartTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getResultDetailList"
v-show="apartTotal>0"
:total="apartTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getResultDetailList"
/>
</el-tab-pane>
</el-tabs>
<el-dialog
title="添加库存预警设置"
:visible.sync="addInvRemindSetDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="60%"
v-if="addInvRemindSetDialogVisible"
title="添加库存预警设置"
:visible.sync="addInvRemindSetDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="60%"
v-if="addInvRemindSetDialogVisible"
>
<ioSplitFifoCodeRemindSetDialog
:prescribeData="this.prescribeData"
:closeDialog="this.closeRemindSetDialog"
:prescribeData="this.prescribeData"
:closeDialog="this.closeRemindSetDialog"
></ioSplitFifoCodeRemindSetDialog>
</el-dialog>
<el-dialog
title="损耗出库"
:visible.sync="destroyOutDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="60%"
v-if="destroyOutDialogVisible"
title="损耗出库"
:visible.sync="destroyOutDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="60%"
v-if="destroyOutDialogVisible"
>
<destroyOutDialog
:prescribeData="prescribeData"
:destroyType="destroyType"
:closeDialog="closeDialog"
:prescribeData="prescribeData"
:destroyType="destroyType"
:closeDialog="closeDialog"
>
</destroyOutDialog>
</el-dialog>
@ -837,12 +837,12 @@ export default {
///界面配置相关------------end
getInvList(_this) {
getInvListByUserOptimize()
.then((response) => {
_this.options.getInvList = response.data || [];
_this.getList();
})
.catch(() => {
});
.then((response) => {
_this.options.getInvList = response.data || [];
_this.getList();
})
.catch(() => {
});
},
hideSearch() {
@ -860,9 +860,11 @@ export default {
this.actDateRange = [];
this.getList();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
onSubmit(_this) {
if (_this == null)
_this = this
_this.filterQuery.page = 1;
_this.getList();
},
getList() {
@ -929,11 +931,11 @@ export default {
this.apartTotal = res.data.total || 0
}
})
.catch(() => {
// this.loading = false
this.apartDetailList = []
this.apartTotal = res.data.total || 0
})
.catch(() => {
// this.loading = false
this.apartDetailList = []
this.apartTotal = res.data.total || 0
})
},
onCodeResultSubmit() {
this.codeQuery = {
@ -978,18 +980,18 @@ export default {
limit: 10,
}
filterWorkOptimize(query)
.then((response) => {
_this.loading = false;
_this.options.findWorkPlace = response.data || [];
if (_this.options.findWorkPlace.length == 1) {
_this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
_this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
}
})
.catch(() => {
_this.loading = false;
_this.options.findWorkPlace = [];
});
.then((response) => {
_this.loading = false;
_this.options.findWorkPlace = response.data || [];
if (_this.options.findWorkPlace.length == 1) {
_this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
_this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
}
})
.catch(() => {
_this.loading = false;
_this.options.findWorkPlace = [];
});
},
invRemindSet(_this, row) {

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

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

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

@ -113,7 +113,7 @@
@click="onReset"
>重置
</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
>
@ -939,16 +939,18 @@ export default {
this.actDateRange = [];
this.getList();
},
onSubmit() {
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
onSubmit(_this) {
if (_this == null)
_this = this
if (_this.actDateRange !== null) {
_this.filterQuery.startTime = _this.actDateRange[0];
_this.filterQuery.endTime = _this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
_this.filterQuery.startTime = null;
_this.filterQuery.endTime = null;
}
this.filterQuery.page = 1;
this.getList();
_this.filterQuery.page = 1;
_this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;

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

@ -119,7 +119,7 @@
@click="onReset"
>重置
</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
>
@ -956,16 +956,18 @@ export default {
this.actDateRange = [];
this.getList();
},
onSubmit() {
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
onSubmit(_this) {
if (_this == null)
_this = this
if (_this.actDateRange !== null) {
_this.filterQuery.startTime = _this.actDateRange[0];
_this.filterQuery.endTime = _this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
_this.filterQuery.startTime = null;
_this.filterQuery.endTime = null;
}
this.filterQuery.page = 1;
this.getList();
_this.filterQuery.page = 1;
_this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;

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

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

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

@ -120,7 +120,7 @@
@click="onReset"
>重置
</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
>
@ -426,13 +426,22 @@ export default {
});
},
onReset() {
this.filterQuery = {}
this.filterQuery = {
busType: null,
tagStatus: 3,
billNo: null,
workPlaceCode: null,
page: 1,
limit: 10
}
this.actDateRange = []
this.getList()
},
onSubmit() {
this.filterQuery.page = 1
this.getList()
onSubmit(_this) {
if (_this == null)
_this = this
_this.filterQuery.page = 1
_this.getList()
},
getList() {

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

@ -119,7 +119,7 @@
@click="onReset"
>重置
</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
>
@ -439,13 +439,22 @@ export default {
});
},
onReset() {
this.filterQuery = {}
this.filterQuery = {
busType: null,
tagStatus: null,
billNo: null,
workPlaceCode: null,
page: 1,
limit: 10
}
this.actDateRange = []
this.getList()
},
onSubmit() {
this.filterQuery.page = 1
this.getList()
onSubmit(_this) {
if (_this == null)
_this = this
_this.filterQuery.page = 1
_this.getList()
},
getList() {

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

@ -113,7 +113,7 @@
@click="onReset"
>重置
</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
>
@ -913,16 +913,18 @@ export default {
this.actDateRange = [];
this.getList();
},
onSubmit() {
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
onSubmit(_this) {
if (_this == null)
_this = this
if (_this.actDateRange !== null) {
_this.filterQuery.startTime = _this.actDateRange[0];
_this.filterQuery.endTime = _this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
_this.filterQuery.startTime = null;
_this.filterQuery.endTime = null;
}
this.filterQuery.page = 1;
this.getList();
_this.filterQuery.page = 1;
_this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;

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

@ -112,7 +112,7 @@
@click="onReset"
>重置
</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
>
@ -615,11 +615,13 @@ export default {
closeDialog() {
this.getList();
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
this.getDraftList();
this.getOtherList();
onSubmit(_this) {
if (_this == null)
_this = this
_this.filterQuery.page = 1;
_this.getList();
_this.getDraftList();
_this.getOtherList();
},

Write Preview
Loading…
Cancel
Save