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" @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
@ -547,7 +547,7 @@ export default {
label: busType.busName label: busType.busName
}; };
}); });
_this.options.getBusType = getWorkPlace _this.options.getBusType = getWorkPlace
if (_this.options.getBusType.length == 1) { if (_this.options.getBusType.length == 1) {
_this.filterQuery.busType = _this.options.getBusType[0].code _this.filterQuery.busType = _this.options.getBusType[0].code
} else { } else {
@ -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() {

66
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,19 +559,19 @@ 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,
page: 1, page: 1,
limit: 10, limit: 10,
}; };
this.errQuery = { this.errQuery = {
tagStatusList: [4], // tagStatusList: [4], //
page: 1, page: 1,
limit: 10, limit: 10,
}, },
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
this.getErrorList(this); this.getErrorList(this);
}, },
@ -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 => {

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

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

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