by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
FLL 2025-07-01 11:22:39 +08:00
commit b6f7558aaa
10 changed files with 99 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/web-antd/src/api/common.d.ts vendored
View File

@ -51,5 +51,6 @@ export interface TreeNode<T = any> {
title?: string;
key?:any
disabled: boolean
}

12
apps/web-antd/src/api/property/chargeManagement/index.ts
View File

@ -10,7 +10,7 @@ import { requestClient } from '#/api/request';
* @returns 绿植租赁-订单收费列表
*/
export function orderChargeList(params?: OrderChargeQuery) {
return requestClient.get<PageResult<OrderChargeVO>>('/system/orderCharge/list', { params });
return requestClient.get<PageResult<OrderChargeVO>>('/property/orderCharge/list', { params });
}
/**
@ -19,7 +19,7 @@ export function orderChargeList(params?: OrderChargeQuery) {
* @returns 绿植租赁-订单收费列表
*/
export function orderChargeExport(params?: OrderChargeQuery) {
return commonExport('/system/orderCharge/export', params ?? {});
return commonExport('/property/orderCharge/export', params ?? {});
}
/**
@ -28,7 +28,7 @@ export function orderChargeExport(params?: OrderChargeQuery) {
* @returns 绿植租赁-订单收费详情
*/
export function orderChargeInfo(id: ID) {
return requestClient.get<OrderChargeVO>(`/system/orderCharge/${id}`);
return requestClient.get<OrderChargeVO>(`/property/orderCharge/${id}`);
}
/**
@ -37,7 +37,7 @@ export function orderChargeInfo(id: ID) {
* @returns void
*/
export function orderChargeAdd(data: OrderChargeForm) {
return requestClient.postWithMsg<void>('/system/orderCharge', data);
return requestClient.postWithMsg<void>('/property/orderCharge', data);
}
/**
@ -46,7 +46,7 @@ export function orderChargeAdd(data: OrderChargeForm) {
* @returns void
*/
export function orderChargeUpdate(data: OrderChargeForm) {
return requestClient.putWithMsg<void>('/system/orderCharge', data);
return requestClient.putWithMsg<void>('/property/orderCharge', data);
}
/**
@ -55,5 +55,5 @@ export function orderChargeUpdate(data: OrderChargeForm) {
* @returns void
*/
export function orderChargeRemove(id: ID | IDS) {
return requestClient.deleteWithMsg<void>(`/system/orderCharge/${id}`);
return requestClient.deleteWithMsg<void>(`/property/orderCharge/${id}`);
}

2
apps/web-antd/src/api/sis/authRecord/index.ts
View File

