Commit 649eb518 authored by Smile's avatar Smile

bug226 (web)【控货管理】缺少“订单状态”查询条件。

parent 5fd93c7a
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('controlorder.No')" prop="searchKey" style="margin-left: 28px;"> <el-form-item :label="$t('controlorder.No')" prop="searchKey" style="margin-left: 28px;">
<el-input v-model="queryParams.searchKey" style="width: 250px;" :placeholder="$t('controlorder.NoRules')" clearable /> <el-input v-model="queryParams.searchKey" onkeyup="this.value=this.value.replace(/\s+/g, '')" style="width: 250px;" :placeholder="$t('controlorder.NoRules')" clearable />
</el-form-item> </el-form-item>
</el-col></el-row> </el-col></el-row>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -55,6 +55,9 @@ ...@@ -55,6 +55,9 @@
<dict-selector v-model="dateFilterType" :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" style="width: 150px; margin-right: 5px" /> <dict-selector v-model="dateFilterType" :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" style="width: 150px; margin-right: 5px" />
<el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('controlorder.start')" :end-placeholder="$t('controlorder.end')" value-format="yyyy-MM-dd HH:mm:ss" /> <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('controlorder.start')" :end-placeholder="$t('controlorder.end')" value-format="yyyy-MM-dd HH:mm:ss" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('receiveorder.status')" prop="dynamicStatusList">
<dict-selector v-model="dynamicStatusList" :type="DICT_TYPE.APP_ORDER_STATUS" style="width: 150px; margin-right: 5px" />
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('common.search') }}</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('common.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('common.reload') }}</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('common.reload') }}</el-button>
...@@ -115,7 +118,6 @@ ...@@ -115,7 +118,6 @@
/> />
<el-table-column <el-table-column
:label="$t('controlorder.status')" :label="$t('controlorder.status')"
prop="statusMsg"
align="center" align="center"
header-align="center" header-align="center"
> >
...@@ -221,6 +223,7 @@ export default { ...@@ -221,6 +223,7 @@ export default {
dateFilter: [], // 筛选日期 dateFilter: [], // 筛选日期
// 总条数 // 总条数
total: 0, total: 0,
dynamicStatusList: '', // 状态筛选类别
// 查询参数 // 查询参数
queryParams: { queryParams: {
page: 1, page: 1,
...@@ -250,6 +253,12 @@ export default { ...@@ -250,6 +253,12 @@ export default {
timeParams['begin' + this.dateFilterType] = this.dateFilter[0] timeParams['begin' + this.dateFilterType] = this.dateFilter[0]
timeParams['end' + this.dateFilterType] = this.dateFilter[1] timeParams['end' + this.dateFilterType] = this.dateFilter[1]
} }
if (this.dynamicStatusList){
this.queryParams.dynamicStatusList=this.dynamicStatusList
}
if (this.queryParams.searchKey !== null && this.queryParams.searchKey !== ''){
this.queryParams.searchKey = this.queryParams.searchKey.replace(/\s+/g, '');
}
return Object.assign({}, this.queryParams, timeParams) return Object.assign({}, this.queryParams, timeParams)
}, },
isChinese() { isChinese() {
...@@ -286,6 +295,7 @@ export default { ...@@ -286,6 +295,7 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dynamicStatusList = ''
this.$refs.queryForm.resetFields() this.$refs.queryForm.resetFields()
this.getList() this.getList()
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment