1、入驻人员

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

@@ -2,6 +2,7 @@ import type {FormSchemaGetter} from '#/adapter/form';
 import type {VxeGridProps} from '#/adapter/vxe-table';
 import {getDictOptions} from "#/utils/dict";
 import {renderDict} from "#/utils/render";
+
 export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
@@ -30,13 +31,17 @@ export const columns: VxeGridProps['columns'] = [
     field: 'id',
     slots: {
       default: ({ rowIndex }) => {
-        return rowIndex + 1;
+        return (rowIndex + 1).toString();
       },
     },
   },
   {
     title: '单位编号',
     field: 'unitNumber',
+    slots:{
+      default: ({ row }) => {
+        return row.id;
+      }}
   },
   {
     title: '单位名称',
@@ -47,7 +52,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'type',
     slots: {
       default: ({ row }) => {
-        return renderDict(row.type, 'wy_rzdwlx');
+        return renderDict(row.type, 'wy_qylx');
       },
     },
   },
@@ -70,11 +75,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '状态',
     field: 'state',
-    slots: {
-      default: ({ row }) => {
-        return renderDict(row.state, 'wy_state');
-      },
-    },
+    slots: {default: 'state'}
   },
   {
     title: '员工数量',
@@ -112,15 +113,16 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'name',
     component: 'Input',
     rules: 'required',
+
   },
   {
     label: '单位类型',
     fieldName: 'type',
     component: 'Select',
-    rules: 'required',
     componentProps: {
-      options: getDictOptions('wy_rzdwlx'),
+      options: getDictOptions('wy_qylx'),
     },
+    rules: 'required',
   },
   {
     label: '联系人',
@@ -134,11 +136,13 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+
   {
     label: '入驻位置',
     fieldName: 'location',
     component: 'Input',
     rules: 'required',
+    formItemClass: 'col-span-2'
   },
   {
     label: '入驻时间',

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

@@ -20,7 +20,11 @@ import type { Resident_unitForm } from '#/api/property/resident/unit/model';
 import { commonDownloadExcel } from '#/utils/file/download';
 
 import resident_unitModal from './unit-modal.vue';
+import unitInfoModal from './unit-detail.vue';
 import { columns, querySchema } from './data';
+import {userStatusChange} from "#/api/system/user";
+import {TableSwitch} from "#/components/table";
+import {useAccess} from "@vben/access";
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -42,8 +46,6 @@ const gridOptions: VxeGridProps = {
     // 点击行选中
     // trigger: 'row',
   },
-  // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-  // columns: columns(),
   columns,
   height: 'auto',
   keepSource: true,
@@ -84,9 +86,12 @@ async function handleEdit(row: Required<Resident_unitForm>) {
   modalApi.setData({ id: row.id });
   modalApi.open();
 }
+const [UnitInfoModal, unitInfoModalApi] = useVbenModal({
+  connectedComponent: unitInfoModal,
+});
 async function handleInfo(row: Required<Resident_unitForm>) {
-  modalApi.setData({ id: row.id });
-  modalApi.open();
+  unitInfoModalApi.setData({ id: row.id });
+  unitInfoModalApi.open();
 }
 async function handleDelete(row: Required<Resident_unitForm>) {
   await resident_unitRemove(row.id);
@@ -112,6 +117,7 @@ function handleDownloadExcel() {
     fieldMappingTime: formOptions.fieldMappingTime,
   });
 }
+const { hasAccessByCodes } = useAccess();
 </script>
 
 <template>
@@ -142,8 +148,22 @@ function handleDownloadExcel() {
           </a-button>
         </Space>
       </template>
+      <template #state="{ row }">
+        <TableSwitch
+          v-model:value="row.state"
+          :api="() => userStatusChange(row)"
+          :disabled=" !hasAccessByCodes(['property:unit:edit'])
+            "
+          @reload="() => tableApi.query()"
+        />
+      </template>
       <template #action="{ row }">
         <Space>
+          <ghost-button
+            @click.stop="handleInfo(row)"
+          >
+            {{ $t('pages.common.info') }}
+          </ghost-button>
           <ghost-button
             v-access:code="['property:unit:edit']"
             @click.stop="handleEdit(row)"
@@ -168,5 +188,6 @@ function handleDownloadExcel() {
       </template>
     </BasicTable>
     <Resident_unitModal @reload="tableApi.query()" />
+    <UnitInfoModal/>
   </Page>
 </template>

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

@@ -0,0 +1,84 @@
+<script setup lang="ts">
+import type {Unit} from '#/api/property/resident/unit/model';
+
+import {shallowRef} from 'vue';
+
+import {useVbenModal} from '@vben/common-ui';
+
+import {Descriptions, DescriptionsItem} from 'ant-design-vue';
+import dayjs from 'dayjs';
+import duration from 'dayjs/plugin/duration';
+import relativeTime from 'dayjs/plugin/relativeTime';
+
+import {resident_unitInfo} from '#/api/property/resident/unit';
+import {renderDict} from "#/utils/render";
+
+dayjs.extend(duration);
+dayjs.extend(relativeTime);
+
+const [BasicModal, modalApi] = useVbenModal({
+  onOpenChange: handleOpenChange,
+  onClosed() {
+    unitDetail.value = null;
+  },
+});
+
+const unitDetail = shallowRef<null | Unit>(null);
+
+async function handleOpenChange(open: boolean) {
+  if (!open) {
+    return null;
+  }
+  modalApi.modalLoading(true);
+
+  const {id} = modalApi.getData() as { id: number | string };
+  const response = await resident_unitInfo(id);
+  // 赋值
+  unitDetail.value = response;
+
+  modalApi.modalLoading(false);
+}
+
+
+</script>
+
+<template>
+  <BasicModal :footer="false" :fullscreen-button="false" title="入驻单位信息" class="w-[70%]">
+    <Descriptions v-if="unitDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
+      <DescriptionsItem label="单位编号">
+       {{ unitDetail.id }}
+      </DescriptionsItem>
+      <DescriptionsItem label="单位名称">
+        {{ unitDetail.name }}
+      </DescriptionsItem>
+      <DescriptionsItem label="单位类型" v-if="unitDetail.type!=null">
+        <component
+          :is="renderDict(unitDetail.type,'wy_qylx')"
+        />
+      </DescriptionsItem>
+      <DescriptionsItem label="联系人">
+        {{ unitDetail.contactPerson +'-'+unitDetail.phone}}
+      </DescriptionsItem>
+      <DescriptionsItem label="入驻位置" :span="2">
+        {{ unitDetail.location }}
+      </DescriptionsItem>
+      <DescriptionsItem label="入驻时间">
+        {{ unitDetail.time }}
+      </DescriptionsItem>
+      <DescriptionsItem label="员工数量">
+        {{ unitDetail.number }}
+      </DescriptionsItem>
+      <DescriptionsItem label="创建时间">
+        {{ unitDetail.createTime ?? '-' }}
+      </DescriptionsItem>
+      <DescriptionsItem label="状态" v-if="unitDetail.state!=null">
+        <component
+          :is="renderDict(unitDetail.state,'wy_state')"
+        />
+      </DescriptionsItem>
+      <DescriptionsItem label="备注">
+        {{ unitDetail.remark ?? '-' }}
+      </DescriptionsItem>
+    </Descriptions>
+  </BasicModal>
+</template>