Commit 4fe97a23 authored by liyuan.chen's avatar liyuan.chen

[feat]合同结束用印信息

parent e2bc87d2
Pipeline #6075 canceled with stages
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
FROM con_contract_use_seal_lv t1 FROM con_contract_use_seal_lv t1
WHERE WHERE
t1.contract_id = ${@contract_id} t1.contract_id = ${@contract_id}
and t1.document_table = 'CON_CONTRACT_FINISH'
]]></bm:query-sql> ]]></bm:query-sql>
<bm:parameters> <bm:parameters>
......
...@@ -10,6 +10,17 @@ ...@@ -10,6 +10,17 @@
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
con_contract_closed_pkg.contract_use_seal_save(p_contract_id => ${@contract_id},
p_user_id => ${/session/@user_id},
p_instruments_types => ${@instruments_types},
p_common_seal => ${@common_seal},
p_corporate_visa_seal => ${@corporate_visa_seal},
p_legal_seal => ${@legal_seal},
p_con_special_seal => ${@con_special_seal},
p_financial_seal => ${@financial_seal},
p_supervisio_seal => ${@supervisio_seal},
p_seal_number => ${@seal_number});
con_contract_closed_pkg.terminate_contract( con_contract_closed_pkg.terminate_contract(
p_contract_id =>${@contract_id}, p_contract_id =>${@contract_id},
p_user_id =>${/session/@user_id} p_user_id =>${/session/@user_id}
......
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
} }
} }
function con560_con_contract_detail() { function con560_con_contract_detail() {
var records = $('con560_contract_result_ds').getSelected(); var records = $('con560_contract_result_ds').getSelected();
var seal_record = $('seal_info_ds').getCurrentRecord();
if (!records.length) { if (!records.length) {
Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录'); Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录');
return; return;
...@@ -86,12 +86,14 @@ ...@@ -86,12 +86,14 @@
} }
} }
var TerminateData = []; var TerminateData = [];
debugger
for (var i = 0; i < records.length; i++) { for (var i = 0; i < records.length; i++) {
if(records[i].data.is_terminate=='否'){ if(records[i].data.is_terminate=='否'){
$L.showInfoMessage("提示",'未收金额如果不为0不可进行合同结束'); $L.showInfoMessage("提示",'未收金额如果不为0不可进行合同结束');
return; return;
} }
jQuery.each(seal_record.data, function(j, v){
records[i].set( j , v );
});
records[i].set('_status', 'update'); records[i].set('_status', 'update');
TerminateData.push(records[i].data); TerminateData.push(records[i].data);
} }
...@@ -183,14 +185,18 @@ ...@@ -183,14 +185,18 @@
} }
} }
function onIndexChange(ds, record, name, value, oldvalue) { function onIndexChange(ds, record, name, value, oldvalue){
$('receivedAmountDs').setQueryParameter('contract_id', record.get('contract_id')); $('receivedAmountDs').setQueryParameter('contract_id', record.get('contract_id'));
$('unreceivedAmountDs').setQueryParameter('contract_id', record.get('contract_id')); $('unreceivedAmountDs').setQueryParameter('contract_id', record.get('contract_id'));
$('receivedAmountDs').query(); $('receivedAmountDs').query();
$('unreceivedAmountDs').query(); $('unreceivedAmountDs').query();
$('seal_info_ds').setQueryParameter('contract_id', record.get('contract_id')); /*$('seal_info_ds').setQueryParameter('contract_id', record.get('contract_id'));
$('seal_info_ds').query(); $('seal_info_ds').query();*/
if(Ext.isEmpty($('seal_info_ds').getCurrentRecord())){
$('seal_info_ds').create();
}
} }
...@@ -205,6 +211,7 @@ ...@@ -205,6 +211,7 @@
<a:dataSet id="con560_lease_organization_name_ds" loadData="true" <a:dataSet id="con560_lease_organization_name_ds" loadData="true"
model="basic.hls_lease_organization_for_lov"/> model="basic.hls_lease_organization_for_lov"/>
<a:dataSet id="con560_contract_status_grid_ds" lookupCode="CON500_CONTRACT_STATUS"/> <a:dataSet id="con560_contract_status_grid_ds" lookupCode="CON500_CONTRACT_STATUS"/>
<a:dataSet id="seal_number_ds" lookupCode="SEAL_NUMBER_FINISH"/>
<a:dataSet id="con560_contract_query_ds" autoCreate="true"> <a:dataSet id="con560_contract_query_ds" autoCreate="true">
<a:fields> <a:fields>
<a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovLabelWidth="100" <a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovLabelWidth="100"
...@@ -243,11 +250,9 @@ ...@@ -243,11 +250,9 @@
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">
<!-- <a:fields>--> <!--<a:fields>
<!-- <a:field name="contract_status_n" displayField="code_value_name"--> <a:field name="contract_status_n" displayField="code_value_name" options="con560_contract_status_grid_ds" returnField="contract_status" valueField="code_value"/>
<!-- options="con560_contract_status_grid_ds" returnField="contract_status"--> </a:fields>-->
<!-- valueField="code_value"/>-->
<!-- </a:fields>-->
<a:events> <a:events>
<a:event name="indexChange" handler="onIndexChange"/> <a:event name="indexChange" handler="onIndexChange"/>
<a:event name="query" handler="aut_authority_list_validate_query"/> <a:event name="query" handler="aut_authority_list_validate_query"/>
...@@ -255,14 +260,15 @@ ...@@ -255,14 +260,15 @@
</a:dataSet> </a:dataSet>
<a:dataSet id="seal_info_ds" autoQuery="true" model="cont.CON560.con_contract_seal_info"> <a:dataSet id="seal_info_ds" autoQuery="true" model="cont.CON560.con_contract_seal_info">
<a:fields> <a:fields>
<a:field name="instruments_types" readOnly="true"/> <a:field name="instruments_types" readOnly="true" defaultValue="所有权转移通知书"/>
<a:field name="common_seal" readOnly="true" defaultValue="Y" uncheckedValue="N" checkedValue="Y"/> <a:field name="common_seal" readOnly="true" defaultValue="Y" uncheckedValue="N" checkedValue="Y"/>
<a:field name="corporate_visa_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/> <a:field name="corporate_visa_seal" readOnly="true" defaultValue="N" uncheckedValue="N" checkedValue="Y"/>
<a:field name="legal_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/> <a:field name="legal_seal" readOnly="true" defaultValue="N" uncheckedValue="N" checkedValue="Y"/>
<a:field name="con_special_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/> <a:field name="con_special_seal" readOnly="true" defaultValue="N" uncheckedValue="N" checkedValue="Y"/>
<a:field name="financial_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/> <a:field name="financial_seal" readOnly="true" defaultValue="N" uncheckedValue="N" checkedValue="Y"/>
<a:field name="supervisio_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/> <a:field name="supervisio_seal" readOnly="true" defaultValue="N" uncheckedValue="N" checkedValue="Y"/>
<a:field name="seal_number_n" readOnly="true"/> <a:field name="seal_number_n" readOnly="true" displayField="code_value_name" options="seal_number_ds" returnField="seal_number" valueField="code_value" defaultValue="一式一份" />
<a:field name="seal_number" readOnly="true" defaultValue="SEAL_O_ON_NUMBER" />
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
...@@ -354,7 +360,7 @@ ...@@ -354,7 +360,7 @@
</a:grid> </a:grid>
</a:tab> </a:tab>
<a:tab prompt="用印信息" width="110"> <a:tab prompt="用印信息" width="110">
<a:grid bindTarget="seal_info_ds" height="250" marginWidth="55" navBar="true"> <a:grid id="seal_info_ds_id" bindTarget="seal_info_ds" height="250" marginWidth="55" navBar="true">
<a:columns> <a:columns>
<a:column name="instruments_types" prompt="文书种类"/> <a:column name="instruments_types" prompt="文书种类"/>
<a:column name="common_seal" prompt="公章" editor="seal_info_check_id"/> <a:column name="common_seal" prompt="公章" editor="seal_info_check_id"/>
......
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
<a:dataSet id="seal_info_ds" autoQuery="true" model="cont.CON560.con_contract_seal_info"> <a:dataSet id="seal_info_ds" autoQuery="true" model="cont.CON560.con_contract_seal_info">
<a:fields> <a:fields>
<a:field name="instruments_types" readOnly="true"/> <a:field name="instruments_types" readOnly="true"/>
<a:field name="common_seal" readOnly="true" defaultValue="Y" uncheckedValue="N" checkedValue="Y"/> <a:field name="common_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/>
<a:field name="corporate_visa_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/> <a:field name="corporate_visa_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/>
<a:field name="legal_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/> <a:field name="legal_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/>
<a:field name="con_special_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/> <a:field name="con_special_seal" readOnly="true" uncheckedValue="N" checkedValue="Y"/>
......
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