Merge branch 'feature-2.0' of ssh://git.mooctest.com:1022/crowd-2019/crowd-test-service-front into feature-2.0

src/components/authen/AuthenticationManage.vue

@@ -57,7 +57,7 @@
         </el-table-column>
       </el-table>
       <el-dialog title="认证详情" :visible.sync="showDialog" center width="40%">
-        <el-form :model="authInfoDetail" label-width="120px" label-position="right">
+        <el-form :model="authInfoDetail" label-width="150px" label-position="right">
           <el-form-item label="类型：">
             <span>
               <el-tag v-if="authInfoDetail.type=='personal'" type="success">个人</el-tag>
@@ -68,34 +68,64 @@
           <el-form-item label="姓名：" v-if="authInfoDetail.type == 'personal'">
             <span>{{authInfoDetail.realName}}</span>
           </el-form-item>
+          <el-form-item label="性别：" v-if="authInfoDetail.type == 'personal'">
+            <span>{{authInfoDetail.gender}}</span>
+          </el-form-item>
           <el-form-item label="身份证号：" v-if="authInfoDetail.type == 'personal'">
-            <span>{{authInfoDetail.IDCard}}</span>
+            <span>{{authInfoDetail.idCard}}</span>
           </el-form-item>
-          <el-form-item label="身份证照：" v-if="authInfoDetail.type == 'personal'">
+          <el-form-item label="身份证正面照：" v-if="authInfoDetail.type == 'personal'">
             <span>
               <el-image
                 style="width: 100px;"
-                :src="authInfoDetail.IDCardPositivePhoto"
+                :src="authInfoDetail.idCardPositivePhoto"
                 fit="scale-down"></el-image>
             </span>
           </el-form-item>
-<!--          <el-form-item label="银行账号：">-->
-<!--            <span>{{authInfoDetail.bankAccount}}</span>-->
-<!--          </el-form-item>-->
+          <el-form-item label="身份证反面照：" v-if="authInfoDetail.type == 'personal'">
+            <span>
+              <el-image
+                style="width: 100px;"
+                :src="authInfoDetail.idCardBackPhoto"
+                fit="scale-down"></el-image>
+            </span>
+          </el-form-item>
+          <el-form-item label="身份证截止时间：" v-if="authInfoDetail.type == 'personal'">
+            <span>{{authInfoDetail.idCardDeadTime}}</span>
+          </el-form-item>
           <el-form-item label="地址：">
             <span>{{authInfoDetail.address}}</span>
           </el-form-item>
+          <el-form-item label="角色：" v-if="authInfoDetail.type == 'personal'">
+            <span>{{authInfoDetail.roleList}}</span>
+          </el-form-item>
           <el-form-item label="申请时间：">
             <span>{{reformTime(new Date(authInfoDetail.applyTime))}}</span>
           </el-form-item>
 
-          <el-form-item label="企业名称：" v-if="authInfoDetail.type == 'enterprise'">
-            <span>{{authInfoDetail.enterpriseName}}</span>
-          </el-form-item>
-          <el-form-item label="法人姓名：" v-if="authInfoDetail.type == 'enterprise'">
-            <span>{{authInfoDetail.legalPersonName}}</span>
+<!--          <el-form-item label="企业名称：" v-if="authInfoDetail.type == 'enterprise'">-->
+<!--            <span>{{authInfoDetail.enterpriseName}}</span>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="法人姓名：" v-if="authInfoDetail.type == 'enterprise'">-->
+<!--            <span>{{authInfoDetail.legalPersonName}}</span>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="营业执照：" v-if="authInfoDetail.type == 'enterprise'">-->
+<!--            <span>-->
+<!--              <el-image-->
+<!--                style="width: 100px;"-->
+<!--                :src="authInfoDetail.businessLicensePhoto"-->
+<!--                fit="scale-down"></el-image>-->
+<!--            </span>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="统一信用代码：" v-if="authInfoDetail.type == 'enterprise'">-->
+<!--            <span>{{authInfoDetail.unifiedSocialCreditCode}}</span>-->
+<!--          </el-form-item>-->
+
+
+          <el-form-item label="企业名称：" v-if="authInfoDetail.type == 'agency'">
+            <span>{{authInfoDetail.evaluationAgencyName}}</span>
           </el-form-item>
