@@ -399,4 +435,15 @@ async function handleClosed() {
.font-medium {
font-weight: 500;
}
+/* 使用 :deep() 穿透 scoped 样式,影响子组件 */
+:deep(.ant-input[disabled]),
+:deep(.ant-input-number-disabled .ant-input-number-input),
+:deep(.ant-select-disabled .ant-select-selection-item),
+:deep(.ant-picker-disabled .ant-picker-input > input) {
+ /* 设置一个更深的颜色 */
+ color: rgb(0 0 0 / 65%) !important;
+
+ /* 有些浏览器需要这个来覆盖默认颜色 */
+ -webkit-text-fill-color: rgb(0 0 0 / 65%) !important;
+}
diff --git a/apps/web-antd/src/views/property/clean/cleanOrders/data.ts b/apps/web-antd/src/views/property/clean/cleanOrders/data.ts
index 05e00daa..bf9e993e 100644
--- a/apps/web-antd/src/views/property/clean/cleanOrders/data.ts
+++ b/apps/web-antd/src/views/property/clean/cleanOrders/data.ts
@@ -12,6 +12,13 @@ export const querySchema: FormSchemaGetter = () => [
fieldName: 'location',
label: '服务地址',
},
+ // {
+ // label: '服务地址(房间号)',
+ // component: 'TreeSelect',
+ // defaultValue: undefined,
+ // fieldName: 'location',
+ // rules: 'required',
+ // },
// {
// label: '服务地址(房间号)',
// fieldName: 'location',
@@ -161,14 +168,9 @@ export const modalSchema: FormSchemaGetter = () => [
},
{
label: '服务地址(房间号)',
+ component: 'Input',
+ defaultValue: undefined,
fieldName: 'location',
- componentProps: {
- placeholder: '请选择房间',
- },
- slots: {
- default: 'location',
- },
- formItemClass: 'col-span-2',
rules: 'required',
},
// {
diff --git a/apps/web-antd/src/views/property/clean/cleanSettings/data.ts b/apps/web-antd/src/views/property/clean/cleanSettings/data.ts
index 110c5ba6..8c95647a 100644
--- a/apps/web-antd/src/views/property/clean/cleanSettings/data.ts
+++ b/apps/web-antd/src/views/property/clean/cleanSettings/data.ts
@@ -95,7 +95,6 @@ export const columns: VxeGridProps['columns'] = [
fixed: 'right',
slots: { default: 'action' },
title: '操作',
- width: 'auto',
},
];
diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/leasePogramManagement/data.ts b/apps/web-antd/src/views/property/greenPlantRentalManagement/leasePogramManagement/data.ts
index 59275f1d..9453c88a 100644
--- a/apps/web-antd/src/views/property/greenPlantRentalManagement/leasePogramManagement/data.ts
+++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/leasePogramManagement/data.ts
@@ -9,11 +9,13 @@ export const querySchema: FormSchemaGetter = () => [
component: 'Input',
fieldName: 'planName',
label: '方案名称',
+ labelWidth: 120
},
{
component: 'Select',
fieldName: 'rentalPeriod',
label: '租赁周期',
+ labelWidth: 120,
componentProps: {
options:[
{ label: '月', value: 0 },
@@ -121,7 +123,7 @@ export const modalSchema: FormSchemaGetter = () => [
{
label: '基础服务项',
fieldName: 'price',
- component: 'Select',
+ component: 'Input',
},
{
label: '优惠活动',
diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/leasePogramManagement/rentalPlan-detial-modal.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/leasePogramManagement/rentalPlan-detial-modal.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/leasePogramManagement/rentalPlan-modal.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/leasePogramManagement/rentalPlan-modal.vue
index 18c8f072..756a1ab2 100644
--- a/apps/web-antd/src/views/property/greenPlantRentalManagement/leasePogramManagement/rentalPlan-modal.vue
+++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/leasePogramManagement/rentalPlan-modal.vue
@@ -21,9 +21,9 @@ const title = computed(() => {
const [BasicForm, formApi] = useVbenForm({
commonConfig: {
// 默认占满两列
- formItemClass: 'col-span-2',
+ formItemClass: 'col-span-1',
// 默认label宽度 px
- labelWidth: 80,
+ labelWidth: 120,
// 通用配置项 会影响到所有表单项
componentProps: {
class: 'w-full',
@@ -43,7 +43,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
const [BasicModal, modalApi] = useVbenModal({
// 在这里更改宽度
- class: 'w-[550px]',
+ class: 'w-[70%]',
fullscreenButton: false,
onBeforeClose,
onClosed: handleClosed,
@@ -91,11 +91,67 @@ async function handleClosed() {
await formApi.resetForm();
resetInitialized();
}
+const detailColumns = [
+ { title: '序号', key: 'index' },
+ { title: '产品编号', dataIndex: 'plantCode', key: 'plantCode' },
+ { title: '产品名称', dataIndex: 'plantName', key: 'plantName' },
+ { title: '产品分类', dataIndex: 'plantType', key: 'plantType' },
+ {
+ title: '图片',
+ dataIndex: 'imgPath',
+ key: 'imgPath',
+ },
+ {
+ title: '规格',
+ dataIndex: 'specification',
+ key: 'specification',
+ },
+ { title: '租金', dataIndex: 'rent', key: 'rent' },
+ { title: '备注', dataIndex: 'remark', key: 'remark' },
+ {
+ title: '状态',
+ dataIndex: 'state',
+ key: 'state',
+ customRender: ({ value }: { value: number }) =>
+ value === 1 ? '上架' : '下架',
+ },
+ {
+ title: '操作',
+ key: 'action',
+ fixed: 'right' as const,
+ },
+];
+
+
+
+
添加保洁订单详情
+
+ {{ $t('pages.common.add') }}
+
+
+
+
+
+ {{ index + 1 }}
+
+
+
+
+
+
+
费用合计:{{ totalSumPeices }}元
+
diff --git a/apps/web-antd/src/views/property/greenPlantRentalManagement/reportStatistics/index.vue b/apps/web-antd/src/views/property/greenPlantRentalManagement/reportStatistics/index.vue
index cac1c875..7e65cb3b 100644
--- a/apps/web-antd/src/views/property/greenPlantRentalManagement/reportStatistics/index.vue
+++ b/apps/web-antd/src/views/property/greenPlantRentalManagement/reportStatistics/index.vue
@@ -214,7 +214,16 @@ onMounted(() => {
-
+
{
flex: 1;
height: 100%;
padding: 10px;
- background-color: #962020;
-
.row {
display: flex;
justify-content: space-between;
+ .box{
+ width: 300px;
+ height: 120px;
+ background-color: #fff;
+ border-radius: 8px;
+ margin: 40px 0px;
+ padding: 10px;
+ .title{
+ font-size: 20px;
+ }
+ .number{
+ font-size: 25px;
+ font-weight: bold;
+ }
+ .percent{
+ font-size: 15px; }
+ }
}
.row-first {