|
|
@@ -579,7 +579,7 @@ export default {
|
|
|
{
|
|
|
label: "创建时间",
|
|
|
prop: "createTimeQuery",
|
|
|
- type: "date",
|
|
|
+ type: "datePicker",
|
|
|
},
|
|
|
],
|
|
|
btnGroup:[
|
|
|
@@ -1181,12 +1181,23 @@ export default {
|
|
|
signDateStart=''
|
|
|
signDateEnd=''
|
|
|
}
|
|
|
+ let createTimeStart = ''
|
|
|
+ let createTimeEnd = ''
|
|
|
+ let createTimeQuery = undefined
|
|
|
+ if (data && data.createTimeQuery && data.createTimeQuery.length > 0) {
|
|
|
+ createTimeStart = data.createTimeQuery[0]
|
|
|
+ createTimeEnd = data.createTimeQuery[1]
|
|
|
+ } else {
|
|
|
+ createTimeStart = ''
|
|
|
+ createTimeEnd = ''
|
|
|
+ }
|
|
|
+
|
|
|
let dockingPerson
|
|
|
if (this.formData.dockingPerson) {
|
|
|
dockingPerson = this.formData.dockingPerson
|
|
|
}
|
|
|
this.$api.task
|
|
|
- .ptTotalAmount({ ...data,...this.pageData,signDateStart,signDateEnd, dockingPerson, signDate: null })
|
|
|
+ .ptTotalAmount({ ...data,...this.pageData,signDateStart,signDateEnd, dockingPerson, signDate: null,createTimeStart,createTimeEnd,createTimeQuery })
|
|
|
.then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.totalList = res.data ? res.data : []
|
|
|
@@ -1195,14 +1206,16 @@ export default {
|
|
|
this.$message.error(res.msg)
|
|
|
}
|
|
|
});
|
|
|
- this.findPage({...data,signDateStart,signDateEnd});
|
|
|
+ this.findPage({...data,signDateStart,signDateEnd,createTimeStart,createTimeEnd});
|
|
|
},
|
|
|
//列表数据
|
|
|
findPage(data) {
|
|
|
+ console.log(data)
|
|
|
this.tableConfig.loading = true;
|
|
|
- this.formData.signDate = null
|
|
|
+ let signDate = undefined
|
|
|
+ let createTimeQuery = undefined
|
|
|
this.$api.task
|
|
|
- .plyFeeQuery({...this.pageData,...data,... this.formData} )
|
|
|
+ .plyFeeQuery({...this.pageData,...data,... this.formData, signDate, createTimeQuery} )
|
|
|
.then(res => {
|
|
|
if (res.code==200) {
|
|
|
this.tableData = res.data.content;
|
|
|
@@ -1226,7 +1239,17 @@ export default {
|
|
|
handExport(){
|
|
|
let signDateStart=''
|
|
|
let signDateEnd=''
|
|
|
+ let createTimeStart=''
|
|
|
+ let createTimeEnd=''
|
|
|
+ let createTimeQuery = undefined
|
|
|
if( this.$refs.templateTable.searchDataClone){
|
|
|
+ if(this.$refs.templateTable.searchDataClone && this.$refs.templateTable.searchDataClone.createTimeQuery && this.$refs.templateTable.searchDataClone.createTimeQuery.length>0){
|
|
|
+ createTimeStart=this.$refs.templateTable.searchDataClone.createTimeQuery[0]
|
|
|
+ createTimeEnd=this.$refs.templateTable.searchDataClone.createTimeQuery[1]
|
|
|
+ } else{
|
|
|
+ createTimeStart=''
|
|
|
+ createTimeEnd=''
|
|
|
+ }
|
|
|
if(this.$refs.templateTable.searchDataClone && this.$refs.templateTable.searchDataClone.signDate && this.$refs.templateTable.searchDataClone.signDate.length>0){
|
|
|
signDateStart=this.$refs.templateTable.searchDataClone.signDate[0]
|
|
|
signDateEnd=this.$refs.templateTable.searchDataClone.signDate[1]
|
|
|
@@ -1238,7 +1261,7 @@ export default {
|
|
|
}
|
|
|
let signDate = undefined
|
|
|
this.$api.task
|
|
|
- .pinHandlingExcel({...this.pageData,...this.$refs.templateTable.searchDataClone,signDateStart,signDateEnd, signDate})
|
|
|
+ .pinHandlingExcel({...this.pageData,...this.$refs.templateTable.searchDataClone,signDateStart,signDateEnd, signDate,createTimeStart,createTimeEnd,createTimeQuery})
|
|
|
.then(res => {
|
|
|
if (res.code==200) {
|
|
|
let url = process.env.BASE_URL + res.data; // 3.创建一个临时的url指向blob对象
|