-          <el-form-item label="营业执照：" v-if="authInfoDetail.type == 'enterprise'">
+          <el-form-item label="营业执照：" v-if="authInfoDetail.type == 'agency'">
             <span>
               <el-image
                 style="width: 100px;"
@@ -103,29 +133,58 @@
                 fit="scale-down"></el-image>
             </span>
           </el-form-item>
-          <el-form-item label="统一信用代码：" v-if="authInfoDetail.type == 'enterprise'">
-            <span>{{authInfoDetail.unifiedSocialCreditCode}}</span>
+          <el-form-item label="企业地址：">
+            <span>{{authInfoDetail.address}}</span>
           </el-form-item>
 
-          <el-form-item label="机构名称：" v-if="authInfoDetail.type == 'agency'">
-            <span>{{authInfoDetail.evaluationAgencyName}}</span>
-          </el-form-item>
-          <el-form-item label="机构能力：" v-if="authInfoDetail.type == 'agency'">
-            <span v-for="item in authInfoDetail.evaluationAgencyAbilityList"> <el-tag>{{item}}</el-tag>
+          <el-form-item label="企业Logo：" v-if="authInfoDetail.type == 'agency'">
+            <span>
+              <el-image
+                style="width: 100px;"
+                :src="authInfoDetail.agencyPhoto"
+                fit="scale-down"></el-image>
             </span>
           </el-form-item>
-          <el-form-item label="机构资源：" v-if="authInfoDetail.type == 'agency'">
-            <span v-for="item in authInfoDetail.evaluationAgencyResourceList"> <el-tag>{{item.type}} ( {{item.name}} ) ：&nbsp; [总数：{{item.totalNum}} ,可用数量：{{item.availableNum}}]</el-tag>
+          <el-form-item label="法人姓名：" v-if="authInfoDetail.type == 'agency'">
+            <span>{{authInfoDetail.legalPersonName}}</span>
+          </el-form-item>
+          <el-form-item label="法人性别：" v-if="authInfoDetail.type == 'agency'">
+            <span>{{authInfoDetail.gender}}</span>
+          </el-form-item>
+          <el-form-item label="法人身份证号：" v-if="authInfoDetail.type == 'agency'">
+            <span>{{authInfoDetail.idCardNum}}</span>
+          </el-form-item>
+          <el-form-item label="法人身份证正面照：" v-if="authInfoDetail.type == 'agency'">
+            <span>
+              <el-image
+                style="width: 100px;"
+                :src="authInfoDetail.idCardPositivePhoto"
+                fit="scale-down"></el-image>
             </span>
           </el-form-item>
-          <el-form-item label="机构Logo：" v-if="authInfoDetail.type == 'agency'">
+          <el-form-item label="法人身份证反面照：" v-if="authInfoDetail.type == 'agency'">
             <span>
               <el-image
                 style="width: 100px;"
-                :src="authInfoDetail.agencyPhoto"
+                :src="authInfoDetail.idCardBackPhoto"
                 fit="scale-down"></el-image>
             </span>
           </el-form-item>
+          <el-form-item label="身份证截止时间：" v-if="authInfoDetail.type == 'agency'">
+            <span>{{authInfoDetail.idCardDeadTime}}</span>
+          </el-form-item>
+          <el-form-item label="企业角色：" v-if="authInfoDetail.type == 'agency'">
+            <span>{{authInfoDetail.roleList}}</span>
+          </el-form-item>
+
+<!--          <el-form-item label="机构能力：" v-if="authInfoDetail.type == 'agency'">-->
+<!--            <span v-for="item in authInfoDetail.evaluationAgencyAbilityList"> <el-tag>{{item}}</el-tag>-->
+<!--            </span>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="机构资源：" v-if="authInfoDetail.type == 'agency'">-->
+<!--            <span v-for="item in authInfoDetail.evaluationAgencyResourceList"> <el-tag>{{item.type}} ( {{item.name}} ) ：&nbsp; [总数：{{item.totalNum}} ,可用数量：{{item.availableNum}}]</el-tag>-->
+<!--            </span>-->
+<!--          </el-form-item>-->
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="info" size="mini" @click="hideAuthDialog()">返回</el-button>
@@ -179,25 +238,34 @@
                 handledAuthList: [],
                 authInfoDetail: {
                     userId: '',
+                    realName: "",
+                    applyTime: "",
+                    checkTime: "",
+                    explain: "",
+                    gender: "",
+                    idCard: "",
+                    idCardBackPhoto: "",
+                    idCardDeadTime: "",
+                    idCardPositivePhoto: "",
+                    isAuthentication: 0,
+                    isDeleted: 0,
+                    roleList: [],
+                    address: "",
+
                     type: '',
-                    realName: '',
-                    IDCard: '',
-                    IDCardPositivePhoto: '',
                     bankAccount: '',
-                    address: '',
-                    applyTime: '',
-
                     enterpriseName: '',
                     legalPersonName: '',
                     businessLicensePhoto: '',
                     unifiedSocialCreditCode: '',
 
-                    evaluationAgencyName: '',
+                    agencyPhoto: "",
+                    evaluationAgencyName: "",
+                    expireTime: '',
+                    idCardNum: "",
                     evaluationAgencyAbilityList: [],
                     evaluationAgencyResourceList: [],
-                    agencyPhoto: '',
                     updateTime: '',
-                    expireTime: ''
                 }
             }
         },
