会议管理

apps/web-antd/src/api/property/chargeManagement/model.d.ts

@@ -49,22 +49,22 @@ export interface OrderChargeVO {
   /**
    * 支付方式
    */
-  paymentMethod: number;
+  paymentMethod: string | number;
 
   /**
    * 开票状态
    */
-  invoiceStatus: number;
+  invoiceStatus: string | number;
 
   /**
    * 发票类型
    */
-  invoiceType: number;
+  invoiceType: string | number;
 
   /**
    * 收费状态
    */
-  chargeStatus: number;
+  chargeStatus: string | number;
 }
 
 export interface OrderChargeForm extends BaseEntity {
@@ -116,22 +116,22 @@ export interface OrderChargeForm extends BaseEntity {
   /**
    * 支付方式
    */
-  paymentMethod?: number;
+  paymentMethod?: string | number;
 
   /**
    * 开票状态
    */
-  invoiceStatus?: number;
+  invoiceStatus?: string | number;
 
   /**
    * 发票类型
    */
-  invoiceType?: number;
+  invoiceType?: string | number;
 
   /**
    * 收费状态
    */
-  chargeStatus?: number;
+  chargeStatus?: string | number;
 }
 
 export interface OrderChargeQuery extends PageQuery {
@@ -178,22 +178,22 @@ export interface OrderChargeQuery extends PageQuery {
   /**
    * 支付方式
    */
-  paymentMethod?: number;
+  paymentMethod?: string | number;
 
   /**
    * 开票状态
    */
-  invoiceStatus?: number;
+  invoiceStatus?: string | number;
 
   /**
    * 发票类型
    */
-  invoiceType?: number;
+  invoiceType?: string | number;
 
   /**
    * 收费状态
    */
-  chargeStatus?: number;
+  chargeStatus?: string | number;
 
   /**
     * 日期范围参数
@@ -250,20 +250,20 @@ export interface orderChargeDetailForm extends BaseEntity {
   /**
    * 支付方式
    */
-  paymentMethod?: number;
+  paymentMethod?: string | number;
 
   /**
    * 开票状态
    */
-  invoiceStatus?: number;
+  invoiceStatus?: string | number;
 
   /**
    * 发票类型
    */
-  invoiceType?: number;
+  invoiceType?: string | number;
 
   /**
    * 收费状态
    */
-  chargeStatus?: number;
+  chargeStatus?: string | number;
 }

apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/data.ts

@@ -24,11 +24,11 @@ export const querySchema: FormSchemaGetter = () => [
     fieldName: 'invoiceStatus',
     label: '开票状态',
   },
-  {
+  // {
-    component: 'Input',
+  //   component: 'Select',
-    fieldName: 'userName',
+  //   fieldName: 'userName',
-    label: '租赁人',
+  //   label: '租赁人',
-  },
+  // },
   // {
   //   component: 'RangePicker',
   //   componentProps: {
@@ -135,6 +135,11 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '发票类型',
     field: 'invoiceType',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.invoiceType, 'pro_invoice_type');
+      },
+    },
     minWidth: '120'
   },
   {
@@ -204,27 +209,36 @@ export const modalSchema: FormSchemaGetter = () => [
   {
     label: '租金',
     fieldName: 'rent',
-    component: 'Input',
+    component: 'InputNumber',
     rules: 'required',
+    componentProps:{
+      precision: 2,
+    }
   },
   {
     label: '押金',
     fieldName: 'deposit',
-    component: 'Input',
+    component: 'InputNumber',
     rules: 'required',
+    componentProps:{
+      precision: 2,
+    }
   },
   {
     label: '违约金',
     fieldName: 'penalty',
-    component: 'Input',
+    component: 'InputNumber',
-    rules: 'required',
-  },
-  {
-    label: '总金额',
-    fieldName: 'totalAmount',
-    component: 'Input',
     rules: 'required',
+    componentProps:{
+      precision: 2,
+    }
   },
+  // {
+  //   label: '总金额',
+  //   fieldName: 'totalAmount',
+  //   component: 'Input',
+  //   rules: 'required',
+  // },
   {
     label: '开票状态',
     fieldName: 'invoiceStatus',

apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-detail.vue

@@ -39,7 +39,7 @@ async function handleOpenChange(open: boolean) {
         {{ orderChargeDetail.orderId }}
       </DescriptionsItem>
       <DescriptionsItem label="租赁合同编号">
-        {{ orderChargeDetail.orderId }}
+        {{ orderChargeDetail.rentalOrder.contractCode }}
       </DescriptionsItem>
       <DescriptionsItem label="租赁人">
         {{ orderChargeDetail.userName}}
@@ -58,8 +58,10 @@ async function handleOpenChange(open: boolean) {
           :is="renderDict(orderChargeDetail.invoiceStatus,'pro_invoice_status')"
         />
       </DescriptionsItem>
-      <DescriptionsItem label="发票类型">
+      <DescriptionsItem label="发票类型" v-if="orderChargeDetail.invoiceType!=null">
-        {{ orderChargeDetail.invoiceType }}
+        <component
+          :is="renderDict(orderChargeDetail.invoiceType,'pro_invoice_type')"
+        />
       </DescriptionsItem>
       <DescriptionsItem label="收费状态" v-if="orderChargeDetail.chargeStatus!=null">
         <component
@@ -67,10 +69,10 @@ async function handleOpenChange(open: boolean) {
         />
       </DescriptionsItem>
       <DescriptionsItem label="产品编号">
-        {{ orderChargeDetail.createTime }}
+        {{ orderChargeDetail.rentalOrder.productList.map(item => item.plantCode).join('、') }}
       </DescriptionsItem>
       <DescriptionsItem label="购买植物">
-        {{ orderChargeDetail.createTime }}
+        {{ orderChargeDetail.rentalOrder.productList.map(item => item.plantName).join('、') }}
       </DescriptionsItem>
       <DescriptionsItem label="总金额">
         {{ orderChargeDetail.totalAmount }}

apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/orderCharge-modal.vue

@@ -51,6 +51,10 @@ const [BasicModal, modalApi] = useVbenModal({
     isUpdate.value = !!id;
     if (isUpdate.value && id) {
       const record = await orderChargeInfo(id);
+      record.chargeStatus = record.chargeStatus?.toString();
+      record.paymentMethod = record.paymentMethod?.toString();
+      record.invoiceType = record.invoiceType?.toString();
+      record.invoiceStatus = record.invoiceStatus?.toString();
       await formApi.setValues(record);
     }
     await markInitialized();

apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/data.ts

@@ -39,7 +39,7 @@ export const columns: VxeGridProps['columns'] = [
     minWidth: '120'
   },
   {
-    title: '服务地点（房间id）',
+    title: '服务地点',
     field: 'roomId',
     minWidth: '120'
   },

apps/web-antd/src/views/property/greenPlantRentalManagement/conservationManagement/index.vue

@@ -104,7 +104,7 @@ function handleMultiDelete() {
 
 <template>
   <Page :auto-content-height="true">
-    <BasicTable table-title="绿植租赁-订单养护管理列表">
+    <BasicTable table-title="养护管理列表">
       <template #toolbar-tools>
         <Space>
           <a-button

apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/data.ts

@@ -119,8 +119,11 @@ export const modalSchema: FormSchemaGetter = () => [
   {
     label: '租金',
     fieldName: 'rent',
-    component: 'Input',
+    component: 'InputNumber',
     rules: 'required',
+    componentProps:{
+      precision: 2,
+    }
   },
   {
     label: '库存数量',

apps/web-antd/src/views/property/greenPlantRentalManagement/productManagement/index.vue

@@ -103,7 +103,7 @@ function handleMultiDelete() {
 
 <template>
   <Page :auto-content-height="true">
-    <BasicTable table-title="绿植租赁-绿植产品列表">
+    <BasicTable table-title="产品管理列表">
       <template #toolbar-tools>
         <Space>
           <a-button