ETA菜单配置

src/api/api.js

@@ -4,9 +4,12 @@ import { customInterence, etaTrialInterence } from './modules/crmApi';
 import {businessCustomInterence} from './modules/businessCustom'
 // 路演权限
 import { roadshowInterence } from './modules/roadshowApi'
+// 菜单权限
+import { menuConfigInterface } from './modules/etaMenuApi'
 export {
     customInterence,
     businessCustomInterence,
     roadshowInterence,
-    etaTrialInterence
+    etaTrialInterence,
+    menuConfigInterface
 }

src/api/modules/etaMenuApi.js

@@ -0,0 +1,63 @@
+/* ETA菜单配置api */
+import {get,post} from '@/api/index'
+export const menuConfigInterface = {
+    /**
+     * 获取商家菜单列表
+     * @param {String} Keyword 关键词 
+     * @returns 
+     */
+    getMenuList:params=>{
+        return get('/eta_business/menu/list',params)
+    },
+    /**
+     * 新增菜单
+     * @param {Number} ParentId 父级id，一级菜单填0 
+     * @param {String} MenuType 菜单类型 0菜单 1按钮 2字段
+     * @param {String} Name 菜单名称
+     * @param {String} IconPath 菜单图标地址 
+     * @param {Number} Sort 排序
+     * @param {String} Path 路由地址 etaMenuConfig 不加斜杠
+     * @param {String} Component 组件路径，目前跟路由地址是一样的值
+     * @param {Number} Hidden 0显示 1隐藏
+     * @param {String} ButtonCode 按钮唯一标识，类型为按钮字段时必填
+     * @returns 
+     */
+    addMenu:params=>{
+        return post('/eta_business/menu/add',params)
+    },
+    /**
+     * 编辑菜单
+     * @param {Number} MenuId 菜单ID 其他参数同上
+     * @returns 
+     */
+    editMenu:params=>{
+        return post('/eta_business/menu/edit',params)
+    },
+    /**
+     * 删除菜单
+     * @param {Number} MenuId 
+     * @returns 
+     */
+    removeMenu:params=>{
+        return post('/eta_business/menu/remove',params)
+    },
+    /**
+     * 获取菜单icon列表
+     * @returns 
+     */
+    getMenuIconList:params=>{
+        return get('/eta_business/menu/icon/list',params)
+    },
+    /**
+     * 新增icon
+     * @returns 
+     */
+    addMenuIcon:params=>{
+        return post('/eta_business/menu/icon/add',params)
+    },
+    
+    //上传banner图
+    bannerupload:params=>{
+        return post('/banner/upload',params)
+    }
+}

src/router/modules/customer.js

