diff --git a/src/main.js b/src/main.js index 6c5505f3..71690875 100644 --- a/src/main.js +++ b/src/main.js @@ -33,7 +33,7 @@ import './permission' // permission control import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; import "default-passive-events"; -import { playAudio,playNoticeTone,parseTime, resetForm, addDateRange,addQueryParam,addFormParam,insertJsScript, selectDictLabel, selectDictLabels, handleTree,handleOptions,addExportAuditRecord } from "@/utils/custom"; +import { playAudio,playNoticeTone,parseTime, resetForm, addDateRange,removeDateRange,addQueryParam,addFormParam,insertJsScript, selectDictLabel, selectDictLabels, handleTree,handleOptions,addExportAuditRecord } from "@/utils/custom"; // 分页组件 @@ -86,6 +86,7 @@ Vue.prototype.getConfigKey = getConfigKey Vue.prototype.parseTime = parseTime Vue.prototype.resetForm = resetForm Vue.prototype.addDateRange = addDateRange +Vue.prototype.removeDateRange = removeDateRange Vue.prototype.addQueryParam = addQueryParam Vue.prototype.addFormParam = addFormParam Vue.prototype.insertJsScript = insertJsScript diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue index 9d07a71f..a8abd193 100644 --- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue +++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue @@ -19,14 +19,10 @@
- + 创建时间 发出时间 -
@@ -336,7 +332,7 @@ export default { openForm: false, titleForm: "", queryOrderType:'1', - querETDType:'1', + queryETDType:'1', titleWayBill:null, openWayBillForm:false, @@ -441,8 +437,10 @@ export default { } }else{ if(this.queryETDType=='2'){ + this.removeDateRange(rqParams,"createTime"); rqParams=this.addDateRange(rqParams, this.dateTimeRange,"etd"); }else{ + this.removeDateRange(rqParams,"etd"); rqParams=this.addDateRange(rqParams, this.dateTimeRange,"createTime"); } } @@ -455,9 +453,11 @@ export default { initQueryParams(){ if(this.queryETDType=='2'){ + this.removeDateRange(rqParams,"createTime"); this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"etd"); }else{ - this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime"); + this.removeDateRange(rqParams,"etd"); + this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime"); } return this.queryParams; },