feat(property): 1

apps/web-antd/src/views/property/resident/unit/data.ts

@@ -176,7 +176,7 @@ export const modalSchema: FormSchemaGetter = () => [
   },
   {
     label: '',
-    fieldName: 'time',
+    fieldName: 'Placeholder',
     component: ''
   },
   {

apps/web-antd/src/views/property/resident/unit/unit-modal.vue

@@ -1,23 +1,23 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, ref } from 'vue'
 
-import { useVbenModal } from '@vben/common-ui';
-import { $t } from '@vben/locales';
-import {cloneDeep, handleNode} from '@vben/utils';
+import { useVbenModal } from '@vben/common-ui'
+import { $t } from '@vben/locales'
+import { cloneDeep, handleNode } from '@vben/utils'
 
-import { useVbenForm } from '#/adapter/form';
-import { resident_unitAdd, resident_unitInfo, resident_unitUpdate } from '#/api/property/resident/unit';
-import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+import { useVbenForm } from '#/adapter/form'
+import { resident_unitAdd, resident_unitInfo, resident_unitUpdate } from '#/api/property/resident/unit'
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'
 
-import { modalSchema } from './data';
-import {communityTree} from "#/api/property/community";
+import { modalSchema } from './data'
+import { communityTree } from "#/api/property/community"
 
-const emit = defineEmits<{ reload: [] }>();
+const emit = defineEmits<{ reload: [] }>()
 
-const isUpdate = ref(false);
+const isUpdate = ref(false)
 const title = computed(() => {
-  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
-});
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add')
+})
 
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
@@ -33,14 +33,14 @@ const [BasicForm, formApi] = useVbenForm({
   schema: modalSchema(),
   showDefaultActions: false,
   wrapperClass: 'grid-cols-2',
-});
+})
 
 const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
   {
     initializedGetter: defaultFormValueGetter(formApi),
     currentGetter: defaultFormValueGetter(formApi),
   },
-);
+)
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
@@ -51,53 +51,57 @@ const [BasicModal, modalApi] = useVbenModal({
   onConfirm: handleConfirm,
   onOpenChange: async (isOpen) => {
     if (!isOpen) {
-      return null;
+      return null
     }
-    modalApi.modalLoading(true);
+    modalApi.modalLoading(true)
 
-    const { id } = modalApi.getData() as { id?: number | string };
-    isUpdate.value = !!id;
+    const { id } = modalApi.getData() as { id?: number | string }
+    isUpdate.value = !!id
     await initLocationOptions()
     if (isUpdate.value && id) {
-      const record = await resident_unitInfo(id);
-      await formApi.setValues(record);
+      const record = await resident_unitInfo(id)
+      await formApi.setValues(record)
     }
-    await markInitialized();
+    await markInitialized()
 
-    modalApi.modalLoading(false);
+    modalApi.modalLoading(false)
   },
-});
+})
 
 async function handleConfirm() {
   try {
-    modalApi.lock(true);
-    const { valid } = await formApi.validate();
+    modalApi.lock(true)
+    const { valid } = await formApi.validate()
     if (!valid) {
-      return;
+      return
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
-    const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? resident_unitUpdate(data) : resident_unitAdd(data));
-    resetInitialized();
-    emit('reload');
-    modalApi.close();
+    const data = cloneDeep(await formApi.getValues())
+
+    data.authBegDate = data.authTime[0]
+    data.authEndDate = data.authTime[1]
+
+    await (isUpdate.value ? resident_unitUpdate(data) : resident_unitAdd(data))
+    resetInitialized()
+    emit('reload')
+    modalApi.close()
   } catch (error) {
-    console.error(error);
+    console.error(error)
   } finally {
-    modalApi.lock(false);
+    modalApi.lock(false)
   }
 }
 /**
  * 入驻位置数据
  */
 async function initLocationOptions() {
-  const locationList = await communityTree(5);
-  const splitStr = '/';
+  const locationList = await communityTree(5)
+  const splitStr = '/'
   handleNode(locationList, 'label', splitStr, function (node: any) {
     if (node.level != 5) {
-      node.disabled = true;
+      node.disabled = true
     }
-  });
+  })
   formApi.updateSchema([
     {
       componentProps: () => ({
@@ -120,12 +124,12 @@ async function initLocationOptions() {
       }),
       fieldName: 'location',
     },
-  ]);
+  ])
 }
 
 async function handleClosed() {
-  await formApi.resetForm();
-  resetInitialized();
+  await formApi.resetForm()
+  resetInitialized()
 }
 </script>