筛选bug

yanshishuju
zane 9 months ago
parent eacb42fffc
commit a706f724a1

@ -1169,6 +1169,7 @@ export default {
); );
tQuery.code = this.codeFormData.code; tQuery.code = this.codeFormData.code;
tQuery.orderType = this.viewType; tQuery.orderType = this.viewType;
tQuery.splitType = this.splitType;
this.addCodeSubmit(tQuery); this.addCodeSubmit(tQuery);
this.$refs.inputRef.select(); this.$refs.inputRef.select();
}, },

@ -488,11 +488,11 @@
<!--单据扫码明细--> <!--单据扫码明细-->
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span> <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
<el-form v-if="queryList4 && queryList4.length > 0" :inline="true" :model="resultQuery" class="query-form" <el-form v-if="queryList4 && queryList4.length > 0" :inline="true" :model="codeQuery" class="query-form"
size="mini"> size="mini">
<!-- <el-form-item class="query-form-item" label="UDI码:">--> <!-- <el-form-item class="query-form-item" label="UDI码:">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="resultQuery.code"--> <!-- v-model="codeQuery.code"-->
<!-- placeholder="请输入UDI码"--> <!-- placeholder="请输入UDI码"-->
<!-- clearable--> <!-- clearable-->
<!-- >--> <!-- >-->
@ -503,7 +503,7 @@
<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="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)"
@ -512,7 +512,7 @@
</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)"
:label="item.columnDesc+`:`"> :label="item.columnDesc+`:`">
<el-select v-model="resultQuery[item.columnName]" <el-select v-model="codeQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
clearable> clearable>
@ -527,7 +527,7 @@
<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="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)"
@ -559,7 +559,7 @@
<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="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)"
@ -573,10 +573,10 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@click="onResultReset" @click="onCodeReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" @click="onResultSubmit" <el-button type="primary" @click="onCodeSubmit"
icon="el-icon-search" icon="el-icon-search"
>查询 >查询
</el-button </el-button
@ -1248,9 +1248,9 @@ export default {
return; return;
} }
this.resultQuery.orderId = this.currentRow.billNo; this.codeQuery.orderId = this.currentRow.billNo;
this.resultDetailLoading = true; this.resultDetailLoading = true;
errorCodeList(this.resultQuery).then((res) => { errorCodeList(this.codeQuery).then((res) => {
this.resultDetailLoading = false; this.resultDetailLoading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.resultDetailList = res.data.list || []; this.resultDetailList = res.data.list || [];

@ -909,6 +909,8 @@ export default {
startTime: null, startTime: null,
endTime: null, endTime: null,
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
keyWords: null
}; };
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();

Loading…
Cancel
Save