修改bug

src/layout/components/AppMain.vue

@@ -1,14 +1,10 @@
 <template>
     <section class="app-main">
         <router-view v-slot="{ Component, route }">
-            <keep-alive v-if="!route.meta.noCache" :include="tagsViewStore.cachedViews">
-                <component :is="Component" v-if="!route.meta.link" :key="route.path" />
+            <keep-alive :include="tagsViewStore.cachedViews">
+                <component v-if="!route.meta.link" :is="Component" :key="route.fullPath" />
             </keep-alive>
-            <transition v-if="route.meta.noCache" :enter-active-class="animante" mode="out-in">
-                <component :is="Component" v-if="!route.meta.link && route.meta.noCache" :key="route.path" />
-            </transition>
         </router-view>
-        <iframe-toggle />
     </section>
 </template>
 

src/views/authority/exportdetail/index.vue

@@ -2,7 +2,7 @@
     <div class="p-3">
         <div class="bg-fff flex1 ov-hd d-flex flex-cln">
             <div class="d-flex a-c pd-16">
-                <div class="f-s-20 c-333 f-w-7 mr-10">订单详情</div>
+                <div class="f-s-20 c-333 f-w-7 mr-10">专家详情</div>
                 <el-button @click="router.go(-1)" type="primary" text>
                     <el-icon>
                         <Back />

src/views/authority/models/ExpertInfo.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="pl-30 pt-30 pb-30">
         <div class="info-out">
-            <img src="https://fileserver.yujin.shuziyunyao.com/oss-file/smart-trace/2025/06/19/69b2b57f30bf4174983632ec7cf962de.png" alt="" class="av-img" />
+            <img :src="props.info?.avatar" alt="" class="av-img" />
             <div class="info">
                 <div>{{ props.info?.name }}</div>
                 <div>
@@ -15,20 +15,21 @@
         <div class="flex-container">
             <el-descriptions :column="4">
                 <el-descriptions-item label="性别:">{{ selectDictLabel(sys_sex_type, props.info?.sex) || '-' }}</el-descriptions-item>
-                <el-descriptions-item label="民族:">{{ props.info?.nation }}</el-descriptions-item>
-                <el-descriptions-item label="身份证号:">{{ props.info?.idCard }}</el-descriptions-item>
-                <el-descriptions-item label="政治面貌:">{{ props.info?.politicalStatus }}</el-descriptions-item>
+                <el-descriptions-item label="民族:">{{ props.info?.nation || '-'}}</el-descriptions-item>
+                <el-descriptions-item label="身份证号:">{{ props.info?.idCard || '-'}}</el-descriptions-item>
+                <el-descriptions-item label="政治面貌:">{{ props.info?.politicalStatus || '-'}}</el-descriptions-item>
                 <el-descriptions-item label="最高学历:">{{ selectDictLabel(dm_educational_type,props.info?.educationalBg )|| '-' }}</el-descriptions-item>
-                <el-descriptions-item label="所学专业:">{{ props.info?.major }}</el-descriptions-item>
-                <el-descriptions-item label="从事专业:">{{ props.info?.job }}</el-descriptions-item>
-                <el-descriptions-item label="通讯地址:">{{ props.info?.address }}</el-descriptions-item>
-                <el-descriptions-item label="联系电话:">{{ props.info?.phone }}</el-descriptions-item>
-                <el-descriptions-item label="传真电话:">{{ props.info?.faxPhone }}</el-descriptions-item>
-                <el-descriptions-item label="邮箱:">{{ props.info?.email }}</el-descriptions-item>
-                <el-descriptions-item label="微信号:">{{ props.info?.wxNum }}</el-descriptions-item>
+                <el-descriptions-item label="所学专业:">{{ props.info?.major || '-'}}</el-descriptions-item>
+                <el-descriptions-item label="从事专业:">{{ props.info?.job || '-'}}</el-descriptions-item>
+                <el-descriptions-item label="通讯地址:">{{ props.info?.address || '-'}}</el-descriptions-item>
+                <el-descriptions-item label="联系电话:">{{ props.info?.phone || '-'}}</el-descriptions-item>
+                <el-descriptions-item label="传真电话:">{{ props.info?.faxPhone || '-'}}</el-descriptions-item>
+                <el-descriptions-item label="随机因子:">{{ props.info?.factor || '-'}}</el-descriptions-item>
+                <el-descriptions-item label="邮箱:">{{ props.info?.email || '-'}}</el-descriptions-item>
+                <el-descriptions-item label="微信号:">{{ props.info?.wxNum || '-'}}</el-descriptions-item>
                 <el-descriptions-item label="岗位状态:">{{ selectDictLabel(dm_position_status,props.info?.status) || '-' }}</el-descriptions-item>
