部分新增功能-街道获取调整

vue/src/api/baseSettings/institution.ts

@@ -14,7 +14,7 @@ export function getInstitutionList(params: any) {
   );
 }
 
-export function getDataList(){
+export function getInstitutionDataList(){
   return request<any>(
     {
       url: 'institution/getDataList',

vue/src/api/baseSettings/userInfo.ts

@@ -14,7 +14,7 @@ export function getSiteUserList(params: any) {
   );
 }
 
-export function getDataList(){
+export function getSiteUserDataList(){
   return request<any>(
     {
       url: 'userInfo/getDataList',

vue/src/views/baseSettings/site/edit.vue

@@ -90,7 +90,8 @@ import {getSiteByID, saveSite} from "@/api/baseSettings/siteInfo";
 import BUploadFile from "@/components/file/uploadFile.vue";
 import {message, SelectProps} from "ant-design-vue";
 import {getRegionCodeList, getStreetCodeList} from "@/api/system/area/index";
-import {getDataList} from "@/api/baseSettings/institution";
+import {getSiteUserDataList} from "@/api/baseSettings/userInfo";
+import {getInstitutionDataList} from "@/api/baseSettings/institution";
 
 interface siteModel {
   dataModel: any;
@@ -119,6 +120,7 @@ export default defineComponent({
 
     const regionList = ref<SelectProps['options']>();
     const streetList = ref<SelectProps['options']>();
+    const siteUserList = ref<SelectProps['options']>();
     const institutionList = ref<SelectProps["options"]>();
 
     const getRegionList = async function(){
@@ -129,8 +131,13 @@ export default defineComponent({
       const streetResult: any = await getStreetCodeList(regionCode);
       streetList.value = streetResult;
     }
+    const getSiteUserList = async function(){
+      const siteUserResult :any = await getSiteUserDataList();
+      console.log('siteUserResult',siteUserResult);
+      siteUserList.value = siteUserResult;
+    }
     const getInstitutionList = async function(){
-      const institutionResult :any = await getDataList();
+      const institutionResult :any = await getInstitutionDataList();
       console.log('institutionResult',institutionResult);
       institutionList.value = institutionResult;
     }
@@ -192,6 +199,7 @@ export default defineComponent({
       formState,
       regionList,
       streetList,
+      siteUserList,
       institutionList,
       isAllowCommit,
       isDetail,
@@ -201,6 +209,7 @@ export default defineComponent({
       show,
       getRegionList,
       getStreetList,
+      getSiteUserList,
       getInstitutionList,
       onSelectChange,
       handleOk,
@@ -211,6 +220,7 @@ export default defineComponent({
   created() {
     this.getRegionList();
     this.getInstitutionList();
+    this.getSiteUserList();
   },
 })
 </script>

vue/src/views/taskAndLog/dowork/edit.vue

@@ -76,7 +76,7 @@ import BUploadFile from "@/components/file/uploadFile.vue";
 import {message, SelectProps} from "ant-design-vue";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import {getRegionCodeList, getStreetCodeList} from "@/api/system/area/index";
-import {getDataList} from "@/api/baseSettings/userInfo";
+import {getSiteUserDataList} from "@/api/baseSettings/userInfo";
 
 interface InstitutionModel {
   dataModel: any;
@@ -120,7 +120,7 @@ export default defineComponent({
       streetList.value = streetResult;
     }
     const getSiteUserList = async function(){
-      const siteUserResult :any = await getDataList();
+      const siteUserResult :any = await getSiteUserDataList();
       console.log('siteUserResult',siteUserResult);
       siteUserList.value = siteUserResult;
     }