@@ -276,6 +344,7 @@
                 this.hideLoading()
                 this.getHandlingAuthList()
                 notify('success', '驳回成功')
+                this.hideAuthDialog()
                 console.log(res)
             },
             handleAuthenticationRejectFail (error) {
@@ -321,11 +390,18 @@
                 this.hideLoading()
                 console.log(res)
                 this.authInfoDetail.realName = res.realName
-                this.authInfoDetail.IDCard = res.idcard
-                this.authInfoDetail.IDCardPositivePhoto = res.idCardPositivePhotoi
-                this.authInfoDetail.bankAccount = res.bankAccount
-                this.authInfoDetail.address = res.address
                 this.authInfoDetail.applyTime = res.applyTime
+                this.authInfoDetail.checkTime = res.checkTime
+                this.authInfoDetail.explain = res.explain
+                this.authInfoDetail.gender = res.gender
+                this.authInfoDetail.idCard = res.idCard
+                this.authInfoDetail.idCardBackPhoto = res.idCardBackPhoto
+                this.authInfoDetail.idCardDeadTime = res.idCardDeadTime
+                this.authInfoDetail.idCardPositivePhoto = res.idCardPositivePhoto
+                this.authInfoDetail.isAuthentication = res.isAuthentication
+                this.authInfoDetail.isDeleted = res.isDeleted
+                this.authInfoDetail.roleList = res.roleList
+                this.authInfoDetail.address = res.address
                 this.showAuthDialog()
                 console.log(res)
 
@@ -352,13 +428,25 @@
             getCurrentAgencyAuthInfoSuccess (res) {
                 this.hideLoading()
               this.authInfoDetail.bankAccount = res.bankAccount
+              this.authInfoDetail.legalPersonName = res.legalPersonName
+              this.authInfoDetail.businessLicensePhoto = res.businessLicensePhoto
               this.authInfoDetail.address = res.address
               this.authInfoDetail.applyTime = res.applyTime
-                this.authInfoDetail.evaluationAgencyName = res.evaluationAgencyName
-                this.authInfoDetail.evaluationAgencyAbilityList = res.evaluationAgencyAbilityList
-                this.authInfoDetail.evaluationAgencyResourceList = res.evaluationAgencyResourceList
-                this.authInfoDetail.agencyPhoto = res.agencyPhoto
-                this.authInfoDetail.updateTime = res.updateTime
+              this.authInfoDetail.evaluationAgencyName = res.evaluationAgencyName
+              this.authInfoDetail.evaluationAgencyAbilityList = res.evaluationAgencyAbilityList
+              this.authInfoDetail.evaluationAgencyResourceList = res.evaluationAgencyResourceList
+              this.authInfoDetail.agencyPhoto = res.agencyPhoto
+              this.authInfoDetail.updateTime = res.updateTime
+              this.authInfoDetail.checkTime = res.checkTime
+              this.authInfoDetail.explain = res.explain
+              this.authInfoDetail.gender = res.gender
+              this.authInfoDetail.idCardNum = res.idCardNum
+              this.authInfoDetail.idCardBackPhoto = res.idCardBackPhoto
+              this.authInfoDetail.idCardDeadTime = res.idCardDeadTime
+              this.authInfoDetail.idCardPositivePhoto = res.idCardPositivePhoto
+              this.authInfoDetail.isAuthentication = res.isAuthentication
+              this.authInfoDetail.isDeleted = res.isDeleted
+              this.authInfoDetail.roleList = res.roleList
               this.showAuthDialog()
             },
             getCurrentAgencyAuthInfoFail (error) {

src/components/commons/Header2.0.vue

@@ -27,35 +27,35 @@
                       </el-link>
                     </router-link>
                   </el-dropdown-item>
-                  <el-dropdown-item v-if="user.authStatus.text == '审核通过' &&  !this.user.personalAuthVO && this.user.agencyVO">
-                    <router-link :to="{ name: 'Agency',params:{userId:user.userVO.id}}">
-                      <el-link icon="el-icon-edit" :underline="false">
-                        修改机构信息
-                      </el-link>
-                    </router-link>
-                  </el-dropdown-item>
-                  <el-dropdown-item v-if="user.authStatus.text == '未实名认证' && !rolesPermissions.isSystemAdministrator">
-                    <router-link :to="{ name: 'AuthenticationIndex'}">
-                      <el-link type="info" icon="el-icon-warning-outline" :underline="false">
-                        未实名认证
-                      </el-link>
-                    </router-link>
-                  </el-dropdown-item>
-                  <el-dropdown-item v-if="user.authStatus.text == '认证审核中'" @click.native="handleClickAuthChecking()">
-                    <el-link type="warning" icon="el-icon-loading" :underline="false">
-                      认证审核中
-                    </el-link>
-                  </el-dropdown-item>
-                  <el-dropdown-item @click.native="handleClickAuthPass()" v-if="user.authStatus.text == '审核通过'">
-                    <el-link type="primary" icon="el-icon-check" :underline="false">
-                      已认证
-                    </el-link>
-                  </el-dropdown-item>
-                  <el-dropdown-item @click.native="handleClickAuthReject()" v-if="user.authStatus.text == '审核未通过'">
-                    <el-link type="danger" icon="el-icon-close" :underline="false">
-                      认证失败
-                    </el-link>
-                  </el-dropdown-item>
+<!--                  <el-dropdown-item v-if="user.authStatus.text == '审核通过' &&  !this.user.personalAuthVO && this.user.agencyVO">-->
+<!--                    <router-link :to="{ name: 'Agency',params:{userId:user.userVO.id}}">-->
+<!--                      <el-link icon="el-icon-edit" :underline="false">-->
+<!--                        修改机构信息-->
+<!--                      </el-link>-->
+<!--                    </router-link>-->
+<!--                  </el-dropdown-item>-->
+<!--                  <el-dropdown-item v-if="user.authStatus.text == '未实名认证' && !rolesPermissions.isSystemAdministrator">-->
+<!--                    <router-link :to="{ name: 'AuthenticationIndex'}">-->
+<!--                      <el-link type="info" icon="el-icon-warning-outline" :underline="false">-->
+<!--                        未实名认证-->
+<!--                      </el-link>-->
+<!--                    </router-link>-->
+<!--                  </el-dropdown-item>-->
+<!--                  <el-dropdown-item v-if="user.authStatus.text == '认证审核中'" @click.native="handleClickAuthChecking()">-->
+<!--                    <el-link type="warning" icon="el-icon-loading" :underline="false">-->
+<!--                      认证审核中-->
+<!--                    </el-link>-->
+<!--                  </el-dropdown-item>-->
+<!--                  <el-dropdown-item @click.native="handleClickAuthPass()" v-if="user.authStatus.text == '审核通过'">-->
+<!--                    <el-link type="primary" icon="el-icon-check" :underline="false">-->
+<!--                      已认证-->
+<!--                    </el-link>-->
+<!--                  </el-dropdown-item>-->
+<!--                  <el-dropdown-item @click.native="handleClickAuthReject()" v-if="user.authStatus.text == '审核未通过'">-->
+<!--                    <el-link type="danger" icon="el-icon-close" :underline="false">-->
+<!--                      认证失败-->
+<!--                    </el-link>-->
+<!--                  </el-dropdown-item>-->
                   <el-dropdown-item divided @click.native="userLogout()">登出</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>

src/components/task/Task.vue

@@ -485,7 +485,7 @@
       //获取任务详情失败时回调函数
       getTaskDetailFail(error) {
         this.hideLoading()
-        notify('error', '获取任务详情失败:' + error.data)
+        // notify('error', '获取任务详情失败:' + error.data)
       },
 
       //处理显示报告