Merge remote-tracking branch 'origin/dev' into v1.5

src/pages/TourHouseSaleInfo/formTourHouseSaleInfo.vue

@@ -342,7 +342,7 @@ const route = useRoute();
 const layoutStore = useLayoutStore();
 const { downloadFile } = useDownload();
 const { getUploadHeaders, getUploadActionUrl, fileListToJson, parseUploadData, getPictureList } = useUpload();
-const { 
+const {
   Delete,
   Search,
   Edit,
@@ -373,19 +373,19 @@ const props = withDefaults(
 const formFilter = reactive({
   // 所属地区类型
   areaIdFilter: undefined,
-  // 是否房东自售 
+  // 是否房东自售
   isSaleByLandlordFilter: undefined,
-  // 房源类型 
+  // 房源类型
   houseSourceTypeFilter: undefined,
   // 厅室类型
   officeTypeFilter: undefined,
-  // 房屋类型 
+  // 房屋类型
   houseTypeFilter: undefined,
   // 朝向类型
   orientationFilter: undefined,
   // 装修类型
   decorationFilter: undefined,
-  // 是否在售 
+  // 是否在售
   isOnSaleFilter: undefined,
   // 联系电话
   mobileFilter: undefined,
@@ -395,19 +395,19 @@ const formFilter = reactive({
 const formFilterCopy = reactive({
   // 所属地区类型
   areaIdFilter: undefined,
-  // 是否房东自售 
+  // 是否房东自售
   isSaleByLandlordFilter: undefined,
-  // 房源类型 
+  // 房源类型
   houseSourceTypeFilter: undefined,
   // 厅室类型
   officeTypeFilter: undefined,
-  // 房屋类型 
+  // 房屋类型
   houseTypeFilter: undefined,
   // 朝向类型
   orientationFilter: undefined,
   // 装修类型
   decorationFilter: undefined,
-  // 是否在售 
+  // 是否在售
   isOnSaleFilter: undefined,
   // 联系电话
   mobileFilter: undefined,
@@ -608,7 +608,7 @@ const loadAreaIdFilterDropdownList = (): Promise<ListData<DictData>> => {
   return new Promise((resolve, reject) => {
     const params = {
     };
-    DictionaryController.dictTourHouseAreaMenuByParentId(params).then(res => {
+    DictionaryController.dictTourHouseAreaMenu(params).then(res => {
       resolve({
         dataList: res.getList(),
       });
@@ -850,4 +850,4 @@ const formInit = () => {
 onMounted(() => {
   formInit();
 });
-</script>
+</script>