Commit 0e199d99 by yangxiaolei

同步修改

parent fd0c39fa
...@@ -6,12 +6,12 @@ export default { ...@@ -6,12 +6,12 @@ export default {
methods: { methods: {
async handleSearch() { async handleSearch() {
let opndatfrom = this.model.infcon.opndatfrom; let opndatfrom = this.model.infcon.opndatfrom;
if (!opndatfrom || opndatfrom == '') { if ((!opndatfrom || opndatfrom == '') && !this.$route.query.trn) {
this.$notify.error({ title: '错误', message: '查询开始日期必输!' }); this.$notify.error({ title: '错误', message: '查询开始日期必输!' });
return; return;
} }
let opndatto = this.model.infcon.opndatto; let opndatto = this.model.infcon.opndatto;
if (!opndatto || opndatto == '') { if ((!opndatto || opndatto == '') && !this.$route.query.trn) {
this.$notify.error({ title: '错误', message: '查询结束日期必输!' }); this.$notify.error({ title: '错误', message: '查询结束日期必输!' });
return; return;
} }
...@@ -22,8 +22,8 @@ export default { ...@@ -22,8 +22,8 @@ export default {
inr:this.model.brdgrp.rec.inr, inr:this.model.brdgrp.rec.inr,
pageIndex: this.pagination.pageIndex, pageIndex: this.pagination.pageIndex,
pageSize: this.pagination.pageSize, pageSize: this.pagination.pageSize,
opndatfrom:moment(opndatfrom).format('YYYY-MM-DD'), opndatfrom:this.$route.query.trn ? null : moment(opndatfrom).format('YYYY-MM-DD'),
opndatto:moment(opndatto).format('YYYY-MM-DD'), opndatto:this.$route.query.trn ? null: moment(opndatto).format('YYYY-MM-DD'),
}; };
let rtnmsg = await Api.post('/service/infbrd/getList', params); let rtnmsg = await Api.post('/service/infbrd/getList', params);
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
......
...@@ -570,6 +570,8 @@ export default { ...@@ -570,6 +570,8 @@ export default {
mounted: function () { mounted: function () {
if(this.$route.query && this.$route.query.trn){ if(this.$route.query && this.$route.query.trn){
this.model.infcon.ownref = this.$route.query.trn this.model.infcon.ownref = this.$route.query.trn
this.model.infcon.opndatfrom = null
this.model.infcon.opndatto = null
this.handleSearch() this.handleSearch()
} }
}, },
......
...@@ -6,15 +6,18 @@ export default { ...@@ -6,15 +6,18 @@ export default {
methods: { methods: {
async handleSearch() { async handleSearch() {
let opndatfrom = this.model.infcon.opndatfrom; let opndatfrom = this.model.infcon.opndatfrom;
if (!opndatfrom || opndatfrom == '') { console.log("this.$route.query.trn=>",this.$route.query.trn)
if ((!opndatfrom || opndatfrom == '') && !this.$route.query.trn) {
this.$notify.error({ title: '错误', message: '查询开始日期必输!' }); this.$notify.error({ title: '错误', message: '查询开始日期必输!' });
return; return;
} }
let opndatto = this.model.infcon.opndatto; let opndatto = this.model.infcon.opndatto;
if (!opndatto || opndatto == '') { if ((!opndatto || opndatto == '') && !this.$route.query.trn) {
this.$notify.error({ title: '错误', message: '查询结束日期必输!' }); this.$notify.error({ title: '错误', message: '查询结束日期必输!' });
return; return;
} }
let params = { let params = {
...this.model.infcon, ...this.model.infcon,
fenlishi: this.model.fenlishi, fenlishi: this.model.fenlishi,
...@@ -25,8 +28,8 @@ export default { ...@@ -25,8 +28,8 @@ export default {
fingua: this.model.fingua, fingua: this.model.fingua,
pageIndex: this.pagination.pageIndex, pageIndex: this.pagination.pageIndex,
pageSize: this.pagination.pageSize, pageSize: this.pagination.pageSize,
opndatfrom:moment(opndatfrom).format('YYYY-MM-DD'), opndatfrom:this.$route.query.trn ? null : moment(opndatfrom).format('YYYY-MM-DD'),
opndatto:moment(opndatto).format('YYYY-MM-DD'), opndatto:this.$route.query.trn ? null :moment(opndatto).format('YYYY-MM-DD'),
}; };
let rtnmsg = await Api.post('/service/inflid/getList', params); let rtnmsg = await Api.post('/service/inflid/getList', params);
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
......
...@@ -432,7 +432,9 @@ export default { ...@@ -432,7 +432,9 @@ export default {
methods: {}, methods: {},
created: function () { created: function () {
if(this.$route.query && this.$route.query.trn){ if(this.$route.query && this.$route.query.trn){
this.model.infcon.seaownref = this.$route.query.trn this.root.model.infcon.seaownref = this.$route.query.trn
this.root.model.infcon.opndatfrom = null
this.root.model.infcon.opndatto = null
this.handleSearch() this.handleSearch()
} }
}, },
......
...@@ -48,7 +48,9 @@ export default { ...@@ -48,7 +48,9 @@ export default {
} }
}, },
mounted () { mounted () {
this.getInidatfro() if(!this.$route.query.trn){
this.getInidatfro()
}
}, },
} }
</script> </script>
......
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