@@ -32,7 +32,7 @@ export default[
       {
         path:'editBusiness',
         name:"editBusiness",
-        component: () => import('@/views/business_manage/businessEdit.vue'),
+        component: () => import('@/views/business_manage/addBusiness.vue'),
 				hidden: false,
         meta:{
           title:'修改商家',
@@ -43,7 +43,7 @@ export default[
       {
         path:'businessDetail',
         name:"businessDetail",
-        component: () => import('@/views/business_manage/businessDetail.vue'),
+        component: () => import('@/views/business_manage/addBusiness.vue'),
 				hidden: false,
         meta:{
           title:'商家详情',
@@ -131,4 +131,22 @@ export default[
       },
     ]
   },
+  {
+    path:'/etaMenuConfig',
+    name:'etaMenuConfig',
+    component:LayoutIndex,
+    meta:{
+      title:'ETA菜单配置'
+    },
+    children:[
+      {
+        path:'etaMenuList',
+        name:'etaMenuList',
+        component:() => import('@/views/etaMenu_manage/etaMenuConfig.vue'),
+        meta:{
+          title:'ETA菜单配置'
+        },
+      }
+    ]
+  },
 ]

src/styles/var.scss

@@ -1,10 +1,3 @@
 :root{
   --border-color:#DCDFE6;
-}
-
-/* 全局按钮主题颜色 */
-.t-button--theme-primary{
-  background-color:#409EFF;
-  border:none;
-  color: #FFFFFF;
 }

src/views/business_manage/addBusiness.vue

@@ -1,15 +1,15 @@
 <template>
     <div class="add-business">
         <!-- 自定义步骤条 -->
-        <t-steps :current="current" status="process">
-            <t-step-item title="步骤1">
-            </t-step-item>
-            <t-step-item title="步骤2">
-            </t-step-item>
-            <t-step-item title="步骤3">
-            </t-step-item>
-        </t-steps>
-        <template v-if="current === 0">
+        <div class="add-steps">
+          <Steps
+            :activeStep="currentStep "
+            :allowStepClick="currentRoute !== 'addBusiness'"
+             @changeActiveStep="changeActiveStep"
+            >
+          </Steps>
+        </div>
+        <template v-if="currentStep  === 1">
             <div class="first-step-form-wrap">
                 <t-form 
                     :data="firstFormData" 
@@ -21,27 +21,27 @@
                 >
                     <div class="form-line">
                         <t-form-item label="所属区域" name="areaType">
-                            <t-radio-group v-model:modelValue="firstFormData.areaType">
+                            <t-radio-group v-model:modelValue="firstFormData.areaType" :disabled="currentRoute === 'businessDetail'">
                               <t-radio label="国内" value="国内">国内</t-radio>
                               <t-radio label="海外" value="海外">海外</t-radio>
                             </t-radio-group>
                         </t-form-item>
                         <t-form-item label="商家名称" name="name">
-                            <!-- <t-input v-model:modelValue="firstFormData.name" placeholder="请输入商家名称"/> -->
+                            <t-input v-model:modelValue="firstFormData.name" placeholder="商家名称" :disabled="currentRoute === 'businessDetail'" v-if="currentRoute === 'businessDetail'"/>
                             <autocomplete
-                            ref="autoRef"
-                            v-model="firstFormData.name"
-                            :fetch-suggestions="callbackHandle"
-                            placeholder="请输入商家名称"
-                            @blur="checkCompany"
-                            @select="customNameSelect"
-                            @focus="checkCompanyfocus"
-                            :disabled='inquireSuccess'
-                            clearable
-                            value-key="value"
-                            style="width:360px"
-                            :popper-class="isCheck?'el-autocomplete-none':'el-autocomplete-suggestion-data-entry'"
-                            class="autocomplete-input">
+                              v-else
+                              ref="autoRef"
+                              v-model="firstFormData.name"
+                              :fetch-suggestions="callbackHandle"
+                              placeholder="请输入商家名称"
+                              @blur="checkCompany"
+                              @select="customNameSelect"
+                              @focus="checkCompanyfocus"
+                              clearable
+                              value-key="value"
+                              style="width:360px"
+                              :popper-class="isCheck?'el-autocomplete-none':'el-autocomplete-suggestion-data-entry'"
+                              class="autocomplete-input">
                                 <template #suffix>
                                   <span 
                                   
@@ -54,26 +54,26 @@
                                 <div v-if="item.KeyNo">{{ item.Name }}</div>
                                 <div v-else style="text-align: center;">暂无数据</div>
                               </template>
-                          </autocomplete>
-                          <el-popover
-                            :visible="showPopover"
-                            ref="popoverRef"
-                            :virtual-ref="autoRef"
-                            trigger="click"
-                            virtual-triggering
-                          >
-                            <div class="popover-box">
-                              <div
-                                v-for="(item, index) in suggestions"
-                                :key="index"
-                                class="popover-item"
-                                @click="customNameSelect(item)"
-                              >
-                                <slot :item="item">{{ item.value }}</slot>
+                            </autocomplete>
+                            <el-popover
+                              :visible="showPopover"
+                              ref="popoverRef"
+                              :virtual-ref="autoRef"
+                              trigger="click"
+                              virtual-triggering
+                            >
+                              <div class="popover-box">
+                                <div
+                                  v-for="(item, index) in suggestions"
+                                  :key="index"
+                                  class="popover-item"
+                                  @click="customNameSelect(item)"
+                                >
+                                  <slot :item="item">{{ item.value }}</slot>
+                                </div>
+                                <div v-if="!suggestions.length" style="text-align: center;">暂无数据</div>
                               </div>
-                              <div v-if="!suggestions.length" style="text-align: center;">暂无数据</div>
-                            </div>
-                          </el-popover>
+                            </el-popover>
                         </t-form-item>
                     </div>
                     <div class="form-line">
@@ -82,6 +82,7 @@
                         </t-form-item>
                         <t-form-item label="商家地址" name="address" v-if="firstFormData.areaType === '国内'">
                             <t-cascader
+                            :disabled="currentRoute === 'businessDetail'"
                             value-mode="all"
                             @change="selectRegion"
                             v-model:modelValue="firstFormData.address"
@@ -92,7 +93,7 @@
                             />
                         </t-form-item>
                         <t-form-item label="所属国家" name="nation" v-else>
-                            <t-select v-model:modelValue="firstFormData.nation" filterable placeholder="请选择所属国家" style="width: 360px;">
+                            <t-select v-model:modelValue="firstFormData.nation" filterable placeholder="请选择所属国家" :disabled="currentRoute === 'businessDetail'" style="width: 360px;">
                             <t-option
                                 v-for="item in countryDataReactive"
                                 :key="item.code"
@@ -109,13 +110,14 @@
                     </div>
                     <div class="form-line">
                         <t-form-item label="决策人" name="decisionMaker">
-                            <t-input v-model:modelValue="firstFormData.decisionMaker" placeholder="请输入决策人"/>
+                            <t-input v-model:modelValue="firstFormData.decisionMaker" :disabled="currentRoute === 'businessDetail'" placeholder="请输入决策人"/>
                         </t-form-item>
                         <t-form-item label="研究团队规模" name="teamSize">
                             <t-select 
                             v-model:modelValue="firstFormData.teamSize" 
                             placeholder="请选择研究团队规模"
                             clearable
+                            :disabled="currentRoute === 'businessDetail'"
                             >
                             <t-option
                                 v-for="item in teamSizeOpts"
@@ -128,12 +130,13 @@
                     </div>
                     <div class="form-line">
                         <t-form-item label="资金规模" name="fundsize">
-                            <t-input v-model:modelValue="firstFormData.fundsize" placeholder="请输入资金规模"/>
+                            <t-input v-model:modelValue="firstFormData.fundsize" :disabled="currentRoute === 'businessDetail'" placeholder="请输入资金规模"/>
                         </t-form-item>
                         <t-form-item label="所属行业" name="industry">
                             <t-select 
                             v-model:modelValue="firstFormData.industry" 
                             placeholder="请选择行业" 
+                            :disabled="currentRoute === 'businessDetail'"
                             clearable
                             >
                             <t-option
@@ -147,10 +150,11 @@
                     </div>
                     <div class="form-line">
                         <t-form-item label="用户上限" name="userMax">
-                            <t-input v-model:modelValue="firstFormData.userMax" type="number" placeholder="请输入用户上限"/>
+                            <t-input v-model:modelValue="firstFormData.userMax" :disabled="currentRoute === 'businessDetail'" type="number" placeholder="请输入用户上限"/>
                         </t-form-item>
                         <t-form-item label="所属销售" name="saller">
                             <t-cascader
+                            :disabled="currentRoute === 'businessDetail'"
                             v-model:modelValue="firstFormData.saller"
                             :options="salesArr"
                             :show-all-levels="false"
@@ -164,7 +168,7 @@
                 </t-form>
             </div>
         </template>
-        <template v-if="current === 1">
+        <template v-if="currentStep  === 2">
           <div class="second-step-form-wrap">
             <t-form
               :data="secondFormData"
@@ -191,33 +195,42 @@
             </t-form>
           </div>
         </template>
-        <template v-if="current === 2">
+        <template v-if="currentStep  === 3">
 
         </template>
 
-        <div class="btns-box">
-            <t-button style="width:80px" theme="primary" v-show="current===0" type="submit" @click="handleStepSecond('first')">下一步</t-button>
-            <t-button style="width:80px" theme="primary" v-show="current===0" plain @click="$router.back()">取消</t-button>
-            <t-button style="width:80px" theme="primary" v-show="current===1 || current===2" plain @click="current--">上一步</t-button>
-            <t-button style="width:80px" theme="primary" v-show="current===1" plain type="submit" @click="handleStepSecond">下一步</t-button>
-            <t-button style="width:80px" theme="primary" v-show="current===2" @click="handleAddBusiness">保存</t-button>
+        <div class="btns-box" v-if="currentRoute === 'addBusiness'">
+            <t-button style="width:80px" theme="primary" v-show="currentStep ===1" type="submit" @click="handleStepSecond('first')">下一步</t-button>
+            <t-button style="width:80px" theme="primary" v-show="currentStep ===1" plain @click="router.back()">取消</t-button>
+            <t-button style="width:80px" theme="primary" v-show="currentStep ===2 || currentStep ===3" plain @click="currentStep --">上一步</t-button>
+            <t-button style="width:80px" theme="primary" v-show="currentStep ===2" plain type="submit" @click="handleStepSecond">下一步</t-button>
+            <t-button style="width:80px" theme="primary" v-show="currentStep ===3" @click="handleAddBusiness">保存</t-button>
         </div>
     </div>
 </template>
 <script setup>
 import { ref, reactive, watch, onMounted, useTemplateRef } from 'vue';
 import autocomplete from "./components/autocomplete.vue";
+import Steps from "./components/Steps.vue";
 import { customInterence, roadshowInterence, businessCustomInterence } from '@/api/api.js';
 import { locationOptions } from '@/utils/location';
 import countryData from "@/utils/countryData";
 import { ElPopover } from 'element-plus';
 import 'element-plus/es/components/popover/style/css'
+import { useRoute, useRouter } from 'vue-router'
 
+const router = useRouter()
+const route = useRoute()
+// 判断路由决定显示内容展示详情、修改、添加
+const currentRoute = ref(route.name);
+const businessId = ref(Number(route.query.id || 0));
 // 响应式状态
-const current = ref(0);
-const firstFormEl=useTemplateRef('firstFormEl')
+const currentStep  = ref(1);
+const firstFormEl = useTemplateRef('firstFormEl')
 const formRef = useTemplateRef('formRef');
 const autoRef  = ref(null);
+const recordData = ref([]);
+const activities = ref([]);
 const countryDataReactive = reactive(countryData);
 const suggestions = ref([]);
 const showPopover = ref(false);
@@ -284,21 +297,83 @@ const rules = {
 }
 // 生命周期钩子
 onMounted(() => {
-  getIndustry();
-  getSale();
+  if (currentRoute.value === 'addBusiness') { // 添加
+    fetchChosenData()
+  } else if (currentRoute.value === 'editBusiness') { // 修改
+    fetchChosenData()
+    fetchBusinessData()
+  } else if (currentRoute.value === 'businessDetail') { // 查看详情
+    fetchBusinessData()
+  }
 });
 
 // 监听器
-watch(() => firstFormData.areaType, (newVal) => {
-  console.log('watch?', newVal);
-  if (newVal === '海外') {
+watchEffect(() => {
+  if (firstFormData.areaType === '海外') {
     firstFormData.creditCode = 'HZ' + new Date().getTime();
   } else {
     firstFormData.creditCode = '';
   }
 });
 
-// 方法
+// 获取选择数据
+const fetchChosenData = async () => {
+  await getIndustry();
+  await getSale();
+}
+
+// 获取商家详情
+const fetchBusinessData = async () => {
+  try {
+    const res = await businessCustomInterence.getBusinessDetail({ EtaBusinessId: businessId.value });
+    if (res.Ret !== 200) return;
+    const { RegionType, BusinessName, CreditCode, Nation, Leader, ResearchTeamSize, CapitalScale, IndustryId, UserMax, SellerId } = res.Data;
+    Object.assign(firstFormData, {
+      areaType: RegionType,
+      name: BusinessName,
+      creditCode: CreditCode,
+      nation: Nation,
+      decisionMaker: Leader,
+      teamSize: ResearchTeamSize,
+      fundsize: CapitalScale,
+      industry: IndustryId,
+      userMax: UserMax,
+      saller: SellerId,
+      address: [res.Data.Province || '', res.Data.City || '']
+    });
+    //获取签约详情
+    getTableData()  
+    //获取操作日志列表
+    getTimeLineData()
+  } catch (error) {
+    console.error('获取商家详情失败:', error);
+  }
+};
+
+//获取签约详情
+const getTableData = async () => {
+  try {
+    const res = await businessCustomInterence.getContractList({ EtaBusinessId:businessId.value });
+    if (res.Ret !== 200) return;
+    recordData.value = res.Data || [];
+  } catch (error) {
+    console.error('获取行业失败:', error);
+  }
+};
+
+// 获取操作日志详情
+const getTimeLineData = async () => {
+  try {
+    const res = await businessCustomInterence.getTimeLineList({ EtaBusinessId:businessId.value });
+    if (res.Ret !== 200) return;
+    activities.value = res.Data || [];
+  } catch (error) {
+    console.error('获取操作日志失败:', error);
+  }
+};
+
+
+// 提交
 const normalizingParams = (params) => {
   const cascaderNodes = salesArr.value.find(item => item.AdminId === params.saller)?.children || [];
   const IndustryName = tradeArr.value.find(item => item.IndustryId === params.industry)?.IndustryName || '';
@@ -338,7 +413,7 @@ const handleStepSecond = async (stepName) => {
 
   businessCustomInterence.addBusiness({ IsCheck: true, ...params }).then(res => {
     if (res.Ret === 200) {
-      current.value++;
+      currentStep .value++;
     }
   });
 };
@@ -441,36 +516,19 @@ const getSale = async () => {
   }));
 };
 
+const changeActiveStep = (index) => {
+  currentStep .value = index + 1
+}
+
 // 响应式变量
 const isCheckCompanyInfo = ref(false);
 const checkCompanyfocusIs = ref(false);
-const inquireSuccess = ref(false);
 const nameRepeat = ref(false);
 const codeRepeat = ref(false);
 const isCheck = ref(false);
 const repeatId = ref('');
 const repeatName = ref('');
 
-// 假设的验证方法，需要替换为实际的验证逻辑
-const validateForm = (formData) => {
-  return new Promise((resolve) => {
-    // 验证逻辑
-    resolve(true); // 假设总是通过验证
-  });
-};
-
-// 假设的全局message和router实例，需要替换为实际的实例
-const message = {
-  success: (msg) => {
-    console.log(msg); // 替换为实际的消息提示逻辑
-  }
-};
-
-const router = {
-  push: (path) => {
-    console.log(`Navigating to ${path}`); // 替换为实际的路由跳转逻辑
-  }
-};
 </script>
 <style lang="scss">
 .el-popover {
@@ -484,6 +542,9 @@ const router = {
     background-color: #fff;
     min-width: 1100px;
     height: calc(100vh - 120px);
+    .add-steps {
+      width: 70%;
+    }
     .first-step-form-wrap,.second-step-form-wrap{
         margin-top:60px;
         border-top: 1px solid #DCDCDC;
@@ -499,17 +560,6 @@ const router = {
                 width:48%;
                 margin-right: 20px;
             }
-            .el-input,.el-select,.el-cascader,.el-radio-group{
-                width:360px;
-            }
-            .el-radio-group{
-                display: flex;
-                justify-content: space-between;
-                .el-radio{
-                    width: 165px;
-                    text-align: center;
-                }
-            }
         }
     }
 }

src/views/business_manage/businessDetail.vue

@@ -1,372 +0,0 @@
-<template>
-    <div class="business-detail-wrap">
-        <div class="business-detail">
-            <Steps 
-                :activeStep="step"
-                :stepsArr="stepsArr"
-                @changeActiveStep="changeActiveStep"
-            />
-            <div class="first-step-form-wrap" v-show="step===1">
-                <el-form 
-                    :model="firstFormData" 
-                    ref="firstFormEl" 
-                    label-width="120px"
-                    inline
-                    :rules="rules"
-                    :disabled="true"
-                    class="first-step-form"
-                >
-                    <div class="form-line">
-                        <el-form-item label="商家名称" prop="BusinessName">
-                            <el-input disabled placeholder="请输入商家名称" v-model="firstFormData.BusinessName"/>
-                        </el-form-item>
-                        <el-form-item label="商家ID" prop="BusinessCode">
-                            <el-input disabled placeholder="请输入商家ID" v-model="firstFormData.BusinessCode"/>
-                        </el-form-item>
-                    </div>
-                    <div class="form-line">
-                        <el-form-item label="所属区域" prop="RegionType">
-                            <el-radio-group v-model="firstFormData.RegionType" disabled>
-                                <el-radio label="国内" border>国内</el-radio>
-                                <el-radio label="海外" border>海外</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="商家地址" prop="address" v-if="firstFormData.RegionType=='国内'">
-                            <el-cascader 
-                                v-model="firstFormData.address"
-                                :props="locationProps"
-                                clearable 
-                                :options="locationOptions"  
-                                @change="selectRegion" 
-                                placeholder="请选择客户地址" 
-                            />
-                        </el-form-item>
-                        <el-form-item label="所属国家" prop="Nation" v-else>
-                            <el-select v-model="firstFormData.Nation" placeholder="请选择所属国家" filterable style="width: 360px;">
-                                <el-option :label="item.cnName" :value="item.cnName" v-for="item in countryData" :key="item.code" >
-                                <div style="display: flex;justify-content: space-between;">
-                                    <span>{{ item.cnName }}</span>
-                                    <span style="color: #8492a6; font-size: 13px">{{ item.code }}</span>
-                                </div>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </div>
-                    <div class="form-line">
-                        <el-form-item label="社会信用码" prop="CreditCode">
-                            <el-input disabled placeholder="请输入社会信用码" v-model="firstFormData.CreditCode"/>
-                        </el-form-item>
-                        <el-form-item label="研究团队规模" prop="ResearchTeamSize">
-                            <el-select 
-                                v-model="firstFormData.ResearchTeamSize" 
-                                placeholder="请选择研究团队规模"
-                                clearable
-                            >
-                                <el-option
-                                    v-for="item in teamSizeOpts"
-                                    :key="item.val"
-                                    :label="item.label"
-                                    :value="item.val">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </div>
-                    <div class="form-line">
-                        <el-form-item label="决策人" prop="Leader">
-                            <el-input placeholder="请输入决策人" v-model="firstFormData.Leader"/>
-                        </el-form-item>
-                        <el-form-item label="所属行业" prop="IndustryId">
-                            <el-select 
-                                v-model="firstFormData.IndustryId" 
-                                placeholder="请选择行业" 
-                                clearable
-                            >
-                                <el-option
-                                    v-for="item in tradeArr"
-                                    :key="item.IndustryId"
-                                    :label="item.IndustryName"
-                                    :value="item.IndustryId">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </div>
-                    <div class="form-line">
-                        <el-form-item label="资金规模" prop="CapitalScale">
-                            <el-input placeholder="请输入资金规模" v-model="firstFormData.CapitalScale"/>
-                        </el-form-item>
-                        <el-form-item label="用户上限" prop="UserMax">
-                            <el-input type="number" placeholder="请输入用户上限" v-model="firstFormData.UserMax"/>
-                        </el-form-item>
-                    </div>
-                    <div class="form-line">
-                        <el-form-item label="所属销售" prop="SellerName">
-                            <el-input disabled placeholder="请输入销售" v-model="firstFormData.SellerName"/>
-                        </el-form-item>
-                    </div>
-                    
-                </el-form>
-            </div>
-            <div class="second-step-form-wrap" v-show="step===2">
-                <el-table :data="recordData" border>
-                    <el-table-column
-                        v-for="item in tableColOpts"
-                        :key="item.key"
-                        :prop="item.key"
-                        :label="item.label"
-                        align="center"
-                    >
-                    </el-table-column>
-                </el-table>
-            </div>
-        </div>
-        <div class="business-other">
-            <div class="btn-wrap">
-                    <el-button type="primary" @click="$router.push({
-                        path:'/editETABusiness',
-                        query:{
-                            id:firstFormData.EtaBusinessId
-                        }
-                    })">编辑</el-button>
-            </div>
-            <div class="time-line-wrap">
-                <el-timeline>
-                    <el-timeline-item
-                        v-for="(activity, index) in activities"
-                        :key="index"
-                        color="#409EFF" 
-                        :timestamp="activity.CreateTime">
-                        <template slot="dot">
-                            <div class="dot-wrap">
-                                <div class="dot-inner"></div>
-                            </div>
-                        </template>
-                        {{activity.OperationRemark}}
-                    </el-timeline-item>
-                </el-timeline>
-            </div>
-        </div>
-
-        <!-- 添加续约 -->
-        <el-dialog
-            title="添加续约"
-            :visible.sync="showRenewal"
-            :modal-append-to-body="false"
-            :close-on-click-modal="false"
-            @closed="showRenewal=false"
-            width="580px"
-        >
-            <AddRenewal 
-                @addRenewal="handleAddRenewal"
-                @close="showRenewal=false"/>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import { customInterence , businessCustomInterence} from '@/api/api.js'
-import Steps from "./components/Steps.vue";
-import AddRenewal from "./components/AddRenewal";
-import {locationOptions} from "@/views/custom_manage/customList/location"
-import country from "@/utils/countryData"
-export default {
-    components: {Steps,AddRenewal},
-    data() {
-        this.countryData = country
-        return {
-            locationOptions,
-            locationProps:{
-                value:'name',
-                children:'city',
-                label:'name'
-            },
-
-            step:1,//第几步
-            teamSizeOpts:[
-                {
-                    val:'50人及以下',
-                    label:'50人及以下'
-                },
-                {
-                    val:'200人及以下',
-                    label:'200人及以下'
-                },
-                {
-                    val:'超过200人',
-                    label:'超过200人'
-                }
-            ],
-            tradeArr:[],
-            firstFormData:{
-                RegionType:'',//1国内 2国外
-                BusinessName:'',
-                CreditCode:'',
-                Address:'',
-                Nation:'',
-                Leader:'',
-                ResearchTeamSize:'',
-                CapitalScale:'',
-                IndustryId:'',
-                UserMax:'',
-                SellerId:'',
-            },
-            rules:{
-                address:[{ required: true, message: '请选择商家地址', trigger: 'change' },],
-                decisionMaker:[{required: true, message: '请输入决策人', trigger: 'blur' },],
-                teamSize:[{required: true, message: '请选择研究团队规模', trigger: 'change' },],
-                industry:[{required: true, message: '请选择所属行业', trigger: 'change' },],
-                userMax:[{required: true, message: '请输入用户上限', trigger: 'blur' },],
-                saller:[{required: true, message: '请选择所属销售', trigger: 'change' },],
-            },
-            recordData:[],
-            tableColOpts:[
-                {
-                    label:'签约时间',
-                    key:'SigningTime'
-                },{
-                    label:'到期时间',
-                    key:'ExpiredTime'
-                },{
-                    label:'到期天数',
-                    key:'ExpireDay'
-                }
-            ],
-            activities:[],
-        }
-    },
-    created() {
-        this.getIndustry()
-        this.getBusinessDetail()
-    },
-    methods: {
-        selectRegion(e){
-            this.firstFormData.province=e[0]
-            this.firstFormData.city=e[1]
-        },
-        /* 根据类型获取行业 */
-		getIndustry() {
-			customInterence.getindustry({
-				Classify:'ficc'
-			}).then(res => {
-				if(res.Ret === 200) {
-					this.tradeArr = res.Data.List || [];
-				}
-			})
-		},
-        changeActiveStep(index){
-            this.step = index + 1
-        },
-        // 获取商家详情
-        getBusinessDetail(){
-            //query id
-            businessCustomInterence.getBusinessDetail({
-                EtaBusinessId:Number(this.$route.query.id)
-            }).then(res=>{
-                if(res.Ret !== 200)return 
-                this.firstFormData = res.Data||{}
-                this.firstFormData.address = [res.Data.Province||'',res.Data.City||'']
-            })
-            //获取签约详情
-            this.getTableData(Number(this.$route.query.id))
-            //获取操作日志列表
-            this.getTimeLineData(Number(this.$route.query.id))
-        },
-        // 获取签约详情
-        getTableData(id){
-            businessCustomInterence.getContractList({
-                EtaBusinessId:id
-            }).then(res=>{
-                if(res.Ret !== 200) return 
-                this.recordData = res.Data||[]
-            })
-        },
-
-        // 获取操作日志详情
-        getTimeLineData(id){
-            businessCustomInterence.getTimeLineList({
-                EtaBusinessId:id
-            }).then(res=>{
-                if(res.Ret!==200) return 
-                this.activities = res.Data||[]
-            })
-        },
-    },
-}
-</script>
-
-<style lang="scss" scoped>
-.business-detail-wrap{
-    display: flex;
-    background-color: #fff;
-    min-width: 1100px;
-    min-height: calc(100vh - 120px);
-    padding:30px;
-    box-sizing: border-box;
-    gap:10%;
-    .business-detail{
-        width:70%;
-        .first-step-form-wrap,.second-step-form-wrap{
-            margin-top:60px;
-            border-top: 1px solid #DCDCDC;
-        }
-        .el-form{
-            .form-line{
-                margin:30px 0;
-                border-bottom: 1px solid #DCDCDC;
-                .el-input,.el-select,.el-cascader,.el-radio-group{
-                    width:360px;
-                }
-                .el-radio-group{
-                    display: flex;
-                    justify-content: space-between;
-                    .el-radio{
-                        width: 165px;
-                        text-align: center;
-                    }
-                }
-            }
-        }
-        .el-table{
-            margin-top: 30px;
-        }
-    }
-    .business-other{
-        flex: 1;
-        .btn-wrap{
-            display: flex;
-            gap:30px;
-            .el-button{
-                flex:1;
-            }
-        }
-        .time-line-wrap{
-            margin-top:30px;
-            border:1px solid #DCDFE6;
-            border-radius: 4px;
-            box-sizing: border-box;
-            padding: 30px;
-            max-height: calc(100vh - 250px);
-            overflow-y: auto;
-            .dot-wrap{
-                width:12px;
-                height:12px;
-                border:6px solid #fff;
-                background-color: #3385FF;
-                position: absolute;
-                left:-6px;
-                top:0;
-                border-radius: 50%;
-                .dot-inner{
-                    position: absolute;
-                    left:3px;
-                    top:3px;
-                    width:6px;
-                    height: 6px;
-                    border-radius: 50%;
-                    background-color: #fff;
-                }
-            }
-        }
-    }
-}
-
-</style>

src/views/business_manage/businessEdit.vue

@@ -1,449 +0,0 @@
-<template>
-    <div class="business-detail-wrap">
-        <div class="business-detail">
-            <Steps 
-                :activeStep="step"
-                :stepsArr="stepsArr"
-                @changeActiveStep="changeActiveStep"
-            />
-            <div class="first-step-form-wrap" v-show="step===1">
-                <el-form 
-                    :model="firstFormData" 
-                    ref="firstFormEl" 
-                    label-width="120px"
-                    inline
-                    :rules="rules"
-                    class="first-step-form"
-                >
-                    <div class="form-line">
-                        <el-form-item label="商家名称" prop="BusinessName">
-                            <el-input disabled placeholder="请输入商家名称" v-model="firstFormData.BusinessName"/>
-                        </el-form-item>
-                        <el-form-item label="商家ID" prop="BusinessCode">
-                            <el-input disabled placeholder="请输入商家ID" v-model="firstFormData.BusinessCode"/>
-                        </el-form-item>
-                    </div>
-                    <div class="form-line">
-                        <el-form-item label="所属区域" prop="RegionType">
-                            <el-radio-group v-model="firstFormData.RegionType" disabled>
-                                <el-radio label="国内" border>国内</el-radio>
-                                <el-radio label="海外" border>海外</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="商家地址" prop="address" v-if="firstFormData.RegionType=='国内'">
-                            <el-cascader 
-                                v-model="firstFormData.address"
-                                :props="locationProps"
-                                clearable 
-                                :options="locationOptions"  
-                                @change="selectRegion" 
-                                placeholder="请选择客户地址" 
-                            />
-                        </el-form-item>
-                        <el-form-item label="所属国家" prop="Nation" v-else>
-                            <el-select v-model="firstFormData.Nation" placeholder="请选择所属国家" filterable style="width: 360px;">
-                                <el-option :label="item.cnName" :value="item.cnName" v-for="item in countryData" :key="item.code" >
-                                <div style="display: flex;justify-content: space-between;">
-                                    <span>{{ item.cnName }}</span>
-                                    <span style="color: #8492a6; font-size: 13px">{{ item.code }}</span>
-                                </div>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </div>
-                    <div class="form-line">
-                        <el-form-item label="社会信用码" prop="CreditCode">
-                            <el-input disabled placeholder="请输入社会信用码" v-model="firstFormData.CreditCode"/>
-                        </el-form-item>
-                        <el-form-item label="研究团队规模" prop="ResearchTeamSize">
-                            <el-select 
-                                v-model="firstFormData.ResearchTeamSize" 
-                                placeholder="请选择研究团队规模"
-                                clearable
-                            >
-                                <el-option
-                                    v-for="item in teamSizeOpts"
-                                    :key="item.val"
-                                    :label="item.label"
-                                    :value="item.val">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </div>
-                    <div class="form-line">
-                        <el-form-item label="决策人" prop="Leader">
-                            <el-input placeholder="请输入决策人" v-model="firstFormData.Leader"/>
-                        </el-form-item>
-                        <el-form-item label="所属行业" prop="IndustryId">
-                            <el-select 
-                                v-model="firstFormData.IndustryId" 
-                                placeholder="请选择行业" 
-                                clearable
-                            >
-                                <el-option
-                                    v-for="item in tradeArr"
-                                    :key="item.IndustryId"
-                                    :label="item.IndustryName"
-                                    :value="item.IndustryId">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </div>
-                    <div class="form-line">
-                        <el-form-item label="资金规模" prop="CapitalScale">
-                            <el-input placeholder="请输入资金规模" v-model="firstFormData.CapitalScale"/>
-                        </el-form-item>
-                        <el-form-item label="用户上限" prop="UserMax">
-                            <el-input type="number" placeholder="请输入用户上限" v-model="firstFormData.UserMax"/>
-                        </el-form-item>
-                    </div>
-                    <div class="form-line">
-                        <el-form-item label="所属销售" prop="SellerName">
-                            <el-input disabled placeholder="请输入销售" v-model="firstFormData.SellerName"/>
-                        </el-form-item>
-                    </div>
-                </el-form>
-            </div>
-            <div class="second-step-form-wrap" v-show="step===2">
-                <el-button type="primary" @click="addRenewalHandle" style="margin-top: 15px;">添加续约</el-button>
-                <el-table :data="recordData" border>
-                    <el-table-column
-                        v-for="item in tableColOpts"
-                        :key="item.key"
-                        :prop="item.key"
-                        :label="item.label"
-                        align="center"
-                    >
-                    </el-table-column>
-                    <el-table-column label="操作" align="center">
-                        <template slot-scope="scope">
-                            <span class="editsty" @click="editRenewal(scope.row)" style="padding: 0 3px;">编辑</span>
-                            <span class="deletesty" @click="deleteRenewal(scope.row)" style="padding: 0 3px;">删除</span>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <!-- <el-button type="text" @click="showRenewal=true">添加续约</el-button> -->
-            </div>
-        </div>
-        <div class="business-other">
-            <div class="btn-wrap">
-                <el-button type="primary" @click="handleSaveDetail">保存</el-button>
-                <el-button type="primary" plain @click="$router.push('/businessETAList')">取消</el-button>
-            </div>
-            <div class="time-line-wrap">
-                <el-timeline>
-                    <el-timeline-item
-                        v-for="(activity, index) in activities"
-                        :key="index"
-                        color="#409EFF" 
-                        :timestamp="activity.CreateTime">
-                        <template slot="dot">
-                            <div class="dot-wrap">
-                                <div class="dot-inner"></div>
-                            </div>
-                        </template>
-                        {{activity.OperationRemark}}
-                    </el-timeline-item>
-                </el-timeline>
-            </div>
-        </div>
-
-        <!-- 添加续约 -->
-        <el-dialog
-            :title="renewalDiaTitle"
-            :visible.sync="showRenewal"
-            :modal-append-to-body="false"
-            :close-on-click-modal="false"
-            @closed="showRenewal=false"
-            width="580px"
-        >
-            <AddRenewal 
-                @addRenewal="handleAddRenewal"
-                @close="showRenewal=false"
-                :renewalForm="renewalForm"/>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import { customInterence , businessCustomInterence} from '@/api/api.js'
-import Steps from "./components/Steps.vue";
-import AddRenewal from "./components/AddRenewal";
-import {locationOptions} from "@/views/custom_manage/customList/location"
-import country from "@/utils/countryData"
-export default {
-    components: {Steps,AddRenewal},
-    data() {
-        this.countryData = country
-        return {
-            locationOptions,
-            locationProps:{
-                value:'name',
-                children:'city',
-                label:'name'
-            },
-
-            step:1,//第几步
-            teamSizeOpts:[
-                {
-                    val:'50人及以下',
-                    label:'50人及以下'
-                },
-                {
-                    val:'200人及以下',
-                    label:'200人及以下'
-                },
-                {
-                    val:'超过200人',
-                    label:'超过200人'
-                }
-            ],
-            tradeArr:[],
-            firstFormData:{
-                RegionType:'',//1国内 2国外
-                BusinessName:'',
-                CreditCode:'',
-                Address:'',
-                Nation:'',
-                Leader:'',
-                ResearchTeamSize:'',
-                CapitalScale:'',
-                IndustryId:'',
-                UserMax:'',
-                SellerId:'',
-                Province:'',
-                City:''
-            },
-            rules:{
-                Nation:[{ required: true, message: '请选择所属国家', trigger: 'change' },],
-                address:[{ required: true, message: '请选择商家地址', trigger: 'change' },],
-                decisionMaker:[{required: true, message: '请输入决策人', trigger: 'blur' },],
-                teamSize:[{required: true, message: '请选择研究团队规模', trigger: 'change' },],
-                industry:[{required: true, message: '请选择所属行业', trigger: 'change' },],
-                userMax:[{required: true, message: '请输入用户上限', trigger: 'blur' },],
-                saller:[{required: true, message: '请选择所属销售', trigger: 'change' },],
-            },
-            recordData:[],
-            tableColOpts:[
-                {
-                    label:'运维时间',
-                    key:'SigningTime'
-                },{
-                    label:'到期时间',
-                    key:'ExpiredTime'
-                },{
-                    label:'到期天数',
-                    key:'ExpireDay'
-                }
-            ],
-            activities:[],
-            showRenewal:false,
-            renewalDiaTitle:"添加续约",
-            renewalForm:{}
-        }
-    },
-    created() {
-        this.getIndustry()
-        this.getBusinessDetail()
-    },
-    methods: {
-        selectRegion(e){
-            this.firstFormData.Province=e[0]
-            this.firstFormData.City=e[1]
-        },
-        /* 根据类型获取行业 */
-		getIndustry() {
-			customInterence.getindustry({
-				Classify:'ficc'
-			}).then(res => {
-				if(res.Ret === 200) {
-					this.tradeArr = res.Data.List || [];
-				}
-			})
-		},
-        changeActiveStep(index){
-            this.step = index + 1
-        },
-        // 获取商家详情
-        getBusinessDetail(){
-            //query id
-            businessCustomInterence.getBusinessDetail({
-                EtaBusinessId:Number(this.$route.query.id)
-            }).then(res=>{
-                if(res.Ret !== 200)return 
-                this.firstFormData = res.Data||{}
-                this.firstFormData.address = [res.Data.Province||'',res.Data.City||'']
-            })
-            //获取签约详情
-            this.getTableData(Number(this.$route.query.id))
-            //获取操作日志列表
-            this.getTimeLineData(Number(this.$route.query.id))
-        },
-        // 获取签约详情
-        getTableData(id){
-            businessCustomInterence.getContractList({
-                EtaBusinessId:id
-            }).then(res=>{
-                if(res.Ret !== 200) return 
-                this.recordData = res.Data||[]
-            })
-        },
-
-        // 获取操作日志详情
-        getTimeLineData(id){
-            businessCustomInterence.getTimeLineList({
-                EtaBusinessId:id
-            }).then(res=>{
-                if(res.Ret!==200) return 
-                this.activities = res.Data||[]
-            })
-        },
-        // 保存商家
-        handleSaveDetail(){
-            const {EtaBusinessId,CapitalScale,
-                   address,Leader,IndustryId,Nation,
-                   ResearchTeamSize,UserMax} = this.firstFormData
-            const IndustryName = this.tradeArr.find(item=>item.IndustryId===IndustryId).IndustryName
-            businessCustomInterence.editBusiness({
-                EtaBusinessId,Leader,
-                IndustryName,CapitalScale,
-                ResearchTeamSize,Nation,
-                IndustryId:Number(IndustryId),
-                UserMax:Number(UserMax),
-                Province:address[0],
-                City:address[1]
-            }).then(res=>{
-                if(res.Ret!==200) return
-                this.$message.success('保存成功')
-                this.getBusinessDetail()
-            })
-        },
-        // 添加续约
-        addRenewalHandle(){
-            this.renewalForm={}
-            this.renewalDiaTitle="添加续约"
-            this.showRenewal=true
-        },
-        // 编辑续约
-        editRenewal(row){
-            this.renewalDiaTitle="编辑续约"
-            this.renewalForm={
-                id:row.EtaBusinessContractId,
-                signDate:row.SigningTime,
-                expirationDate:row.ExpiredTime
-            }
-            this.showRenewal=true
-        },
-        deleteRenewal(row){
-            this.$confirm("是否确认删除该签约信息？", "提示", {
-                type: "warning"
-            }).then(() => {
-                businessCustomInterence.
-                removeContract({EtaBusinessContractId:row.EtaBusinessContractId})
-                .then(res=>{
-                    if(res.Ret == 200){
-                        this.$message.success("删除成功")
-                        this.getTableData(Number(this.$route.query.id))
-                        this.getTimeLineData(Number(this.$route.query.id))
-                    }
-                })
-            }).catch(() => {});
-        },
-        //添加续约-保存
-        handleAddRenewal({signDate,expirationDate,id}){
-            // id-商家合约ID
-            let api = Number(id) ? 'editContract' : 'addNewContract'
-            businessCustomInterence[api]({
-                EtaBusinessId:Number(this.$route.query.id),
-                EtaBusinessContractId:Number(id),
-                SigningTime:signDate,
-                ExpiredTime:expirationDate
-            }).then(res=>{
-                if(res.Ret!==200) return 
-                this.$message.success(this.renewalDiaTitle+'成功')
-                this.showRenewal=false
-                this.getTableData(Number(this.$route.query.id))
-                this.getTimeLineData(Number(this.$route.query.id))
-            })
-        }
-    },
-}
-</script>
-
-<style lang="scss" scoped>
-.business-detail-wrap{
-    display: flex;
-    background-color: #fff;
-    min-width: 1100px;
-    min-height: calc(100vh - 120px);
-    padding:30px;
-    box-sizing: border-box;
-    gap:10%;
-    .business-detail{
-        width:70%;
-        .first-step-form-wrap,.second-step-form-wrap{
-            margin-top:60px;
-            border-top: 1px solid #DCDCDC;
-        }
-        .el-form{
-            .form-line{
-                margin:30px 0;
-                border-bottom: 1px solid #DCDCDC;
-                .el-input,.el-select,.el-cascader,.el-radio-group{
-                    width:360px;
-                }
-                .el-radio-group{
-                    display: flex;
-                    justify-content: space-between;
-                    .el-radio{
-                        width: 165px;
-                        text-align: center;
-                    }
-                }
-            }
-        }
-        .el-table{
-            margin-top: 15px;
-        }
-    }
-    .business-other{
-        flex: 1;
-        .btn-wrap{
-            display: flex;
-            gap:30px;
-            .el-button{
-                flex:1;
-            }
-        }
-        .time-line-wrap{
-            margin-top:30px;
-            border:1px solid #DCDFE6;
-            border-radius: 4px;
-            box-sizing: border-box;
-            padding: 30px;
-            max-height: calc(100vh - 250px);
-            overflow-y: auto;
-            .dot-wrap{
-                width:12px;
-                height:12px;
-                border:6px solid #fff;
-                background-color: #3385FF;
-                position: absolute;
-                left:-6px;
-                top:0;
-                border-radius: 50%;
-                .dot-inner{
-                    position: absolute;
-                    left:3px;
-                    top:3px;
-                    width:6px;
-                    height: 6px;
-                    border-radius: 50%;
-                    background-color: #fff;
-                }
-            }
-        }
-    }
-}
-
-</style>

src/views/business_manage/businessList.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="business-ETA-list">
       <div class="top-filter-box">
-        <t-button theme="primary" @click="navigateToAdd">新增</t-button>
+        <t-button @click="navigateToAdd">新增</t-button>
         <t-input
               style="width: 310px; margin-left: auto"
               placeholder="商家名称/社会信用码/商家ID"
@@ -108,9 +108,9 @@
               {{ row.BusinessName }}
             </span>
           </template>
-          <template #cellEmptyContent="{ col }">
+          <template #cellEmptyContent="{ col, row }">
             <div class="table-opt-btns" v-if="col.colKey === 'opt'">
-              <span @click="handleEdit(col)">编辑</span>
+              <span @click="handleEdit(row)">编辑</span>
               <span @click="handleShowRenewal(col)">添加续约</span>
               <t-dropdown>
                 <t-icon name="more" />
@@ -381,12 +381,7 @@
   <style lang="scss">
   .business-ETA-list {
     .t-select__wrap {
-      width: 240px;
-    }
-    .top-filter-box {
-      .t-cascader__search-input {
-        min-width: 30px;
-      }
+      // width: 240px;
     }
   }
   </style>
@@ -410,17 +405,11 @@
     background: #fff;
     border-radius: 4px;
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.05);
-  
     .select-wrap {
       display: flex;
       gap: 20px;
       align-items: center;
       margin-bottom: 20px;
-  
-      .t-select,
-      .t-cascader {
-        width: 240px;
-      }
     }
   
     .link {
@@ -431,14 +420,12 @@
         text-decoration: underline;
       }
     }