@ -39,7 +39,7 @@ export function authRecordInfo(id: ID) {
* @returns void
*/
export function authRecordAdd(data: AuthRecordForm) {
return requestClient.postWithMsg<void>('/sis/authRecord', data);
return requestClient.postWithMsg<void>('/sis/authRecord/add', data);
}
/**

10
apps/web-antd/src/api/sis/authRecord/model.d.ts vendored
View File

@ -1,4 +1,4 @@
import type { PageQuery, BaseEntity } from '#/api/common';
import type { BaseEntity, PageQuery } from '#/api/common';
export interface AuthRecordVO {
/**
@ -15,25 +15,25 @@ export interface AuthRecordVO {
* 门禁id
*/
acdId: string | number;
}
export interface AuthRecordForm extends BaseEntity {
/**
* 主键id
*/
id?: string | number;
libId?: string | number;
/**
* 人像id
*/
imgId?: string | number;
imgIds?: string[] | number[];
/**
* 门禁id
*/
acdId?: string | number;
acIds?: string[] | number[];
issue: boolean;
}
export interface AuthRecordQuery extends PageQuery {

8
apps/web-antd/src/views/property/clean/cleanOrders/clean-modal.vue
View File

@ -310,10 +310,12 @@ async function handleConfirm() {
: isUpdate.value
? editCleanId.value
: '';
// data.sumPeices = totalSumPeices;
data.sumPeices = parseInt(totalSumPeices.value, 10);
// 组装 cleanIds
data.cleanIds = detailTable.value.map((item: any) => item.id);
data.details = detailTable.value;
// data.cleanIds = detailTable.value.map((item: any) => item.id);
data.cleanList = detailTable.value;
console.log(data);
console.log(12037847120120);
await clean_orderAdd(data)

12
apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/index.vue
View File

@ -51,7 +51,7 @@ const gridOptions: VxeGridProps = {
rowConfig: {
keyField: 'id',
},
id: 'system-orderCharge-index'
id: 'property-orderCharge-index'
};
const [BasicTable, tableApi] = useVbenVxeGrid({
@ -105,7 +105,7 @@ function handleDownloadExcel() {
<template #toolbar-tools>
<Space>
<a-button
v-access:code="['system:orderCharge:export']"
v-access:code="['property:orderCharge:export']"
@click="handleDownloadExcel"
>
{{ $t('pages.common.export') }}
@ -114,13 +114,13 @@ function handleDownloadExcel() {
:disabled="!vxeCheckboxChecked(tableApi)"
danger
type="primary"
v-access:code="['system:orderCharge:remove']"
v-access:code="['property:orderCharge:remove']"
@click="handleMultiDelete">
{{ $t('pages.common.delete') }}
</a-button>
<a-button
type="primary"
v-access:code="['system:orderCharge:add']"
v-access:code="['property:orderCharge:add']"
@click="handleAdd"
>
{{ $t('pages.common.add') }}
@ -130,7 +130,7 @@ function handleDownloadExcel() {
<template #action="{ row }">
<Space>
<ghost-button
v-access:code="['system:orderCharge:edit']"
v-access:code="['property:orderCharge:edit']"
@click.stop="handleEdit(row)"
>
{{ $t('pages.common.edit') }}
@ -143,7 +143,7 @@ function handleDownloadExcel() {
>
<ghost-button
danger
v-access:code="['system:orderCharge:remove']"
v-access:code="['property:orderCharge:remove']"
@click.stop=""
>
{{ $t('pages.common.delete') }}

62
apps/web-antd/src/views/property/greenPlantRentalManagement/orderManagement/data.ts
View File

@ -134,12 +134,12 @@ export const modalSchema: FormSchemaGetter = () => [
triggerFields: [''],
},
},
{
label: '订单号',
fieldName: 'orderNo',
component: 'Input',
rules: 'required',
},
// {
// label: '订单号',
// fieldName: 'orderNo',
// component: 'Input',
// rules: 'required',
// },
{
label: '客户名称',
fieldName: 'customerName',
@ -170,25 +170,20 @@ export const modalSchema: FormSchemaGetter = () => [
component: 'RangePicker',
componentProps: {
showTime: true,
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
},
rules: 'selectRequired',
},
{
label: '应付总额',
fieldName: 'totalAmount',
component: 'Input',
rules: 'required',
},
{
label: '租赁方式',
fieldName: 'rentalType',
component: 'Select',
componentProps: {
options:getDictOptions('wy_sf')
options:getDictOptions('wy_zlfs')
},
rules: 'selectRequired',
formItemClass:'col-span-2'
},
{
label: '租赁方案id',
@ -200,6 +195,7 @@ export const modalSchema: FormSchemaGetter = () => [
triggerFields: ['rentalType'],
},
rules: 'required',
formItemClass:'col-span-2'
},
{
label: '绿植产品id',
@ -213,9 +209,14 @@ export const modalSchema: FormSchemaGetter = () => [
rules: 'required',
},
{
label: '租赁产品数量',
label: '租赁数量',
fieldName: 'productNum',
component: 'Input',
component: 'InputNumber',
componentProps: {
min: 1,
precision: 0,
step: 1
},
dependencies: {
// 仅当 租赁方式 为 1（单点） 时显示
show: (formValues) => formValues.rentalType === '1',
@ -223,6 +224,12 @@ export const modalSchema: FormSchemaGetter = () => [
},
rules: 'required',
},
{
label: '应付总额',
fieldName: 'totalAmount',
component: 'Input',
rules: 'required',
},
{
label: '支付状态',
fieldName: 'paymentStatus',
@ -231,21 +238,22 @@ export const modalSchema: FormSchemaGetter = () => [
},
rules: 'selectRequired',
},
{
label: '是否续租',
fieldName: 'isRelet',
component: 'RadioGroup',
componentProps: {
buttonStyle: 'solid',
optionType: 'button',
options: getDictOptions('wy_sf'),
},
},
// {
// label: '是否续租',
// fieldName: 'isRelet',
// component: 'RadioGroup',
// componentProps: {
// buttonStyle: 'solid',
// optionType: 'button',
// options: getDictOptions('wy_sf'),
// },
// },
{
label: '合同状态',
fieldName: 'contractStatus',
component: 'Select',
componentProps: {
options: getDictOptions('wy_htzt'),
},
},
{

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

@ -153,16 +153,6 @@ export const modalSchema: FormSchemaGetter = () => [
// rules:'required',
// formItemClass: 'col-span-2',
// },
{
label: '人脸图片',
fieldName: 'img',
component: 'ImageUpload',
componentProps: {
// accept: 'image/*', // 可选拓展名或者mime类型 ,拼接
maxCount: 1, // 最大上传文件数 默认为1 为1会绑定为string而非string[]类型
},
formItemClass: 'col-span-2',
},
{
label: '入驻时间',
fieldName: 'time',
@ -179,6 +169,16 @@ export const modalSchema: FormSchemaGetter = () => [
fieldName: 'carNumber',
component: 'Input',
},
{
label: '人脸图片',
fieldName: 'img',
component: 'ImageUpload',
componentProps: {
// accept: 'image/*', // 可选拓展名或者mime类型 ,拼接
maxCount: 1, // 最大上传文件数 默认为1 为1会绑定为string而非string[]类型
},
formItemClass: 'col-span-2',
},
{
label: '人员状态',
fieldName: 'state',

36
apps/web-antd/src/views/sis/personLibImg/imgAuth-modal.vue
View File

@ -5,11 +5,12 @@ import { useVbenModal } from '@vben/common-ui';
import { useBeforeCloseDiff } from '#/utils/popup';
import { Switch, Transfer, Tree } from 'ant-design-vue';
import { queryTree } from '#/api/sis/accessControl';
import { authRecordAdd } from '#/api/sis/authRecord';
import type { TreeNode } from '#/api/common';
import type { AuthRecordForm } from '#/api/sis/authRecord/model';
const emit = defineEmits<{ reload: [] }>();
const title = ref('门禁授权');
const { onBeforeClose } = useBeforeCloseDiff({});
const [BasicModal, modalApi] = useVbenModal({
@ -19,20 +20,29 @@ const [BasicModal, modalApi] = useVbenModal({
onBeforeClose,
onClosed: handleClosed,
onConfirm: handleConfirm,
onOpenChange: async (isOpen) => {
if (!isOpen) {
checked.value = false;
targetKeys.value = []
}
}
});
async function handleConfirm() {
try {
modalApi.lock(true);
/*const { valid } = await formApi.validate();
if (!valid) {
return;
}
const data = cloneDeep(await formApi.getValues());
await (isUpdate.value ? personLibImgUpdate(data) : personLibImgAdd(data));*/
// resetInitialized();
const { ids, libId } = modalApi.getData() as {
ids?: number[] | string[];
libId: number | string;
};
const params: AuthRecordForm = {
libId,
imgIds: ids,
acIds: targetKeys.value,
issue: checked.value
};
const res = await authRecordAdd(params);
console.log(res);
emit('reload');
modalApi.close();
} catch (error) {
@ -60,6 +70,10 @@ function handleTreeData(treeData: TreeNode[] | any[], datasource: TreeNode[]) {
treeData.forEach((item) => {
item.title = item.label;
item.key = item.code;
// 如果不是门禁，则
if (item.level != 5) {
item.disabled = true;
}
datasource.push(item);
if (item.children) {
handleTreeData(item.children, datasource);
@ -102,7 +116,7 @@ function isChecked(
<div class="p-4">
<Transfer
v-model:target-keys="targetKeys"
class="tree-transfer h-[400px]"
class="tree-transfer h-[400px] overflow-auto"
:data-source="dataSource"
:render="(item) => item.title"
>

4
apps/web-antd/src/views/sis/personLibImg/index.vue
View File

@ -129,7 +129,9 @@ function handleDownloadExcel() {
* 对图像进行门禁授权
*/
function accessControlAuth() {
authModalApi.setData({});
const rows = tableApi.grid.getCheckboxRecords();
const ids = rows.map((row: Required<PersonLibImgForm>) => row.id);
authModalApi.setData({ ids, libId: rows[0].libId });
authModalApi.open();
}
</script>