|
@@ -33,7 +33,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px">
|
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shelfOrder-refresh">查询</a-button>
|
|
|
- <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shelfOrder-reset">重置</a-button>
|
|
|
+ <a-button style="margin-left: 5px" @click="resetSearchForm(0)" :disabled="disabled" id="shelfOrder-reset">重置</a-button>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
</a-form>
|
|
@@ -136,14 +136,15 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
// 重置
|
|
|
- resetSearchForm () {
|
|
|
+ resetSearchForm (flag) {
|
|
|
this.time = []
|
|
|
this.$refs.rangeDate.resetDate(this.time)
|
|
|
this.queryParam.orderStartDate = ''
|
|
|
this.queryParam.orderEndDate = ''
|
|
|
this.queryParam.orderBillNo = ''
|
|
|
this.queryParam.billState = undefined
|
|
|
- if (this.$route.query && this.$route.query.bizType == 'SHELF_WARN') {
|
|
|
+ console.log(flag)
|
|
|
+ if (this.$route.query && this.$route.query.bizType == 'SHELF_WARN' && flag == 1) {
|
|
|
this.queryParam.shelfSnList = [this.$route.query.shelfSn]
|
|
|
} else {
|
|
|
this.queryParam.shelfSnList = undefined
|
|
@@ -164,7 +165,7 @@ export default {
|
|
|
mounted () {
|
|
|
if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
|
|
|
this.pageInit()
|
|
|
- this.resetSearchForm()
|
|
|
+ this.resetSearchForm(1)
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
@@ -174,9 +175,9 @@ export default {
|
|
|
},
|
|
|
activated () {
|
|
|
// 如果是新页签打开,则重置当前页面
|
|
|
- if (this.$store.state.app.isNewTab) {
|
|
|
+ if (this.$store.state.app.isNewTab || this.$route.query && this.$route.query.bizType == 'SHELF_WARN') {
|
|
|
this.pageInit()
|
|
|
- this.resetSearchForm()
|
|
|
+ this.resetSearchForm(1)
|
|
|
}
|
|
|
// 仅刷新列表,不重置页面
|
|
|
if (this.$store.state.app.updateList) {
|