bug修复

src/views/business_manage/addBusiness.vue

@@ -86,10 +86,6 @@
               </t-form-item>
             </div>
             <div class="form-line">
-              <t-form-item label="用户上限" name="userMax">
-                <t-input v-model:modelValue="firstFormData.userMax" @change="changeUserMax" :disabled="currentRoute === 'businessDetail'"
-                 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" :keys="cascaderProps" filterable @change="changeSaller"
@@ -184,7 +180,6 @@ const firstFormData = reactive({
   teamSize: '',
   fundsize: '',
   industry: '',
-  userMax: '',
   saller: ''
 });
 const secondFormData = reactive({
@@ -229,7 +224,6 @@ const rules = {
   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' }],
   signDate: [{ required: true, message: '请选择签约日期', trigger: 'change' }],
   expirationDate: [{ required: true, message: '请选择到期日期', trigger: 'change' }],
@@ -338,7 +332,7 @@ 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, SigningTime, ExpiredTime, City } = res.Data;
+    const { RegionType, BusinessName, CreditCode, Nation, Leader, ResearchTeamSize, CapitalScale, IndustryId, SellerId, SigningTime, ExpiredTime, City, Province } = res.Data;
     Object.assign(firstFormData, {
       areaType: RegionType,
       name: BusinessName,
@@ -348,9 +342,10 @@ const fetchBusinessData = async () => {
       teamSize: ResearchTeamSize,
       fundsize: CapitalScale,
       industry: IndustryId,
-      userMax: UserMax,
       saller: SellerId,
-      address: City
+      address: City,
+      province: Province,
+      city: City
     });
     Object.assign(secondFormData, {
       expirationDate: ExpiredTime,
@@ -396,21 +391,6 @@ const getTimeLineData = async () => {
   }
 };
 
-// 监听用户数量变化 - 过滤输入内容
-const changeUserMax = () => {
-  // 使用正则表达式删除小数点
-  let filteredValue = firstFormData.userMax.replace(/\./g, '');
-  // 检查过滤后的值是否为有效的整数
-  const intValue = parseInt(filteredValue);
-  if (!isNaN(intValue)) {
-    firstFormData.userMax = intValue;
-  } else {
-    // 如果过滤后的值不是有效的整数
-    MessagePlugin.error('请输入一个有效的整数！');
-    firstFormData.userMax = '';
-  }
-};
-
 // 提交
 const normalizingParams = (params) => {
   const IndustryName = tradeArr.value.find(item => item.IndustryId === params.industry)?.IndustryName || '';
@@ -428,7 +408,6 @@ const normalizingParams = (params) => {
     IndustryName: IndustryName,
     CapitalScale: params.fundsize,
     ResearchTeamSize: params.teamSize,
-    UserMax: Number(params.userMax),
     SigningTime: params.signDate || '',
     ExpiredTime: params.expirationDate || '',
     IsCheck: params.IsCheck,
@@ -461,7 +440,7 @@ const handleStepSecond = async (stepName) => {
 
 const handleAddBusiness = async (isEdit = '') => {
   const res = await businessCustomInterence.addChartPermission({
-    ChartClassifyIdStr: permissionRef.value.actuallyAllChecked.join(',') || '',
+    ChartClassifyIdStr: permissionRef.value && permissionRef.value.actuallyAllChecked.join(',') || '',
     EtaBusinessId: handleEtaBusinessId.value === 0 ? businessId.value : handleEtaBusinessId.value
   });
   if (res.Ret !== 200) return;
@@ -503,7 +482,9 @@ const changeActiveStep = (index) => {
 
 // 编辑
 const editEtaBusiness = async () => {
-  const {creditCode, province, city, decisionMaker,industry,nation,teamSize,userMax} = firstFormData;
+  const {creditCode, province, city, decisionMaker,industry,nation,teamSize} = firstFormData;
+  console.log('editEtaBusiness', firstFormData);
+  
   const IndustryName = tradeArr.value.find(item => item.IndustryId === industry)?.IndustryName || '';
   const query = {
     EtaBusinessId: businessId.value,
@@ -513,7 +494,6 @@ const editEtaBusiness = async () => {
     ResearchTeamSize: teamSize||'',
     Nation: nation,
     IndustryId:Number(industry),
-    UserMax:Number(userMax),
     Province:province,
     City:city,
   }
@@ -554,6 +534,9 @@ const editEtaBusiness = async () => {
           width: 48%;
           margin-right: 20px;
         }
+        .t-form-item__saller {
+          margin-bottom: var(--td-comp-margin-xxl);
+        }
       }
     }
 

src/views/business_manage/components/SetPermission.vue

@@ -144,12 +144,9 @@ const removeChildren = (arrayA, arrayB) => {
     return arrayA.filter(item => !setB.has(item));
 }
 
-
 // 保存按钮
 const handleSave = async () => {
-  console.log(actuallyAllChecked.value);
-  
-  // emit('setPermission', actuallyAllChecked.value);
+  emit('setPermission', actuallyAllChecked.value);
 };
 // 搜索
 const changeSearchTxt = () => {

src/views/etaMenu/components/ModifyMenuDialog.vue

@@ -210,7 +210,16 @@ const changeListLevel = (level) => {
       return m;
     });
   } else {
-    menuList.value = [...menuList.value, ..._.cloneDeep(props.etaMenu)];
+    const mergedArray = [...menuList.value, ...props.etaMenu].reduce((acc, curr) => {
+      const existing = acc.find(item => item.MenuId === curr.MenuId);
+      if (existing) {
+        Object.assign(existing, curr);
+      } else {
+        acc.push(curr);
+      }
+      return acc;
+    }, []);
+    menuList.value = mergedArray;
   }
 };
 
@@ -246,23 +255,15 @@ onMounted(() => {
         flex-direction: column;
         margin: 0 auto;
         width: 400px;
-        .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;
-                    }
-                }
-            }
-        }
+          .icon-wrap{
+              display: flex;
+              align-items: center;
+              img{
+                  width:24px;
+                  height: 24px;
+                  margin-right: 15px;
+              }
+          }
         .btn-wrap {
             margin-top: 20px;
             display: flex;

src/views/training/components/addTags.vue

@@ -128,7 +128,7 @@ const modifyTags = () => {
 };
 
 const toTagPage = () => {
-  window.open('/trainingLabel');
+  window.open('/training/trainingLabel');
 };
 </script>
 

src/views/training/modifyVideoPage.vue

@@ -80,9 +80,9 @@
         <!-- 预览视频弹窗 -->
         <t-dialog
             :visible.sync="previewPop"
-            :modal-append-to-body='false'
             width="60vw"
-            :title="previewPopTitle"
+            :header="previewPopTitle"
+            :footer="false"
             @close="endingPreview"
         >
          <video style="width: 100%;height: 100%;max-height: 70vh;outline: none;" 
@@ -391,10 +391,10 @@ const changeRoute = () => {
 // 预览视频
 const handlePreviewVideo = () => {
   if (isVideoUploading.value || !form.value.VideoUrl) return;
-  previewVideo.play();
   previewPopTitle.value = form.value.Title || '暂无标题';
   previewVideoUrl.value = form.value.VideoUrl;
   previewPop.value = true;
+  previewVideo.play();
 };
 
 // 结束预览弹窗关闭回调 -- 暂停视频