FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!314
This commit is contained in:
王夏晖
2022-02-14 09:30:12 +08:00
parent 424aa2daf6 5d073b024f
commit e3a3002080
40 changed files with 2469 additions and 685 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+13 -2
View File
@@ -2434,10 +2434,16 @@ export default {
if(this.replaceLawsNumForm.issueTimeArr && this.replaceLawsNumForm.issueTimeArr.length > 0){
this.replaceLawsNumForm.issueTimeStart = this.replaceLawsNumForm.issueTimeArr[0] || null
this.replaceLawsNumForm.issueTimeEnd = this.replaceLawsNumForm.issueTimeArr[1] || null
}else{
this.replaceLawsNumForm.issueTimeStart = ""
this.replaceLawsNumForm.issueTimeEnd = ""
}
if(this.replaceLawsNumForm.reviewTimeArr && this.replaceLawsNumForm.reviewTimeArr.length > 0){
this.replaceLawsNumForm.reviewTimeStart = this.replaceLawsNumForm.reviewTimeArr[0] || null
this.replaceLawsNumForm.reviewTimeEnd = this.replaceLawsNumForm.reviewTimeArr[1] || null
}else{
this.replaceLawsNumForm.reviewTimeStart = ""
this.replaceLawsNumForm.reviewTimeEnd = ""
}
this.$http.get('lawss/sarBussionessStandState/getSarBussionStandPage', this.replaceLawsNumForm, {
_this: this,
@@ -2461,13 +2467,18 @@ export default {
this.replaceLawsNumForm.page = 1
this.replacePage = 1
if(this.replaceLawsNumForm.issueTimeArr && this.replaceLawsNumForm.issueTimeArr.length > 0){
console.log(this.replaceLawsNumForm.issueTimeArr)
this.replaceLawsNumForm.issueTimeStart = this.replaceLawsNumForm.issueTimeArr[0] || null
this.replaceLawsNumForm.issueTimeEnd = this.replaceLawsNumForm.issueTimeArr[1] || null
}else{
this.replaceLawsNumForm.issueTimeStart = ""
this.replaceLawsNumForm.issueTimeEnd = ""
}
if(this.replaceLawsNumForm.reviewTimeArr && this.replaceLawsNumForm.reviewTimeArr.length > 0){
this.replaceLawsNumForm.reviewTimeStart = this.replaceLawsNumForm.reviewTimeArr[0] || null
this.replaceLawsNumForm.reviewTimeEnd = this.replaceLawsNumForm.reviewTimeArr[1] || null
}else{
this.replaceLawsNumForm.reviewTimeStart = ""
this.replaceLawsNumForm.reviewTimeEnd = ""
}
this.$http.get('lawss/sarBussionessStandState/getSarBussionStandPage', this.replaceLawsNumForm, {
_this: this,
@@ -3363,7 +3374,7 @@ export default {
let routeUrl = this.$router.resolve({
name: 'OtherBussStandardDetails',
params: {
id: item.id,
id: item.standId,
pageType: 'BUSINESS_STAND'
}
})