Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/business/platform/data/templaterender/preview/index.vue

@@ -165,7 +165,11 @@ export default {
         this.selectedValue = this.multiple ? [] : {}
         this.setSelectRow()
       }
-      this.$emit('action-event', key, JSON.parse(JSON.stringify(this.selectedValue)))
+      this.$emit('close', false)
+      if(typeof this.selectedValue != 'undefined'){
+        this.$emit('action-event', key, JSON.parse(JSON.stringify(this.selectedValue)))
+      }
+      
     },
     setSelectRow() {
       if (this.$refs['dataTemplate'] && this.$refs['dataTemplate'].setSelectRow) {

src/views/platform/org/employee/list.vue

@@ -349,11 +349,12 @@ export default {
                     }
                     if (item.job) {
                         // 转角色名
-                        const name = this.getRoleName(item.job)
-                        this.$set(item, 'roleName', name)
+                        const role = this.getRoleName(item.job)
+                        this.$set(item, 'roleName', role)
                     }
+                    ActionUtils.handleListData(this, response.data)
                 })
-                ActionUtils.handleListData(this, response.data)
+                
                 this.loading = false
             }).catch(() => {
                 this.loading = false