新增预警页面

web-vue/packages/erp/views/erp/account/form.vue

@@ -4,20 +4,20 @@
  * @author gaoxq
 -->
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     :showFooter="true"
     :okAuth="'erp:account:edit'"
-    @register="registerDrawer"
+    @register="registerModal"
     @ok="handleSubmit"
-    width="40%"
+    width="60%"
   >
     <template #title>
       <Icon :icon="getTitle.icon" class="m-1 pr-1" />
       <span> {{ getTitle.value }} </span>
     </template>
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts" setup name="ViewsErpAccountForm">
   import { ref, unref, computed } from 'vue';
@@ -26,7 +26,7 @@
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
-  import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
+  import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
   import { ErpAccount, erpAccountSave, erpAccountForm } from '@jeesite/erp/api/erp/account';
 
   const emit = defineEmits(['success', 'register']);
@@ -108,20 +108,20 @@
     baseColProps: { md: 24, lg: 12 },
   });
 
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    setDrawerProps({ loading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
     await resetFields();
     const res = await erpAccountForm(data);
     record.value = (res.erpAccount || {}) as ErpAccount;
     record.value.__t = new Date().getTime();
     await setFieldsValue(record.value);
-    setDrawerProps({ loading: false });
+    setModalProps({ loading: false });
   });
 
   async function handleSubmit() {
     try {
       const data = await validate();
-      setDrawerProps({ confirmLoading: true });
+      setModalProps({ confirmLoading: true });
       const params: any = {
         isNewRecord: record.value.isNewRecord,
         accountId: record.value.accountId || data.accountId,
@@ -129,7 +129,7 @@
       // console.log('submit', params, data, record);
       const res = await erpAccountSave(params, data);
       showMessage(res.message);
-      setTimeout(closeDrawer);
+      setTimeout(closeModal);
       emit('success', data);
     } catch (error: any) {
       if (error && error.errorFields) {
@@ -137,7 +137,7 @@
       }
       console.log('error', error);
     } finally {
-      setDrawerProps({ confirmLoading: false });
+      setModalProps({ confirmLoading: false });
     }
   }
 </script>

web-vue/packages/erp/views/erp/account/list.vue

@@ -24,7 +24,7 @@
         </a>
       </template>
     </BasicTable>
-    <InputForm @register="registerDrawer" @success="handleSuccess" />
+    <InputForm @register="registerModal" @success="handleSuccess" />
     <FormImport @register="registerImportModal" @success="handleSuccess" />
   </div>
 </template>
@@ -39,7 +39,6 @@
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
   import { ErpAccount, erpAccountList } from '@jeesite/erp/api/erp/account';
   import { erpAccountDelete, erpAccountListData } from '@jeesite/erp/api/erp/account';
-  import { useDrawer } from '@jeesite/core/components/Drawer';
   import { useModal } from '@jeesite/core/components/Modal';
   import { FormProps } from '@jeesite/core/components/Form';
   import InputForm from './form.vue';
@@ -200,10 +199,10 @@
     await getForm().setFieldsValue(record.value);
   });
 
-  const [registerDrawer, { openDrawer }] = useDrawer();
+  const [registerModal, { openModal }] = useModal();
 
   function handleForm(record: Recordable) {
-    openDrawer(true, record);
+    openModal(true, record);
   }
 
   async function handleExport() {