diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index d526bcf44..b54864820 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -78,6 +78,8 @@ class SoongWorkflowRecord(models.Model): search='_search_is_to_do', ) + priority = fields.Selection([('0', 'Normal'), ('1', 'Urgent')], 'Priority', default='0', index=True) + is_company = fields.Boolean(string="本公司", default=True, compute='_compute_is_company',search='_search_part_of_company') @api.depends_context('uid', 'company') diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml index bb8276e97..fe4111ea0 100644 --- a/soong_workflow/views/soong_workflow_record.xml +++ b/soong_workflow/views/soong_workflow_record.xml @@ -235,6 +235,7 @@ - -
- +
-
- - -
-
- +
+ +
-
- +
-
- +
diff --git a/yuthon_report/views/cumulative_arrears_report.xml b/yuthon_report/views/cumulative_arrears_report.xml new file mode 100644 index 000000000..304958079 --- /dev/null +++ b/yuthon_report/views/cumulative_arrears_report.xml @@ -0,0 +1,39 @@ + + + + + 累计欠收 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_cumulative_arrears_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "面积(m²)", "field": "面积", "flex": 1}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.4}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1.2}, + {"headerName": "月租金", "field": "月租金", "flex": 1, "type": "number"}, + {"headerName": "欠租金额", "field": "欠租金额", "flex": 1, "type": "number"}, + {"headerName": "欠租所属月份", "field": "欠租所属月份", "flex": 1.2}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/current_month_received_report.xml b/yuthon_report/views/current_month_received_report.xml new file mode 100644 index 000000000..935fa12af --- /dev/null +++ b/yuthon_report/views/current_month_received_report.xml @@ -0,0 +1,36 @@ + + + + + 归属本月实收 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_current_month_received_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1}, + {"headerName": "物业名称", "field": "物业名称", "flex": 1.6}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.2}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/current_receivable_property_fee_report.xml b/yuthon_report/views/current_receivable_property_fee_report.xml new file mode 100644 index 000000000..d021cc685 --- /dev/null +++ b/yuthon_report/views/current_receivable_property_fee_report.xml @@ -0,0 +1,39 @@ + + + + + 当期应收-物管水电费 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_current_receivable_property_fee_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "应收租期", "field": "应收租期", "flex": 1.4}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.6}, + {"headerName": "金额(含税)", "field": "金额(含税)", "flex": 1, "type": "number"}, + {"headerName": "税率", "field": "税率", "flex": 0.8}, + {"headerName": "金额(不含税)", "field": "金额(不含税)", "flex": 1, "type": "number"}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "产权证", "field": "产权证", "flex": 1.2}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1.2}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/current_receivable_rent_report.xml b/yuthon_report/views/current_receivable_rent_report.xml new file mode 100644 index 000000000..08752eaf0 --- /dev/null +++ b/yuthon_report/views/current_receivable_rent_report.xml @@ -0,0 +1,41 @@ + + + + + 当期应收-租金 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_current_receivable_rent_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6, "valueFormatter": "params.value === false || params.value === null || params.value === undefined || params.value === 'false' ? '' : params.value"}, + {"headerName": "应收开始", "field": "应收开始", "flex": 1.2}, + {"headerName": "应收结束", "field": "应收结束", "flex": 1.2}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.6}, + {"headerName": "金额(含税)", "field": "金额(含税)", "flex": 1, "type": "number"}, + {"headerName": "税率", "field": "税率", "flex": 0.8, "valueFormatter": "params.value === false || params.value === null || params.value === undefined || params.value === 'false' ? '' : params.value"}, + {"headerName": "金额(不含税)", "field": "金额(不含税)", "flex": 1, "type": "number"}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "产权证", "field": "产权证", "flex": 1.2}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1.2}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ], + "getRowStyle": "function(params) { if (params.data.acc_type === 'new') { return { color: '#28a745' }; } return null; }" + } + } + + + + + + + diff --git a/yuthon_report/views/deposit_total_report.xml b/yuthon_report/views/deposit_total_report.xml new file mode 100644 index 000000000..00b8bf3e5 --- /dev/null +++ b/yuthon_report/views/deposit_total_report.xml @@ -0,0 +1,36 @@ + + + + + 押金累计总额 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_deposit_total_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.5}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/management_area_report.xml b/yuthon_report/views/management_area_report.xml new file mode 100644 index 000000000..72d2a05e7 --- /dev/null +++ b/yuthon_report/views/management_area_report.xml @@ -0,0 +1,37 @@ + + + + + 管理面积报表 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "yuthon.property", + "method": "get_management_area_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "物业id", "field": "物业id", "flex": 0.8}, + {"headerName": "产权证号", "field": "产权证号", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 1.8}, + {"headerName": "可租面积", "field": "可租面积", "flex": 1, "type": "number"}, + {"headerName": "产权面积", "field": "产权面积", "flex": 1, "type": "number"}, + {"headerName": "用途", "field": "用途", "flex": 1}, + {"headerName": "管理费标准", "field": "管理费标准", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/monthly_assessment_fee_report.xml b/yuthon_report/views/monthly_assessment_fee_report.xml new file mode 100644 index 000000000..7171644a5 --- /dev/null +++ b/yuthon_report/views/monthly_assessment_fee_report.xml @@ -0,0 +1,37 @@ + + + + + 本月支出-评估费 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_monthly_assessment_fee_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "编码", "field": "编码", "flex": 1}, + {"headerName": "日期", "field": "日期", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "备注", "field": "备注", "flex": 2}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/monthly_expense_total_report.xml b/yuthon_report/views/monthly_expense_total_report.xml new file mode 100644 index 000000000..c7b5fb689 --- /dev/null +++ b/yuthon_report/views/monthly_expense_total_report.xml @@ -0,0 +1,37 @@ + + + + + 本月支出-合计 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_monthly_expense_total_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "编码", "field": "编码", "flex": 1}, + {"headerName": "日期", "field": "日期", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "备注", "field": "备注", "flex": 2}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/monthly_maintenance_fee_report.xml b/yuthon_report/views/monthly_maintenance_fee_report.xml new file mode 100644 index 000000000..d2a269e63 --- /dev/null +++ b/yuthon_report/views/monthly_maintenance_fee_report.xml @@ -0,0 +1,37 @@ + + + + + 本月支出-维修费 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_monthly_maintenance_fee_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "编码", "field": "编码", "flex": 1}, + {"headerName": "日期", "field": "日期", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "备注", "field": "备注", "flex": 2}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/monthly_management_fee_report.xml b/yuthon_report/views/monthly_management_fee_report.xml new file mode 100644 index 000000000..b83d07f7a --- /dev/null +++ b/yuthon_report/views/monthly_management_fee_report.xml @@ -0,0 +1,37 @@ + + + + + 本月支出-管理费 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_monthly_management_fee_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "编码", "field": "编码", "flex": 1}, + {"headerName": "日期", "field": "日期", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "备注", "field": "备注", "flex": 2}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/monthly_other_expense_report.xml b/yuthon_report/views/monthly_other_expense_report.xml new file mode 100644 index 000000000..eadf7ba7a --- /dev/null +++ b/yuthon_report/views/monthly_other_expense_report.xml @@ -0,0 +1,37 @@ + + + + + 本月支出-其他 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_monthly_other_expense_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "编码", "field": "编码", "flex": 1}, + {"headerName": "日期", "field": "日期", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "备注", "field": "备注", "flex": 2}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/parking_fee_current_month_receivable.xml b/yuthon_report/views/parking_fee_current_month_receivable.xml new file mode 100644 index 000000000..8333afc7c --- /dev/null +++ b/yuthon_report/views/parking_fee_current_month_receivable.xml @@ -0,0 +1,36 @@ + + + + + 停车费本月应收 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_parking_fee_current_month_receivable", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.5}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/parking_fee_current_month_report.xml b/yuthon_report/views/parking_fee_current_month_report.xml new file mode 100644 index 000000000..4aef2d783 --- /dev/null +++ b/yuthon_report/views/parking_fee_current_month_report.xml @@ -0,0 +1,36 @@ + + + + + 停车费本月实收 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_parking_fee_current_month_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.5}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/parking_fee_yearly_report.xml b/yuthon_report/views/parking_fee_yearly_report.xml new file mode 100644 index 000000000..8b2f5f002 --- /dev/null +++ b/yuthon_report/views/parking_fee_yearly_report.xml @@ -0,0 +1,36 @@ + + + + + 停车费本年累计 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_parking_fee_yearly_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.5}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/penalty_detail_report.xml b/yuthon_report/views/penalty_detail_report.xml new file mode 100644 index 000000000..af426a5fa --- /dev/null +++ b/yuthon_report/views/penalty_detail_report.xml @@ -0,0 +1,45 @@ + + + + + 违约金明细报表 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_penalty_detail_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1}, + {"headerName": "物业名称", "field": "物业名称", "flex": 1.6}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.2}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "违约金计费时间(天)", "field": "违约金计费时间(天)", "flex": 1}, + {"headerName": "欠租金额", "field": "欠租金额", "flex": 1, "type": "number"}, + {"headerName": "每天违约金(元/天)", "field": "每天违约金(元/天)", "flex": 1}, + {"headerName": "违约金金额", "field": "违约金金额", "flex": 1, "type": "number"}, + {"headerName": "总已收金额", "field": "总已收金额", "flex": 1, "type": "number"}, + {"headerName": "总未收金额", "field": "总未收金额", "flex": 1, "type": "number"}, + {"headerName": "当月收款时间", "field": "当月收款时间", "flex": 1}, + {"headerName": "当月收款金额", "field": "当月收款金额", "flex": 1, "type": "number"}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "产权证号", "field": "产权证号", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/receivable_detail_report.xml b/yuthon_report/views/receivable_detail_report.xml new file mode 100644 index 000000000..e49b204be --- /dev/null +++ b/yuthon_report/views/receivable_detail_report.xml @@ -0,0 +1,36 @@ + + + + + 合同应收 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_receivable_detail_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "应收租期", "field": "应收租期", "flex": 1.4}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.4}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "物业名称", "field": "物业名称", "flex": 1.8}, + {"headerName": "产权证", "field": "产权证", "flex": 1.2}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1.2} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/rentable_area_report.xml b/yuthon_report/views/rentable_area_report.xml new file mode 100644 index 000000000..98d68978b --- /dev/null +++ b/yuthon_report/views/rentable_area_report.xml @@ -0,0 +1,37 @@ + + + + + 可租面积 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "yuthon.property", + "method": "get_rentable_area_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "物业ID", "field": "物业ID", "flex": 0.8}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "面积", "field": "面积", "flex": 1, "type": "number"}, + {"headerName": "物业状态", "field": "物业状态", "flex": 1}, + {"headerName": "空置时长", "field": "空置时长", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/rented_area_report.xml b/yuthon_report/views/rented_area_report.xml new file mode 100644 index 000000000..9baedbf24 --- /dev/null +++ b/yuthon_report/views/rented_area_report.xml @@ -0,0 +1,38 @@ + + + + + 已租面积 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "yuthon.property", + "method": "get_rented_area_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.5}, + {"headerName": "面积", "field": "面积", "flex": 1, "type": "number"}, + {"headerName": "单价", "field": "单价", "flex": 1, "type": "number"}, + {"headerName": "租金", "field": "租金", "flex": 1, "type": "number"}, + {"headerName": "管理员", "field": "管理员", "flex": 1}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/yearly_assessment_fee_report.xml b/yuthon_report/views/yearly_assessment_fee_report.xml new file mode 100644 index 000000000..a12be209c --- /dev/null +++ b/yuthon_report/views/yearly_assessment_fee_report.xml @@ -0,0 +1,37 @@ + + + + + 本年累计-评估费用 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_yearly_assessment_fee_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "编码", "field": "编码", "flex": 1}, + {"headerName": "日期", "field": "日期", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "管理员", "field": "管理员", "flex": 1}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "备注", "field": "备注", "flex": 2} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/yearly_expense_report.xml b/yuthon_report/views/yearly_expense_report.xml new file mode 100644 index 000000000..028650988 --- /dev/null +++ b/yuthon_report/views/yearly_expense_report.xml @@ -0,0 +1,36 @@ + + + + + 支出本年-合计 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_yearly_expense_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "支出日期", "field": "支出日期", "flex": 1.2}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "备注", "field": "备注", "flex": 2}, + {"headerName": "管理员", "field": "管理员", "flex": 1}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/yearly_maintenance_fee_report.xml b/yuthon_report/views/yearly_maintenance_fee_report.xml new file mode 100644 index 000000000..3f20f5424 --- /dev/null +++ b/yuthon_report/views/yearly_maintenance_fee_report.xml @@ -0,0 +1,37 @@ + + + + + 本年累计-维修费 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_yearly_maintenance_fee_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "编码", "field": "编码", "flex": 1}, + {"headerName": "支出日期", "field": "支出日期", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "管理员", "field": "管理员", "flex": 1}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "备注", "field": "备注", "flex": 2} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/yearly_management_fee_report.xml b/yuthon_report/views/yearly_management_fee_report.xml new file mode 100644 index 000000000..742217a8a --- /dev/null +++ b/yuthon_report/views/yearly_management_fee_report.xml @@ -0,0 +1,37 @@ + + + + + 本年累计-管理费 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_yearly_management_fee_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "编码", "field": "编码", "flex": 1}, + {"headerName": "支出日期", "field": "支出日期", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "管理员", "field": "管理员", "flex": 1}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "备注", "field": "备注", "flex": 2} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/yearly_other_fee_report.xml b/yuthon_report/views/yearly_other_fee_report.xml new file mode 100644 index 000000000..a2565169e --- /dev/null +++ b/yuthon_report/views/yearly_other_fee_report.xml @@ -0,0 +1,37 @@ + + + + + 本年累计-其他费用 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_yearly_other_fee_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "编码", "field": "编码", "flex": 1}, + {"headerName": "支出日期", "field": "支出日期", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "管理员", "field": "管理员", "flex": 1}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "备注", "field": "备注", "flex": 2} + ] + } + } + + + + + + + diff --git a/yuthon_report/views/yearly_penalty_report.xml b/yuthon_report/views/yearly_penalty_report.xml new file mode 100644 index 000000000..e38a9dfaf --- /dev/null +++ b/yuthon_report/views/yearly_penalty_report.xml @@ -0,0 +1,36 @@ + + + + + 违约金本年累计 + receivable_report_client + + { + "sideBar": true, + "report_config": { + "model": "property.accounts.receivable", + "method": "get_yearly_penalty_report", + "columns": [ + {"headerName": "序号", "field": "序号", "flex": 0.6}, + {"headerName": "合同编号", "field": "合同编号", "flex": 1.2}, + {"headerName": "物业名称", "field": "物业名称", "flex": 2}, + {"headerName": "承租方名称", "field": "承租方名称", "flex": 1.5}, + {"headerName": "金额", "field": "金额", "flex": 1, "type": "number"}, + {"headerName": "所属公司", "field": "所属公司", "flex": 1}, + {"headerName": "管理员", "field": "管理员", "flex": 1} + ] + } + } + + + + + + + diff --git a/yuthon_trade/models/yuthon_trade_setting.py b/yuthon_trade/models/yuthon_trade_setting.py index 5e5fb712f..c274a1af7 100644 --- a/yuthon_trade/models/yuthon_trade_setting.py +++ b/yuthon_trade/models/yuthon_trade_setting.py @@ -35,6 +35,11 @@ class SealsTypeSetting(models.Model): is_effect = fields.Boolean(string="是否生效", compute="_compute_is_effect") scope_setting_ids = fields.Many2many('seals.scope.setting', string="用章范围") + def _compute_display_name(self): + for record in self: + scope_name = record.scope_setting_id.name if record.scope_setting_id else "无" + record.display_name = f"{scope_name}{record.name}" + @api.depends('start_date', 'end_date') def _compute_is_effect(self): diff --git a/yuthon_trade/views/yuthon_business_approval_viwes.xml b/yuthon_trade/views/yuthon_business_approval_viwes.xml index 40cba2aa4..f91a6bc3c 100644 --- a/yuthon_trade/views/yuthon_business_approval_viwes.xml +++ b/yuthon_trade/views/yuthon_business_approval_viwes.xml @@ -60,8 +60,7 @@ - - + diff --git a/yuthon_trade/views/yuthon_seals_approval_views.xml b/yuthon_trade/views/yuthon_seals_approval_views.xml index 85ddeac8a..62cb54c01 100644 --- a/yuthon_trade/views/yuthon_seals_approval_views.xml +++ b/yuthon_trade/views/yuthon_seals_approval_views.xml @@ -43,8 +43,7 @@ - - +