diff --git a/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/model.d.ts b/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/model.d.ts
index dd4e4824..38196b80 100644
--- a/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/model.d.ts
+++ b/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/model.d.ts
@@ -46,6 +46,10 @@ export interface InspectionPointVO {
*/
searchValue: string;
+ itemName: string;
+
+ createTime: string;
+
}
export interface InspectionPointForm extends BaseEntity {
diff --git a/apps/web-antd/src/views/property/assetManage/depot/data.ts b/apps/web-antd/src/views/property/assetManage/depot/data.ts
index 3d8cabf5..afc2f889 100644
--- a/apps/web-antd/src/views/property/assetManage/depot/data.ts
+++ b/apps/web-antd/src/views/property/assetManage/depot/data.ts
@@ -2,6 +2,8 @@ import type {FormSchemaGetter} from '#/adapter/form';
import type {VxeGridProps} from '#/adapter/vxe-table';
import {renderDict} from "#/utils/render";
import {getDictOptions} from "#/utils/dict";
+import {z} from "#/adapter/form";
+import {$t} from "@vben/locales";
export const querySchema: FormSchemaGetter = () => [
@@ -30,18 +32,10 @@ export const querySchema: FormSchemaGetter = () => [
export const columns: VxeGridProps['columns'] = [
{type: 'checkbox', width: 60},
- {
- title: '序号',
- field: 'id',
- slots: {
- default: ({rowIndex}) => {
- return (rowIndex + 1).toString();
- }
- }
- },
{
title: '仓库名称',
field: 'depotName',
+ width:200
},
{
title: '仓库类型',
@@ -50,21 +44,23 @@ export const columns: VxeGridProps['columns'] = [
default: ({row}) => {
return renderDict(row.modelType, 'wy_cclx')
}
- }
+ },
+ width:180
},
{
title: '状态',
field: 'state',
- slots: {default: 'state'}
+ slots: {default: 'state'},
+ width:120
+ },
+ {
+ title: '创建时间',
+ field: 'createTime',
},
{
title: '描述信息',
field: 'msg',
- },
-
- {
- title: '创建时间',
- field: 'createTime',
+ minWidth:180,
},
{
field: 'action',
@@ -89,7 +85,7 @@ export const modalSchema: FormSchemaGetter = () => [
label: '仓库名称',
fieldName: 'depotName',
component: 'Input',
- rules:'required'
+ rules: z.string().min(1,'请输入仓库名称').max(30, { message: '仓库名称过长' }),
},
{
label: '仓库类型',
diff --git a/apps/web-antd/src/views/property/community/data.ts b/apps/web-antd/src/views/property/community/data.ts
index 8dc5734c..770114f1 100644
--- a/apps/web-antd/src/views/property/community/data.ts
+++ b/apps/web-antd/src/views/property/community/data.ts
@@ -154,7 +154,7 @@ export const modalSchema: FormSchemaGetter = () => [
{
label: '占地面积',
fieldName: 'area',
- component: 'Input',
+ component: 'InputNumber',
},
{
label: '建成时间',
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts
index 95fd466a..9e269ea2 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts
@@ -116,7 +116,7 @@ export const modalSchema: FormSchemaGetter = () => [
label: '计划名称',
fieldName: 'planName',
component: 'Input',
- rules: 'required',
+ rules: z.string().min(1,'请输入计划名称').max(30, { message: '计划名称过长' }),
},
{
label: '巡检路线',
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
index a80edc9a..b6d51485 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
@@ -50,6 +50,13 @@ export const columns: VxeGridProps['columns'] = [
title: '创建时间',
field: 'createTime',
},
+ {
+ title: '二维码',
+ field: 'qrcode',
+ slots:{
+ default: 'qrcode'
+ }
+ },
{
title: '备注',
field: 'remark',
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/index.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/index.vue
index 156f113a..bce8238d 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/index.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/index.vue
@@ -1,7 +1,7 @@
@@ -134,6 +154,12 @@ function handleMultiDelete() {
+
+ {{ $t('pages.common.info') }}
+
+
+
+
+
+
+
+ 下载
+
+
+
+
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/point-detail.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/point-detail.vue
new file mode 100644
index 00000000..7b9fe199
--- /dev/null
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/point-detail.vue
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+ {{ pointDetail.pointName }}
+
+
+
+
+
+ {{pointDetail.itemName}}
+
+
+ {{ pointDetail.nfcCode}}
+
+
+ {{ pointDetail.createTime}}
+
+
+
+
+
+ {{pointDetail.remark}}
+
+
+
+