商家管理问题修改

src/views/business_manage/addBusiness.vue

@@ -27,53 +27,32 @@
                             </t-radio-group>
                         </t-form-item>
                         <t-form-item label="商家名称" name="name">
-                            <t-input v-model:modelValue="firstFormData.name" placeholder="商家名称" :disabled="currentRoute === 'businessDetail'" v-if="currentRoute === 'businessDetail'"/>
-                            <autocomplete
-                              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 
-                                  
-                                      v-if="firstFormData.name.length > 3" 
-                                      style="color:#409EFF;cursor: pointer;" slot="suffix"  
-                                      @click="searchautoRef"
-                                  > 查询</span>
-                                </template>
-                              <template v-slot:default="{ item }">
-                                <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>
+                          <t-select-input
+                            v-model:value="firstFormData.name"
+                            :popup-visible="popupVisible"
+                            :popup-props="{ overlayInnerStyle: { padding: '6px' } }"
+                            placeholder="请输入任意关键词"
+                            allow-input
+                            clearable
+                            style="width: 300px"
+                            @input-change="onInputChange"
+                            @popup-visible-change="onPopupVisibleChange"
+                          >
+                            <template #panel>
+                              <div class="tdesign-demo__select-input-ul-autocomplete" v-if="showPopup">
+                                <div v-for="item in options" :key="item" @click="() => onOptionClick(item)">
+                                  {{ item.Name }}
                                 </div>
-                                <div v-if="!suggestions.length" style="text-align: center;">暂无数据</div>
                               </div>
-                            </el-popover>
+                            </template>
+                            <template #suffix>
+                              <span 
+                                  v-if="showSearchBtn" 
+                                  style="color:#409EFF;cursor: pointer;" slot="suffix"  
+                                  @click="getBusinessNameSearch(firstFormData.name)"
+                              > 查询</span>
+                            </template>
+                          </t-select-input>
                         </t-form-item>
                     </div>
                     <div class="form-line">
@@ -160,6 +139,7 @@
                             :show-all-levels="false"
                             :keys="cascaderProps"
                             filterable
+                            @change="changeSaller"
                             clearable
                             placeholder="请选择销售"
                             />
@@ -209,13 +189,11 @@
     </div>
 </template>
 <script setup>
-import { ref, reactive, watch, onMounted, useTemplateRef } from 'vue';
-import autocomplete from "./components/autocomplete.vue";
+import { ref, reactive, onMounted, useTemplateRef } from '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'
 
@@ -228,12 +206,10 @@ const businessId = ref(Number(route.query.id || 0));
 const currentStep  = ref(1);
 const firstFormEl = useTemplateRef('firstFormEl')
 const formRef = useTemplateRef('formRef');
-const autoRef  = ref(null);
+const cascaderNode = ref({});
 const recordData = ref([]);
 const activities = ref([]);
 const countryDataReactive = reactive(countryData);
