Merge remote-tracking branch 'origin/master'

src/views/xtgl/yhgl.vue

@@ -284,11 +284,14 @@ export default {
       })
     },
     handleGzzSelect(row) {
-      if (!this.selectYhxx || !this.selectYhxx.user_code) {
+      if (!this.selectYhxx || !this.selectYhxx.yhdm) {
         this.$message({ message: '请先选择一个用户！', type: 'error' })
         return
       }
-      const relation = { 'user_code': this.selectYhxx.user_code, 'role_code': row.role_code }
+      const relation = { 'yhdm': this.selectYhxx.yhdm,
+        'role_code': row.role_code,
+        'yhms': this.selectYhxx.yhms
+      }
       if (row.isselect) {
         addRoleForUser([relation]).then(response => {
           this.$message({ message: '添加角色成功！', type: 'success' })