Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!181

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -1567,6 +1567,8 @@ export default {
       twoOptions: [],
       threeOptions: [],
       sarType: 'FOREIGN_STAND',
+      id: '', // 收藏数据的id
+      collectId: '', // 收藏id
       // 收藏标准
       personCollect: {
         collectResId: '',
@@ -3234,6 +3236,17 @@ export default {
               }, res => {
                 this.isSubmit = false
                 if (res.ok) {
+                  this.personCollect.collectType = 'FOREIGN_STAND'
+                  this.personCollect.id = res.data.collectId
+                  this.personCollect.collectResId = res.data.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, {
+                    _this: this,
+                    loading: 'loading'
+                  }, res => {
+                  }, e => {
+                  })
                   this.getDomesticStandardTable(this.tableFlag)
                   this.resetForm()
                   if (this.addOrUPdateFlag === 1) {