pref:优化设备列表 没有组织，弹窗组织

 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { deviceProfile, getGATEWAYdevice } from '/@/api/device/deviceManager';
 import { deviceProfile, getGATEWAYdevice } from '/@/api/device/deviceManager';
-import { getOrganizationList } from '/@/api/system/system';
-import { copyTransFun } from '/@/utils/fnUtils';
 
 
 export enum TypeEnum {
 export enum TypeEnum {
   IS_GATEWAY = 'GATEWAY',
   IS_GATEWAY = 'GATEWAY',
@@ -82,25 +80,10 @@ export const step1Schemas: FormSchema[] = [
   },
   },
   {
   {
     field: 'organizationId',
     field: 'organizationId',
-    required: true,
     label: '所属组织',
     label: '所属组织',
-    component: 'ApiTreeSelect',
-    componentProps({ formActionType }) {
-      const { setFieldsValue } = formActionType;
-      return {
-        api: async () => {
-          const data = await getOrganizationList();
-          copyTransFun(data as any as any[]);
-          return data;
-        },
-
-        onChange() {
-          setFieldsValue({
-            gatewayId: null,
-          });
-        },
-      };
-    },
+    component: 'Input',
+    required: true,
+    slot: 'addOrg',
   },
   },
   {
   {
     field: 'gatewayId',
     field: 'gatewayId',

@@ -2,6 +2,25 @@
   <div class="step1">
   <div class="step1">
     <div class="step1-form">
     <div class="step1-form">
       <BasicForm @register="register">
       <BasicForm @register="register">
+        <template #addOrg="{ model, field }">
+          <div style="display: flex; align-items: center">
+            <div style="width: 245px">
+              <a-tree-select
+                v-model:value="model[field]"
+                show-search
+                style="width: 100%"
+                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                placeholder="请选择组织"
+                allow-clear
+                tree-default-expand-all
+                :tree-data="treeData"
+              />
+            </div>
+            <div>
+              <a-button type="link" @click="handleOpenOrgDrawer">新增组织</a-button>
+            </div>
+          </div>
+        </template>
         <template #iconSelect>
         <template #iconSelect>
           <Upload
           <Upload
             name="avatar"
             name="avatar"
@@ -86,10 +105,11 @@
         <div ref="wrapRef" style="height: 300px; width: 90%" class="ml-6"></div>
         <div ref="wrapRef" style="height: 300px; width: 90%" class="ml-6"></div>
       </div>
       </div>
     </Modal>
     </Modal>
+    <DeptDrawer @register="registerModal" @success="handleSuccess" />
   </div>
   </div>
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
-  import { defineComponent, ref, nextTick, unref, reactive } from 'vue';
+  import { defineComponent, ref, nextTick, unref, reactive, toRefs, onMounted } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { step1Schemas } from '../../config/data';
   import { step1Schemas } from '../../config/data';
   import { useScript } from '/@/hooks/web/useScript';
   import { useScript } from '/@/hooks/web/useScript';
@@ -102,6 +122,10 @@
   import icon from '/@/assets/images/wz.png';
   import icon from '/@/assets/images/wz.png';
   import { useDebounceFn } from '@vueuse/core';
   import { useDebounceFn } from '@vueuse/core';
   import { validatorLongitude, validatorLatitude } from '/@/utils/rules';
   import { validatorLongitude, validatorLatitude } from '/@/utils/rules';
+  import { getOrganizationList } from '/@/api/system/system';
+  import { copyTransFun } from '/@/utils/fnUtils';
+  import { useDrawer } from '/@/components/Drawer';
+  import DeptDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
 
 
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
@@ -117,6 +141,7 @@
       Row,
       Row,
       Col,
       Col,
       LoadingOutlined,
       LoadingOutlined,
+      DeptDrawer,
     },
     },
     props: {
     props: {
       isUpdate: {
       isUpdate: {
@@ -125,6 +150,27 @@
     },
     },
     emits: ['next'],
     emits: ['next'],
     setup(props, { emit }) {
     setup(props, { emit }) {
+      const orgData: any = reactive({
+        treeData: [],
+      });
+      const getOrganizationListFunc = async () => {
+        const data = await getOrganizationList();
+        copyTransFun(data as any as any[]);
+        orgData.treeData = data;
+      };
+      onMounted(async () => {
+        await getOrganizationListFunc();
+      });
+      const { treeData } = toRefs(orgData);
+      const [registerModal, { openDrawer }] = useDrawer();
+      const handleOpenOrgDrawer = () => {
+        openDrawer(true, {
+          isUpdate: false,
+        });
+      };
+      const handleSuccess = async () => {
+        await getOrganizationListFunc();
+      };
       const redirectPosition = () => {
       const redirectPosition = () => {
         if (positionState.longitude && positionState.latitude) {
         if (positionState.longitude && positionState.latitude) {
           var pt = new BMap.Point(positionState.longitude, positionState.latitude);
           var pt = new BMap.Point(positionState.longitude, positionState.latitude);
@@ -152,6 +198,7 @@
       async function nextStep() {
       async function nextStep() {
         try {
         try {
           let values = await validate();
           let values = await validate();
+          console.log(values);
           values = { devicePic: devicePic.value, ...positionState, ...values };
           values = { devicePic: devicePic.value, ...positionState, ...values };
           delete values.icon;
           delete values.icon;
           delete values.deviceAddress;
           delete values.deviceAddress;
@@ -400,6 +447,10 @@
         loading,
         loading,
         rules,
         rules,
         redirectPosition,
         redirectPosition,
+        treeData,
+        registerModal,
+        handleOpenOrgDrawer,
+        handleSuccess,
       };
       };
     },
     },
   });
   });

@@ -17,7 +17,6 @@
               @click="handleCreateOrEdit('add')"
               @click="handleCreateOrEdit('add')"
               class="ml-2"
               class="ml-2"
               style="color: #409eff; cursor: pointer"
               style="color: #409eff; cursor: pointer"
-              type="primary"
               size="small"
               size="small"
               >新建转换脚本</span
               >新建转换脚本</span
             >
             >