修改机构详情

src/components/authen/AuthenticationManage.vue

@@ -98,8 +98,8 @@
           </el-form-item>
           <el-form-item label="角色：" v-if="authInfoDetail.type == 'personal'">
             <el-checkbox-group v-model="authInfoDetail.roleList" disabled>
-              <el-checkbox :label="0">发包</el-checkbox>
-              <el-checkbox :label="1">接包</el-checkbox>
+              <el-checkbox :label="1">发包</el-checkbox>
+              <el-checkbox :label="0">接包</el-checkbox>
             </el-checkbox-group>
 <!--            <span>{{authInfoDetail.roleList}}</span>-->
           </el-form-item>
@@ -183,8 +183,8 @@
 
           <el-form-item label="企业角色：" v-if="authInfoDetail.type == 'agency'">
             <el-checkbox-group v-model="authInfoDetail.roleList" disabled>
-              <el-checkbox :label="0">发包</el-checkbox>
-              <el-checkbox :label="1">接包</el-checkbox>
+              <el-checkbox :label="1">发包</el-checkbox>
+              <el-checkbox :label="0">接包</el-checkbox>
             </el-checkbox-group>
             <!--            <span>{{authInfoDetail.roleList}}</span>-->
           </el-form-item>

src/components/commons/Header2.0.vue

@@ -3,7 +3,7 @@
     <div class="container">
         <div class="nav-location pull-left">
           <i class="el-icon-location-outline" style="margin-right: 5px"></i>
-          <span style="line-height: 34px" v-if="!city">{{city}}</span>
+          <span style="line-height: 34px" v-if="!city && city != ''">{{city}}</span>
           <span style="line-height: 34px" v-else>暂无</span>
         </div>
         <div class="nav-list pull-right">

src/js/api.js

@@ -59,6 +59,7 @@ export default {
     GET_INDIVIDUAL_AUTHENTICATION_INFO: '/api/user/{userId}/personalAuth',
     GET_ENTERPRISE_AUTHENTICATION_INFO: '/api/user/{userId}/enterpriseAuth',
     GET_AGENCY_AUTHENTICATION_INFO: '/api/user/{userId}/agency',
+    GET_AGENCY_AUTHENTICATION_INFO_COMMON: '/api/user/{userId}/agency/common',
     GET_ALL_HANDLING_AUTH_INFO: '/api/user/authentication/handling',
     GET_ALL_HANDLED_AUTH_INFO: '/api/user/authentication/handled',
     PASS_AGENCY_AUTH:'/api/user/{userId}/agency/status/accept',

src/js/index.js

@@ -6,6 +6,7 @@ import {
   getAllHandlingAuthInfo,
   getAuthUrls,
   getCurrentAgencyAuthInfo,
+  getAgencyAuthInfoCommon,
   getCurrentAuthenInfo,
   getCurrentEnterpriseAuthInfo,
   getCurrentIndividualAuthenInfo,
@@ -105,6 +106,7 @@ export {
   getCurrentIndividualAuthenInfo,
   getCurrentEnterpriseAuthInfo,
   getCurrentAgencyAuthInfo,
+  getAgencyAuthInfoCommon,
   checkPassAuth,
   checkRejectAuth,
   updateAgencyResourceAndAbility

src/js/userService.js

@@ -148,6 +148,15 @@ export const getCurrentAgencyAuthInfo = (userId, getCurrentEnterpriseAuthInfoSuc
     getCurrentEnterpriseAuthInfoFail(error)
   })
 }
+
+export const getAgencyAuthInfoCommon = (userId, getCurrentEnterpriseAuthInfoSuccess, getCurrentEnterpriseAuthInfoFail) => {
+  Http.get(Apis.USER.GET_AGENCY_AUTHENTICATION_INFO_COMMON.replace('{userId}', userId)).then((res) => {
+    getCurrentEnterpriseAuthInfoSuccess(res)
+  }).catch((error) => {
+    getCurrentEnterpriseAuthInfoFail(error)
+  })
+}
+
 export const getCurrentAuthenInfo = () => {
   const individualData = {
     type: '个人',//企业、机构、个人

src/pages/DetailPage/AgencyDetail.vue

@@ -38,7 +38,7 @@
         <el-form-item label="接包数量" prop="taskCount" v-if="this.type == 0">
           <span>{{authentication.taskCount}}</span>
         </el-form-item>
-        <el-form-item label="审核通过时间" prop="checkTime">
+        <el-form-item label="认证时间" prop="checkTime">
           <span>{{dateFormat(new Date(authentication.checkTime),'yyyy-MM-dd HH:mm:ss')}}</span>
         </el-form-item>
 
@@ -57,7 +57,7 @@
     getAllReportTypes,
     defaultValue,
     storageGet,
-    getCurrentAgencyAuthInfo,
+    getAgencyAuthInfoCommon,
     getAllAgencyResourceTypes,
     getAllServiceTypes,
   } from '@/js/index'
@@ -76,7 +76,7 @@
         authentication: {
           mobile: '',
           evaluationAgencyName: '',
-          bankAccount: '',
+          // bankAccount: '',
           address: '',
           evaluationAgencyAbilityList: [],
           evaluationAgencyResourceList: [],
@@ -108,7 +108,7 @@
       //加载数据
       getAuthInfo() {
         this.showLoading()
-        getCurrentAgencyAuthInfo(this.userId, this.getAuthInfoSuccess, this.getAuthInfoFail)
+        getAgencyAuthInfoCommon(this.userId, this.getAuthInfoSuccess, this.getAuthInfoFail)
       },
       getAuthInfoSuccess(res) {
         this.hideLoading()
@@ -116,11 +116,11 @@
         this.authentication.evaluationAgencyName = res.data.evaluationAgencyName == null ? '暂未填写' : res.data.evaluationAgencyName
         this.authentication.evaluationAgencyAbilityList = res.data.evaluationAgencyAbilityList == null ? [] : res.data.evaluationAgencyAbilityList
         this.authentication.evaluationAgencyResourceList = res.data.evaluationAgencyResourceList == null ? [] : res.data.evaluationAgencyResourceList
-        this.authentication.bankAccount = res.data.bankAccount == null ? '暂未填写' : res.data.bankAccount
+        // this.authentication.bankAccount = res.data.bankAccount == null ? '暂未填写' : res.data.bankAccount
         this.authentication.address = res.data.address == null ? '暂未填写' : res.data.address
         this.authentication.authStatus = res.data.authStatus
         this.authentication.legalPersonName = res.data.legalPersonName == null ? '暂未填写' : res.data.legalPersonName
-        this.authentication.explain = res.data.explain
+        // this.authentication.explain = res.data.explain
         this.authentication.taskCount = res.data.taskCount
         this.authentication.checkTime = res.data.checkTime
       },

src/pages/UserCenter/EnterpriseAuth.vue

@@ -101,8 +101,8 @@
         </el-form-item>
         <el-form-item label="认证权限" prop="roleList">
           <el-checkbox-group v-model="enterpriseForm.roleList" :disabled="!canEdit">
-            <el-checkbox :label="0">发包</el-checkbox>
-            <el-checkbox :label="1">接包</el-checkbox>
+            <el-checkbox :label="1">发包</el-checkbox>
+            <el-checkbox :label="0">接包</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
       </el-form>

src/pages/UserCenter/IndividualAuth.vue

@@ -47,8 +47,8 @@
       </el-form-item>
       <el-form-item label="认证权限" prop="roleList">
         <el-checkbox-group v-model="individualForm.roleList" :disabled="!canEdit">
-          <el-checkbox :label="0">发包</el-checkbox>
-          <el-checkbox :label="1">接包</el-checkbox>
+          <el-checkbox :label="1">发包</el-checkbox>
+          <el-checkbox :label="0">接包</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
     </el-form>