Skip to content

H
hls_rent
Commit a2cb82d9 authored by congweijing's avatar congweijing
Browse files
Options

修改一些页面布局以及房屋状态更改的package

parent 99eb97b2
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 100 deletions
hls_rent(bm)/RENT300/rent_ver_search.bm
View file @ a2cb82d9
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
(sys_code_pkg.get_sys_code_value_name('HLS_FEE_ITEMS', (sys_code_pkg.get_sys_code_value_name('HLS_FEE_ITEMS',
(SELECT 'fee_items_1' (SELECT 'fee_items_1'
FROM dual))) fee_item, FROM dual))) fee_item,
hvt.credit_item_rent verification_fee, hvt.credit_item_water verification_fee,
hvt.source_type, hvt.source_type,
(sys_code_pkg.get_sys_code_value_name('HLS_SOURCE_TYPE', (sys_code_pkg.get_sys_code_value_name('HLS_SOURCE_TYPE',
hvt.source_type)) source_type_name, hvt.source_type)) source_type_name,
......
hls_rent(screen)/RENT100/room_info_search.screen
View file @ a2cb82d9
...@@ -106,7 +106,10 @@ ...@@ -106,7 +106,10 @@
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:form id="" title="查询条件"> <a:form id="" title="查询条件" style="width:100%">
<a:screenTopToolbar>
<a:toolbarButton click="RENT100_roomInfoSearch" text="查询" width="80"/>
</a:screenTopToolbar>
<a:box id="" column="3" style="width:100%"> <a:box id="" column="3" style="width:100%">
<a:textField name="room_abbr" bindtarget="RENT100_room_info_query" prompt="房屋简称"/> <a:textField name="room_abbr" bindtarget="RENT100_room_info_query" prompt="房屋简称"/>
<a:textField name="landlord_name" bindtarget="RENT100_room_info_query" prompt="房东姓名"/> <a:textField name="landlord_name" bindtarget="RENT100_room_info_query" prompt="房东姓名"/>
...@@ -116,9 +119,7 @@ ...@@ -116,9 +119,7 @@
<a:datePicker name="creation_date_to" bindtarget="RENT100_room_info_query" prompt="创建日期到"/> <a:datePicker name="creation_date_to" bindtarget="RENT100_room_info_query" prompt="创建日期到"/>
<a:comboBox name="room_status" bindtarget="RENT100_room_info_query" prompt="房屋状态"/> <a:comboBox name="room_status" bindtarget="RENT100_room_info_query" prompt="房屋状态"/>
</a:box> </a:box>
<a:screenTopToolbar>
<a:toolbarButton click="RENT100_roomInfoSearch" text="查询" width="80"/>
</a:screenTopToolbar>
</a:form> </a:form>
<a:grid id="RENT100_room_info_result_ds_grid" bindTarget="RENT100_room_info_result_ds" marginHeight="121" marginWidth="45" navBar="true"> <a:grid id="RENT100_room_info_result_ds_grid" bindTarget="RENT100_room_info_result_ds" marginHeight="121" marginWidth="45" navBar="true">
<a:columns> <a:columns>
......
hls_rent(screen)/RENT200/hls_hrms_hsm1.screen
View file @ a2cb82d9
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<a:field name="creation_date_from"/> <a:field name="creation_date_from"/>
<a:field name="creation_date_to" validator="validate_date"/> <a:field name="creation_date_to" validator="validate_date"/>
<a:field name="people_status_code" /> <a:field name="people_status_code" />
<a:field name="people_status" displayField="code_value_name" options="HLS_status_Ds1" returnField="people_status_code" valueField="code_value_name"/> <a:field name="people_status" displayField="code_value_name" options="HLS_status_Ds1" returnField="people_status_code" valueField="code_value"/>
</a:fields> </a:fields>
<!-- <a:events> <!-- <a:events>
<a:event name="submitsuccess" handler="GLD5010_headerSubmitSuccess"/> <a:event name="submitsuccess" handler="GLD5010_headerSubmitSuccess"/>
...@@ -188,18 +188,18 @@ ...@@ -188,18 +188,18 @@
<a:button click="winOpen_create_user" text="新增" width="80" iconAlign="left"/> <a:button click="winOpen_create_user" text="新增" width="80" iconAlign="left"/>
</a:toolBar> </a:toolBar>
<a:columns> <a:columns>
<a:column name="personnel_no" editor="" prompt="入住人员编号" renderer="HLS_staff_info_result_grid_ds" width="100" /> <a:column name="personnel_no" align="center" editor="" prompt="入住人员编号" renderer="HLS_staff_info_result_grid_ds" width="100" />
<a:column name="staff_no" editor="" prompt="入住人员工号" width="100" /> <a:column name="staff_no" align="center" editor="" prompt="入住人员工号" width="100" />
<a:column name="name" editor="" prompt="入住人员姓名" width="100"/> <a:column name="name" align="center" editor="" prompt="入住人员姓名" width="100"/>
<a:column name="gender" editor="" prompt="性别" width="100"/> <a:column name="gender" align="center" editor="" prompt="性别" width="100"/>
<a:column name="department" editor="" prompt="所在部门" width="80"/> <a:column name="department" align="center" editor="" prompt="所在部门" width="100"/>
<a:column name="base_in" editor="" prompt="base地" width="80"/> <a:column name="base_in" align="center" editor="" prompt="base地" width="100"/>
<a:column name="phone_number" editor="" prompt="联系电话" width="80"/> <a:column name="phone_number" align="center" editor="" prompt="联系电话" width="100"/>
<a:column name="email" editor="" prompt="邮箱地址" width="80"/> <a:column name="email" editor="" prompt="邮箱地址" width="180"/>
<a:column name="message" editor="" prompt="备注" width="120"/> <a:column name="message" editor="" prompt="备注" width="180"/>
<!--<a:column name="creation_date" editor="" prompt="创建日期" width="120"/>--> <!--<a:column name="creation_date" editor="" prompt="创建日期" width="120"/>-->
<a:column name="created_date" editor="" prompt="创建的日期" width="120"/> <a:column name="created_date" align="center" editor="" prompt="创建的日期" width="120"/>
<a:column name="people_status" editor="" prompt="入住人员状态" width="80"/> <a:column name="people_status" align="center" editor="" prompt="入住人员状态" width="80"/>
</a:columns> </a:columns>
......
hls_rent(screen)/RENT200/hls_hrms_hsm2.screen
View file @ a2cb82d9
...@@ -109,13 +109,13 @@ ...@@ -109,13 +109,13 @@
<a:field name="creation_date_from"/> <a:field name="creation_date_from"/>
<a:field name="creation_date_to" validator="validate_date"/> <a:field name="creation_date_to" validator="validate_date"/>
<a:field name="people_status_code" /> <a:field name="people_status_code" />
<a:field name="people_status" displayField="code_value_name" options="HLS_status_Ds1" returnField="people_status_code" valueField="code_value_name"/> <a:field name="people_status" displayField="code_value_name" options="HLS_status_Ds1" returnField="people_status_code" valueField="code_value"/>
</a:fields> </a:fields>
<!-- <a:events> <!-- <a:events>
<a:event name="submitsuccess" handler="GLD5010_headerSubmitSuccess"/> <a:event name="submitsuccess" handler="GLD5010_headerSubmitSuccess"/>
</a:events>--> </a:events>-->
</a:dataSet> </a:dataSet>
<a:dataSet id="HLS_staff_info_input" autoQuery="true" model="hls_rent.RENT200.hls_staff_info_search" queryDataSet="HLS_staff_info_input_ds1" selectable="true"/> <a:dataSet id="HLS_staff_info_input" autoQuery="true" model="hls_rent.RENT200.hls_staff_info_search" queryDataSet="HLS_staff_info_input_ds1" />
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
...@@ -143,18 +143,18 @@ ...@@ -143,18 +143,18 @@
<!--<a:button click="winOpen_create_user" text="新增" width="80" iconAlign="left"/>--> <!--<a:button click="winOpen_create_user" text="新增" width="80" iconAlign="left"/>-->
<!--</a:toolBar>--> <!--</a:toolBar>-->
<a:columns> <a:columns>
<a:column name="personnel_no" editor="" prompt="入住人员编号" renderer="HLS_staff_info_result_grid_ds" width="100" /> <a:column name="personnel_no" align="center" editor="" prompt="入住人员编号" renderer="HLS_staff_info_result_grid_ds" width="100" />
<a:column name="staff_no" editor="" prompt="入住人员工号" width="100" /> <a:column name="staff_no" align="center" editor="" prompt="入住人员工号" width="100" />
<a:column name="name" editor="" prompt="入住人员姓名" width="100"/> <a:column name="name" align="center" editor="" prompt="入住人员姓名" width="100"/>
<a:column name="gender" editor="" prompt="性别" width="100"/> <a:column name="gender" align="center" editor="" prompt="性别" width="100"/>
<a:column name="department" editor="" prompt="所在部门" width="80"/> <a:column name="department" align="center" editor="" prompt="所在部门" width="100"/>
<a:column name="base_in" editor="" prompt="base地" width="80"/> <a:column name="base_in" align="center" editor="" prompt="base地" width="100"/>
<a:column name="phone_number" editor="" prompt="联系电话" width="80"/> <a:column name="phone_number" align="center" editor="" prompt="联系电话" width="100"/>
<a:column name="email" editor="" prompt="邮箱地址" width="80"/> <a:column name="email" editor="" prompt="邮箱地址" width="180"/>
<a:column name="message" editor="" prompt="备注" width="120"/> <a:column name="message" editor="" prompt="备注" width="180"/>
<!--<a:column name="creation_date" editor="" prompt="创建日期" width="120"/>--> <!--<a:column name="creation_date" editor="" prompt="创建日期" width="120"/>-->
<a:column name="created_date" editor="" prompt="创建的日期" width="120"/> <a:column name="created_date" align="center" editor="" prompt="创建的日期" width="120"/>
<a:column name="people_status" editor="" prompt="入住人员状态" width="80"/> <a:column name="people_status" align="center" editor="" prompt="入住人员状态" width="80"/>
</a:columns> </a:columns>
......
hls_rent(screen)/RENT300/rent_fee_add.screen
View file @ a2cb82d9
...@@ -2,9 +2,15 @@ ...@@ -2,9 +2,15 @@
<a:screen xmlns:a="http://www.aurora-framework.org/application" trace="true"> <a:screen xmlns:a="http://www.aurora-framework.org/application" trace="true">
<a:view> <a:view>
<a:script><![CDATA[ <a:script><![CDATA[
function DateSet(cell, date, text){
$('RENT1030_fee_add_ds').getCurrentRecord().set('fee_add_date', new Date());
}
function RENT1030_save_info(){ function RENT1030_save_info(){
$('RENT1030_fee_add_ds').submit(); $('RENT1030_fee_add_ds').submit();
} }
function RENT1030_exit(){
$('add_fee_info_window').close();
}
function compareDate(date1, date2){ function compareDate(date1, date2){
if(date1 > date2){ if(date1 > date2){
return false; return false;
...@@ -60,13 +66,13 @@ ...@@ -60,13 +66,13 @@
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:screenTopToolbar> <a:screenTopToolbar>
<a:gridButton id="back_button" click="" text="HLS.EXIT"/> <a:gridButton id="back_button" click="RENT1030_exit" text="HLS.EXIT"/>
<a:gridButton id="save_button" click="RENT1030_save_info" text="HLS.SAVE"/> <a:gridButton id="save_button" click="RENT1030_save_info" text="HLS.SAVE"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form style="width:100%;border:none"> <a:form style="width:100%;border:none">
<a:box column="2" > <a:box column="2" >
<a:textField name="fee_no" bindTarget="RENT1030_fee_add_ds" prompt="费用单编号" readOnly="true"/> <a:textField name="fee_no" bindTarget="RENT1030_fee_add_ds" prompt="费用单编号" readOnly="true"/>
<a:datePicker name="fee_add_date" bindTarget="RENT1030_fee_add_ds" prompt="新增日期" /> <a:datePicker name="fee_add_date" bindTarget="RENT1030_fee_add_ds" prompt="新增日期" dayRenderer="DateSet"/>
</a:box> </a:box>
<a:box column="2" > <a:box column="2" >
<a:datePicker name="fee_first_date" bindTarget="RENT1030_fee_add_ds" prompt="费用开始日" /> <a:datePicker name="fee_first_date" bindTarget="RENT1030_fee_add_ds" prompt="费用开始日" />
......
hls_rent(screen)/RENT300/rent_manual_receipt.screen
View file @ a2cb82d9
...@@ -42,6 +42,10 @@ ...@@ -42,6 +42,10 @@
objectVal.setReadOnly(true); objectVal.setReadOnly(true);
} }
} }
//ds获取系统当前日期
function DateSet(cell, date, text){
$('RENT1030_manual_receipt_ds').getCurrentRecord().set('receipt_date', new Date());
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
...@@ -78,7 +82,7 @@ ...@@ -78,7 +82,7 @@
<a:form id="RENT1030_manual_receipt_ds_form" style="width:100%;border:none" bindTarget="RENT1030_manual_receipt_ds" title ="收款新增"> <a:form id="RENT1030_manual_receipt_ds_form" style="width:100%;border:none" bindTarget="RENT1030_manual_receipt_ds" title ="收款新增">
<a:box column="3" > <a:box column="3" >
<!--<a:textField name="receipt_no" bindTarget="RENT1030_manual_receipt_ds" prompt="收款编号" readOnly="true"/>--> <!--<a:textField name="receipt_no" bindTarget="RENT1030_manual_receipt_ds" prompt="收款编号" readOnly="true"/>-->
<a:datePicker name="receipt_date" bindTarget="RENT1030_manual_receipt_ds" prompt="收款日期"/> <a:datePicker name="receipt_date" bindTarget="RENT1030_manual_receipt_ds" prompt="收款日期" dayRenderer="DateSet"/>
<a:comboBox name="receipt_ways" bindTarget="RENT1030_manual_receipt_ds" prompt="收款方式"/> <a:comboBox name="receipt_ways" bindTarget="RENT1030_manual_receipt_ds" prompt="收款方式"/>
</a:box> </a:box>
<a:box id="RENT1030_receipt_sources_objects" column="2"> <a:box id="RENT1030_receipt_sources_objects" column="2">
......
hls_rent(screen)/RENT400/checkin1.screen
View file @ a2cb82d9
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<!--<a:field name="contract_condition" displayField="code_value_name" options="contract_condition_ds" returnField="code_value_name" valueField="code_value"/>--> <!--<a:field name="contract_condition" displayField="code_value_name" options="contract_condition_ds" returnField="code_value_name" valueField="code_value"/>-->
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
<a:dataSet id="hls_search_line_ds" queryDataSet="hls_search_contract_ds" model="hls_rent.RENT500.HLS_room_contract_info" selectable="true" autoPageSize="true" autoCreate="true"> <a:dataSet id="hls_search_line_ds" queryDataSet="hls_search_contract_ds" model="hls_rent.RENT500.HLS_room_contract_info" selectable="true" selectionModel="single" autoPageSize="true" autoCreate="true">
<a:field name="h_contract_number"/> <a:field name="h_contract_number"/>
<a:field name="contract_condition"/> <a:field name="contract_condition"/>
<a:field name="room_id"/> <a:field name="room_id"/>
...@@ -88,18 +88,18 @@ ...@@ -88,18 +88,18 @@
</a:form> </a:form>
<a:grid id="search_line_grid" bindTarget="hls_search_line_ds" marginHeight="121" marginWidth="45" navBar="true"> <a:grid id="search_line_grid" bindTarget="hls_search_line_ds" marginHeight="121" marginWidth="45" navBar="true">
<a:columns> <a:columns>
<a:column name="h_contract_number" prompt="房屋合同编号" width="140" /> <a:column name="h_contract_number" align="center" prompt="房屋合同编号" width="140" />
<a:column name="room_abbr" prompt="房屋简称" width="80"/> <a:column name="room_abbr" align="center" prompt="房屋简称" width="80"/>
<a:column name="room_type" prompt="房屋类型" width="80"/> <a:column name="room_type" align="center" prompt="房屋类型" width="80"/>
<a:column name="landlord_name" prompt="房东姓名" width="80"/> <a:column name="landlord_name" align="center" prompt="房东姓名" width="80"/>
<a:column name="landlord_tel" prompt="联系电话" width="120"/> <a:column name="landlord_tel" align="center" prompt="联系电话" width="120"/>
<a:column name="intermediary" prompt="中介名称" width="80"/> <a:column name="intermediary" align="center" prompt="中介名称" width="80"/>
<a:column name="bed" prompt="床位" width="80"/> <a:column name="bed" align="center" prompt="床位" width="80"/>
<a:column name="bed_used" prompt="已住床位" width="80"/> <a:column name="bed_used" align="center" prompt="已住床位" width="80"/>
<a:column name="bed_free" prompt="剩余床位" width="80"/> <a:column name="bed_free" align="center" prompt="剩余床位" width="80"/>
<a:column name="contract_start_date" prompt="合同开始日期" width="100"/> <a:column name="contract_start_date" align="center" prompt="合同开始日期" width="100"/>
<a:column name="contract_finish_date" prompt="合同到期日期" width="100"/> <a:column name="contract_finish_date" align="center" prompt="合同到期日期" width="100"/>
<a:column name="contract_condition" prompt="房屋合同状态" width="120"/> <a:column name="contract_condition" align="center" prompt="房屋合同状态" width="120"/>
<!--<a:column name="contract_remark" prompt="合同备注" width="80"/>--> <!--<a:column name="contract_remark" prompt="合同备注" width="80"/>-->
</a:columns> </a:columns>
<a:toolBar> <a:toolBar>
......
hls_rent(screen)/RENT400/checkin2.screen
View file @ a2cb82d9
...@@ -26,6 +26,13 @@ ...@@ -26,6 +26,13 @@
function openWindow() { function openWindow() {
history.go(0); history.go(0);
} }
function rendererDay(cell,date,text,currentMonth){
var today = new Date();
if(date < new Date(today.getFullYear(),today.getMonth(),today.getDate())){
cell.disabled=true;
}
return text;
}
//保存记录 //保存记录
function record_save(){ function record_save(){
var h_contract_number = $('Hls_hsm_ds').getAll()[0].data.h_contract_number; var h_contract_number = $('Hls_hsm_ds').getAll()[0].data.h_contract_number;
...@@ -137,7 +144,6 @@ ...@@ -137,7 +144,6 @@
<a:field name="room_addr_country"/> <a:field name="room_addr_country"/>
<a:field name="room_addr_province" /> <a:field name="room_addr_province" />
<a:field name="room_addr_city" /> <a:field name="room_addr_city" />
<!--<a:field name="people_id"/>-->
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
...@@ -173,10 +179,10 @@ ...@@ -173,10 +179,10 @@
<a:column name="base_in" prompt="base地" width="80"/> <a:column name="base_in" prompt="base地" width="80"/>
<a:column name="phone_number" prompt="联系电话" width="80"/> <a:column name="phone_number" prompt="联系电话" width="80"/>
<a:column name="email" prompt="邮箱地址" width="80"/> <a:column name="email" prompt="邮箱地址" width="80"/>
<a:column name="leaving_date" editor="hls_hsm_date" bindtarget="Hls_hsm_ds" prompt="预计入住时间至" width="120"/> <a:column name="leaving_date" editor="hls_hsm_date" bindtarget="Hls_hsm_ds" prompt="预计入住时间至" renderer="Aurora.formatDate" width="120"/>
</a:columns> </a:columns>
<a:editors> <a:editors>
<a:datePicker id="hls_hsm_date"/> <a:datePicker id="hls_hsm_date" dayRenderer="rendererDay"/>
<a:lov id="hls_hsm_lv"/> <a:lov id="hls_hsm_lv"/>
</a:editors> </a:editors>
</a:grid> </a:grid>
......
hls_rent(screen)/RENT400/checkout.screen
View file @ a2cb82d9
...@@ -27,7 +27,16 @@ ...@@ -27,7 +27,16 @@
height:480,width:820 height:480,width:820
}); });
} }
function rendererDay(cell,date,text,currentMonth){
var today = new Date();
if(date < new Date(today.getFullYear(),today.getMonth(),today.getDate())){
cell.disabled=true;
}
return text;
}
function check_out(){ function check_out(){
debugger;
if($('hls_check_out_line_ds').getSelected().length==0){ if($('hls_check_out_line_ds').getSelected().length==0){
Aurora.showErrorMessage( 'ERROR', '请至少选择一条记录！',null, 200, 100 ); Aurora.showErrorMessage( 'ERROR', '请至少选择一条记录！',null, 200, 100 );
return false; return false;
...@@ -124,18 +133,18 @@ ...@@ -124,18 +133,18 @@
<!--<a:button click="checkoutfunction" text="退房" width="80" />--> <!--<a:button click="checkoutfunction" text="退房" width="80" />-->
<!--</a:toolBar>--> <!--</a:toolBar>-->
<a:columns> <a:columns>
<a:column name="contract_no" prompt="房屋合同编号" renderer="hls_house_contract_link" width="120" /> <a:column name="contract_no" align="center" prompt="房屋合同编号" renderer="hls_house_contract_link" width="120" />
<a:column name="staff_no" prompt="入住人员工号" width="100"/> <a:column name="staff_no" align="center" prompt="入住人员工号" width="100"/>
<a:column name="name" prompt="入住人员姓名" width="100"/> <a:column name="name" align="center" prompt="入住人员姓名" width="100"/>
<a:column name="gender" prompt="性别" width="80"/> <a:column name="gender" align="center" prompt="性别" width="80"/>
<a:column name="department" prompt="所在部门" width="80"/> <a:column name="department" align="center" prompt="所在部门" width="80"/>
<a:column name="base_in" prompt="base地" width="80"/> <a:column name="base_in" align="center" prompt="base地" width="80"/>
<a:column name="phone_number" prompt="联系电话" width="100"/> <a:column name="phone_number" align="center" prompt="联系电话" width="100"/>
<a:column name="room_abbr" prompt="房屋简称" width="80"/> <a:column name="room_abbr" align="center" prompt="房屋简称" width="80"/>
<a:column name="room_type" prompt="房屋类型" width="80"/> <a:column name="room_type" align="center" prompt="房屋类型" width="80"/>
<a:column name="live_start_date" prompt="入住日期" width="160" renderer="Aurora.formatDate"/> <a:column name="live_start_date" align="center" prompt="入住日期" width="160" renderer="Aurora.formatDate"/>
<a:column name="rent_dates" prompt="入住天数" width="80"/> <a:column name="rent_dates" align="center" prompt="入住天数" width="80"/>
<a:column name="people_status" prompt="入住人员状态" width="120"/> <a:column name="people_status" align="center" prompt="入住人员状态" width="120"/>
</a:columns> </a:columns>
<!--<a:box>--> <!--<a:box>-->
<!--<a:datePicker name="check_out_date" />--> <!--<a:datePicker name="check_out_date" />-->
...@@ -144,7 +153,7 @@ ...@@ -144,7 +153,7 @@
<!--</a:box>--> <!--</a:box>-->
</a:grid> </a:grid>
<a:hBox> <a:hBox>
<a:datePicker name="check_out_date" bindTarget="HLS_check_out_date_ds" prompt="退房日期"> <a:datePicker name="check_out_date" bindTarget="HLS_check_out_date_ds" dayRenderer="rendererDay" prompt="退房日期">
</a:datePicker> </a:datePicker>
<a:toolbarButton click="check_out" text="退房"/> <a:toolbarButton click="check_out" text="退房"/>
</a:hBox> </a:hBox>
......
hls_rent(screen)/RENT400/contract_detial.screen
View file @ a2cb82d9
...@@ -110,7 +110,6 @@ ...@@ -110,7 +110,6 @@
<a:textField name="contract_invoice_tax" bindtarget="HLS_Contract_info_ds" prompt="合同发票税" /> <a:textField name="contract_invoice_tax" bindtarget="HLS_Contract_info_ds" prompt="合同发票税" />
<a:textField name="sum_price" bindtarget="HLS_Contract_info_ds" prompt="总金额" /> <a:textField name="sum_price" bindtarget="HLS_Contract_info_ds" prompt="总金额" />
<a:textField name="currency" bindtarget="HLS_Contract_info_ds" editable="false" prompt="币种" /> <a:textField name="currency" bindtarget="HLS_Contract_info_ds" editable="false" prompt="币种" />
</a:box> </a:box>
<a:box column="1"> <a:box column="1">
<a:textField name="remark" bindtarget="HLS_Contract_info_ds" prompt="备注" width="400"/> <a:textField name="remark" bindtarget="HLS_Contract_info_ds" prompt="备注" width="400"/>
......
hls_rent(screen)/RENT500/Create_contract.screen
View file @ a2cb82d9
...@@ -28,6 +28,14 @@ ...@@ -28,6 +28,14 @@
} }
return true; return true;
} }
function rendererDay(cell,date,text,currentMonth){
var today = new Date();
if(date < new Date(today.getFullYear(),today.getMonth(),today.getDate())){
cell.disabled=true;
}
return text;
}
//判断日期是否有效 //判断日期是否有效
function validate_date(record, name, value){ function validate_date(record, name, value){
if(name == 'contract_start_date' || name == 'contract_finish_date'){ if(name == 'contract_start_date' || name == 'contract_finish_date'){
...@@ -50,7 +58,8 @@ ...@@ -50,7 +58,8 @@
<!--合同新增DS--> <!--合同新增DS-->
<a:dataSet id="hls_room_info_ds" model="hls_rent.RENT500.HLS_Contract_info" autoCreate="true"> <a:dataSet id="hls_room_info_ds" model="hls_rent.RENT500.HLS_Contract_info" autoCreate="true">
<a:fields> <a:fields>
<a:field name="room_id" required="true" lovHeight="460" lovService="hls_rent.RENT500.HLS_room_info" lovWidth="600" title="房屋选择"> <a:field name="room_id"/>
<a:field name="room_abbr" required="true" lovHeight="460" lovService="hls_rent.RENT500.HLS_room_info" lovWidth="600" title="房屋选择">
<a:mapping> <a:mapping>
<a:map from="room_id" to="room_id" /> <a:map from="room_id" to="room_id" />
<a:map from="room_area" to="room_area"/> <a:map from="room_area" to="room_area"/>
...@@ -94,11 +103,11 @@ ...@@ -94,11 +103,11 @@
<a:form id="c_form" style="width:100%" title=""> <a:form id="c_form" style="width:100%" title="">
<a:form id="head_form" column="3" style="width:100%" > <a:form id="head_form" column="3" style="width:100%" >
<a:textField name="h_contract_number" bindtarget="hls_room_info_ds" editable="false" prompt="房屋合同编号"/> <a:textField name="h_contract_number" bindtarget="hls_room_info_ds" editable="false" prompt="房屋合同编号"/>
<a:datePicker name="contract_start_date" bindtarget="hls_room_info_ds" prompt="合同开始日期"/> <a:datePicker name="contract_start_date" bindtarget="hls_room_info_ds" prompt="合同开始日期" dayRenderer="rendererDay"/>
<a:datePicker name="contract_finish_date" bindtarget="hls_room_info_ds" prompt="合同结束日期"/> <a:datePicker name="contract_finish_date" bindtarget="hls_room_info_ds" prompt="合同结束日期" dayRenderer="rendererDay"/>
</a:form> </a:form>
<a:form id="room_form" column="3" style="width:100%" title="房屋信息" > <a:form id="room_form" column="3" style="width:100%" title="房屋信息" >
<a:lov name="room_id" bindtarget="hls_room_info_ds" prompt="房屋选择"/> <a:lov name="room_abbr" bindtarget="hls_room_info_ds" prompt="房屋选择"/>
<a:textField name="room_type" bindtarget="hls_room_info_ds" editable="false" prompt="房屋类型"/> <a:textField name="room_type" bindtarget="hls_room_info_ds" editable="false" prompt="房屋类型"/>
<a:textField name="room_area" bindtarget="hls_room_info_ds" editable="false" prompt="房屋面积"/> <a:textField name="room_area" bindtarget="hls_room_info_ds" editable="false" prompt="房屋面积"/>
<a:textField name="bed" bindtarget="hls_room_info_ds" editable="false" prompt="床位" /> <a:textField name="bed" bindtarget="hls_room_info_ds" editable="false" prompt="床位" />
...@@ -107,8 +116,7 @@ ...@@ -107,8 +116,7 @@
<a:textField name="intermediary" bindtarget="hls_room_info_ds" editable="false" prompt="中介名称"/> <a:textField name="intermediary" bindtarget="hls_room_info_ds" editable="false" prompt="中介名称"/>
<a:textField name="intermediary_name" bindtarget="hls_room_info_ds" editable="false" prompt="中介联系人"/> <a:textField name="intermediary_name" bindtarget="hls_room_info_ds" editable="false" prompt="中介联系人"/>
<a:textField name="intermediary_tel" bindtarget="hls_room_info_ds" editable="false" prompt="中介联系电话"/> <a:textField name="intermediary_tel" bindtarget="hls_room_info_ds" editable="false" prompt="中介联系电话"/>
<a:textField name="" bindtarget="" editable="false" prompt="房屋地址"/> <a:textField name="room_addr_country" bindtarget="hls_room_info_ds" editable="false" prompt="房屋地址国家"/>
<a:textField name="room_addr_country" bindtarget="hls_room_info_ds" editable="false" prompt="国家"/>
<a:textField name="room_addr_province" bindtarget="hls_room_info_ds" editable="false" prompt="省"/> <a:textField name="room_addr_province" bindtarget="hls_room_info_ds" editable="false" prompt="省"/>
<a:textField name="room_addr_city" bindtarget="hls_room_info_ds" editable="false" prompt="市"/> <a:textField name="room_addr_city" bindtarget="hls_room_info_ds" editable="false" prompt="市"/>
</a:form> </a:form>
...@@ -118,7 +126,7 @@ ...@@ -118,7 +126,7 @@
<a:form id="contract_form" column="2" style="width:100%" title="租金信息"> <a:form id="contract_form" column="2" style="width:100%" title="租金信息">
<a:numberField name="month_rent_price" allowNegative="false" bindtarget="hls_room_info_ds" prompt="月租金"/> <a:numberField name="month_rent_price" allowNegative="false" bindtarget="hls_room_info_ds" prompt="月租金"/>
<a:numberField name="tenancy_term" bindtarget="hls_room_info_ds" prompt="租期"/> <a:numberField name="tenancy_term" bindtarget="hls_room_info_ds" prompt="租期"/>
<a:numberField name="agency_fee" bindtarget="hls_room_info_ds" prompt=" "/> <a:numberField name="agency_fee" bindtarget="hls_room_info_ds" prompt="中介费"/>
<a:numberField name="Contract_invoice_tax" bindtarget="hls_room_info_ds" prompt="合同发票税" /> <a:numberField name="Contract_invoice_tax" bindtarget="hls_room_info_ds" prompt="合同发票税" />
<a:button click="v_sum_price" text="计算" width="80"/> <a:button click="v_sum_price" text="计算" width="80"/>
<a:numberField name="sum_price" bindtarget="hls_room_info_ds" editable="false" prompt="总金额" /> <a:numberField name="sum_price" bindtarget="hls_room_info_ds" editable="false" prompt="总金额" />
......
hls_rent(screen)/RENT500/modification.screen
View file @ a2cb82d9
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<a:field name="sum_price"/> <a:field name="sum_price"/>
<a:field name="contract_condition"/> <a:field name="contract_condition"/>
<a:field name="contract_remark"/> <a:field name="contract_remark"/>
<a:field name="room_id" lovHeight="460" lovService="hls_rent.RENT500.HLS_room_info" lovWidth="600" title="房屋选择"> <a:field name="room_abbr" lovHeight="460" lovService="hls_rent.RENT500.HLS_room_info" lovWidth="600" title="房屋选择">
<a:mapping> <a:mapping>
<a:map from="room_id" to="room_id"/> <a:map from="room_id" to="room_id"/>
<a:map from="room_area" to="room_area" readOnly="true" /> <a:map from="room_area" to="room_area" readOnly="true" />
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<a:datePicker name="contract_finish_date" bindtarget="HLS_Contract_info_ds" prompt="合同结束日期" renderer="formatDate"/> <a:datePicker name="contract_finish_date" bindtarget="HLS_Contract_info_ds" prompt="合同结束日期" renderer="formatDate"/>
</a:box> </a:box>
<a:box column="3"> <a:box column="3">
<a:lov name="room_id" bindtarget="HLS_Contract_info_ds" prompt="房屋选择"/> <a:lov name="room_abbr" bindtarget="HLS_Contract_info_ds" prompt="房屋选择"/>
<a:textField name="room_type" bindtarget="HLS_Contract_info_ds" editable="false" prompt="房屋类型"/> <a:textField name="room_type" bindtarget="HLS_Contract_info_ds" editable="false" prompt="房屋类型"/>
<a:textField name="room_area" bindtarget="HLS_Contract_info_ds" editable="false" prompt="房屋面积"/> <a:textField name="room_area" bindtarget="HLS_Contract_info_ds" editable="false" prompt="房屋面积"/>
<a:textField name="bed" bindtarget="HLS_Contract_info_ds" editable="false" prompt="床位" /> <a:textField name="bed" bindtarget="HLS_Contract_info_ds" editable="false" prompt="床位" />
...@@ -112,8 +112,7 @@ ...@@ -112,8 +112,7 @@
<a:textField name="intermediary" bindtarget="HLS_Contract_info_ds" editable="false" prompt="中介名称"/> <a:textField name="intermediary" bindtarget="HLS_Contract_info_ds" editable="false" prompt="中介名称"/>
<a:textField name="intermediary_name" bindtarget="HLS_Contract_info_ds" editable="false" prompt="中介联系人"/> <a:textField name="intermediary_name" bindtarget="HLS_Contract_info_ds" editable="false" prompt="中介联系人"/>
<a:textField name="intermediary_tel" bindtarget="HLS_Contract_info_ds" editable="false" prompt="中介联系电话"/> <a:textField name="intermediary_tel" bindtarget="HLS_Contract_info_ds" editable="false" prompt="中介联系电话"/>
<a:textField name="" bindtarget="" editable="false" prompt="房屋地址"/> <a:textField name="room_addr_country" bindtarget="HLS_Contract_info_ds" editable="false" prompt="房屋地址国家"/>
<a:textField name="room_addr_country" bindtarget="HLS_Contract_info_ds" editable="false" prompt="国家"/>
<a:textField name="room_addr_province" bindtarget="HLS_Contract_info_ds" editable="false" prompt="省"/> <a:textField name="room_addr_province" bindtarget="HLS_Contract_info_ds" editable="false" prompt="省"/>
<a:textField name="room_addr_city" bindtarget="HLS_Contract_info_ds" editable="false" prompt="市"/> <a:textField name="room_addr_city" bindtarget="HLS_Contract_info_ds" editable="false" prompt="市"/>
</a:box> </a:box>
......
hls_rent(screen)/RENT500/search_contract.screen
View file @ a2cb82d9
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
//修改按钮 //修改按钮
function modification(){ function modification(){
if($('hls_search_line_ds').getSelected().length==0){ if($('hls_search_line_ds').getSelected().length==0){
Aurora.showErrorMessage( 'ERROR', '请至少选择一条记录！',null, 200, 100 ); Aurora.showErrorMessage( 'ERROR', '请选择一条记录！',null, 200, 100 );
return false; return false;
}else if($('hls_search_line_ds').getSelected().length>1){ }else if($('hls_search_line_ds').getSelected().length>1){
Aurora.showErrorMessage( 'ERROR', '只能选择一条记录！',null, 200, 100 ); Aurora.showErrorMessage( 'ERROR', '只能选择一条记录！',null, 200, 100 );
...@@ -124,12 +124,13 @@ ...@@ -124,12 +124,13 @@
<a:field name="contract_condition"/> <a:field name="contract_condition"/>
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
<a:form id="search_contract_header" style="width:100%" title="查询条件">
<a:screenTopToolbar> <a:screenTopToolbar>
<a:gridButton click="hls_house_query" text="查询" width="80"/> <a:gridButton click="hls_house_query" text="查询" width="80"/>
<!--<a:gridButton click="addWindow" text="新增" width="80"/>--> <!--<a:gridButton click="addWindow" text="新增" width="80"/>-->
<!--<a:gridButton click="modificationWindow" text="修改" width="80"/>--> <!--<a:gridButton click="modificationWindow" text="修改" width="80"/>-->
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form id="search_contract_header" style="width:100%" title="查询条件">
<a:box id="search_contract_header_box" column="3" style="width:100%"> <a:box id="search_contract_header_box" column="3" style="width:100%">
<a:textField name="room_abbr" bindtarget="hls_search_contract_ds" prompt="房屋简称"/> <a:textField name="room_abbr" bindtarget="hls_search_contract_ds" prompt="房屋简称"/>
<a:textField name="landlord_name" bindtarget="hls_search_contract_ds" prompt="房东姓名"/> <a:textField name="landlord_name" bindtarget="hls_search_contract_ds" prompt="房东姓名"/>
...@@ -151,18 +152,18 @@ ...@@ -151,18 +152,18 @@
<a:button click="modification" text="修改" width="80"/> <a:button click="modification" text="修改" width="80"/>
</a:toolBar> </a:toolBar>
<a:columns> <a:columns>
<a:column name="h_contract_number" renderer="hls_house_contract_link" prompt="房屋合同编号" width="140" /> <a:column name="h_contract_number" align="center" renderer="hls_house_contract_link" prompt="房屋合同编号" width="140" />
<a:column name="contract_start_date" prompt="合同开始日期" width="100"/> <a:column name="contract_start_date" align="center" prompt="合同开始日期" width="100"/>
<a:column name="contract_finish_date" prompt="合同到期日期" width="100"/> <a:column name="contract_finish_date" align="center" prompt="合同到期日期" width="100"/>
<a:column name="room_abbr" prompt="房屋简称" width="80"/> <a:column name="room_abbr" align="center" prompt="房屋简称" width="80"/>
<a:column name="room_type" prompt="房屋类型" width="80"/> <a:column name="room_type" align="center" prompt="房屋类型" width="80"/>
<a:column name="bed" prompt="床位" width="80"/> <a:column name="bed" align="center" prompt="床位" width="80"/>
<a:column name="bed_used" prompt="已住床位" width="80"/> <a:column name="bed_used" align="center" prompt="已住床位" width="80"/>
<a:column name="bed_free" prompt="剩余床位" width="80"/> <a:column name="bed_free" align="center" prompt="剩余床位" width="80"/>
<a:column name="landlord_name" prompt="房东姓名" width="80"/> <a:column name="landlord_name" align="center" prompt="房东姓名" width="80"/>
<a:column name="landlord_tel" prompt="联系电话" width="120"/> <a:column name="landlord_tel" align="center" prompt="联系电话" width="120"/>
<a:column name="intermediary" prompt="中介名称" width="80"/> <a:column name="intermediary" align="center" prompt="中介名称" width="80"/>
<a:column name="contract_condition" prompt="房屋合同状态" width="120"/> <a:column name="contract_condition" align="center" prompt="房屋合同状态" width="120"/>
<a:column name="contract_remark" prompt="合同备注" width="80"/> <a:column name="contract_remark" prompt="合同备注" width="80"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
......
package/HLS_Contract_info_pkg.pck
View file @ a2cb82d9
...@@ -90,6 +90,7 @@ create or replace package body HLS_Contract_info_pkg is ...@@ -90,6 +90,7 @@ create or replace package body HLS_Contract_info_pkg is
1, 1,
-1, -1,
sysdate); sysdate);
end; end;
procedure update_contract_info(p_h_contract_number varchar2, procedure update_contract_info(p_h_contract_number varchar2,
p_contract_start_date date, p_contract_start_date date,
...@@ -103,9 +104,17 @@ create or replace package body HLS_Contract_info_pkg is ...@@ -103,9 +104,17 @@ create or replace package body HLS_Contract_info_pkg is
p_currency varchar2, p_currency varchar2,
p_remark varchar2, p_remark varchar2,
p_contract_remark varchar2) is p_contract_remark varchar2) is
v_old_room_id number;
begin begin
select room_id
into v_old_room_id
from hls_contract_info
where h_contract_number = p_h_contract_number;
--更新原来合同中的房屋状态为“空闲”
update hls_room_info
set room_status = 'status1'
where room_id = v_old_room_id;
--更新合同信息
update HLS_Contract_info update HLS_Contract_info
set contract_start_date = p_contract_start_date, set contract_start_date = p_contract_start_date,
contract_finish_date = p_contract_finish_date, contract_finish_date = p_contract_finish_date,
...@@ -122,7 +131,10 @@ create or replace package body HLS_Contract_info_pkg is ...@@ -122,7 +131,10 @@ create or replace package body HLS_Contract_info_pkg is
last_updated_by = -1, last_updated_by = -1,
last_update_date = sysdate last_update_date = sysdate
where h_contract_number = p_h_contract_number; where h_contract_number = p_h_contract_number;
--更新新合同中房屋状态为“已租住”
update hls_room_info
set room_status = 'status2'
where room_id = p_room_id;
end; end;
procedure modifi_contract_condition(p_h_contract_number varchar2) is procedure modifi_contract_condition(p_h_contract_number varchar2) is
...@@ -130,6 +142,10 @@ create or replace package body HLS_Contract_info_pkg is ...@@ -130,6 +142,10 @@ create or replace package body HLS_Contract_info_pkg is
update HLS_Contract_info update HLS_Contract_info
set contract_condition = 'type2' set contract_condition = 'type2'
where h_contract_number = p_h_contract_number; where h_contract_number = p_h_contract_number;
update hls_room_info
set room_status = 'status2'
where room_id IN (select room_id from hls_contract_info where h_contract_number = p_h_contract_number);
end; end;
end HLS_Contract_info_pkg; end HLS_Contract_info_pkg;
/ /
package/hls_rent_pkg.pck
View file @ a2cb82d9
...@@ -681,8 +681,8 @@ create or replace package body hls_rent_pkg is ...@@ -681,8 +681,8 @@ create or replace package body hls_rent_pkg is
from hls_rent_fee_info hfi; from hls_rent_fee_info hfi;
begin begin
for i_cursor in fee_cursor loop for i_cursor in fee_cursor loop
if (i_cursor.fee_items != null or i_cursor.fee_items != '') and if (i_cursor.fee_items is not null) and
(i_cursor.fee_objects != null or i_cursor.fee_items != '') then (i_cursor.fee_objects is not null) then
if i_cursor.fee_items = p_fee_items and if i_cursor.fee_items = p_fee_items and
i_cursor.fee_objects = p_room_id then i_cursor.fee_objects = p_room_id then
v_fee_period := v_fee_period + 1; v_fee_period := v_fee_period + 1;
......
tables(新)/hls_hsm入住人员信息表最终版.sql
View file @ a2cb82d9
...@@ -24,7 +24,7 @@ base_in varchar2(20) not null, ...@@ -24,7 +24,7 @@ base_in varchar2(20) not null,
phone_number varchar2(100) not null, phone_number varchar2(100) not null,
people_status varchar2(20) not null, people_status varchar2(20) not null,
email varchar2(100) not null, email varchar2(100) not null,
message varchar2(500) not null, message varchar2(500),
contract_no varchar2(30), contract_no varchar2(30),
leaving_date date, leaving_date date,
live_start_date date, live_start_date date,
...@@ -53,7 +53,7 @@ comment on column hls_hsm.live_start_date is ' ...@@ -53,7 +53,7 @@ comment on column hls_hsm.live_start_date is '
comment on column hls_hsm.check_out_date is '退房日期（已退房要用）'; comment on column hls_hsm.check_out_date is '退房日期（已退房要用）';
comment on column hls_hsm.created_by is '默认'; comment on column hls_hsm.created_by is '默认';
comment on column hls_hsm.creation_date is '默认'; comment on column hls_hsm.creation_date is '默认';
comment on column hls_hsm.last_update_by is '默认'; comment on column hls_hsm.last_updated_by is '默认';
comment on column hls_hsm.last_update_date is '默认'; comment on column hls_hsm.last_update_date is '默认';
-- create/recreate primary, unique and foreign key constraints -- create/recreate primary, unique and foreign key constraints
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment