Skip to content

L
leaf-hlcm
Commit 6bff6a68 authored by lijingjing's avatar lijingjing
Browse files
Options

[fix] 销项发票bug修改

parent 1e2adfd1
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 35 deletions
src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.lwm
View file @ 6bff6a68
......@@ -85,10 +85,14 @@
<bm:query-field name="document_number_t" queryExpression="t1.document_number &lt;= ${@document_number_t}"/>
<bm:query-field name="invoice_number_f" queryExpression="t1.invoice_number &gt;= ${@invoice_number_f}"/>
<bm:query-field name="invoice_number_t" queryExpression="t1.invoice_number &lt;= ${@invoice_number_t}"/>
<bm:query-field name="invoice_date_f" queryExpression="t1.invoice_date &gt;= to_date(${@invoice_date_f},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="invoice_date_t" queryExpression="t1.invoice_date &lt;= to_date(${@invoice_date_t},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="accounting_date_f" queryExpression="t1.accounting_date &gt;= to_date(${@accounting_date_f},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="accounting_date_t" queryExpression="t1.accounting_date &lt;= to_date(${@accounting_date_t},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="contract_number_f" queryExpression="t1.contract_number &lt;= ${@contract_number_f}"/>
<bm:query-field name="contract_number_t" queryExpression="t1.contract_number &lt;= ${@contract_number_t}"/>
<bm:query-field name="invoice_date_f" queryExpression="to_date(t1.invoice_date,&apos;yyyy-mm-dd&apos;) &gt;= to_date(${@invoice_date_f},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="invoice_date_t" queryExpression="to_date(t1.invoice_date,&apos;yyyy-mm-dd&apos;) &lt;= to_date(${@invoice_date_t},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="accounting_date_f" queryExpression="to_date(t1.accounting_date,&apos;yyyy-mm-dd&apos;) &gt;= to_date(${@accounting_date_f},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="accounting_date_t" queryExpression="to_date(t1.accounting_date,&apos;yyyy-mm-dd&apos;) &lt;= to_date(${@accounting_date_t},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="total_amount_f" queryExpression="t1.total_amount &gt;= ${@total_amount_f}"/>
<bm:query-field name="total_amount_t" queryExpression="t1.total_amount &lt;= ${@total_amount_t}"/>
<bm:query-field name="invoice_bp_code_f" queryExpression="t1.invoice_bp_code &gt;= ${@invoice_bp_code_f}"/>
......@@ -98,7 +102,9 @@
<bm:query-field name="invoice_kind" queryExpression="t1.invoice_kind = ${@invoice_kind}"/>
<bm:query-field name="invoice_title" queryExpression="t1.invoice_title like ${@invoice_title}"/>
<bm:query-field name="created_by" queryExpression="t1.created_by = ${@created_by}"/>
<bm:query-field name="query_contract_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, con_contract cc where df.contract_id = cc.contract_id and df.ar_invoice_hd_id = t1.invoice_hd_id and cc.contract_number between nvl(${@contract_number_f}, cc.contract_number) and nvl(${@contract_number_t}, cc.contract_number))"/>
<!--
<bm:query-field name="contract_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, con_contract cc where df.contract_id = cc.contract_id and df.ar_invoice_hd_id = t1.invoice_hd_id and cc.contract_number between nvl(${@contract_number_f}, cc.contract_number) and nvl(${@contract_number_t}, cc.contract_number))"/>
-->
<bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/>
<bm:query-field name="lease_channel" queryExpression="t1.lease_channel = ${@lease_channel}"/>
</bm:query-fields>
......
src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
View file @ 6bff6a68
......@@ -185,7 +185,7 @@
<a:fields>
<a:field name="currency_name" displayField="currency_name" options="acr512_currency_ds" returnField="currency" valueField="currency_code"/>
<a:field name="invoice_kind" defaultValue="2"/>
<a:field name="invoice_kind_desc" defaultValue="普通发票" displayField="code_value_name" options="acr512_invoice_kind_ds" returnField="invoice_kind" valueField="code_value"/>
<a:field name="invoice_kind_desc" displayField="code_value_name" options="acr512_invoice_kind_ds" returnField="invoice_kind" valueField="code_value"/>
<a:field name="business_type_desc" displayField="business_type_desc" options="acr512_business_type_ds" returnField="business_type" valueField="business_type"/>
<a:field name="created_by_name" lovGridHeight="320" lovHeight="500" lovService="acr.ACR512.acr_invoice_sys_user_lov" lovWidth="500" title="开票人选择">
<a:mapping>
......@@ -249,46 +249,55 @@
-->
</a:screenTopToolbar>
<a:form marginWidth="200" padding="0" title="应收发票维护">
<a:form marginWidth="400" padding="0" title="应收发票维护">
<a:hBox labelSeparator=" ">
<a:textField name="document_number_f" bindTarget="acr512_invoice_query_ds" prompt="HLS.DOCUMENT_NUMBER_FROM" width="135"/>
<!--
<div><![CDATA[${l:HLS.DOCUMENT_NUMBER_TO}]]></div>
<a:textField name="document_number_t" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>
<a:lov name="project_number_f" bindTarget="acr512_invoice_query_ds" prompt="HLS.PROJECT_NUMBER_FROM" width="135"/>
-->
<a:textField name="document_number_t" bindTarget="acr512_invoice_query_ds" prompt="单据编号到" width="135"/>
<a:lov name="contract_number_f" bindTarget="acr512_invoice_query_ds" prompt="合同编号从" width="135"/>
<!--
<div><![CDATA[${l:HLS.CONTRACT_NUMBER_TO}]]></div>
-->
<a:lov name="contract_number_t" bindTarget="acr512_invoice_query_ds" prompt="合同编号到" width="135"/>
<!-- <a:lov name="project_number_f" bindTarget="acr512_invoice_query_ds" prompt="HLS.PROJECT_NUMBER_FROM" width="135"/>
<div><![CDATA[${l:HLS.DOCUMENT_NUMBER_TO}]]></div>
<a:lov name="project_number_t" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>
<a:lov name="project_number_t" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>-->
<!--
<a:comboBox name="business_type_desc" bindTarget="acr512_invoice_query_ds" prompt="HLS.BUSINESS_TYPE_DESC" width="135"/>
-->
<!--
<a:comboBox name="lease_channel_desc" bindTarget="acr512_invoice_query_ds" prompt="商业模式" width="135"/>
-->
<!-- <a:comboBox name="currency_name" bindTarget="acr512_invoice_query_ds" prompt="HLS.CURRENCY" width="135"/> -->
</a:hBox>
<a:hBox labelSeparator=" ">
<a:textField name="invoice_number_f" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_NUMBER_FROM" width="135"/>
<div><![CDATA[${l:ACR.INVOICE_NUMBER_TO}]]></div>
<a:textField name="invoice_number_t" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>
<a:lov name="contract_number_f" bindTarget="acr512_invoice_query_ds" prompt="HLS.CONTRACT_NUMBER_FROM" width="135"/>
<div><![CDATA[${l:HLS.CONTRACT_NUMBER_TO}]]></div>
<a:lov name="contract_number_t" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>
<a:datePicker name="accounting_date_f" bindTarget="acr512_invoice_query_ds" prompt="记账日期从" width="135"/>
<!--
<div><![CDATA[${l:HLS.ACCOUNT_DATE_TO}]]></div>
-->
<a:datePicker name="accounting_date_t" bindTarget="acr512_invoice_query_ds" prompt="记账日期到" width="135"/>
<a:lov name="created_by_name" bindTarget="acr512_invoice_query_ds" prompt="ACR.CREATED_BY_NAME" width="135"/>
<a:textField name="invoice_title" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_TITLE" width="135"/>
</a:hBox>
<a:hBox labelSeparator=" ">
<a:datePicker name="invoice_date_f" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_DATE_FROM" width="135"/>
<a:datePicker name="invoice_date_f" bindTarget="acr512_invoice_query_ds" prompt="发票日期从" width="135"/>
<!--
<div><![CDATA[${l:ACR.INVOICE_DATE_TO}]]></div>
<a:datePicker name="invoice_date_t" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>
<a:lov name="invoice_bp_code_f" bindTarget="acr512_invoice_query_ds" prompt="HLS.CUSTOMER_NUMBER_FROM" width="135"/>
-->
<a:datePicker name="invoice_date_t" bindTarget="acr512_invoice_query_ds" prompt="发票日期到" width="135"/>
<a:lov name="invoice_bp_code_f" bindTarget="acr512_invoice_query_ds" prompt="客户编号从" width="135"/>
<!--
<div><![CDATA[${l:HLS.CUSTOMER_NUMBER_TO}]]></div>
<a:lov name="invoice_bp_code_t" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>
<a:comboBox name="invoice_kind_desc" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_KIND" width="135"/>
-->
<a:lov name="invoice_bp_code_t" bindTarget="acr512_invoice_query_ds" prompt="客户编号到" width="135"/>
</a:hBox>
<a:hBox labelSeparator=" ">
<a:datePicker name="accounting_date_f" bindTarget="acr512_invoice_query_ds" prompt="HLS.ACCOUNT_DATE_FROM" width="135"/>
<div><![CDATA[${l:HLS.ACCOUNT_DATE_TO}]]></div>
<a:datePicker name="accounting_date_t" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>
<a:numberField name="total_amount_f" allowFormat="true" bindTarget="acr512_invoice_query_ds" prompt="ACR.TOTAL_AMOUNT_FROM" width="135"/>
<div><![CDATA[${l:ACR.TOTAL_AMOUNT_TO}]]></div>
<a:numberField name="total_amount_t" allowFormat="true" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>
<a:textField name="invoice_title" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_TITLE" width="135"/>
<a:comboBox name="invoice_kind_desc" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_KIND" width="135"/>
</a:hBox>
</a:form>
<a:grid id="acr512_invoice_update_grid_ds" bindTarget="acr512_invoice_result_ds" marginHeight="250" marginWidth="30" navBar="true">
......
src/main/webapp/modules/acr/ACR513/acr_invoice_confirm.lview
View file @ 6bff6a68
......@@ -279,19 +279,19 @@
<a:lov name="contract_number_f" bindTarget="acr513_invoice_query_ds" prompt="HLS.CONTRACT_NUMBER_FROM"
width="135"/>
<a:lov name="contract_number_t" bindTarget="acr513_invoice_query_ds" prompt="合同编号到" width="135"/>
<a:textField name="invoice_title" bindTarget="acr513_invoice_query_ds" prompt="ACR.INVOICE_TITLE"
width="135"/>
<!-- <a:textField name="invoice_title" bindTarget="acr513_invoice_query_ds" prompt="ACR.INVOICE_TITLE"
width="135"/>-->
<a:comboBox name="billing_way_desc" bindTarget="acr513_invoice_query_ds" prompt="开票方式" width="135"/>
<a:lov name="created_by_name" bindTarget="acr513_invoice_query_ds" prompt="ACR.CREATED_BY_NAME"
width="135"/>
<a:datePicker name="accounting_date_f" bindTarget="acr513_invoice_query_ds"
<!-- <a:datePicker name="accounting_date_f" bindTarget="acr513_invoice_query_ds"
prompt="HLS.ACCOUNT_DATE_FROM" width="135"/>
<a:datePicker name="accounting_date_t" bindTarget="acr513_invoice_query_ds" prompt="记账日期到" width="135"/>
<a:datePicker name="accounting_date_t" bindTarget="acr513_invoice_query_ds" prompt="记账日期到" width="135"/>-->
<a:numberField name="total_amount_f" bindTarget="acr513_invoice_query_ds" prompt="ACR.TOTAL_AMOUNT_FROM"
<!-- <a:numberField name="total_amount_f" bindTarget="acr513_invoice_query_ds" prompt="ACR.TOTAL_AMOUNT_FROM"
width="135"/>
<a:numberField name="total_amount_t" bindTarget="acr513_invoice_query_ds" prompt="发票金额到" width="135"/>
<a:numberField name="total_amount_t" bindTarget="acr513_invoice_query_ds" prompt="发票金额到" width="135"/>-->
<a:comboBox name="invoice_kind_desc" bindTarget="acr513_invoice_query_ds" prompt="ACR.INVOICE_KIND"
width="135"/>
<a:textField name="document_number_f" bindTarget="acr513_invoice_query_ds"
......
src/main/webapp/modules/cont/CON3200/con_re_print_entrance.lview
View file @ 6bff6a68
......@@ -18,7 +18,7 @@
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
if(record.get('contract_status')=='NEW' || record.get('contract_status')=='INCEPT_RETURN'||record.get('sign_contract_status')=='SIGNING' || record.get('sign_contract_status') =='SIGN'){
if((record.get('contract_status')=='NEW' || record.get('contract_status')=='INCEPT_RETURN')&& (record.get('sign_contract_status')=='SIGNING' || record.get('sign_contract_status') =='SIGN')){
param['function_code'] = 'CON3200N';
param['function_usage'] = 'MODIFY';
}
......
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