Commit fdfdd823a60fbe2fb9eeee914381f6a508b2dfef

Authored by xingyu4j
1 parent 5da9ae25

fix: tenant

yudao-ui-admin-vue3/src/views/system/tenant/index.vue
... ... @@ -99,7 +99,6 @@
99 99 </template>
100 100 <script setup lang="ts">
101 101 import { ref, unref, onMounted } from 'vue'
102   -import dayjs from 'dayjs'
103 102 import { useI18n } from '@/hooks/web/useI18n'
104 103 import { useMessage } from '@/hooks/web/useMessage'
105 104 import { useVxeGrid } from '@/hooks/web/useVxeGrid'
... ... @@ -163,7 +162,6 @@ const handleUpdate = async (rowId: number) =&gt; {
163 162 // 设置数据
164 163 const res = await TenantApi.getTenantApi(rowId)
165 164 tenantPackageId.value = res.packageId
166   - res.expireTime = dayjs(res.expireTime).format('YYYY-MM-DD HH:mm:ss')
167 165 unref(formRef)?.setValues(res)
168 166 }
169 167  
... ... @@ -198,11 +196,9 @@ const submitForm = async () =&gt; {
198 196 const data = unref(formRef)?.formModel as TenantApi.TenantVO
199 197 data.packageId = tenantPackageId.value
200 198 if (actionType.value === 'create') {
201   - data.expireTime = dayjs(data.expireTime).valueOf().toString()
202 199 await TenantApi.createTenantApi(data)
203 200 message.success(t('common.createSuccess'))
204 201 } else {
205   - data.expireTime = dayjs(data.expireTime).valueOf().toString()
206 202 await TenantApi.updateTenantApi(data)
207 203 message.success(t('common.updateSuccess'))
208 204 }
... ...
yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts
... ... @@ -69,11 +69,9 @@ const crudSchemas = reactive&lt;VxeCrudSchema&gt;({
69 69 field: 'expireTime',
70 70 formatter: 'formatDate',
71 71 form: {
72   - show: true,
73 72 component: 'DatePicker',
74 73 componentProps: {
75   - type: 'datetime',
76   - valueFormat: 'x'
  74 + type: 'datetime'
77 75 }
78 76 }
79 77 },
... ...