-                <el-descriptions-item label="创建人:">{{ props.info?.createByName }}</el-descriptions-item>
-                <el-descriptions-item label="创建时间:">{{ props.info?.createTime }}</el-descriptions-item>
+                <el-descriptions-item label="创建人:">{{ props.info?.createByName || '-'}}</el-descriptions-item>
+                <el-descriptions-item label="创建时间:">{{ props.info?.createTime || '-'}}</el-descriptions-item>
             </el-descriptions>
         </div>
         <div class="jianjie">
@@ -72,6 +73,7 @@ const formatBytes = (bytes, decimals = 2)=> {
 .av-img{
     height: 150px;
     width: 150px;
+    object-fit: contain;
 }
 .info-out{
     display: flex;
@@ -81,7 +83,7 @@ const formatBytes = (bytes, decimals = 2)=> {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-
+     margin-left: 20px;
 }
 .info span{
     border-style: solid;

src/views/dgtmedicine/check/detail.vue

@@ -22,15 +22,31 @@
                         <el-descriptions-item label="法人电话:">{{ form?.legalPersonPhone || '-' }}</el-descriptions-item>
                         <el-descriptions-item label="注册类型:">{{ form?.regType || '-' }}</el-descriptions-item>
                         <el-descriptions-item label="主管部门:">{{ form?.department || '-' }}</el-descriptions-item>
-                        <el-descriptions-item label="总资产:">{{ form?.totalAssets || '-' }}</el-descriptions-item>
+                        <el-descriptions-item label="企业注册资金:">
+                            {{ form?.registeredCapital || '-' }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="企业成立时间:">
+                            {{ form?.establishDate || '-' }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="企业位置（经纬度）:">
+                            {{ form?.registeredCapital || '-' }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="企业详细地址:">
+                            {{ form?.address || '-' }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="经营范围:">
+                            {{ form?.businessScope || '-' }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="承担项目:">
+                            {{ form?.undertakenProjects || '-' }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="取得成就:">
+                            {{ form?.achievements || '-' }}
+                        </el-descriptions-item>
                         <el-descriptions-item label="单位负责人:">{{ form?.contact || '-' }}</el-descriptions-item>
                         <el-descriptions-item label="单位负责人联系电话:">{{ form?.contactTel || '-' }}</el-descriptions-item>
                         <el-descriptions-item label="邮箱">{{ form?.email || '-' }}</el-descriptions-item>
                         <el-descriptions-item label="单位简介:" :span="2">{{ form?.introduction || '-' }}</el-descriptions-item>
-                        <el-descriptions-item label="入会主要目的:" :span="2">
-                            {{ form?.membershipPurpose || '-'
-                            }}
-                        </el-descriptions-item>
                     </el-descriptions>
                     <el-divider />
                     <el-descriptions :column="3" direction="vertical">
@@ -49,12 +65,15 @@
                     </el-descriptions>
                     <el-divider />
                     <div class="info-title f-s-16 c-333 f-w-7 mb-10">药材种植信息</div>
-                    <vxe-table border :data="form?.plantingInfo" min-height="0" max-height="100%">
-                        <!-- 序号 -->
-                        <vxe-column title="序号" align="center" type="seq" width="60" />
-                        <vxe-column title="种植药材品种" align="center" field="variety" :formatter="colNoData" />
-                        <vxe-column title="种植地点" align="center" field="plantingPlace" :formatter="colNoData" />
-                        <vxe-column title="种植面积" align="center" field="plantingArea" :formatter="colNoData" />
+                    <vxe-table :data="form?.plantingInfo" border min-height="0" max-height="100%">
+                        <vxe-column type="seq" width="60" title="序号" :formatter="colNoData"></vxe-column>
+                        <vxe-column field="variety" title="品种" :formatter="colNoData"></vxe-column>
+                        <vxe-column field="plantingDuration" title="种植年限" :formatter="colNoData"></vxe-column>
+                        <vxe-column field="production" title="药材年产量" :formatter="colNoData"></vxe-column>
+                        <vxe-column field="plantingArea" title="种植面积" :formatter="colNoData"></vxe-column>
+                        <vxe-column field="baseName" title="基地名称" :formatter="colNoData"></vxe-column>
+                        <vxe-column field="basePlace" title="基地详细地址" :formatter="colNoData"></vxe-column>
+                        <vxe-column field="basePosition" title="基地经纬度" :formatter="colNoData"></vxe-column>
                     </vxe-table>
                     <el-divider />
                     <div class="info-title f-s-16 c-333 f-w-7 mb-10">缴费信息</div>

src/views/enterprise/recordCompany/index.vue

@@ -130,10 +130,10 @@
                             <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
                                 v-hasPermi="['enterprise:recordCompany:edit']"></el-button>
                         </el-tooltip>
-                        <el-tooltip content="删除" placement="top">
+                        <!-- <el-tooltip content="删除" placement="top">
                             <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
                                 v-hasPermi="['enterprise:recordCompany:remove']"></el-button>
-                        </el-tooltip>
+                        </el-tooltip> -->
                         <template v-if="scope.row.status * 1 === 0">
                             <el-tooltip content="审核通过" placement="top">
                                 <el-button link type="primary" icon="CircleCheck"

src/views/training/meeting-add/index.vue

@@ -47,7 +47,7 @@
                             <el-col v-if="+form?.certFlag" :span="6">
                                 <el-form-item label="证书名称" prop="certificateInfo">
                                     <el-select v-model="form.certificateInfo" multiple placeholder="证书名称" clearable>
-                                        <el-option v-for="item in dm_training_cert" :key="item.value" :label="item.label" :value="item.value" />
+                                        <el-option v-for="item in lm_training_cert" :key="item.value" :label="item.label" :value="item.value" />
                                     </el-select>
                                 </el-form-item>
                             </el-col>
@@ -91,7 +91,7 @@ import { debounce } from 'lodash';
 import { useRouter } from 'vue-router';
 import { trainingAdd, trainingDetail, trainingUpdate } from '@/api/training';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { dm_training_join_type, yes_no, dm_training_cert } = toRefs<any>(proxy?.useDict('dm_training_join_type', 'yes_no', 'dm_training_cert'));
+const { dm_training_join_type, yes_no, lm_training_cert } = toRefs<any>(proxy?.useDict('dm_training_join_type', 'yes_no', 'lm_training_cert'));
 const router = useRouter();
 const route = useRoute();
 const form = ref<any>({

src/views/training/meeting/index.vue

@@ -57,7 +57,7 @@
                         <vxe-column field="certCount" title="领取证书人数" width="80" />
                         <vxe-column title="创建人" align="center" field="createByName" width="80" :formatter="colNoData" />
                         <vxe-column title="创建时间" align="center" field="createTime" min-width="100" :formatter="colNoData" />
-                        <vxe-column field="certFlag" title="会议状态" width="80">
+                        <vxe-column field="trainingStatus" title="会议状态" width="80">
                             <template #default="{ row }">
                                 <DictTag :options="dm_training_status" :value="row?.trainingStatus"></DictTag>
                             </template>

src/views/zycp-app/swyq-code/index.vue

@@ -40,6 +40,7 @@
                             <RowProGB :row="row"></RowProGB>
                         </template>
                     </vxe-column>
+                    <vxe-column field="cpyName" class-name="c-333 f-w-5" width="100" title="申请企业名称"></vxe-column>
                     <vxe-column min-width="160" title="码数量" :formatter="colNoData">
                         <template #default="{ row }">
                             <div class="f-w-5 c-333">{{ row.codeAllCount || '-' }}</div>
@@ -66,7 +67,8 @@
                     </vxe-column>
                     <vxe-column width="110" title="生成状态" :formatter="colNoData">
                         <template #default="{ row }">
-                            <template v-if="row.status * 1">生成成功</template>
+                            <template v-if="row.status * 1 == 1">生成成功</template>
+                            <template v-else-if="row.status * 1 == 11">未开始</template>
                             <template v-else>生成中</template>
                         </template>
                     </vxe-column>