diff --git a/sh_backmate_theme_adv_enterprise/static/src/scss/navbar/navbar.scss b/sh_backmate_theme_adv_enterprise/static/src/scss/navbar/navbar.scss index d82801c86..6a8cf781c 100644 --- a/sh_backmate_theme_adv_enterprise/static/src/scss/navbar/navbar.scss +++ b/sh_backmate_theme_adv_enterprise/static/src/scss/navbar/navbar.scss @@ -739,6 +739,7 @@ background-repeat: no-repeat; background-size: cover; color: #4E4E4E; + z-index: 9; } } } @@ -749,6 +750,7 @@ background-repeat: no-repeat; background-size: cover; color: #4E4E4E; + z-index: 9 } } } diff --git a/yuthon_report/models/ledger_report.py b/yuthon_report/models/ledger_report.py index 395e0128b..f4c931dc5 100644 --- a/yuthon_report/models/ledger_report.py +++ b/yuthon_report/models/ledger_report.py @@ -15,12 +15,12 @@ class YuthonProperty(models.Model): ) - if params.get("date_start"): - date_start = datetime.datetime.fromisoformat(params.get("date_start")).date() - domain.append(("actual_start_time", ">=", date_start)) - if params.get("date_end"): - date_end = datetime.datetime.fromisoformat(params.get("date_start")).date() - domain.append(("actual_end_time", "<=", date_end)) + # if params.get("date_start"): + # date_start = datetime.datetime.fromisoformat(params.get("date_start")).date() + # domain.append(("actual_start_time", ">=", date_start)) + # if params.get("date_end"): + # date_end = datetime.datetime.fromisoformat(params.get("date_start")).date() + # domain.append(("actual_end_time", "<=", date_end)) condition = params.get('condition',False) @@ -53,20 +53,20 @@ class YuthonProperty(models.Model): "承租方": p.lessee_id.name or "" if p.lessee_id else "", "出租地址": p.rental_address or "", "联系人": "p.contact "or "", - "出租用途": p.property_contract_ids.lease_contract_id.rental_purposes.name or "" + "出租用途": p.property_contract_ids[0].lease_contract_id.rental_purposes.name or "" if p.property_contract_ids and p.property_contract_ids.lease_contract_id.rental_purposes else "", - "审批情况": p.approval_status or "", - "租赁合同号": p.contract_id.name or "" if p.contract_id else "", - "出租面积": p.rental_area or 0.0, - "评估价(元/m² •月)": p.appraisal_price or 0.0, - "首年租金": p.first_year_rent or 0.0, - "合同签订日期": p.contract_date.strftime("%Y-%m-%d") if p.contract_date else "", - "合约开始时间": p.term_start_time.strftime("%Y-%m-%d") if p.term_start_time else "", - "合约结束时间": p.term_end_time.strftime("%Y-%m-%d") if p.term_end_time else "", + "审批情况": "p.approval_status "or "", + # "租赁合同号": p.contract_id.name or "" if "p.contract_id" else "", + "出租面积": "p.rental_area "or 0.0, + "评估价(元/m² •月)": "p.appraisal_price" or 0.0, + # "首年租金": p.first_year_rent or 0.0, + # "合同签订日期": p.contract_date.strftime("%Y-%m-%d") if "p.contract_date" else "", + # "合约开始时间": p.term_start_time.strftime("%Y-%m-%d") if "p.term_start_time" else "", + # "合约结束时间": p.term_end_time.strftime("%Y-%m-%d") if "p.term_end_time" else "", "单价": p.unit_price or 0.0, - "月租金": p.monthly_amount or 0.0, - "合同总金额": p.total_amount or 0.0, - "实际已收到金额": p.real_amount or 0.0 + # "月租金": p.monthly_amount or 0.0, + # "合同总金额": p.total_amount or 0.0, + # "实际已收到金额": p.real_amount or 0.0 } for p in properties ] \ No newline at end of file diff --git a/yuthon_report/static/src/components/yuthon_report/receivable_report.js b/yuthon_report/static/src/components/yuthon_report/receivable_report.js index 5c503db82..147428268 100644 --- a/yuthon_report/static/src/components/yuthon_report/receivable_report.js +++ b/yuthon_report/static/src/components/yuthon_report/receivable_report.js @@ -45,7 +45,7 @@ class ReceivableReport extends Component { columnDefs: this.config.columns || [], rowData: [], sideBar: true, - defaultColDef: { resizable: true, sortable: true, filter: true }, + defaultColDef: { sortable: true, filter: true, width: 200,minWidth: 150,flex: false, resizable: false }, }; this.grid = new agGrid.createGrid(this.gridRef.el, this.gridOptions); diff --git a/yuthon_report/static/src/components/yuthon_report/yuthon_report.js b/yuthon_report/static/src/components/yuthon_report/yuthon_report.js index c4f7e4410..fe4ee4334 100644 --- a/yuthon_report/static/src/components/yuthon_report/yuthon_report.js +++ b/yuthon_report/static/src/components/yuthon_report/yuthon_report.js @@ -45,7 +45,7 @@ class YouthonReport extends Component { columnDefs: this.config.columns || [], rowData: [], sideBar: true, - defaultColDef: { resizable: true, sortable: true, filter: true }, + defaultColDef: { sortable: true, filter: true, width: 200,minWidth: 150,flex: false, resizable: false }, }; this.grid = new agGrid.createGrid(this.gridRef.el, this.gridOptions);