-  
     .table-opt-btns {
       color: #4099ef;
       display: flex;
       align-content: center;
       justify-content: center;
       align-items: center;
-  
       span {
         margin: 0 3px;
         cursor: pointer;

src/views/business_manage/components/Steps.vue

@@ -1,106 +1,115 @@
 <template>
     <div class="step-wrap">
-        <div class="step-item" :class="{'active':activeStep===index+1}"
-            v-for="(step,index) in stepsArr" :key="index"
-            @click="changeActiveStep(index)">
-            <div class="step-line"></div>
-            <div class="step-icon" v-if="(activeStep<=index+1)||allowStepClick">{{index+1}}</div>
-            <div class="step-icon finished" v-else><i class="el-icon-check"></i></div>
-            <div class="step-text">{{step.text}}</div>
-        </div>
+      <div 
+        class="step-item" 
+        :class="{'active': activeStep === index + 1}"
+        v-for="(step, index) in stepsArr" 
+        :key="index"
+        @click="changeActiveStep(index)"
+      >
+        <div class="step-line" :class="{'active-line': activeStep >= index + 1}"></div>
+        <div class="step-icon" v-if="(activeStep <= index + 1) || allowStepClick">{{ index + 1 }}</div>
+        <div class="step-icon finished" v-else><CheckIcon size="16px" style="color: #3385FF; width: 20px; height: 20px;" /></div>
+        <div class="step-text">{{ step.text }}</div>
+      </div>
     </div>
-</template>
-
-<script>
-export default {
-    props:{
-        allowStepClick:{ //是否允许点击切换步骤
-            type:Boolean,
-            default:true
-        },
-        activeStep:{ //激活的步骤
-            type:Number,
-            default:0
-        },
-        stepsArr:{ //步骤数组
-            type:Array,
-            default:()=>{
-                return [
-                    {
-                        text:'基础信息'
-                    },{
-                        text:'签约信息'
-                    }
-                ]
-            }
-        }
-    },
-    data() {
-        return {
-
-        };
+  </template>
+  
+  <script setup>
+  import { defineProps, defineEmits } from 'vue';
+  import { CheckIcon } from 'tdesign-icons-vue-next';
+  
+  const props = defineProps({
+    allowStepClick: { // 是否允许点击切换步骤
+      type: Boolean,
+      default: true
     },
-    methods: {
-        changeActiveStep(index){
-            if(!this.allowStepClick) return 
-            this.$emit('changeActiveStep',index)
-        }
+    activeStep: { // 激活的步骤
+      type: Number,
+      default: 0
     },
-};
-</script>
-
-<style scoped lang="scss">
-.step-wrap{
+    stepsArr: { // 步骤数组
+      type: Array,
+      default: () => {
+        return [
+          {
+            text: '基础信息'
+          },
+          {
+            text: '签约信息'
+          },
+          {
+            text: '社区权限'
+          }
+        ];
+      }
+    }
+  });
+  
+  const emit = defineEmits(['changeActiveStep']);
+  
+  function changeActiveStep(index) {
+    console.log(!props.allowStepClick);
+    
+    if (!props.allowStepClick) return;
+    emit('changeActiveStep', index);
+  }
+  </script>
+  
+  <style scoped lang="scss">
+  .step-wrap {
     display: flex;
-    .step-item{
-        position: relative;
-        display: flex;
-        align-items: center;
-        gap:16px;
-        color:rgba(0, 0, 0, 0.4);
-        cursor: pointer;
-        .step-line{
-            flex: 1;
-            height:2px;
-            background-color: #DCDCDC;
-            min-width: 270px;
-        }
-        .step-icon{
-            width:24px;
-            height:24px;
-            border-radius: 50%;
-            border:2px solid rgba(0, 0, 0, 0.4);
-            text-align: center;
-            line-height: 24px;
-            font-size: 16px;
-            &.finished{
-                border-color: #3385FF;
-                i{
-                    color:#3385FF;
-                    font-weight: bold;
-                }
-            }
+    .step-item {
+      position: relative;
+      display: flex;
+      align-items: center;
+      gap: 16px;
+      color: rgba(0, 0, 0, 0.4);
+      cursor: pointer;
+      .step-line {
+        flex: 1;
+        height: 2px;
+        background-color: #DCDCDC;
+        min-width: 270px;
+      }
+      .active-line {
+        background-color: #3385FF;
+      }
+      .step-icon {
+        width: 24px;
+        height: 24px;
+        border-radius: 50%;
+        border: 2px solid rgba(0, 0, 0, 0.4);
+        text-align: center;
+        line-height: 18px;
+        font-size: 16px;
+        &.finished {
+          border-color: #3385FF;
+          i {
+            color: #3385FF;
+            font-weight: bold;
+          }
         }
-        .step-text{
-            margin-right: 16px;
+      }
+      .step-text {
+        margin-right: 16px;
+      }
+      &:first-child {
+        .step-line {
+          display: none;
         }
-        &:first-child{
-            .step-line{
-                display: none;
-            }
+      }
+      &.active {
+        color: #3385FF;
+        .step-icon {
+          background-color: #3385FF;
+          color: #fff;
+          border-color: transparent;
         }
-
-        &.active{
-            color:#3385FF;
-            .step-icon{
-                background-color: #3385FF;
-                color:#fff;
-                border-color: transparent;
-            }
-            .step-line{
-                background-color: #3385FF;
-            }
+        .step-line {
+          background-color: #3385FF;
         }
+      }
     }
-}
-</style>
+  }
+  </style>

src/views/etaMenu_manage/components/ChoosedIconDialog.vue

@@ -0,0 +1,131 @@
+<template>
+    <div class="choosed-icon-wrap">
+        <t-dialog
+            :visible.sync="isShowIconDialog"
+            :close-on-click-modal="false"
+            :modal-append-to-body='false'
+            title="选择图标"
+            @close="$emit('close')"
+            width="420px"
+            v-dialogDrag
+            center
+        >
+            <div class="dialog-container-wrap">
+                <div class="top">
+                    <el-upload action="" accept="image/*" 
+                        :http-request="handleUploadImg" 
+                        :show-file-list="false"
+                    >
+                        <el-button size="small">选择文件</el-button>
+                        <span>支持上传图标</span>
+                    </el-upload>
+                    
+                    
+                </div>
+                <div class="icon-box">
+                    <div class="icon-item" :class="{'active':icon.IconPath===choosedIcon}" 
+                        v-for="icon in iconList" :key="icon.IconId"
+                        @click.stop="choosedIcon = icon.IconPath">
+                        <img :src="icon.IconPath">
+                    </div>
+                </div>
+                <div class="btn-wrap" style="text-align: center;margin-bottom: 25px;">
+                    <el-button type="primary" plain  @click="$emit('close')">取消</el-button>
+                    <el-button type="primary"  style="margin-left:50px;" @click="saveIcon">保存</el-button>
+                </div>
+            </div>
+        </t-dialog>
+    </div>
+</template>
+
+<script>
+import {menuConfigInterface} from '@/api/modules/etaMenuApi';
+export default {
+    props:{
+        isShowIconDialog:{
+            type:Boolean,
+            default:false
+        }
+    },
+    data() {
+        return {
+            iconList:[],
+            choosedIcon:''
+        };
+    },
+    watch:{
+        isShowIconDialog(newVal){
+            if(newVal){
+                this.getIconList()
+            }
+        }
+    },
+    methods: {
+        getIconList(){
+            menuConfigInterface.getMenuIconList().then(res=>{
+                if(res.Ret!==200) return 
+                this.iconList = res.Data||[]
+            })
+        },
+        async handleUploadImg(e){
+            if(!['image/png','image/jpeg'].includes(e.file.type)){
+                this.$message.warning('仅支持png、jpg格式的图片')
+                return
+            }
+            if(e.file.size>50*1024){
+                this.$message.warning('图标文件大小不能超过50kb')
+                return 
+            }
+            let form = new FormData()
+            form.append("file", e.file)
+            const res = await bannerupload.bannerupload(form)
+            if(res.Ret===200){
+                await menuConfigInterface.addMenuIcon({
+                    IconPath:res.Data.ResourceUrl
+                })
+                this.getIconList()
+            }
+        },
+        saveIcon(){
+            if(!this.choosedIcon){
+                this.$message.warning('请选择图标')
+                return
+            }
+            this.$emit('save',this.choosedIcon)
+        }
+    },
+};
+</script>
+
+<style scoped lang="scss">
+.choosed-icon-wrap{
+    .top{
+        span{
+            margin-left: 15px;
+            color: #DCDCDC;
+        }
+    }
+    .icon-box{
+        margin: 20px 0;
+        border:1px dashed #DCDCDC;
+        padding:20px;
+        display: flex;
+        flex-wrap: wrap;
+        gap:20px;
+        max-height: 256px;
+        overflow-y: auto;
+        .icon-item{
+            width:30px;
+            height:30px;
+            cursor: pointer;
+            img{
+                width: 100%;
+            }
+            &:hover,&.active{
+                background-color: antiquewhite;
+                border-radius: 50%;
+            }
+        }
+    }
+}
+</style>

src/views/etaMenu_manage/components/ModifyMenuDialog.vue

@@ -0,0 +1,247 @@
+<template>
+    <div class="modify-menu-wrap">
+        <t-dialog
+            :visible.sync="isShowMenuDialog"
+            :close-on-click-modal="false"
+            :modal-append-to-body='false'
+            :title="form.MenuId?'编辑菜单':'添加菜单'"
+            @close="$emit('close')"
+            width="820px"
+            v-dialogDrag
+            center
+        >
+            <div class="dialog-container-wrap">
+                <el-form :model="form" :rules="rules" label-width="80px" :hide-required-asterisk="true" ref="menuForm">
+                    <el-form-item label="菜单类型" prop="MenuType">
+                        <el-radio-group v-model="form.MenuType" :disabled="form.MenuId">
+                            <el-radio :label="0" :disabled="isMenuDisabled">菜单</el-radio>
+                            <el-radio :label="1" :disabled="isbtnDisabled">按钮</el-radio>
+                            <el-radio :label="2" :disabled="isbtnDisabled">字段</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="上级菜单" prop="ParentId">
+                        <el-cascader v-model="form.ParentId"
+                            :options="menuList"
+                            :props="menuProps"
+                            :disabled="openType==='add'?false:!(openType!=='add'&&form.MenuType===0&&form.treeLevel===1)"
+                        >
+                        </el-cascader>
+                    </el-form-item>
+                    <el-form-item :label="nameLabel" prop="Name">
+                        <el-input v-model="form.Name"></el-input>
+                    </el-form-item>
+                    <template v-if="form.MenuType===0">
+                        <el-form-item label="菜单图标" prop="Name" v-if="form.treeLevel===0">
+                            <div class="icon-wrap">
+                                <img :src="form.IconPath" v-if="form.IconPath">
+                                <el-button @click="isShowIconDialog = true">选择图标</el-button>
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="路由地址" prop="Path">
+                            <el-input v-model="form.Path"></el-input>
+                            <el-tooltip effect="dark" content="页面跳转路径" placement="right">
+                                <span class="hint-text">
+                                    <i class="el-icon-warning-outline"></i>
+                                </span>
+                            </el-tooltip>
+                        </el-form-item>
+                        <el-form-item label="组件地址" prop="Component">
+                            <el-input v-model="form.Component"></el-input>
+                            <el-tooltip effect="dark" content="代码中页面地址" placement="right">
+                                <span class="hint-text">
+                                    <i class="el-icon-warning-outline"></i>
+                                </span>
+                            </el-tooltip>
+                        </el-form-item>
+                    </template>
+                    <el-form-item label="按钮ID" prop="ButtonCode" v-if="form.MenuType!==0">
+                        <el-input v-model="form.ButtonCode"></el-input>
+                    </el-form-item>
+                    <el-form-item label="显示排序" prop="Sort">
+                        <el-input v-model="form.Sort" type="number" :min="0"></el-input>
+                    </el-form-item>
+                    <el-form-item label="是否隐藏" prop="Hidden">
+                        <el-radio-group v-model="form.Hidden">
+                            <el-radio :label="0">显示</el-radio>
+                            <el-radio :label="1">隐藏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                </el-form>
+                <div class="btn-wrap" style="text-align: center;margin-bottom: 25px;">
+                    <el-button type="primary" plain style="width:200px;" @click="$emit('close')">取消</el-button>
+                    <el-button type="primary"  style="margin-left:50px;width:200px;" @click="saveMenu">保存</el-button>
+                </div>
+            </div>
+        </t-dialog>
+        <ChoosedIconDialog 
+            :isShowIconDialog="isShowIconDialog"
+            @save="(e)=>{form.IconPath = e;isShowIconDialog = false}"
+            @close="isShowIconDialog = false"
+        />
+    </div>
+</template>
+
+<script>
+import ChoosedIconDialog from './ChoosedIconDialog.vue';
+
+export default {
+    props: {
+        formData: {
+            type: Object,
+            default: {}
+        },
+        isShowMenuDialog: {
+            type: Boolean,
+            default: false
+        },
+        etaMenu: {
+            type: Array,
+            default: []
+        },
+        openType: {
+            type: String,
+            default: 'add'
+        }
+    },
+    data() {
+        return {
+            form: {
+                MenuType: 0,
+                ParentId: 0,
+                Name: '',
+                IconPath: '',
+                Path: '',
+                Component: '',
+                Sort: 0,
+                Hidden: 0,
+                ButtonCode: '',
+                treeLevel: 0
+            },
+            rules: {
+                ParentId:[{required:true,message:'请选择上级菜单'}],
+                Name:[{required:true,message:'请输入菜单标题'}],
+                IconPath:[{required:true,message:'请选择菜单图标'}],
+                Path:[{required:true,message:'请输入路由地址'}],
+                Component:[{required:true,message:'请输入组件地址'}],
+                Sort:[{required:true,message:'请输入显示排序'}],
+                ButtonCode:[{required:true,message:'请输入按钮ID'}]
+            },
+            menuList: [{
+                    MenuId: -1,
+                    Name: '无'
+                }],
+            menuProps: {
+                value: 'MenuId',
+                label: 'Name',
+                children: 'Children',
+                checkStrictly: true,
+                emitPath: false,
+            },
+            isShowIconDialog: false,
+        };
+    },
+    watch: {
+        isShowMenuDialog(newVal) {
+            if (newVal) {
+                this.form = this.$options.data().form;
+                this.menuList = this.$options.data().menuList;
+                this.initForm();
+                this.$nextTick(()=>{
+                    this.$refs.menuForm&&this.$refs.menuForm.clearValidate();
+                })
+            }
+        },
+        'form.MenuType': {
+            handler(newVal) {
+                this.changeListLevel(newVal);
+            },
+            deep: true
+        }
+    },
+    computed: {
+        //菜单类型-菜单 是否禁用
+        isMenuDisabled() {
+            return this.form.treeLevel > 1 && this.openType !== 'add';
+        },
+        //菜单类型-按钮、字段 是否禁用
+        isbtnDisabled() {
+            return this.form.treeLevel === 1 && this.openType !== 'add';
+        },
+        nameLabel(){
+            const nameMap = {
+                0:'菜单标题',
+                1:'按钮名称',
+                2:'字段名称'
+            }
+            return nameMap[this.form.MenuType]||'菜单标题'
+        },
+    },
+    methods: {
+        initForm() {
+            this.menuList = [...this.menuList, ..._.cloneDeep(this.etaMenu)];
+            if (this.openType === 'addNext') {
+                this.form.ParentId = this.formData.ParentId;
+                this.form.treeLevel = this.formData.treeLevel;
+            }
+            if (this.openType === 'edit') {
+                this.form = _.cloneDeep(this.formData);
+            }
+            if (this.form.treeLevel > 1 && this.openType !== 'edit') {
+                this.form.MenuType = 1;
+            }
+            if(this.form.treeLevel===0 && this.openType !== 'add'){
+                this.form.ParentId = -1
+            }
+        },
+        saveMenu() {
+            //检验表单
+            this.$refs.menuForm.validate((valid)=>{
+                if(valid){
+                    this.$emit(this.form.MenuId ? 'edit' : 'add', this.form);
+                }
+            })
+            
+        },
+        changeListLevel(level) {
+            if (level === 0) {
+                this.menuList = this.menuList.map(m => {
+                    if (m.Children) {
+                        delete m.Children;
+                    }
+                    return m;
+                });
+            }
+            else {
+                this.menuList = [...this.$options.data().menuList, ..._.cloneDeep(this.etaMenu)];
+            }
+        }
+    },
+    components: { ChoosedIconDialog }
+};
+</script>
+
+<style lang="scss">
+.modify-menu-wrap{
+    .dialog-container-wrap{
+        display: flex;
+        flex-direction: column;
+        .el-form{
+            align-self: center;
+            .el-form-item{
+                .el-input{
+                    width: 315px;
+                }
+                .icon-wrap{
+                    display: flex;
+                    align-items: center;
+                    img{
+                        width:24px;
+                        height: 24px;
+                        margin-right: 15px;
+                    }
+                }
+            }
+        }
+    }
+}
+</style>

src/views/etaMenu_manage/etaMenuConfig.vue

@@ -0,0 +1,204 @@
+<template>
+    <div class="eta-menu-config-wrap">
+        <div class="menu-top">
+            <t-button @click="handleModifyMenu('add',{})">添加菜单</t-button>
+            <t-input style="width: 310px; margin-left: auto" placeholder="请输入菜单名称" clearable v-model="Keyword" @input="getMenuData">
+                <template #prefixIcon><SearchIcon /></template>
+            </t-input>
+        </div>
+        <div class="menu-table">
+            <t-table
+                :data="tableData"
+                row-key="MenuId"
+                :tree-props="{children:'Children'}"
+                :columns="tableColumns"
+                :bordered="true"
+            >
+                <!-- 菜单名称 -->
+                <template #Name="{ row }">
+                    <span class="menu-name" >{{row.Name}}</span>
+                </template>
+                <!-- 图标 -->
+                <template #IconPath="{ row }" >
+                    <img class="menu-icon" :src="row.IconPath" v-if="row.IconPath" style="width:24px;height:24px;">
+                    <span class="menu-icon" v-else>-</span>
+                </template>
+                <!-- 状态 -->
+                <template #Hidden="{ row }" >
+                    <span class="menu-status">{{row.Hidden===0?'显示':'隐藏'}}</span>
+                </template>
+                <!-- <template >
+                    <span>{{row[column.key]}}</span>
+                </template> -->
+                <template #opt="{ row }">
+                    <t-button variant="text" theme="primary" @click="handleModifyMenu('addNext',row)">添加子项</t-button>
+                    <t-button variant="text" theme="primary" @click="handleModifyMenu('edit',row)">编辑</t-button>
+                    <t-button variant="text" theme="primary" style="color:#FF0000;" @click="deleteMenu(row)">删除</t-button>
+                </template>
+            </t-table>
+        </div>
+        <ModifyMenuDialog 
+            :isShowMenuDialog="isShowMenuDialog"
+            :formData="formData"
+            :etaMenu="tableData"
+            :openType="openType"
+            @add="(params)=>{modifyMenu(params,'addMenu')}"
+            @edit="(params)=>{modifyMenu(params,'editMenu')}"
+            @close="()=>{formData = {};isShowMenuDialog = false;}"
+        />
+    </div>
+</template>
+
+<script>
+import {menuConfigInterface} from '@/api/modules/etaMenuApi';
+import ModifyMenuDialog from './components/ModifyMenuDialog.vue';
+import { SearchIcon } from 'tdesign-icons-vue-next';
+export default {
+    data() {
+        return {
+            Keyword: '',
+            tableColumns: [{
+                title: '菜单名称',
+                    colKey: 'Name',
+                }, {
+                    title: '图标',
+                    colKey: 'IconPath',
+                }, {
+                    title: '状态',
+                    colKey: 'Hidden',
+                }, {
+                    title: '创建时间',
+                    colKey: 'CreateTime',
+                }, { 
+                    align: 'center',
+                    colKey: 'opt',
+                    title: '操作'
+                },
+                ],
+            tableData: [{}],
+            formData: {},
+            openType:'add',
+            isShowMenuDialog: false,
+        };
+    },
+    methods: {
+        getMenuData() {
+            menuConfigInterface.getMenuList({
+                Keyword: this.Keyword
+            }).then(res => {
+                if (res.Ret !== 200)
+                    return;
+                this.tableData = res.Data.List || [];
+                this.tableData.forEach(d=>{
+                    this.formatData(d,0)
+                })
+            });
+        },
+        //给data加上层级
+        formatData(data,level){
+            data.treeLevel = level
+            if(data.Children && data.Children.length){
+                data.Children = data.Children.map(i=>{
+                    return this.formatData(i,level+1)
+                })
+            }
+            return data
+        },
+        handleModifyMenu(type, data) {
+            if (type === 'addNext') {
+                this.formData.ParentId = data.MenuId;
+                this.formData.treeLevel = data.treeLevel+1
+            }
+            else if (type === 'edit') {
+                this.formData = data;
+            }
+            else {
+                this.formData = {treeLevel:0};
+            }
+            this.openType = type
+            this.isShowMenuDialog = true;
+        },
+        deleteMenu(data){
+            const hintTextMap = {
+                0:'菜单及子项',
+                1:'按钮',
+                2:'字段'
+            }
+            this.$confirm(`删除后不可恢复，确认删除该${hintTextMap[data.MenuType]}吗？`,'提示',{
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(()=>{
+                menuConfigInterface.removeMenu({MenuId:data.MenuId}).then(res=>{
+                    if(res.Ret!==200) return 
+                    this.$message.success('删除成功')
+                    this.getMenuData()
+                })
+            }).catch(()=>{})
+            
+        },
+        modifyMenu(params,type){
+            let InterfaceParams = {}
+            if(params.MenuType===0){
+                const {ParentId,MenuType,Name,IconPath,Sort,Path,Component,Hidden} = params
+                InterfaceParams = {
+                    ParentId:ParentId===-1?0:ParentId,
+                    MenuType,
+                    Name,
+                    IconPath,
+                    Sort:Number(Sort),
+                    Path,
+                    Component,
+                    Hidden
+                }
+            }else{
+                const {ParentId,MenuType,Name,Sort,Hidden,ButtonCode} = params
+                InterfaceParams = {
+                    ParentId:ParentId===-1?0:ParentId,
+                    MenuType,
+                    Name,
+                    Sort:Number(Sort),
+                    Hidden,
+                    ButtonCode
+                }
+            }
+            if(type==='editMenu'){
+                InterfaceParams = {...{MenuId:params.MenuId},...InterfaceParams}
+            }
+            menuConfigInterface[type](InterfaceParams).then(res=>{
+                    if(res.Ret!==200) return 
+                    this.$message.success(`${type==='addMenu'?'添加':'编辑'}成功`)
+                    this.getMenuData()
+                    this.isShowMenuDialog = false
+                })
+        },
+        editMenu(params){}
+    },
+    mounted() {
+        this.getMenuData();
+    },
+    components: { ModifyMenuDialog, SearchIcon }
+};
+</script>
+
+<style scoped lang="scss">
+.eta-menu-config-wrap{
+    .menu-top{
+        padding:20px;
+        background-color: #fff;
+        display: flex;
+        justify-content: space-between;
+        .el-input{
+            width:260px;
+        }
+    }
+    .menu-table{
+        margin-top: 20px;
+        padding:20px;
+        background-color: #fff;
+        .menu-name{
+            display: inline-block;
+        }
+    }
+}
+</style>

src/views/etaTrial/etaTrialList.vue

@@ -6,7 +6,7 @@
         <template v-if="false">
           <!-- !Role.includes('admin') -->
           <!-- 管理员-ETA试用列表 -->
-          <template v-if="route.path === '/etaTrialList'">
+          <template v-if="currentPath === '/etaTrialList'">
             <t-button type="primary" @click="changePath('/etaApprovalList')">审批列表</t-button>
             <div class="approval-hint" v-if="approvalNum">
               ·{{ approvalNum }}条申请记录待审批
@@ -14,7 +14,7 @@
             <t-button type="primary" @click="toQuestionnaireSurvey" style="margin-left: 30px;">问卷调研</t-button>
           </template>
           <!-- 管理员-审批列表 -->
-          <template v-if="route.path === '/etaApprovalList'">
+          <template v-if="currentPath === '/etaApprovalList'">
             <t-select v-model="approvalState" placeholder="请选择" @change="selectHandle">
               <t-option
                 v-for="item in approvalStateArr"
@@ -27,14 +27,14 @@
         </template>
         <template v-else>
           <!-- 非管理员-ETA试用列表 -->
-          <template v-if="route.path === '/etaTrialList'">
+          <template v-if="currentPath === '/etaTrialList'">
             <t-button type="primary" @click="changePath('/etaAddApproval')">新增申请</t-button>
             <t-button type="primary" plain @click="changePath('/etaApprovalList')" style="margin-left: 30px;">客户管理</t-button>
             <t-button type="primary" @click="toQuestionnaireSurvey" style="margin-left: 30px;">问卷调研</t-button>
             <t-checkbox v-model="onlyMine" @change="onlyMineChange" style="margin-left: 30px;">我申请的</t-checkbox>
           </template>
           <!-- 非管理员-我的审批+账号列表 -->
-          <template v-if="route.path === '/etaApprovalList'">
+          <template v-if="currentPath === '/etaApprovalList'">
             <div class="tips">*账号用于登录ETA试用平台：https://exptest.hzinsights.com/</div>
             <div class="right-header">
               <span>已选{{ selectedTotal }}</span>
@@ -44,7 +44,7 @@
         </template>
       </div>
       <div class="search-wrap">
-        <template v-if="route.path === '/etaApprovalList'">
+        <template v-if="currentPath === '/etaApprovalList'">
           <t-button type="primary" @click="batchMove">批量移动</t-button>
           <t-button type="primary" @click="batchOperate">一键启用</t-button>
         </template>
@@ -59,7 +59,7 @@
       </div>
     </div>
     <div class="table-wrap">
-      <t-table :data="tableData" @sort-change="sortChangeHandle" :columns="columnList" ref="dataRef" border v-loading="tableLoading" @select="selectHandles" @select-all="selectAllHandle" @selection-change="selectionChange">
+      <t-table :data="tableData" @sort-change="sortChangeHandle" :columns="columnList" ref="dataRef" :bordered="true" :table-layout="'auto'" rowKey="EtaTrialId" v-loading="tableLoading" @select="selectHandles" @select-all="selectAllHandle" @selection-change="selectionChange">
         <!-- 多选 -->
         <!-- <t-table-column align="center" type="selection" width="55" v-if="route.path === '/etaApprovalList'">
         </t-table-column> -->
@@ -74,25 +74,21 @@
               {{ row['Enabled'] === 0 ? '禁用' : '启用' }}
             </span>
         </template>
-        <template #cellEmptyContent="{ row }">
+        <template #opt="{ row }">
             <!-- 非管理员-账号列表的操作: 申请启用 -->
             <div>
-              <t-button type="text" size="small" @click="Move(row)">移动</t-button>
-              <t-button type="text" size="small" v-if="row.Enabled === 0" @click="handleOperate('active', row)">申请启用</t-button>
+              <t-button variant="text" theme="primary" @click="Move(row)">移动</t-button>
+              <span v-if="row.Enabled === 0" @click="handleOperate('active', row)">申请启用</span>
             </div>
             <!-- 非管理员-我的审批操作: 撤回,重新申请,删除,驳回理由-->
             <div v-if="!Role.includes('admin') && listType === 'all'">
-              <t-button type="text" size="small" v-if="ApprovalStatus[row.ApprovalStatus] === 0" @click="handleOperate('withdraw', row)">撤回</t-button>
-              <t-button type="text" size="small" v-if="ApprovalStatus[row.ApprovalStatus] >= 2" @click="handleOperate('apply', row)">重新申请</t-button>
-              <t-button type="text" size="small" v-if="ApprovalStatus[row.ApprovalStatus] === 3" @click="handleOperate('checkReplay', row)">驳回理由</t-button>
-              <t-button type="text" size="small" v-if="ApprovalStatus[row.ApprovalStatus] === 2" class="color-hint" @click="handleOperate('delete', row)">删除</t-button>
+              <span type="text" size="small" v-if="ApprovalStatus[row.ApprovalStatus] === 0" @click="handleOperate('withdraw', row)">撤回</span>
+              <span type="text" size="small" v-if="ApprovalStatus[row.ApprovalStatus] >= 2" @click="handleOperate('apply', row)">重新申请</span>
+              <span type="text" size="small" v-if="ApprovalStatus[row.ApprovalStatus] === 3" @click="handleOperate('checkReplay', row)">驳回理由</span>
+              <span type="text" size="small" v-if="ApprovalStatus[row.ApprovalStatus] === 2" class="color-hint" @click="handleOperate('delete', row)">删除</span>
               <!-- 已审批通过的:查看密码 -->
-              <t-button type="text" size="small" v-if="ApprovalStatus[row.ApprovalStatus] === 1" @click="handleOperate('showDetail', row)">账号密码</t-button>
+              <span type="text" size="small" v-if="ApprovalStatus[row.ApprovalStatus] === 1" @click="handleOperate('showDetail', row)">账号密码</span>
             </div>
-            <!-- 管理员-审批列表操作: 审批-->
-            <!-- <template v-if="Role.includes('admin')">
-              <t-button type="text" size="small" v-if="ApprovalStatus[row.ApprovalStatus] === 0" @click="handleOperate('approve', row)">审批</t-button>
-            </template> -->
         </template>
       </t-table>
       <t-pagination
@@ -150,7 +146,6 @@
 
 <script setup>
 import { ref, reactive, computed, watch, onMounted } from 'vue';
-// import { TButton, TSelect, TOption, TTable, TTableColumn, TPagination, TDialog } from 'tdesign-vue-next';
 import { SearchIcon } from 'tdesign-icons-vue-next';
 import { etaTrialColumn, adminApprovalList, approvedList, ApprovalStatus } from './config';
 import { etaTrialInterence } from '@/api/modules/crmApi.js';
@@ -159,7 +154,7 @@ import { useRoute, useRouter } from 'vue-router'
 const router=useRouter()
 const route=useRoute()
 // 响应式数据
-const currentPath = ref('');
+const currentPath = ref(route.path);
 const approvalNum = ref(0);
 const searchText = ref('');
 const onlyMine = ref(false);
@@ -173,7 +168,7 @@ const approvalStateArr = reactive([
 // const ApprovalStatus = reactive(ApprovalStatus);
 const canEdit = ref(false);
 const tableData = ref([]);
-const columnList = ref([]);
+const columnList = ref(etaTrialColumn);
 const tableLoading = ref(false);
 const sortKeys = reactive([
   'Expiration', 'ModifyTime', 'LastLoginTime', 'ActiveTime',
@@ -212,16 +207,17 @@ const selectedTotal = computed(() => {
 });
 
 // 监听器
-watch('route.path', (newVal) => {
-  currentPath.value = newVal;
-  currentPage.value = 1;
-  SortParam.value = '';
-  SortType.value = '';
-  approvalState.value = 2;
-  searchText.value = '';
-  getTableData();
-});
-watch('listType', (val) => {
+watch(() => route.path,(newVal) => {
+    currentPath.value = newVal;
+    currentPage.value = 1;
+    SortParam.value = '';
+    SortType.value = '';
+    approvalState.value = 2;
+    searchText.value = '';
+    getTableData();
+  }
+);
+watch( listType, (val) => {
   currentPage.value = 1;
   SortParam.value = '';
   SortType.value = '';