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

- 修复证件信息管理 查看详细信息照片缺失问题

src/views/train/cardOverdue/components/corpUserList.vue

@@ -110,7 +110,7 @@ export default {
   data() {
     return {
       userId: this.$parent.USER_ID_T,
-      baseInfourl: '/api/user/getUserDetailInfoByUserId',
+      baseInfourl: '/user/getDetailByUserIdAndCorpInfoId',
       treeLoading: false,
       listLoading: false,
       add: true,
@@ -297,7 +297,7 @@ export default {
     },
     // 查看
     toUserDetail(ROW) {
-      this.$refs.userbaseinfoview.openWindow(ROW.USER_ID, JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID)
+      this.$refs.userbaseinfoview.openWindow(ROW.USER_ID, JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID ,ROW.EMPLOYMENT_APPLY_MANAGEMENT_ID)
     },
     userEdit() {
       this.$refs.form.validate(valid => {
@@ -380,7 +380,7 @@ export default {
         })
         return false
       }
-      this.$refs.sendUtil.init(_selectData)
+      this.$refs.sendUtil.init(_selectData,1)
     },
     // 判断按钮权限，用于是否显示按钮
     hasButton: function() {