Merge branch 'ldx' into dev

src/views/promotion/plan/effectivePlan.vue

@@ -834,7 +834,6 @@ const getPlanList = async (arg) => {
   tableList.value = res.data.records
   total.value = res.data.totalRecord
 }
-getPlanList()
 
 // 归属人列表
 const belongPerList = ref([])

src/views/promotion/plan/index.vue

@@ -269,13 +269,15 @@ const getBelongPerList = async () => {
   })
 
   // 城市经理，设置默认归属人 
+
   isCityManager && (queryParams.employeeId = belongPerList.value.find(item => item.employeeNo === empInfo.empNo)?.value)
 }
 
 onMounted(async () => {
   // 给城市经理设置默认选中战区，需要确保归属人列表数据有值
   await getBelongPerList()
-  getWarZoneList()
+  await getWarZoneList()
+  getPlanList()
 })
 
 /************ 数据列表管理 ************/

src/views/promotion/plan/invalidPlan.vue

@@ -225,7 +225,6 @@ const getPlanList = async (arg) => {
   tableList.value = res.data.records
   total.value = res.data.totalRecord
 }
-getPlanList()
 
 defineExpose({
   getPlanList