-const suggestions = ref([]);
-const showPopover = ref(false);
 const locationOptionsReactive = reactive(locationOptions);
 const firstFormData = reactive({
   areaType: '国内',
@@ -283,7 +259,7 @@ const tradeArr = ref([]); // 需要在getIndustry方法中赋值
 const salesArr = ref([]); // 需要在getSale方法中赋值
 const rules = {
   areaType: [{ required: true, message: '请选择所属区域', trigger: 'change' }],
-  name: [{ required: true, message: '请输入商家名称', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入商家名称', trigger: 'change' }],
   creditCode: [{ required: true, message: '请输入社会信用码', trigger: 'blur' }],
   address: [{ required: true, message: '请选择商家地址', trigger: 'change' }],
   nation: [{ required: true, message: '请选择所属国家', trigger: 'change' }],
@@ -295,6 +271,40 @@ const rules = {
   signDate: [{ required: true, message: '请选择签约日期', trigger: 'change' }],
   expirationDate: [{ required: true, message: '请选择到期日期', trigger: 'change' }],
 }
+
+// 商家名称相关
+const popupVisible = ref(false);
+const showPopup = ref(false);
+const showSearchBtn = ref(false);
+const options = ref([]);
+const onOptionClick = (item) => {
+  firstFormData.name = item.value;
+  firstFormData.creditCode = item.KeyNo;
+  popupVisible.value = false;
+};
+const onInputChange = (keyword) => {
+  firstFormData.name = keyword;
+  if (keyword.length >= 4) {
+    showSearchBtn.value = true;
+  } else {
+    getBusinessNameSearch('')
+    showSearchBtn.value = false;
+  }
+};
+const onPopupVisibleChange = (val) => {
+  popupVisible.value = val;
+};
+const getBusinessNameSearch = async (val) => {
+  let res = await customInterence.companyQccSearch({ KeyWord: val });
+    if (res.Ret === 200) {
+      if (res.Data && res.Data.length > 0) {
+        options.value = res.Data.map(item => ({ value: item.Name, ...item }));
+        showPopup.value = true;
+      } else {
+      }
+    }
+};
+
 // 生命周期钩子
 onMounted(() => {
   if (currentRoute.value === 'addBusiness') { // 添加
@@ -361,6 +371,14 @@ const getTableData = async () => {
   }
 };
 
+// 监听销售变化
+const changeSaller = (value, {node}) => {
+  cascaderNode.value = {
+    saller: value,
+    sallerName: node ? node.label : ''
+  }
+};
+
 // 获取操作日志详情
 const getTimeLineData = async () => {
   try {
@@ -375,7 +393,6 @@ const getTimeLineData = async () => {
 
 // 提交
 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 || '';
   return {
     BusinessName: params.name,
@@ -384,8 +401,8 @@ const normalizingParams = (params) => {
     Province: params.province,
     City: params.city,
     Nation: params.nation,
-    SellerId: Number(cascaderNodes[0]?.AdminId || 0),
-    SellerName: cascaderNodes[0]?.AdminName || '',
+    SellerId: Number(cascaderNode.value.saller || 0),
+    SellerName: cascaderNode.value.sallerName || '',
     Leader: params.decisionMaker,
     IndustryId: Number(params.industry),
     IndustryName: IndustryName,
@@ -422,80 +439,20 @@ const handleAddBusiness = () => {
   const params = normalizingParams({ ...firstFormData, ...secondFormData });
   businessCustomInterence.addBusiness({ IsCheck: false, ...params }).then(res => {
     if (res.Ret !== 200) return;
-    // 假设你有一个全局的message方法，这里需要替换为实际的消息提示逻辑
-    message.success('添加成功');
-    // 假设你有一个全局的router实例，这里需要替换为实际的路由跳转逻辑
-    router.push('/businessETAList');
+    MessagePlugin.success('添加成功');
+    router.push('/customer/businessList');
   });
 };
 
-
-const searchautoRef = () => {
-  showPopover.value = true;
-  autoRef.value.search(firstFormData.name)
-}
-
-const callbackHandle = async (data, cb) => {
-  if (data) {
-    isCheckCompanyInfo.value = true;
-    cb([]);
-    let res = await customInterence.companyQccSearch({ KeyWord: data });
-    if (res.Ret === 200) {
-      isCheckCompanyInfo.value = false;
-      if (res.Data && res.Data.length > 0) {
-        let arr = res.Data.map(item => ({ value: item.Name, ...item }));
-        suggestions.value = arr;
-        cb(arr);
-      } else {
-        cb([{}]);
-      }
-    }
-  }
-};
-
-const checkCompanyfocus = () => {
-  checkCompanyfocusIs.value = true;
-  setTimeout(() => {
-    checkCompanyfocusIs.value = false;
-  }, 500);
-};
-
-const customNameSelect = (value) => {
-  showPopover.value = false;
-  firstFormData.name = value.value || '';
-  firstFormData.creditCode = value.CreditCode;
-  setTimeout(async () => {
-    checkCompany();
-  }, 10);
-};
-
-const checkCompany = () => {
-  setTimeout(() => {
-    if (checkCompanyfocusIs.value) return;
-    if ((!firstFormData.name && !firstFormData.creditCode) || (isCheckCompanyInfo.value && firstFormData.name)) return;
-    customInterence.checkCompanyInfo({
-      CompanyName: firstFormData.name,
-      CreditCode: firstFormData.creditCode
-    }).then(res => {
-      if (res.Ret === 200) {
-        if (res.Data.RepeatStatus > 0) {
-          repeatId.value = res.Data.CompanyId;
-          repeatName.value = res.Data.ProductName;
-          nameRepeat.value = res.Data.RepeatStatus;
-          codeRepeat.value = res.Data.Status;
-          isCheck.value = true;
-        } else {
-          nameRepeat.value = 0;
-          isCheck.value = false;
-        }
-      }
-    });
-  }, 500);
-};
-
 const selectRegion = (e, context) => {
-  firstFormData.province = context.node.getParents()[0].label;
+  if (!context.node) return;
+  firstFormData.province = context.node.getParents()[0]?.label;
   firstFormData.city = e;
+  if (e === '北京市' || e === '上海市' || e === '天津市' || e === '重庆市') {
+    firstFormData.province = e
+  }
+  console.log('省份：', firstFormData.province, '城市：', firstFormData.city);
+  
 };
 
 const getIndustry = () => {
@@ -520,14 +477,6 @@ const changeActiveStep = (index) => {
   currentStep .value = index + 1
 }
 
-// 响应式变量
-const isCheckCompanyInfo = ref(false);
-const checkCompanyfocusIs = ref(false);
-const nameRepeat = ref(false);
-const codeRepeat = ref(false);
-const isCheck = ref(false);
-const repeatId = ref('');
-const repeatName = ref('');
 
 </script>
 <style lang="scss">
@@ -573,12 +522,13 @@ const repeatName = ref('');
     width: 200px;
     z-index: 99;
 }
-.popover-box {
-  width: 360px;
-  .popover-item {
-    margin: 10px 0;
+.tdesign-demo__select-input-ul-autocomplete {
+  padding: 10px 0;
+  div {
     cursor: pointer;
+    padding: 0 10px;
+    height: 30px;
+    line-height: 30px;
   }
 }
-
 </style>

src/views/business_manage/businessAuth.vue

@@ -3,16 +3,16 @@
         <div class="header">
             <div class="name">{{$route.query.name||''}}</div>
             <div class="btn-wrap">
-                <el-button @click="handleBtnClik('cancel')">取消</el-button>
-                <el-button type="primary" @click="handleBtnClik('save')">保存</el-button>
+                <t-button theme="default" @click="handleBtnClik('cancel')">取消</t-button>
+                <t-button theme="primary" @click="handleBtnClik('save')">保存</t-button>
             </div>
         </div>
         <div class="model-wrap">
-            <el-button :type="model==='auth'?'primary':''" @click="model='auth'">菜单权限</el-button>
+            <t-button :type="model==='auth'?'primary':''" @click="model='auth'">菜单权限</t-button>
         </div>
         <div class="auth-wrap" v-show="model==='auth'">
-            <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" style="margin-bottom: 20px;">全选</el-checkbox>
-            <el-tree 
+            <t-checkbox v-model="checkAll" :indeterminate="isIndeterminate" style="margin-bottom: 20px;">全选</t-checkbox>
+            <t-tree 
                 v-loading="treeLoading"
                 ref="checkboxTree"
                 :data="authList" 
@@ -22,281 +22,279 @@
                 node-key="MenuId"
                 :default-checked-keys="defaultCheckedKeys"
                 @check-change="()=>{handleCheckChange()}">
-            </el-tree>
+            </t-tree>
         </div>
-        <!-- <div class="interence-wrap" v-show="model==='interence'">
-            <div class="interence-item">
-                <span>研报审批</span>
-                <el-radio-group v-model="isApprove">
-                    <el-radio :label="0">否</el-radio>
-                    <el-radio :label="1">是</el-radio>
-                </el-radio-group>
-                <el-checkbox-group v-model="approveList" v-show="isApprove===1">
-                    <el-checkbox :label="2">智能研报</el-checkbox>
-                    <el-checkbox :label="1">研报列表</el-checkbox>
-                </el-checkbox-group>
-            </div>
-        </div> -->
     </div>
 </template>
 
-<script>
-import {businessCustomInterence} from '@/api/api.js'
-export default {
-    data() {
-        return {
-            authList:[],
-            defaultCheckedKeys:[],
-            treeLoading:false,
-            checkAll:false,
-            isIndeterminate:false,
-            model:'auth',
-            isApprove:'',
-            approveList:[],
-            checkList:[]
-        };
-    },
-    watch:{
-        checkAll(newVal){
-            if(newVal){
-                const topLevelNodes = this.authList.map(i=>i.MenuId)
-                this.$refs.checkboxTree.setCheckedKeys(topLevelNodes)
-            }else{
-                if(!this.isIndeterminate){
-                    this.$refs.checkboxTree.setCheckedKeys([])
-                }
-            }
-        },
-        isApprove(newVal){
-            if(newVal===0){
-                this.approveList=[]
-            }
-        }
-    },
-    methods: {
-        getBusinessConfigList(){
-            const EtaBusinessId = this.$route.query.id
-            if(!EtaBusinessId) return 
-            businessCustomInterence.getConfigList({
-                EtaBusinessId:Number(EtaBusinessId)
-            }).then(res=>{
-                if(res.Ret!==200) return
-                const list = res.Data||[]
-                const approveItem = list.find(i=>i.ConfigCode==='approval_flow')
-                if(!approveItem) return
-                if(!approveItem.ConfigValue.length){
-                    this.isApprove = approveItem.ConfigValue
-                    return
-                }
-                if(Number(approveItem.ConfigValue)===0){
-                    this.isApprove = Number(approveItem.ConfigValue)
-                    return
-                }
-                if(Number(approveItem.ConfigValue)>0){
-                    this.isApprove = 1
-                    this.approveList = approveItem.ConfigValue==3?[1,2]:[Number(approveItem.ConfigValue)]
-                }
-            })
-        },
-        getBusinessAuthList(){
-            const EtaBusinessId = this.$route.query.id
-            if(!EtaBusinessId) return 
-            this.treeLoading = true
-            businessCustomInterence.getAuthList({
-                EtaBusinessId:Number(EtaBusinessId)
-            }).then(res=>{
-                if(res.Ret!==200) return 
-                this.treeLoading = false
-                if(!res.Data) return
-                const {List,ChoiceList=[],HalfChoiceList=[]} = res.Data
-                this.authList = List||[]
-                this.checkList = ChoiceList
-                this.authList.forEach(item=>{
-                    this.checkTree(item)
-                })
-                //this.defaultCheckedKeys = ChoiceList.filter((item)=>!HalfChoiceList.some((halfItem)=>item===halfItem))
-                this.$nextTick(()=>{
-                    this.authList.forEach(item=>{
-                        this.checkTree(item)
-                    })
-                    this.defaultCheckedKeys = this.checkList
-                    this.handleCheckChange(this.defaultCheckedKeys)
-                })
-                
-            })
-        },
-        checkTree(data){
-            //非叶子节点递归
-            if(data.Children && data.Children.length){
-                data.Children = data.Children.map(i=>{
-                    return this.checkTree(i)
-                })
-            }
-            //叶子节点向上检查MenuId
-            if(!data.Children||data.Children&&data.Children.length===0){
-                this.checkDataList(data)
-            }
-            return data
-        },
-        //根据MenuId找到对应节点
-        findTreeNode(MenuId){
-            return this.$refs.checkboxTree.getNode(MenuId)
-        },
-        checkDataList(data){
-            //获取data的MenuId 和 checkList对比 
-            //如果MenuId不在checkList里，检查data.ParentId在不在checkList里，若在，则从checkList里去除
-            if(!this.checkList.includes(data.MenuId)&&this.checkList.includes(data.ParentId)){
-                const index = this.checkList.indexOf(data.ParentId)
-                index!==-1&&this.checkList.splice(index,1)
-                console.log('应该去除的节点',data.ParentId)
-            }
-            //向上检查MenuId
-            const parentNode = this.findTreeNode(data.ParentId)
-            if(parentNode){
-                this.checkDataList(parentNode.data)
-            }
-        },
-        async handleBtnClik(type){
-            if(type==='save'){
-                //获取树形列表选择的项 getCheckedKeys getHalfCheckedKeys
-                const keys = this.$refs.checkboxTree.getCheckedKeys()
-                const halfKeys = this.$refs.checkboxTree.getHalfCheckedKeys()
-                if(!keys.length&&!halfKeys.length){
-                    this.$message.warning('请至少选择一个权限')
-                    return
-                }
-                //合成一个数组并去重
-                const ChoiceList = Array.from(new Set([...keys,...halfKeys]))
-                //请求接口
-                const res = await businessCustomInterence.setAuthList({
-                    EtaBusinessId:Number(this.$route.query.id),
-                    MenuIds:ChoiceList,
-                    HalfMenuIds:halfKeys
-                })
-                if(res.Ret!==200) return 
-                this.$message.success('权限设置成功')
-
-                /* if(typeof(this.isApprove)==='string'){
-                    this.$message.warning('请配置接口权限')
-                    this.model='interence'
-                    return
-                }else{
-                    if(this.isApprove&&!this.approveList.length){
-                        this.$message.warning('请选择接口权限')
-                        return
-                    }
-                    let configValue = ''
-                    if(this.isApprove){
-                        configValue = this.approveList.length>1?"3":this.approveList[0]+"" //3表示全选
-                    }else{
-                        configValue = this.isApprove+""
-                    }
-                    const list = [{ConfigCode:"approval_flow",ConfigValue:configValue}] //目前只有一项
-                    const interenceRes = await businessCustomInterence.setConfigList({
-                        EtaBusinessId:Number(this.$route.query.id),
-                        List:list
-                    })
-                    if(interenceRes.Ret!==200) return 
-                    this.$message.success('接口权限设置成功')
-                } */
-            }
-            this.$router.push('/businessETAList')
-        },
-        handleCheckChange(choiceList/* ,HalfChoiceList */){
-            const keys = choiceList||this.$refs.checkboxTree.getCheckedKeys()
-            //const halfKeys = HalfChoiceList||this.$refs.checkboxTree.getHalfCheckedKeys()
-            const ChoiceList = Array.from(new Set([...keys]))
-            const topLevelNodes = this.authList.map(i=>i.MenuId)
-            let nodeLength = 0
-            topLevelNodes.forEach(i=>{
-                if(ChoiceList.includes(i)){nodeLength++}
-                if(!ChoiceList.includes(i)){nodeLength--}
-            })
-            if(nodeLength===topLevelNodes.length){
-                this.checkAll = true
-                this.isIndeterminate = false
-            }else{
-                this.checkAll = false
-                this.isIndeterminate = Boolean(ChoiceList.length)
-            }
-        }
-    },
-    mounted(){
-        this.getBusinessConfigList()
-        this.getBusinessAuthList()
+<script setup>
+import { onMounted, ref, watch, nextTick } from 'vue';
+import { businessCustomInterence } from '@/api/api.js';
+import { useRoute, useRouter } from 'vue-router'
+
+const router=useRouter()
+const route=useRoute()
+
+// 响应式数据
+const authList = ref([]);
+const defaultCheckedKeys = ref([]);
+const treeLoading = ref(false);
+const checkAll = ref(false);
+const isIndeterminate = ref(false);
+const model = ref('auth');
+const isApprove = ref('');
+const approveList = ref([]);
+const checkList = ref([]);
+
+// 获取业务配置列表
+const getBusinessConfigList = async () => {
+  const EtaBusinessId = Number(route.query.id);
+  if (!EtaBusinessId) return;
+
+  try {
+    const res = await businessCustomInterence.getConfigList({ EtaBusinessId });
+    if (res.Ret !== 200) return;
+
+    const list = res.Data || [];
+    const approveItem = list.find(i => i.ConfigCode === 'approval_flow');
+    if (!approveItem) return;
+
+    if (!approveItem.ConfigValue.length) {
+      isApprove.value = approveItem.ConfigValue;
+      return;
+    }
+
+    if (Number(approveItem.ConfigValue) === 0) {
+      isApprove.value = Number(approveItem.ConfigValue);
+      return;
+    }
+
+    if (Number(approveItem.ConfigValue) > 0) {
+      isApprove.value = 1;
+      approveList.value = approveItem.ConfigValue === 3 ? [1, 2] : [Number(approveItem.ConfigValue)];
     }
+  } catch (error) {
+    console.error('获取业务配置列表失败:', error);
+  }
 };
+
+// 获取业务权限列表
+const getBusinessAuthList = async () => {
+  const EtaBusinessId = Number(route.query.id);
+  if (!EtaBusinessId) return;
+
+  treeLoading.value = true;
+
+  try {
+    const res = await businessCustomInterence.getAuthList({ EtaBusinessId });
+    if (res.Ret !== 200) return;
+
+    treeLoading.value = false;
+    if (!res.Data) return;
+
+    const { List = [], ChoiceList = [], HalfChoiceList = [] } = res.Data;
+    authList.value = List;
+    checkList.value = ChoiceList;
+
+    authList.value.forEach(item => checkTree(item));
+
+    await nextTick();
+    authList.value.forEach(item => checkTree(item));
+    defaultCheckedKeys.value = checkList.value;
+    handleCheckChange(defaultCheckedKeys.value);
+  } catch (error) {
+    console.error('获取业务权限列表失败:', error);
+    treeLoading.value = false;
+  }
+};
+
+// 递归检查树节点
+const checkTree = (data) => {
+  if (data.Children && data.Children.length) {
+    data.Children = data.Children.map(i => checkTree(i));
+  }
+
+  if (!data.Children || (data.Children && data.Children.length === 0)) {
+    checkDataList(data);
+  }
+
+  return data;
+};
+
+// 根据MenuId找到对应节点
+const findTreeNode = (MenuId) => {
+  // 假设这是一个自定义的checkboxTree组件的方法，需要根据实际情况调整
+  return refCheckboxTree.value.getNode(MenuId);
+};
+
+// 检查数据列表
+const checkDataList = (data) => {
+  if (!checkList.value.includes(data.MenuId) && checkList.value.includes(data.ParentId)) {
+    const index = checkList.value.indexOf(data.ParentId);
+    if (index !== -1) checkList.value.splice(index, 1);
+    console.log('应该去除的节点', data.ParentId);
+  }
+
+  const parentNode = findTreeNode(data.ParentId);
+  if (parentNode) {
+    checkDataList(parentNode.data);
+  }
+};
+
+// 处理按钮点击
+const handleBtnClik = async (type) => {
+  if (type === 'save') {
+    const keys = refCheckboxTree.value.getCheckedKeys();
+    const halfKeys = refCheckboxTree.value.getHalfCheckedKeys();
+
+    if (!keys.length && !halfKeys.length) {
+      MessagePlugin.warning('请至少选择一个权限');
+      return;
+    }
+
+    const ChoiceList = Array.from(new Set([...keys, ...halfKeys]));
+
+    try {
+      const res = await businessCustomInterence.setAuthList({
+        EtaBusinessId: Number(route.query.id),
+        MenuIds: ChoiceList,
+        HalfMenuIds: halfKeys,
+      });
+      if (res.Ret !== 200) return;
+      MessagePlugin.success('权限设置成功');
+    } catch (error) {
+      console.error('设置权限失败:', error);
+    }
+  }
+
+  // 路由跳转
+  router.push('/businessETAList');
+};
+
+// 处理复选框变化
+const handleCheckChange = (choiceList) => {
+  const keys = choiceList || refCheckboxTree.value.getCheckedKeys();
+  const ChoiceList = Array.from(new Set([...keys]));
+  const topLevelNodes = authList.value.map(i => i.MenuId);
+  let nodeLength = 0;
+
+  topLevelNodes.forEach(i => {
+    if (ChoiceList.includes(i)) nodeLength++;
+    if (!ChoiceList.includes(i)) nodeLength--;
+  });
+
+  if (nodeLength === topLevelNodes.length) {
+    checkAll.value = true;
+    isIndeterminate.value = false;
+  } else {
+    checkAll.value = false;
+    isIndeterminate.value = Boolean(ChoiceList.length);
+  }
+};
+
+// 监听器
+watch(
+  () => checkAll.value,
+  (newVal) => {
+    if (newVal) {
+      const topLevelNodes = authList.value.map(i => i.MenuId);
+      refCheckboxTree.value.setCheckedKeys(topLevelNodes);
+    } else {
+      if (!isIndeterminate.value) {
+        refCheckboxTree.value.setCheckedKeys([]);
+      }
+    }
+  }
+);
+
+watch(
+  () => isApprove.value,
+  (newVal) => {
+    if (newVal === '0') {
+      approveList.value = [];
+    }
+  }
+);
+
+// 组件挂载时执行的函数
+onMounted(() => {
+  getBusinessConfigList();
+  getBusinessAuthList();
+});
+
+// 假设checkboxTree组件的ref
+const refCheckboxTree = ref(null);
 </script>
 
 <style lang="scss">
 .business-auth-wrap{
-    .el-tree {
+    .t-tree {
         border-top: 1px solid #E5E7ED;
         border-left: 1px solid #E5E7ED;
         border-right: 1px solid #E5E7ED;
         width: 98%;
         margin-bottom: 40px;
-        .el-tree-node__label{
+        .t-tree-node__label{
             margin:10px;
         }
-        .el-tree-node__content{
+        .t-tree-node__content{
             min-width: 200px;
             width: 200px;
             white-space: normal;
             box-sizing: border-box;
         }
-        .el-tree-node{
-            .el-tree-node{
-                .el-tree-node__children{
+        .t-tree-node{
+            .t-tree-node{
+                .t-tree-node__children{
                     width: 100%;
                 }
-                .el-tree-node{
+                .t-tree-node{
                     &:not(:first-child){
-                    /* .el-tree-node__content{
+                    /* .t-tree-node__content{
                         border-right: 1px solid #E5E7ED;
                     } */
                         border-top: 1px solid #E5E7ED;
                     }
-                    .el-tree-node__content{
+                    .t-tree-node__content{
                         border-right: 1px solid #E5E7ED;
                     }
                 }
     
             }
         }
-        .el-tree-node__content {
+        .t-tree-node__content {
             padding: 5px 10px !important;
             height: auto;
-            .el-tree-node__expand-icon.el-icon-caret-right {
+            .t-tree-node__expand-icon.t-icon-caret-right {
             //display: none;
             }
         }
-        > .el-tree-node {
+        > .t-tree-node {
             padding: 0 !important;
             display: flex;
             border-bottom: 1px solid #E5E7ED;
 
-            > .el-tree-node__children {
+            > .t-tree-node__children {
             width: 100%;
-            > .el-tree-node {
+            > .t-tree-node {
                 &:not(:first-child) {
                 border-top: 1px solid #E5E7ED;
                 }
-                >.el-tree-node__content{
+                >.t-tree-node__content{
                     border-left: 1px solid #E5E7ED;
                     border-right: 1px solid #E5E7ED;
                 }
             }
             }
         }
-        .el-tree-node__children {
+        .t-tree-node__children {
             display: flex;
             flex-direction: column;
-            .el-tree-node {
+            .t-tree-node {
                 display: flex;
                 flex: 1;
                 padding: 0px !important;
-                .el-tree-node__content {
+                .t-tree-node__content {
                     border-bottom: none;
                     .custom-tree-node {
                     height: 24px;
@@ -306,7 +304,7 @@ export default {
                         margin-left: 10px;
                         display: none;
                     }
-                    .el-button {
+                    .t-button {
                         padding: 0px !important;
                         border-radius: 4px;
                         background: #363554;
@@ -314,10 +312,10 @@ export default {
                     }
                     }
                 }
-                .el-tree-node__children {
-                    .el-tree-node {
+                .t-tree-node__children {
+                    .t-tree-node {
                     &:not(:first-child) {
-                        .el-tree-node__content {
+                        .t-tree-node__content {
                         //border-left: none;
                         }
                     }
@@ -344,6 +342,10 @@ export default {
             font-size: 18px;
             font-weight: bold;
         }
+        .btn-wrap {
+            display: flex;
+            gap: 10px;
+        }
     }
     .model-wrap{
         display: flex;

src/views/business_manage/businessList.vue

@@ -29,12 +29,11 @@
           <t-cascader
             v-model="sales"
             :options="salesArr"
-            :show-all-levels="false"
             :keys="cascaderProps"
             multiple
-            collapse-tags
             filterable
             clearable
+            :minCollapsedNum="1"
             placeholder="请选择销售"
             @change="changeSelectOptions('sales')"
           />
@@ -42,7 +41,10 @@
             v-model="valueLocation"
             :options="reactiveLocationOptions"
             :keys="locationProps"
+            value-type="full"
             clearable
+            :minCollapsedNum="1"
+            multiple 
             placeholder="请选择客户地址"
             @change="changeSelectOptions('location')"
           />
@@ -111,14 +113,14 @@
           <template #cellEmptyContent="{ col, row }">
             <div class="table-opt-btns" v-if="col.colKey === 'opt'">
               <span @click="handleEdit(row)">编辑</span>
-              <span @click="handleShowRenewal(col)">添加续约</span>
+              <span @click="handleShowRenewal(row)">添加续约</span>
               <t-dropdown>
                 <t-icon name="more" />
-                <t-dropdown-menu v-model:visible="dropdownVisible[col.id]">
-                  <t-dropdown-item @click="itemClickHandle('setAuth', col)">权限设置</t-dropdown-item>
-                  <t-dropdown-item @click="itemClickHandle('modifySale', col)">修改销售</t-dropdown-item>
-                  <t-dropdown-item @click="itemClickHandle('disable', col)">
-                    {{ col.Enable ? '禁用' : '启用' }}
+                <t-dropdown-menu v-model:visible="dropdownVisible[row.id]">
+                  <t-dropdown-item @click="itemClickHandle('setAuth', row)">权限设置</t-dropdown-item>
+                  <t-dropdown-item @click="itemClickHandle('modifySale', row)">修改销售</t-dropdown-item>
+                  <t-dropdown-item @click="itemClickHandle('permission', row)">
+                    社区权限设置
                   </t-dropdown-item>
                 </t-dropdown-menu>
               </t-dropdown>
@@ -137,33 +139,27 @@
   
       <!-- 添加续约 -->
       <t-dialog
-        title="添加续约"
+        header="添加续约"
         :visible.sync="showRenewal"
-        :modal-append-to-body="false"
-        :close-on-click-modal="false"
+        :footer="false"
         @close="showRenewal = false"
       >
-        <template v-slot:content>
-          <AddRenewal @addRenewal="handleAddRenewal" @close="showRenewal = false" />
-        </template>
+        <AddRenewal @addRenewal="handleAddRenewal" @close="showRenewal = false" />
       </t-dialog>
   
       <!-- 修改销售 -->
       <t-dialog
-        title="修改销售"
+        header="修改销售"
         :visible.sync="showModifySaller"
-        :modal-append-to-body="false"
-        :close-on-click-modal="false"
         @close="showModifySaller = false"
+        :footer="false"
       >
-        <template v-slot:content>
           <ModifySaller
             :salesArr="salesArr"
             :data="modifyData"
             @modifySaller="handleModifySaller"
             @close="showModifySaller = false"
           />
-        </template>
       </t-dialog>
     </div>
   </template>
@@ -178,7 +174,6 @@
   import countryData from '@/utils/countryData';
   import { SearchIcon } from 'tdesign-icons-vue-next';
   const router=useRouter()
-  const route=useRoute()
   const searchTxt = ref('');
   const provinceValue = ref('');
   const cityValue = ref('');
@@ -191,7 +186,6 @@
   const sortParam = ref(0)
   const sortType = ref(0)
   const locationProps = reactive({
-    multiple: true,
     value: 'name',
     children: 'city',
     label: 'name',
@@ -202,7 +196,6 @@
     emitPath: false,
     label: 'AdminName',
     value: 'AdminId',
-    multiple: true,
   });
   const signStatus = ref('');
   const signStatusOpts = ref([
@@ -266,8 +259,13 @@
         'CreateTime':3,//创建时间
         'UserMax':4,//用户上限
     }
-    sortParam.value = sortParamMap[params.prop]
-    sortType.value = params.order === 'ascending' ? 1 :params.order === 'descending' ? 2 : 0
+    if (params) {
+        sortParam.value = sortParamMap[params.sortBy]
+        sortType.value = params.descending === true ? 2 : 1 ;
+    } else {
+      sortParam.value = 0
+      sortType.value = 0
+    }
     page.value = 1
     fetchBusinessList()
   };
@@ -314,34 +312,54 @@
   
   const handleAddRenewal = ({ signDate, expirationDate }) => {
     // 处理添加续约逻辑
+    businessCustomInterence.addNewContract({
+        EtaBusinessId: modifyData.value.EtaBusinessId,
+        SigningTime: signDate,
+        ExpiredTime: expirationDate
+    }).then(res=>{
+        if(res.Ret!==200) return 
+        MessagePlugin.success('添加续约成功')
+        showRenewal.value = false
+        fetchBusinessList()
+    })
   };
   
-  const handleModifySaller = ({ saller, sallerName }) => {
+  const handleModifySaller = ({ saller, sallerName, EtaBusinessId }) => {
     // 处理修改销售逻辑
+    businessCustomInterence.changeBusinessSeller({
+        EtaBusinessId,
+        SellerId:saller,
+        SellerName:sallerName
+    }).then(res=>{
+        if(res.Ret!==200) return 
+        MessagePlugin.success('修改销售成功')
+        showModifySaller.value = false
+        fetchBusinessList()
+    })
   };
   
-  const changeBusinessStatus = (data) => {
-    // 处理启用/禁用商家逻辑
+  const changePermissionStatus = (data) => {
+    // 处理权限变更逻辑
   };
   
   const itemClickHandle = (type, data) => {
     if (type === 'modifySale') {
       modifyData.value = data;
       showModifySaller.value = true;
-    } else if (type === 'disable') {
-      changeBusinessStatus(data);
+    } else if (type === 'permission') {
+      changePermissionStatus(data);
     } else if (type === 'setAuth') {
-      // 处理权限设置逻辑
+      // 去设置权限页面
+      router.push({ path: '/customer/businessAuth', query: { id: data.EtaBusinessId, name:data.BusinessName } });
     }
   };
   
-  const toggleDropdown = (row) => {
-    dropdownVisible[row.id] = !dropdownVisible[row.id];
-  };
+  // const toggleDropdown = (row) => {
+  //   dropdownVisible[row.id] = !dropdownVisible[row.id];
+  // };
   
   const getIndustry = async () => {
     try {
-      // 假设 customInterence 是一个已经定义好的 API 服务
       const res = await customInterence.getindustry({ Classify: 'ficc' });
       if (res.Ret === 200) {
         tradeArr.value = res.Data.List || [];
@@ -353,7 +371,6 @@
   
   const getSale = async () => {
     try {
-      // 假设 roadshowInterence 是一个已经定义好的 API 服务
       const res = await roadshowInterence.getSellerList();
       if (res.Ret !== 200) return;
       salesArr.value = res.Data.List.map((item) => ({

src/views/business_manage/components/AddRenewal.vue

@@ -1,97 +1,101 @@
 <template>
     <div class="add-renewal-wrap">
-        <el-form 
-            :model="ruleForm" 
+        <t-form 
+            :data="ruleForm" 
             :rules="rules" 
-            ref="ruleForm" 
+            ref="validateRef" 
             label-width="100px" 
             class="demo-ruleForm"
         >
-            <el-form-item label="运维时间" prop="signDate">
-                <el-date-picker
+            <t-form-item label="运维时间" name="signDate">
+                <t-date-picker
                     v-model="ruleForm.signDate"
                     type="date"
                     placeholder="选择日期"
                     value-format="yyyy-MM-dd"
                 />
-            </el-form-item>
-            <el-form-item label="到期时间" prop="expirationDate">
-                <el-date-picker
+            </t-form-item>
+            <t-form-item label="到期时间" name="expirationDate">
+                <t-date-picker
                     v-model="ruleForm.expirationDate"
                     type="date"
                     placeholder="选择日期"
                     value-format="yyyy-MM-dd"
                 />
-            </el-form-item>
-            <div style="text-align:center;margin:30px 0">
-                <el-button type="primary" plain @click="handleClose">取消</el-button>
-                <el-button type="primary" @click="handleSave">保存</el-button>
+            </t-form-item>
+            <div class="foot-container">
+                <t-button theme="default" plain @click="handleClose">取消</t-button>
+                <t-button theme="primary" @click="handleSave">保存</t-button>
             </div>
-        </el-form>
+        </t-form>
     </div>
 </template>
 
-<script>
-export default {
-    props:{
-        renewalForm:{
-            type:Object,
-            default:()=>{
-                return {}
-            }
-        }
-    },
-    watch:{
-        renewalForm:{
-            handler:function(value){
-                if(value.id){
-                    this.ruleForm.id = value.id || 0
-                    this.ruleForm.signDate = value.signDate || ''
-                    this.ruleForm.expirationDate = value.expirationDate || ''
-                }
-            },
-            immediate:true
-        }
-    },
-    data() {
-        return {
-            rules:{
-                signDate:[{required: true, message: '请选择运维时间', trigger: 'change' },],
-                expirationDate:[{required: true, message: '请选择到期时间', trigger: 'change' },],
-            },
-            ruleForm:{
-                id:0,
-                signDate:'',
-                expirationDate:''
-            }
-        }
-    },
-    methods: {
-        handleSave(){
-            this.$refs.ruleForm.validate((valid)=>{
-                if(valid){
-                    const flag=this.$moment(this.ruleForm.signDate).isBefore(this.ruleForm.expirationDate);
-                    if(!flag){
-                        this.$message.warning('到期时间不得早于运维时间')
-                        return
-                    }
-                    this.$emit('addRenewal',this.ruleForm)
-                    this.initForm()
-                }
-            })
-        },
-        initForm(){
-            this.ruleForm.id = 0
-            this.ruleForm.signDate = ''
-            this.ruleForm.expirationDate = ''
-            this.$nextTick(()=>{
-                this.$refs.ruleForm.clearValidate();
-            })
-        },
-        handleClose(){
-            this.initForm()
-            this.$emit('close')
-        }
-    },
+<script setup>
+import { ref, watch, nextTick } from 'vue';
+import moment from 'moment'; // 确保安装了moment库
+
+const props = defineProps({
+  renewalForm: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+// emit事件
+const emit = defineEmits(['close', 'addRenewal']);
+const ruleForm = ref({
+  id: 0,
+  signDate: '',
+  expirationDate: '',
+});
+const rules = {
+  signDate: [{ required: true, message: '请选择运维时间', trigger: 'change' }],
+  expirationDate: [{ required: true, message: '请选择到期时间', trigger: 'change' }],
+};
+const validateRef = ref(null);
+
+// 监听renewalForm的变化
+watch(
+  () => props.renewalForm,
+  (newValue) => {
+    if (newValue.id) {
+      ruleForm.value.id = newValue.id || 0;
+      ruleForm.value.signDate = newValue.signDate || '';
+      ruleForm.value.expirationDate = newValue.expirationDate || '';
+    }
+  },
+  { immediate: true }
+);
+
+const handleSave = async () => {
+  const valid = await validateRef.value.validate()
+  if (valid !== true) return
+  const flag = moment(ruleForm.value.signDate).isBefore(ruleForm.value.expirationDate);
+  if (!flag) {
+    MessagePlugin.warning('到期时间不得早于运维时间');
+    return;
+  }
+  emit('addRenewal', ruleForm.value);
+  initForm();
+};
+
+const initForm = () => {
+  ruleForm.value = { id: 0, signDate: '', expirationDate: '' };
+  nextTick(() => {
+    // validateRef.value.resetFields(); // 重置表单验证状态
+  });
+};
+
+const handleClose = () => {
+  initForm();
+  emit('close');
+};
+</script>
+<style scoped lang="scss">
+.foot-container {
+    padding:20px 0;
+    display: flex;
+    gap: 10px;
+    justify-content: flex-end;
 }
-</script>
+</style>

src/views/business_manage/components/ModifySaller.vue

@@ -1,95 +1,108 @@
 <template>
     <div class="modify-saller-wrap">
-        <el-form 
-            :model="ruleForm" 
+        <t-form 
+            :data="ruleForm" 
             :rules="rules" 
-            ref="ruleForm" 
+            ref="ruleFormRef" 
             label-width="100px" 
-            class="demo-ruleForm"
         >
-            <el-form-item label="商家名称">
+            <t-form-item label="商家名称">
                 <span>{{data.BusinessName||''}}</span>
-            </el-form-item>
-            <el-form-item label="当前销售">
+            </t-form-item>
+            <t-form-item label="当前销售">
                 <span>{{data.SellerName||''}}</span>
-            </el-form-item>
-            <el-form-item label="移至销售" prop="saller">
-                <el-cascader
+            </t-form-item>
+            <t-form-item label="移至销售" name="saller">
+                <t-cascader
                     ref="cascader"
                     v-model="ruleForm.saller"
-                    :options="salesArr"
-                    :show-all-levels="false"
-                    :props="{
+                    :options="props.salesArr"
+                    :keys="{
                         expandTrigger: 'hover',
                         children: 'Child',
-                        emitPath: false,
                         label:'AdminName',
                         value:'AdminId',
                     }"
-                    collapse-tags
                     filterable
                     clearable
+                    @change="changeSaller"
                     placeholder="请选择销售"
                 />
-            </el-form-item>
-            <div style="text-align:center;margin:30px 0">
-                <el-button type="primary" plain @click="handleClose">取消</el-button>
-                <el-button type="primary" @click="handleSave">保存</el-button>
+            </t-form-item>
+            <div class="foot-container">
+                <t-button theme="default" plain @click="handleClose">取消</t-button>
+                <t-button theme="primary" @click="handleSave">保存</t-button>
             </div>
-        </el-form>
+        </t-form>
     </div>
 </template>
 
-<script>
-export default {
-    props:{
-        salesArr:{ //销售数据
-            type:Array,
-            default:()=>{return []}
-        },
-        data:{ //正在编辑的数据
-            type:Object,
-            default:()=>{return {}}
-        }
-    },
-    data() {
-        return {
-            salesArr:[],
-            rules:{
-                saller:[{required: true, message: '请选择所属销售', trigger: 'change' },],
-            },
-            ruleForm:{
-                saller:''
-            }
-        }
-    },
-    created() {},
-    methods: {
-        handleSave(){
-            this.$refs.ruleForm.validate((valid)=>{
-                if(valid){
-                    const cascaderNodes = this.$refs.cascader.getCheckedNodes({leafOnly:true})
-                    this.$emit('modifySaller',{
-                        saller:Number(cascaderNodes[0]?cascaderNodes[0].value:0),
-                        sallerName:cascaderNodes[0]?cascaderNodes[0].label:''
-                    })
-                    this.initForm()
 
-                }
-            })
-        },
-        initForm(){
-            this.ruleForm.saller = ''
-            this.$refs.ruleForm.resetFields();
-        },
-        handleClose(){
-            this.initForm()
-            this.$emit('close')
-        },
-    },
-}
-</script>
+<script setup>
+import { ref, reactive } from 'vue';
+
+// 暴露给模板的refs
+const ruleFormRef = ref(null);
+const cascader = ref(null);
+const props = defineProps({
+  salesArr: {
+    type: Array,
+    default: () => [],
+  },
+  data: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+
+// 定义emit事件
+const emit = defineEmits(['close', 'modifySaller']);
+const cascaderNode = ref({});
+const rules = reactive({
+  saller: [{ required: true, message: '请选择所属销售', trigger: 'change' }],
+});
+const ruleForm = reactive({
+  saller: '',
+});
+
+// 监听销售变化
+const changeSaller = (value, {node}) => {
+  cascaderNode.value = {
+    saller: value,
+    sallerName: node ? node.label : ''
+  }
+};
 
-<style>
+const handleSave = async () => {
+  const valid = await ruleFormRef.value.validate()
+  if (valid !== true) return
+  emit('modifySaller', {
+  saller: Number(cascaderNode.value.saller || 0),
+  sallerName: cascaderNode.value.sallerName || '',
+  EtaBusinessId: props.data.EtaBusinessId,
 
+  });
+  // 重置表单并关闭弹窗
+  initForm();
+};
+
+const initForm = () => {
+  ruleForm.saller = '';
+//   ruleFormRef.value.resetFields();
+};
+
+const handleClose = () => {
+  initForm();
+  emit('close');
+};
+</script>
+
+<style scoped lang="scss">
+.foot-container {
+    padding:20px 0;
+    display: flex;
+    gap: 10px;
+    justify-content: flex-end;
+}
 </style>

src/views/business_manage/components/autocomplete.vue

@@ -1,215 +0,0 @@
-<template>
-  <div
-    class="autocomplete"
-    v-click-outside="close"
-    aria-haspopup="listbox"
-    role="combobox"
-    :aria-expanded="suggestionVisible"
-    :aria-owns="id"
-  >
-    <t-input
-      ref="inputRef"
-      v-bind="$attrs"
-      @input="handleInput"
-      @change="handleChange"
-      @focus="handleFocus"
-      @blur="handleBlur"
-      @clear="handleClear"
-      @onKeydown.up.native.prevent="highlight(state.highlightedIndex - 1)"
-      @onKeydown.down.native.prevent="highlight(state.highlightedIndex + 1)"
-      @onKeydown.enter.native="handleKeyEnter"
-      @onKeydown.native.tab="close"
-    >
-      <template v-if="$slots.prepend" #prepend>
-        <slot name="prepend"></slot>
-      </template>
-      <template v-if="$slots.append" #append>
-        <slot name="append"></slot>
-      </template>
-      <template v-if="$slots.prefix" #prefix>
-        <slot name="prefix"></slot>
-      </template>
-      <template v-if="$slots.suffix" #suffix>
-        <slot name="suffix"></slot>
-      </template>
-    </t-input>
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive, computed, watch, onMounted, onBeforeUnmount, unref } from 'vue';
-import debounce from 'lodash/debounce';
-import {ClickOutside as vClickOutside} from 'element-plus'
-// 定义props
-const props = defineProps({
-  valueKey: {
-    type: String,
-    default: 'value',
-  },
-  popperOptions: Object,
-  placeholder: String,
-  clearable: {
-    type: Boolean,
-    default: false,
-  },
-  disabled: Boolean,
-  name: String,
-  size: String,
-  value: String,
-  maxlength: Number,
-  minlength: Number,
-  autofocus: Boolean,
-  fetchSuggestions: Function,
-  triggerOnFocus: {
-    type: Boolean,
-    default: true,
-  },
-  placement: {
-    type: String,
-    default: 'bottom-start',
-  },
-  popperAppendToBody: {
-    type: Boolean,
-    default: true,
-  },
-  highlightFirstItem: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-// 定义emit事件
-const emit = defineEmits(['input', 'change', 'focus', 'blur', 'clear', 'select']);
-// 使用ref和reactive管理状态
-const inputRef = ref(null);
-const suggestionsRef = ref(null);
-const popoverRef = ref()
-const state = reactive({
-  activated: false,
-  suggestions: [],
-  loading: false,
-  highlightedIndex: -1,
-  suggestionDisabled: false,
-});
-
-// 生成唯一ID
-const id = ref(`autocomplete-${Math.random().toString(36).substr(2, 9)}`);
-
-// 计算属性
-const suggestionVisible = computed(() => {
-  return (state.suggestions.length > 0 || state.loading) && state.activated;
-});
-
-// 数据获取函数，使用lodash的debounce进行防抖处理
-const getData = debounce((queryString) => {
-  if (state.suggestionDisabled) return;
-  state.loading = true;
-  props.fetchSuggestions(queryString, (suggestions) => {
-    state.loading = false;
-    if (state.suggestionDisabled) return;
-    if (Array.isArray(suggestions)) {
-      state.suggestions = suggestions;
-      state.highlightedIndex = props.highlightFirstItem ? 0 : -1;
-    } else {
-      console.error('[Autocomplete Error] Suggestions must be an array');
-    }
-  });
-}, 300);
-
-// 处理输入框输入事件
-const handleInput = (value) => {
-  emit('input', value);
-  // search(value);
-};
-
-// 搜索功能
-const search = (value) => {
-  state.activated = true;
-  state.suggestionDisabled = false;
-  if (!props.triggerOnFocus && !value) {
-    state.suggestionDisabled = true;
-    state.suggestions = [];
-    return;
-  }
-  getData(value);
-};
-
-// 处理输入框值变化事件
-const handleChange = (value) => emit('change', value);
-
-// 处理输入框聚焦事件
-const handleFocus = (event) => {
-  emit('focus', event);
-  // if (props.triggerOnFocus) {
-  //   getData(props.value);
-  // }
-};
-
-// 处理输入框失焦事件
-const handleBlur = (event) => emit('blur', event);
-
-// 处理输入框清空事件
-const handleClear = () => {
-  state.activated = false;
-  emit('clear');
-};
-
-// 关闭下拉列表
-const close = () => {
-  state.activated = false;
-  // unref(popoverRef).popperRef?.delayHide?.()
-};
-
-// 处理键盘Enter键事件
-const handleKeyEnter = (event) => {
-  if (suggestionVisible.value && state.highlightedIndex >= 0 && state.highlightedIndex < state.suggestions.length) {
-    event.preventDefault();
-    select(state.suggestions[state.highlightedIndex]);
-  }
-};
-
-// 选择建议项
-const select = (item) => {
-  emit('input', item[props.valueKey]);
-  emit('select', item);
-  state.suggestions = [];
-  state.highlightedIndex = -1;
-};
-
-// 高亮建议项
-const highlight = (index) => {
-  if (!suggestionVisible.value || state.loading) return;
-  if (index < 0) {
-    state.highlightedIndex = -1;
-    return;
-  }
-  if (index >= state.suggestions.length) {
-    index = state.suggestions.length - 1;
-  }
-  state.highlightedIndex = index;
-};
-
-// 监听suggestionVisible的变化
-watch(suggestionVisible, (val) => {
-  if (val && inputRef.value) {
-    // 这里可以添加逻辑来处理suggestionVisible变化时的逻辑，但原始代码中这部分是空的
-  }
-});
-
-// 组件挂载时执行
-onMounted(() => {
-  emit('focus');
-});
-
-// 组件卸载前执行
-onBeforeUnmount(() => {
-  // 清理逻辑，如果有的话
-});
-defineExpose({
-  search
-});
-</script>
-
-<style scoped>
-/* 添加您的样式 */
-</style>

src/views/etaMenu/components/ModifyMenuDialog.vue

@@ -2,8 +2,6 @@
     <div class="modify-menu-wrap">
         <t-dialog
             :visible.sync="isShowMenuDialog"
-            :close-on-click-modal="false"
-            :modal-append-to-body='false'
             :header="form.MenuId?'编辑菜单':'添加菜单'"
             @close="$emit('close')"
             width="720px"

src/views/etaTrial/addApproval.vue

@@ -1,51 +1,51 @@
 <template>
   <div class="add-approval-wrap">
    <!--  {{tableData}} -->
-    <el-table :data="tableData" :row-class-name="tableRowClassName" v-loading="pageLoading" border>
+    <t-table :data="tableData"  :row-class-name="tableRowClassName" v-loading="pageLoading" border>
       <!-- 序号 -->
-      <el-table-column
+      <t-table-column
         type="index"
         width="50"
         label="序号"
         align="center"
       />
       <!-- 姓名 -->
-      <el-table-column label="姓名" min-width="100">
+      <t-table-column label="姓名" min-width="100">
         <template slot-scope="{row}">
-          <el-input v-model="row.UserName" :disabled="row.isApply" placeholder="姓名"></el-input>
+          <t-input v-model="row.UserName" :disabled="row.isApply" placeholder="姓名"></t-input>
         </template>
-      </el-table-column>
+      </t-table-column>
       <!-- 公司名称 -->
-      <el-table-column label="公司名称" min-width="150">
+      <t-table-column label="公司名称" min-width="150">
         <template slot-scope="{row}">
-          <el-input v-model="row.CompanyName" :disabled="row.isApply" placeholder="公司名称"></el-input>
+          <t-input v-model="row.CompanyName" :disabled="row.isApply" placeholder="公司名称"></t-input>
         </template>
-      </el-table-column>
+      </t-table-column>
       <!-- 职位 -->
-      <el-table-column label="职位" min-width="100">
+      <t-table-column label="职位" min-width="100">
         <template slot-scope="{row}">
-          <el-input v-model="row.Position" :disabled="row.isApply" placeholder="职位"></el-input>
+          <t-input v-model="row.Position" :disabled="row.isApply" placeholder="职位"></t-input>
         </template>
-      </el-table-column>
+      </t-table-column>
       <!-- 手机号码 -->
-      <el-table-column label="手机号码" min-width="120">
+      <t-table-column label="手机号码" min-width="120">
         <template slot-scope="{row}">
-          <el-input v-model.trim="row.Mobile" :disabled="row.isApply" placeholder="手机号码"></el-input>
+          <t-input v-model.trim="row.Mobile" :disabled="row.isApply" placeholder="手机号码"></t-input>
         </template>
-      </el-table-column>
+      </t-table-column>
       <!-- 操作 -->
-      <el-table-column label="操作" align="center">
+      <t-table-column label="操作" align="center">
         <template slot-scope="{row,$index}">
-          <el-button type="text" size="small" @click="addTableData">添加</el-button>
-          <el-button type="text" size="small" class="color-hint" 
+          <t-button type="text" size="small" @click="addTableData">添加</t-button>
+          <t-button type="text" size="small" class="color-hint" 
             @click="deleteTableData($index)"
-            v-if="(tableData.length>1&&!row.isApply)">删除</el-button>
+            v-if="(tableData.length>1&&!row.isApply)">删除</t-button>
         </template>
-      </el-table-column>
-    </el-table>
+      </t-table-column>
+    </t-table>
     <div class="btn-wrap">
-      <el-button type="primary" @click="handleApprove">提交申请</el-button>
-      <el-button @click="cancelApprove">取 消</el-button>
+      <t-button type="primary" @click="handleApprove">提交申请</t-button>
+      <t-button @click="cancelApprove">取 消</t-button>
     </div>
     <!-- 提示弹窗 -->
     <add-apply-hint-dialog 
@@ -255,7 +255,7 @@ export default {
 
 <style lang="scss">
 .add-approval-wrap{
-  .el-table .warning-row {
+  .t-table .warning-row {
     background: #FEF0F0;
   }
 }

src/views/etaTrial/compontents/move.vue

@@ -1,40 +1,41 @@
 <template>
 <!-- 新增申请 提示弹窗 弹窗 -->
   <div class="move-dialog">
-    <el-dialog
+    <t-dialog
       :visible.sync="isMoveShow"
       :close-on-click-modal="false"
       :modal-append-to-body="false"
       :header="title"
       @close="handleMove(false)"
       width="530px"
+      :footer="false"
       v-dialogDrag
       center
     >
       <div class="dialog-container">
-        <el-form ref="form" :model="form" label-width="150px">
-          <el-form-item label="移动到">
-            <el-cascader
+        <t-form ref="form" :model="form" label-width="150px">
+          <t-form-item label="移动到">
+            <t-cascader
               v-model="value"
               placeholder="请选择用户"
               style="width:200px;margin-right:10px;margin-bottom:8px;"
               :options="salesArr"
-              :props="defaultSalesProps"
+              :keys="defaultSalesProps"
               :show-all-levels="false"
               :key="modifySales"
               collapse-tags
               clearable
               filterable
               @change="changeSales">
-            </el-cascader>
-          </el-form-item>
-        </el-form>
+            </t-cascader>
+          </t-form-item>
+        </t-form>
       </div>
       <div class="foot-container">
-        <el-button @click="handleMove(false)">取 消</el-button>
-        <el-button type="primary" @click="handleMove">确定</el-button>
+        <t-button theme="default" @click="handleMove(false)">取 消</t-button>
+        <t-button theme="primary" @click="handleMove">确定</t-button>
       </div>
-    </el-dialog>
+    </t-dialog>
   </div>
 </template>
 
@@ -106,7 +107,7 @@ export default {
 <style lang="scss">
 .move-dialog{
   .dialog-container{
-    .el-input--suffix {
+    .t-input--suffix {
       width: 100%;
     }
   }

src/views/etaTrial/etaTrialList.vue

@@ -6,15 +6,15 @@
         <template v-if="false">
           <!-- !Role.includes('admin') -->
           <!-- 管理员-ETA试用列表 -->
-          <template v-if="currentPath === '/etaTrialList'">
-            <t-button type="primary" @click="changePath('/etaApprovalList')">审批列表</t-button>
+          <template v-if="currentPath === '/etaTrial/etaTrialList'">
+            <t-button @click="changePath('/etaTrial/etaApprovalList')">审批列表</t-button>
             <div class="approval-hint" v-if="approvalNum">
               ·{{ approvalNum }}条申请记录待审批
             </div>
             <t-button type="primary" @click="toQuestionnaireSurvey" style="margin-left: 30px;">问卷调研</t-button>
           </template>
           <!-- 管理员-审批列表 -->
-          <template v-if="currentPath === '/etaApprovalList'">
+          <template v-if="currentPath === '/etaTrial/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="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>
+          <template v-if="currentPath === '/etaTrial/etaTrialList'">
+            <t-button @click="changePath('/etaTrial/etaAddApproval')">新增试用客户</t-button>
+            <t-button plain @click="changePath('/etaTrial/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="currentPath === '/etaApprovalList'">
+          <template v-if="currentPath === '/etaTrial/etaApprovalList'">
             <div class="tips">*账号用于登录ETA试用平台：https://exptest.hzinsights.com/</div>
             <div class="right-header">
               <span>已选{{ selectedTotal }}</span>
@@ -44,9 +44,9 @@
         </template>
       </div>
       <div class="search-wrap">
-        <template v-if="currentPath === '/etaApprovalList'">
-          <t-button type="primary" @click="batchMove">批量移动</t-button>
-          <t-button type="primary" @click="batchOperate">一键启用</t-button>
+        <template v-if="currentPath === '/etaTrial/etaApprovalList'">
+          <t-button @click="batchMove">批量移动</t-button>
+          <t-button @click="batchOperate">一键启用</t-button>
         </template>
         <t-input
           v-model="searchText"
@@ -61,7 +61,7 @@
     <div class="table-wrap">
       <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 align="center" type="selection" width="55" v-if="route.path === '/etaTrial/etaApprovalList'">
         </t-table-column> -->
        
         <!-- <template #approveType="{ row }">
@@ -115,12 +115,12 @@
       @closeDialog="closeDialog"
     ></add-apply-hint-dialog> -->
     <!-- 移动弹窗 -->
-    <!-- <move
+    <move
       :isMoveShow.sync="isMoveShow"
       :moveInfo="moveInfo"
       @moveConfirm="moveConfirm"
       @closeMove="closeMove"
-    ></move> -->
+    ></move>
     <!-- 查看账号密码弹窗 -->
     <t-dialog
       v-if="showDetailDialogShow"
@@ -137,7 +137,7 @@
         <p>账号：{{ applyInfo.applyData[0].Account }}</p>
         <p>密码：{{ applyInfo.applyData[0].Password }}</p>
         <div class="button">
-          <t-button type="primary" @click="showDetailDialogShow = false">知道了</t-button>
+          <t-button @click="showDetailDialogShow = false">知道了</t-button>
         </div>
       </div>
     </t-dialog>
@@ -237,20 +237,17 @@ const getSalesArr = async () => {
 const getTableData = async (type) => {
   tableLoading.value = true;
   let interenceName = 'getETATrialList';
-  if (currentPath.value === '/etaTrialList') {
+  if (currentPath.value === '/etaTrial/etaTrialList') {
     canEdit.value = false;
     columnList.value = etaTrialColumn;
     interenceName = 'getETATrialList';
-  } else if (currentPath.value === '/etaApprovalList') {
+  } else if (currentPath.value === '/etaTrial/etaApprovalList') {
     canEdit.value = true;
     if (listType.value !== 'all') {
       columnList.value = approvedList;
       interenceName = 'getApprovalList';
     }
   }
-  columnList.value = etaTrialColumn
-  console.log(etaTrialColumn);
-  
   const res = await etaTrialInterence[interenceName]({
     PageSize: pageSize.value,
     CurrentIndex: currentPage.value,
@@ -429,7 +426,7 @@ const handleOperate = async (type, data) => {
     const { ApplyMethod } = data;
     if (ApplyMethod === 1) {
       sessionStorage.setItem('applyInfo', JSON.stringify(applyInfo));
-      router.push('/etaAddApproval'); // 确保 router 已被正确导入
+      router.push('/etaTrial/etaAddApproval'); // 确保 router 已被正确导入
     } else {
       isAddApplyHintShow.value = true;
     }
@@ -447,7 +444,7 @@ const handleOperate = async (type, data) => {
       const { ApplyMethod } = data;
       if (ApplyMethod === 1) {
         sessionStorage.setItem('applyInfo', JSON.stringify(applyInfo));
-        router.push('/etaAddApproval'); // 确保 router 已被正确导入
+        router.push('/etaTrial/etaAddApproval'); // 确保 router 已被正确导入
       } else {
         isAddApplyHintShow.value = true;
       }
@@ -469,7 +466,7 @@ const handleOperate = async (type, data) => {
       const res = await etaTrialInterence.deleteApproval({ ApprovalId: data.ApprovalId });
       if (res.Ret !== 200) return;
       getTableData();
-      message.success('删除成功'); // 确保 message 已被正确导入
+      MessagePlugin.success('删除成功');
     }
   } else if (type === 'showDetail') {
     showDetailDialogShow.value = true;
@@ -492,7 +489,7 @@ const moveConfirm = (data) => {
   };
   etaTrialInterence.accountTransfer(params).then(res => {
     if (res.Ret !== 200) return;
-    message.success('移动成功'); // 确保 message 已被正确导入
+    MessagePlugin.success('移动成功');
     getTableData();
     isMoveShow.value = false;
   });
@@ -526,7 +523,7 @@ const Move = (row) => {
 
 const batchMove = () => {
   if (selectList.value.length === 0) {
-    message.warning('请至少选择一个客户'); // 确保 message 已被正确导入
+    MessagePlugin.warning('请至少选择一个客户');
     return;
   }
   moveInfo.type = 2;
@@ -536,7 +533,7 @@ const batchMove = () => {
 
 const batchOperate = async () => {
   if (getMobileList(tableData.value, selectList.value).length === 0) {
-    message.warning('请至少选择一个客户'); // 确保 message 已被正确导入
+    MessagePlugin.warning('请至少选择一个客户');
     return;
   }
   const res = await etaTrialInterence.applyEnable({
@@ -545,7 +542,7 @@ const batchOperate = async () => {
   });
   if (res.Ret !== 200) return;
   getTableData();
-  message.success('启用成功'); // 确保 message 已被正确导入
+  MessagePlugin.success('启用成功');
 };
 
 const getMobileList = (array1, array2) => {