权限

apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts

@@ -1,8 +1,7 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import { getDictOptions } from '#/utils/dict';
-import { costItemSettingList } from '#/api/property/costManagement/costItemSetting';
+import {renderDict} from "#/utils/render";
-import {meterReadingTypeList} from '#/api/property/costManagement/meterReadingType';
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -27,7 +26,12 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '费用类型',
-    field: 'itemId',
+    field: 'costType',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.costType, 'wy_cbfylx');
+      },
+    },
   },
   {
     title: '抄表类型',
@@ -97,7 +101,7 @@ export const modalSchema: FormSchemaGetter = () => [
     //   return {
     //   api: async ()=>{
     //     console.log(values);
-        
+
     //     const rows = await costItemSettingList({pageSize:1000000000,pageNum:1,costType:values.costType});
     //     return rows;
     //   },
@@ -118,7 +122,7 @@ export const modalSchema: FormSchemaGetter = () => [
     //   return {
     //     api: async()=>{
     //       const rows = await meterReadingTypeList({pageSize:1000000000,pageNum:1,costType:values.costType=='5'?0:1});
-    //       return rows;      
+    //       return rows;
     //   },
     //       resultField:'rows',
     //       labelField:'name',

apps/web-antd/src/views/property/costManagement/costMeterWater/index.vue

@@ -29,15 +29,6 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
-  // 不需要直接删除
-  // fieldMappingTime: [
-  //  [
-  //    'createTime',
-  //    ['params[beginTime]', 'params[endTime]'],
-  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //  ],
-  // ],
 };
 
 const gridOptions: VxeGridProps = {

apps/web-antd/src/views/property/visitorManagement/visitorTodo/visitorTodo-detail.vue

@@ -44,8 +44,8 @@ async function handleOpenChange(open: boolean) {
       <DescriptionsItem label="访客身份证">
         {{ visitorTodoDetail.idCard }}
       </DescriptionsItem>
-      <DescriptionsItem label="人脸图片">
+      <DescriptionsItem label="人脸图片" v-if="visitorTodoDetail.facePictures" :span="2">
-        {{ visitorTodoDetail.facePictures }}
+        <img :src="visitorTodoDetail.facePictures" alt="图片加载失败"  class="w-[100px] h-[100px]"/>
       </DescriptionsItem>
       <DescriptionsItem label="所属公司">
         {{ visitorTodoDetail.visitorUnit}}
@@ -65,7 +65,7 @@ async function handleOpenChange(open: boolean) {
         />
       </DescriptionsItem>
       <DescriptionsItem label="拜访时间">
-        {{ visitorTodoDetail.visitingBeginTime+' - '+visitorTodoDetail.visitingBeginTime }}
+        {{ visitorTodoDetail.visitingBeginTime+' - '+visitorTodoDetail.visitingEndTime }}
       </DescriptionsItem>
 <!--      <DescriptionsItem label="是否预约车位" v-if="visitorTodoDetail.bookingParkingSpace!=null">-->
 <!--        <component-->