Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/views/property/assetManage/asset/asset-modal.vue

@@ -10,8 +10,7 @@ import { assetAdd, assetInfo, assetUpdate } from '#/api/property/assetManage/ass
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';
-import { packageSelectList } from "#/api/system/tenant-package";
+import { assetTypeselect } from "#/api/property/assetManage/assetType";
-import { assetTypeselect } from "#/api/property/assetType";
 import { depotList } from "#/api/property/assetManage/depot";
 import { suppliersList } from "#/api/property/assetManage/suppliers";
 

apps/web-antd/src/views/property/assetManage/asset/data.ts

@@ -1,9 +1,8 @@
 import type {FormSchemaGetter} from '#/adapter/form';
 import type {VxeGridProps} from '#/adapter/vxe-table';
 import {getDictOptions} from "#/utils/dict";
-import { renderDict } from "#/utils/render";
+import {assetTypeList} from "#/api/property/assetManage/assetType";
-import { DictEnum } from '@vben/constants';
+import type {AssetTypeVO} from "#/api/property/assetManage/assetType/model";
-
 
 
 export const querySchema: FormSchemaGetter = () => [
@@ -16,6 +15,13 @@ export const querySchema: FormSchemaGetter = () => [
     component: 'Select',
     fieldName: 'model',
     label: '资产类型',
+    componentProps: {
+      showSearch:true,
+      placeholder:'根据类型名称搜索...',
+      onSearch:handleSearch,
+      onChange:handleChange,
+      options:typeData
+    },
   },
   {
     component: 'Select',
@@ -28,8 +34,6 @@ export const querySchema: FormSchemaGetter = () => [
 
 ];
 
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   {type: 'checkbox', width: 60},
   {
@@ -47,7 +51,7 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '资产类型',
-    field: 'modelName',
+    field: 'model',
   },
   {
     title: '规格',
@@ -66,16 +70,16 @@ export const columns: VxeGridProps['columns'] = [
     field: 'unit',
   },
   {
-    title: '仓库',
+    title: '仓库id',
-    field: 'depotName',
+    field: 'depotId',
   },
   {
     title: '描述信息',
     field: 'msg',
   },
   {
-    title: '供应商',
+    title: '供应商id',
-    field: 'suppliersName',
+    field: 'suppliersId',
   },
   {
     title: '入库时间',
@@ -84,11 +88,6 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '固定资产',
     field: 'type',
-    slots: {
-      default: ({ row }) => {
-        return renderDict(row.type, DictEnum.WY_SF);
-      },
-    },
   },
   {
     title: '创建时间',
@@ -121,7 +120,7 @@ export const modalSchema: FormSchemaGetter = () => [
   {
     label: '类型',
     fieldName: 'model',
-    component: 'Select',
+    component: 'Textarea',
   },
   {
     label: '规格',
@@ -144,9 +143,9 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
   },
   {
-    label: '仓库',
+    label: '仓库id',
     fieldName: 'depotId',
-    component: 'Select',
+    component: 'Input',
   },
   {
     label: '描述信息',
@@ -156,7 +155,7 @@ export const modalSchema: FormSchemaGetter = () => [
   {
     label: '供应商id',
     fieldName: 'suppliersId',
-    component: 'Select',
+    component: 'Input',
   },
   {
     label: '入库时间',
@@ -172,8 +171,34 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '固定资产类型',
     fieldName: 'type',
     component: 'Select',
-    componentProps: {
+    componentProps: {},
-      options: getDictOptions('wy_sf'),
-    },
   },
 ];
+let typeData:AssetTypeVO[]=[]
+const handleSearch = (val: string) => {
+  queryAssetsType(val, (d: any[]) => (typeData = d));
+};
+const handleChange = (val: string) => {
+  queryAssetsType(val, (d: any[]) => (typeData = d));
+};
+
+
+
+function queryAssetsType(value: string, callback: any) {
+  let queryParam={
+    pageNum:100,
+    pageSize:1,
+    assetTypeName:value
+  }
+   assetTypeList(queryParam).then(res=>{
+     const data: any[] = [];
+     res.rows.forEach((r: any) => {
+       data.push({
+         value: r.assetTypeName,
+         label: r.id,
+       });
+     });
+     callback(data);
+   })
+}
+

apps/web-antd/src/views/property/assetManage/asset/index.vue

@@ -110,6 +110,7 @@ function handleDownloadExcel() {
 
 <template>
   <Page :auto-content-height="true">
+
     <BasicTable table-title="资产列表">
       <template #toolbar-tools>
         <Space>

apps/web-antd/src/views/property/assetManage/assetType/assetType-modal.vue

@@ -6,7 +6,7 @@ import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
 
 import { useVbenForm } from '#/adapter/form';
-import { assetTypeAdd, assetTypeInfo, assetTypeUpdate } from '#/api/property/assetType';
+import { assetTypeAdd, assetTypeInfo, assetTypeUpdate } from '#/api/property/assetManage/assetType';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
 
 import { modalSchema } from './data';

apps/web-antd/src/views/property/assetManage/assetType/data.ts

@@ -8,20 +8,17 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'assetTypeName',
     label: '分类名称',
   },
-  {
-    component: 'Input',
-    fieldName: 'sort',
-    label: '排序',
-  },
 ];
-
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
   {
-    title: '主键',
+    title: '序号',
     field: 'id',
+    slots: {
+      default: ({rowIndex}) => {
+        return (rowIndex+1).toString()
+      }
+    }
   },
   {
     title: '分类名称',
@@ -35,10 +32,6 @@ export const columns: VxeGridProps['columns'] = [
     title: '创建时间',
     field: 'createTime',
   },
-  {
-    title: '创建人',
-    field: 'createBy',
-  },
   {
     field: 'action',
     fixed: 'right',
@@ -62,10 +55,11 @@ export const modalSchema: FormSchemaGetter = () => [
     label: '分类名称',
     fieldName: 'assetTypeName',
     component: 'Input',
+    rules:'required'
   },
   {
     label: '排序',
     fieldName: 'sort',
-    component: 'Input',
+    component: 'InputNumber',
   },
 ];

apps/web-antd/src/views/property/assetManage/assetType/index.vue

@@ -1,13 +1,8 @@
 <script setup lang="ts">
-import type { Recordable } from '@vben/types';
-
-import { ref } from 'vue';
-
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
 
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-import dayjs from 'dayjs';
 
 import {
   useVbenVxeGrid,
@@ -19,8 +14,8 @@ import {
   assetTypeExport,
   assetTypeList,
   assetTypeRemove,
-} from '#/api/property/assetType';
+} from '#/api/property/assetManage/assetType';
-import type { AssetTypeForm } from '#/api/property/assetType/model';
+import type { AssetTypeForm } from '#/api/property/assetManage/assetType/model';
 import { commonDownloadExcel } from '#/utils/file/download';
 
 import assetTypeModal from './assetType-modal.vue';
@@ -35,15 +30,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 = {
@@ -55,8 +41,6 @@ const gridOptions: VxeGridProps = {
     // 点击行选中
     // trigger: 'row',
   },
-  // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-  // columns: columns(),
   columns,
   height: 'auto',
   keepSource: true,

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

@@ -1,6 +1,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 = () => [
   {
@@ -49,6 +50,11 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '性别',
     field: 'gender',
+    slots:{
+      default: ({row})=>{
+        return renderDict(row.gender,'sys_user_sex')
+      }
+    }
   },
   {
     field: 'img',
@@ -75,7 +81,9 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '状态',
     field: 'state',
-    // slots: { default: 'state' },
+    slots:{
+      default: 'state'
+    }
   },
   {
     title: '备注',

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

@@ -14,7 +14,7 @@ import {
 import {
   personExport,
   personList,
-  personRemove,
+  personRemove, personUpdate,
 } from '#/api/property/resident/person';
 import type { PersonForm } from '#/api/property/resident/person/model';
 import { commonDownloadExcel } from '#/utils/file/download';
@@ -22,7 +22,8 @@ import { commonDownloadExcel } from '#/utils/file/download';
 import personModal from './person-modal.vue';
 import personDetail from './person-detail.vue';
 import { columns, querySchema } from './data';
-// import {TableSwitch} from "#/components/table";
+import {useAccess} from "@vben/access";
+import {TableSwitch} from "#/components/table";
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -44,8 +45,6 @@ const gridOptions: VxeGridProps = {
     // 点击行选中
     // trigger: 'row',
   },
-  // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-  // columns: columns(),
   columns,
   height: 'auto',
   keepSource: true,
@@ -80,6 +79,7 @@ const [PersonDetail, personDetailApi] = useVbenModal({
   connectedComponent: personDetail,
 });
 
+const { hasAccessByCodes } = useAccess();
 
 function handleAdd() {
   modalApi.setData({});
@@ -120,7 +120,6 @@ function handleInfo(row: Required<PersonForm>) {
   personDetailApi.setData({ id: row.id });
   personDetailApi.open();
 }
-
 </script>
 
 <template>
@@ -154,16 +153,16 @@ function handleInfo(row: Required<PersonForm>) {
       <template #img="{ row }">
         <Avatar :src="row.img" />
       </template>
-<!--      <template #state="{ row }">-->
+      <template #state="{ row }">
-<!--        <TableSwitch-->
+        <TableSwitch
-<!--          v-model:value="row.status"-->
+          :checkedValue="1"
-<!--          :api="() => personStatusChange(row)"-->
+          :unCheckedValue="0"
-<!--          :disabled="-->
+          v-model:value="row.state"
-<!--              row.userId === 1 || !hasAccessByCodes(['system:user:edit'])-->
+          :api="() => personUpdate(row)"
-<!--            "-->
+          :disabled="!hasAccessByCodes(['property:person:edit'])"
-<!--          @reload="() => tableApi.query()"-->
+          @reload="() => tableApi.query()"
-<!--        />-->
+        />
-<!--      </template>-->
+      </template>
       <template #action="{ row }">
         <Space>
           <ghost-button

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

@@ -8,11 +8,10 @@ import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import relativeTime from 'dayjs/plugin/relativeTime';
 
-// import {personInfo} from '#/api/property/resident/person';
+import {personInfo} from '#/api/property/resident/person';
 import type {Person} from "#/api/property/resident/person/model";
 import {accessControlColumns,carColumns} from "#/views/property/resident/person/data";
-// import {personList} from "#/api/property/resident/person";
+import { renderDictValue} from "#/utils/render";
-// import {renderDict} from "#/utils/render";
 
 
 dayjs.extend(duration);
@@ -36,11 +35,9 @@ async function handleOpenChange(open: boolean) {
   }
   modalApi.modalLoading(true);
 
-  // const {id} = modalApi.getData() as { id: number | string };
+  const {id} = modalApi.getData() as { id: number | string };
-  // const response = await personInfo(id);
-  const response = {id:1};
   // 赋值
-  personDetail.value = response;
+  personDetail.value = await personInfo(id);
 
   modalApi.modalLoading(false);
 }
@@ -52,25 +49,25 @@ async function handleOpenChange(open: boolean) {
   <BasicModal :footer="false" :fullscreen-button="false" title="入驻人员信息" class="w-[70%]">
     <Descriptions v-if="personDetail" size="small" :column="1" bordered :labelStyle="{width:'100px'}">
       <DescriptionsItem label="入驻人员">
-       {{ '入驻人员' }}
+       {{ personDetail.userName+'-'+renderDictValue(personDetail.gender,'sys_user_sex')+'-'+personDetail.phone}}
       </DescriptionsItem>
       <DescriptionsItem label="所属单位">
-        {{ '单位名称' }}
+        {{personDetail.unitName+'-'+personDetail.unitId }}
       </DescriptionsItem>
       <DescriptionsItem label="入驻位置">
-        {{ '单位名称' }}
+        {{ personDetail.locathon }}
       </DescriptionsItem>
       <DescriptionsItem label="人脸图片">
-        {{ '单位名称' }}
+        {{ personDetail.img }}
       </DescriptionsItem>
       <DescriptionsItem label="入驻时间">
-        {{ '单位名称' }}
+        {{ personDetail.time}}
       </DescriptionsItem>
       <DescriptionsItem label="车牌号码">
-        {{ '单位名称' }}
+        {{personDetail.carNumber}}
       </DescriptionsItem>
       <DescriptionsItem label="备注">
-        {{ '单位名称' }}
+        {{ personDetail.remark }}
       </DescriptionsItem>
 
     </Descriptions>
@@ -85,7 +82,7 @@ async function handleOpenChange(open: boolean) {
             </template>
           </Table>
         </TabPane>
-        <TabPane key="2" tab="车辆记录">
+        <TabPane key="2" tab="车辆记录" v-if="personDetail?.carNumber">
           <Table :dataSource="[]" :columns="carColumns" :pagination="false" >
             <template #bodyCell="{ column, index }">
               <template v-if="column.field === 'id'">

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

@@ -27,6 +27,7 @@ let userInfo = reactive({
 });
 let unitName = ref('');
 const userId = ref<number | string>(0);
+const unitId = ref<number | string>(0);
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
@@ -69,7 +70,7 @@ const [BasicModal, modalApi] = useVbenModal({
     if (isUpdate.value && id) {
       const record = await personInfo(id);
       userId.value = record.userId;
-      console.log(userId.value,'====================1111')
+      unitId.value = record.unitId;
       await formApi.setValues(record);
     }
     await markInitialized();
@@ -87,10 +88,12 @@ async function handleConfirm() {
     }
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     let data = cloneDeep(await formApi.getValues());
-    if (!isUpdate.value) {
+    if (userInfo) {
       data.userName = userInfo.userName
       data.phone = userInfo.phone
       data.gender = userInfo.gender
+    }
+    if(unitName.value){
       data.unitName = unitName.value
     }
     await (isUpdate.value ? personUpdate(data) : personAdd(data));
@@ -125,7 +128,7 @@ function getUnitInfo(unit: { name: string }) {
         <QueryUserList @update:userInfo="getUserInfo" v-bind="slotProps" :isUpdate="isUpdate" :userId="userId"/>
       </template>
       <template #unitId="slotProps">
-        <QueryUnitList @update:unitInfo="getUnitInfo" v-bind="slotProps" :disabled="isUpdate"/>
+        <QueryUnitList @update:unitInfo="getUnitInfo" v-bind="slotProps" :isUpdate="isUpdate" :unitId="unitId"/>
       </template>
     </BasicForm>
   </BasicModal>

apps/web-antd/src/views/property/resident/person/query-unit-list.vue

@@ -1,13 +1,20 @@
 <script lang="ts" setup>
-import {ref} from 'vue';
+import {ref, watch} from 'vue';
 import {Select} from 'ant-design-vue';
-import {resident_unitList} from "#/api/property/resident/unit";
+import {resident_unitList,resident_unitInfo} from "#/api/property/resident/unit";
 
 defineOptions({name: 'QueryUnitList'});
 
-withDefaults(defineProps<{ disabled?: boolean; placeholder?: string }>(), {
+const props= withDefaults(defineProps<{
+  disabled?: boolean;
+  placeholder?: string;
+  isUpdate?:boolean;
+  unitId?:string;
+}>(), {
   disabled: false,
   placeholder: '可根据单位名称进行搜索...',
+  isUpdate:false,
+  unitId:'',
 });
 
 async function queryUnit(value: string, callback: any) {
@@ -15,11 +22,14 @@ async function queryUnit(value: string, callback: any) {
     name: value,
     pageSize: 100,
     pageNum: 1,
+    state:1,
   }
   const res = await resident_unitList(queryData);
   const options = res.rows.map((unit) => ({
     label: unit.name+'-'+unit.id,
     value: unit.id,
+    name:unit.name,
+    unitNumber:unit.unitNumber,
   }));
   callback(options);
 }
@@ -32,19 +42,33 @@ const handleSearch = (val: string) => {
 const emit = defineEmits(['update:unitInfo']);
 const handleChange = (val: string) => {
   value.value = val;
-  const unitInfoStr = data.value.find(option => option.value === val)?.label;
+  const unitInfo = data.value.find(option => option.value === val);
-  let arr = unitInfoStr.split('-')
-  let unitInfo = {
-    name: arr[0],
-    unitNumber: arr[1],
-  }
   emit('update:unitInfo', unitInfo);
 };
+
+async function getUnitInfo(val) {
+  const unit = await resident_unitInfo(val)
+  if (unit) {
+    data.value = [{
+      label: unit.name+'-'+unit.id,
+      value: unit.id,
+      name:unit.name,
+      unitNumber:unit.id,
+    }]
+  }
+}
+
+watch(() => props.unitId,
+  (newX) => {
+    if (props.isUpdate) {
+      getUnitInfo(newX)
+    }
+  }, {immediate: true})
 </script>
 
 <template>
-<!--  v-model:value="value"-->
   <Select
+    v-model="value"
     show-search
     :placeholder="placeholder"
     style="width: 100%"

apps/web-antd/src/views/property/resident/person/query-user-list.vue

@@ -17,10 +17,10 @@ const props = withDefaults(defineProps<{
   isUpdate: false,
   userId: 0
 });
-watch(() => props.isUpdate,
+watch(() => props.userId,
   (newX) => {
-    if (newX) {
+    if (props.isUpdate) {
-      getUserInfo()
+      getUserInfo(newX)
     }
   }, {immediate: true})
 
@@ -50,30 +50,33 @@ const handleSearch = (val: string) => {
 };
 const emit = defineEmits(['update:userInfo']);
 const handleChange = (val: string) => {
-  // value.value = val;
+  value.value = val;
   const userInfo = data.value.find(option => option.value === val);
   queryUser(val, (d: any[]) => (data.value = d));
   emit('update:userInfo', userInfo);
 };
 
-async function getUserInfo() {
+async function getUserInfo(val) {
-  console.log(value.value, '=============value')
+  if (!val)  return;
-  const user = await (await findUserInfo(value.value)).user
+  const res = await findUserInfo(val)
-  console.log(user, '=================ss')
+  const user = res.user
-  if(user){
+  if (user) {
-    data.value=[{
+    data.value = [{
-      label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex') + '-' + user.phonenumber,
+      // label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex') + '-' + user.phonenumber,
+      label: user.nickName + '-' +  user.phonenumber,
       value: user.userId,
       userName: user.userName,
       gender: user.sex,
       phone: user.phonenumber,
     }]
+    emit('update:userInfo', data.value[0]);
   }
 }
 </script>
 
 <template>
   <Select
+    :disabled="isUpdate"
     v-model="value"
     show-search
     :placeholder="placeholder"