Merge remote-tracking branch 'origin/develop' into develop

2021-07-27 18:27:12 +08:00
parent 6b03c59949 6383fb7f70
commit 9d9219bd62
39 changed files with 2753 additions and 1975 deletions
@@ -3363,8 +3363,8 @@ export default {
                this.isSubmit = false
                if (res.ok) {
                  this.personCollect.collectType = 'INLAND_STAND'
-                  this.personCollect.id = this.id
-                  this.personCollect.collectResId = this.collectId
+                  this.personCollect.id = this.collectId
+                  this.personCollect.collectResId = this.id
                  this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')'
                  this.personCollect.userId = this.$store.getters.userInfo.userId
                  this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, {