Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/home/component/workbench.vue

@@ -66,10 +66,10 @@
                     <div class="text-[#505050]" style="width: 100%;">优先级: {{ ['低','中','高'][item.priority] }}</div>
                   </div>
                   <div class="w-full flex items-center justify-between mt-4">
-                    <div class="text-[#505050]" style="width: 100%;">任务开始时间: {{ item.endDate }}</div>
+                    <div class="text-[#505050]" style="width: 100%;">任务开始时间: {{ item.startDate }}</div>
                   </div>
                   <div class="w-full flex items-center justify-between mt-4">
-                    <div class="text-[#505050]" style="width: 100%;">任务截至时间: {{ item.startDate }}</div>
+                    <div class="text-[#505050]" style="width: 100%;">任务截至时间: {{ item.endDate }}</div>
                   </div>
                 </div>
               </template>

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/biReport/addEdit/index.vue

@@ -110,6 +110,10 @@ function dragAndDropEditing() {
     globalPopup?.showWarning('请先选择业务对象')
     return
   }
+  if (mapData?.selectNodes.length > 10) {
+    globalPopup?.showWarning('最多只能选择10个业务对象')
+    return
+  }
 
   sessionStorage.setItem('reportJson', JSON.stringify({
     addFormVal: {
@@ -205,9 +209,16 @@ onMounted(() => {
                 <div class="absolute left-[-10px] top-[2px] text-[red]">*</div>
               </div>
             </template>
-            <el-select v-model="formVal.businessObject" placeholder="请选择" @change="businessObjectSelectChange">
-              <el-option v-for="item in businessTableList" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
+            <div class="flex w-full items-center">
+              <el-select v-model="formVal.businessObject" placeholder="请选择" @change="businessObjectSelectChange">
+                <el-option v-for="item in businessTableList" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+              <div class="ml-4">
+                <el-tooltip class="box-item" effect="dark" content="最多只能选择10个业务对象" placement="top">
+                  <el-icon><QuestionFilled /></el-icon>
+                </el-tooltip>
+              </div>
+            </div>
           </el-form-item>
         </el-form>