This commit is contained in:
linfso 2025-02-21 17:04:32 +08:00
parent f71b8d26fc
commit 261f11049d
2 changed files with 9 additions and 8 deletions

View File

@ -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

View File

@ -19,14 +19,10 @@
</el-form-item>
<el-form-item label="创建时间" prop="dateTimeRange">
<div slot="label">
<el-radio-group class="query-label" v-model="querETDType">
<el-radio-group class="query-label" v-model="queryETDType">
<el-radio label="1">创建时间</el-radio>
<el-radio label="2">发出时间</el-radio>
</el-radio-group>
<!-- <el-select v-model="querETDType" placeholder="" filterable >
<el-option :key="1" label="创建时间" value="1"/>
<el-option :key="2" label="发出时间" value="2"/>
</el-select> -->
</div>
<elDateAdvPicker clearable v-model="dateTimeRange" style="width:260px" ></elDateAdvPicker>
</el-form-item>
@ -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;
},