Commit 3bb883cc authored by 25484's avatar 25484

Merge branch 'feature/hls_bp_master_create_entrance' into develop

parents 9edb91d9 673d0133
...@@ -143,9 +143,9 @@ ...@@ -143,9 +143,9 @@
</a:mapping> </a:mapping>
</a:field> --> </a:field> -->
<a:field name="contract_number" typeCase="Upper"/> <a:field name="contract_number" typeCase="Upper"/>
<a:field name="lease_organization_name" displayField="description" <!-- <a:field name="lease_organization_name" displayField="description"-->
options="con560_lease_organization_name_ds" returnField="lease_organization" <!-- options="con560_lease_organization_name_ds" returnField="lease_organization"-->
valueField="lease_organization"/> <!-- valueField="lease_organization"/>-->
<a:field name="owner_user_id_n" lovGridHeight="350" lovHeight="475" <a:field name="owner_user_id_n" lovGridHeight="350" lovHeight="475"
lovService="cont.CON560.sys_user_for_lov" lovWidth="520" title="出单人选择"> lovService="cont.CON560.sys_user_for_lov" lovWidth="520" title="出单人选择">
<a:mapping> <a:mapping>
...@@ -153,9 +153,12 @@ ...@@ -153,9 +153,12 @@
<a:map from="description" to="owner_user_id_n"/> <a:map from="description" to="owner_user_id_n"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="contract_status_n" displayField="code_value_name"
options="con560_contract_status_ds" returnField="contract_status"
valueField="code_value"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
<a:dataSet id="con560_contract_result_ds" autoPageSize="true" autoQuery="true" <a:dataSet id="con560_contract_result_ds" autoPageSize="true" autoQuery="true" pageSize="4"
model="cont.CON560.con_contract_finish_for_query" queryDataSet="con560_contract_query_ds" model="cont.CON560.con_contract_finish_for_query" queryDataSet="con560_contract_query_ds"
queryUrl="${/request/@context_path}/autocrud/cont.CON560.con_contract_finish_for_query/query" queryUrl="${/request/@context_path}/autocrud/cont.CON560.con_contract_finish_for_query/query"
selectable="true" selectionModel="single"> selectable="true" selectionModel="single">
...@@ -181,21 +184,22 @@ ...@@ -181,21 +184,22 @@
<a:textField name="contract_number" bindTarget="con560_contract_query_ds" prompt="HLS.CONTRACT_NUMBER"/> <a:textField name="contract_number" bindTarget="con560_contract_query_ds" prompt="HLS.CONTRACT_NUMBER"/>
<a:lov name="bp_name" bindTarget="con560_contract_query_ds" prompt="HLS.TENANT_CODE"/> <a:lov name="bp_name" bindTarget="con560_contract_query_ds" prompt="HLS.TENANT_CODE"/>
<!--<a:lov name="owner_user_id_n" bindTarget="con560_contract_query_ds" prompt="出单人"/>--> <!--<a:lov name="owner_user_id_n" bindTarget="con560_contract_query_ds" prompt="出单人"/>-->
<a:comboBox name="lease_organization_name" bindTarget="con560_contract_query_ds" prompt="事业部"/> <!-- <a:comboBox name="lease_organization_name" bindTarget="con560_contract_query_ds" prompt="事业部"/>-->
<a:comboBox name="contract_status_n" bindTarget="con560_contract_query_ds" prompt="合同状态"/>
</a:form> </a:form>
<a:grid id="con560_con_contract_grid_ds" bindTarget="con560_contract_result_ds" height="250" <a:grid id="con560_con_contract_grid_ds" bindTarget="con560_contract_result_ds" height="250"
marginWidth="30" navBar="true"> marginWidth="30" navBar="true">
<a:columns> <a:columns>
<a:column name="contract_number" lock="true" prompt="HLS.CONTRACT_NUMBER" <a:column name="contract_number" lock="true" prompt="HLS.CONTRACT_NUMBER"
renderer="con560_render_contractMaintainDs_grid" width="150"/> renderer="con560_render_contractMaintainDs_grid" width="150"/>
<a:column name="bp_name" prompt="HLS.TENANT_NAME" width="100"/> <a:column name="bp_name" prompt="HLS.TENANT_NAME" width="240"/>
<a:column name="inception_of_lease" prompt="起租日期" renderer="Leaf.formatDate" width="100"/> <a:column name="inception_of_lease" prompt="起租日期" renderer="Leaf.formatDate" width="100"/>
<a:column name="lease_end_date" prompt="合同预计结束日期" renderer="Leaf.formatDate" width="100"/> <a:column name="lease_end_date" prompt="合同预计结束日期" renderer="Leaf.formatDate" width="140"/>
<a:column name="is_terminate" prompt="租金是否结清" width="100"/> <a:column name="is_terminate" prompt="租金是否结清" width="100"/>
<a:column name="residual_value" align="right" prompt="留购价" renderer="Leaf.formatMoney" width="50"/> <a:column name="residual_value" align="right" prompt="留购价" renderer="Leaf.formatMoney" width="50"/>
<!--<a:column name="signing_user_id_n" prompt="签约人" width="100"/>--> <!--<a:column name="signing_user_id_n" prompt="签约人" width="100"/>-->
<a:column name="signing_date" prompt="签约时间" renderer="Leaf.formatDate" width="100"/> <!-- <a:column name="signing_date" prompt="签约时间" renderer="Leaf.formatDate" width="100"/>-->
<a:column name="signing_location" prompt="签约地点" width="100"/> <!-- <a:column name="signing_location" prompt="签约地点" width="100"/>-->
<!--<a:column name="bp_vender" align="center" footerRenderer="summaryRenderer" prompt="主供应商名称" width="200"/>--> <!--<a:column name="bp_vender" align="center" footerRenderer="summaryRenderer" prompt="主供应商名称" width="200"/>-->
<a:column name="lease_item_amount" align="right" footerRenderer="summaryRenderer" prompt="租赁物总价" <a:column name="lease_item_amount" align="right" footerRenderer="summaryRenderer" prompt="租赁物总价"
renderer="Leaf.formatMoney" width="120"/> renderer="Leaf.formatMoney" width="120"/>
......
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<a:column name="down_payment" align="right" footerRenderer="summaryRenderer" prompt="首付款" <a:column name="down_payment" align="right" footerRenderer="summaryRenderer" prompt="首付款"
renderer="Leaf.formatMoney" width="120"/> renderer="Leaf.formatMoney" width="120"/>
<!--<a:column name="owner_user_id_n" prompt="出单人" width="60"/>--> <!--<a:column name="owner_user_id_n" prompt="出单人" width="60"/>-->
<a:column name="contract_status" prompt="合同状态" width="80"/> <a:column name="contract_status_n" prompt="合同状态" width="80"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
<a:tabPanel marginHeight="420" marginWidth="30"> <a:tabPanel marginHeight="420" marginWidth="30">
......
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