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

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -63,7 +63,7 @@
         @sort-change="sortChange"
       >
         <template slot="companyName" slot-scope="scope">
-          <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
+          <div v-if="scope.row.companyId&&scope.row.companyName" class="a-link" @click="getUipIdByCid(scope.row.companyId)" v-html="scope.row.companyName"></div>
           <div v-else v-html="scope.row.companyName || '--'"></div>
         </template>
         <template slot="stockPercent" slot-scope="scope">
@@ -76,6 +76,7 @@
 
 <script>
   import {memberList,memberCount,memberListExport} from '@/api/detail/groupAccount/groupAccount'
+  import { getUipIdByCid } from '@/api/macro/macro'
   import dataRegion from '@/assets/json/dataRegion'
   import { getDictType } from '@/api/main'
   import mixin from '../../party-a/mixins/mixin'
@@ -479,6 +480,20 @@
         this.handleQuery(params)
         this.$emit('handle-scroll')
       },
+      getUipIdByCid(companyId){
+        var params=[companyId]
+        getUipIdByCid(params).then(res=>{
+          if (res.code==200) {
+            if(res.data&&res.data.length>0&&res.data[0].uipId){
+              this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
+            }else{
+              this.$router.push({path: '/company/'+this.encodeStr(companyId)})
+            }
+          }
+        }).catch(error=>{
+
+        });
+      },
       clickDialog(){
         this.exportData.dialogExportVisible=true;
       },

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -3053,7 +3053,6 @@ export default {
       }else {
         this.dataEXCEL.exportCount=2000;
       }
-      console.log(this.exportData)
       //企业资质
       if(this.exportData.type === 1){
         api.aptitudeExport(this.dataEXCEL).then(res => {