Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
leaf-hlcm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hlcm
leaf-hlcm
Commits
38806c66
Commit
38806c66
authored
Nov 21, 2019
by
lijingjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "销项发票创建"
This reverts commit
623a5190
, reversing changes made to
e66e1434
.
parent
5d92ffd6
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
4 additions
and
20 deletions
+4
-20
acr_bp_agent_ds.lwm
...ain/webapp/WEB-INF/classes/acr/ACR510/acr_bp_agent_ds.lwm
+0
-1
acr_invoice_billing_object_lov.lwm
...INF/classes/acr/ACR510/acr_invoice_billing_object_lov.lwm
+0
-1
acr_invoice_cf_v_new.lwm
...ebapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm
+0
-1
acr_invoice_create.lwm
.../webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm
+0
-1
contract_status_lov.lwm
...webapp/WEB-INF/classes/acr/ACR510/contract_status_lov.lwm
+0
-1
hls_cashflow_item_v_lov.lwm
...pp/WEB-INF/classes/acr/ACR510/hls_cashflow_item_v_lov.lwm
+0
-1
acr_invoice_bp_master_list.lwm
...WEB-INF/classes/acr/ACR512/acr_invoice_bp_master_list.lwm
+0
-1
acr_invoice_hd_batch.lwm
...ebapp/WEB-INF/classes/acr/ACR512/acr_invoice_hd_batch.lwm
+0
-1
acr_invoice_sys_user_lov.lwm
...p/WEB-INF/classes/acr/ACR512/acr_invoice_sys_user_lov.lwm
+1
-1
acr_invoice_update_query.bm
...pp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.bm
+1
-1
acr_invoice_update_query.lwm
...p/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.lwm
+0
-1
acr_invoice_reverse.lwm
...webapp/WEB-INF/classes/acr/ACR514/acr_invoice_reverse.lwm
+0
-1
acr_invoice_query.lview
src/main/webapp/modules/acr/ACR310/acr_invoice_query.lview
+1
-2
acr_invoice_update_detail.lview
...webapp/modules/acr/ACR512/acr_invoice_update_detail.lview
+0
-1
acr_invoice_update_query.lview
.../webapp/modules/acr/ACR512/acr_invoice_update_query.lview
+0
-1
acr_invoice_confirm.lview
src/main/webapp/modules/acr/ACR513/acr_invoice_confirm.lview
+0
-1
con_re_print_entrance.lview
...n/webapp/modules/cont/CON3200/con_re_print_entrance.lview
+1
-3
No files found.
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_bp_agent_ds.lwm
View file @
38806c66
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
$Revision: 1.0
$Revision: 1.0
$Purpose:
$Purpose:
-->
-->
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:operations>
<bm:operations>
<bm:operation
name=
"query"
>
<bm:operation
name=
"query"
>
...
...
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_billing_object_lov.lwm
View file @
38806c66
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
$Revision: 1.0
$Revision: 1.0
$Purpose:
$Purpose:
-->
-->
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:fields>
<bm:fields>
<bm:field
name=
"contract_id"
/>
<bm:field
name=
"contract_id"
/>
...
...
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm
View file @
38806c66
...
@@ -145,7 +145,6 @@
...
@@ -145,7 +145,6 @@
<bm:field
name=
"lease_channel"
/>
<bm:field
name=
"lease_channel"
/>
</bm:fields>
</bm:fields>
<bm:query-fields>
<bm:query-fields>
<bm:query-field
name=
"cf_item"
queryExpression=
"t2.cf_item = ${@cf_item}"
/>
<bm:query-field
name=
"cf_item"
queryExpression=
"t2.cf_item = ${@cf_item}"
/>
<bm:query-field
name=
"due_date_from"
queryExpression=
"t2.due_date >= to_date(${@due_date_from},'yyyy-mm-dd')"
/>
<bm:query-field
name=
"due_date_from"
queryExpression=
"t2.due_date >= to_date(${@due_date_from},'yyyy-mm-dd')"
/>
<bm:query-field
name=
"due_date_to"
queryExpression=
"t2.due_date <= to_date(${@due_date_to},'yyyy-mm-dd')"
/>
<bm:query-field
name=
"due_date_to"
queryExpression=
"t2.due_date <= to_date(${@due_date_to},'yyyy-mm-dd')"
/>
...
...
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm
View file @
38806c66
...
@@ -174,7 +174,6 @@
...
@@ -174,7 +174,6 @@
]]>
]]>
</bm:query-sql>
</bm:query-sql>
</bm:operation>
</bm:operation>
<bm:operation
name=
"update"
>
<bm:operation
name=
"update"
>
<bm:update-sql>
<![CDATA[
<bm:update-sql>
<![CDATA[
begin
begin
...
...
src/main/webapp/WEB-INF/classes/acr/ACR510/contract_status_lov.lwm
View file @
38806c66
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:operations>
<bm:operations>
<bm:operation
name=
"query"
>
<bm:operation
name=
"query"
>
...
...
src/main/webapp/WEB-INF/classes/acr/ACR510/hls_cashflow_item_v_lov.lwm
View file @
38806c66
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
$Revision: 1.0
$Revision: 1.0
$Purpose:
$Purpose:
-->
-->
<ns1:model
xmlns:ns1=
"http://www.leaf-framework.org/schema/bm"
alias=
"t1"
extend=
"hls.HLS005.hls_cashflow_item_v"
extendMode=
"reference"
>
<ns1:model
xmlns:ns1=
"http://www.leaf-framework.org/schema/bm"
alias=
"t1"
extend=
"hls.HLS005.hls_cashflow_item_v"
extendMode=
"reference"
>
<ns1:fields>
<ns1:fields>
<ns1:field
name=
"cf_item"
forDisplay=
"false"
forQuery=
"false"
/>
<ns1:field
name=
"cf_item"
forDisplay=
"false"
forQuery=
"false"
/>
...
...
src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_bp_master_list.lwm
View file @
38806c66
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
$Revision: 1.0
$Revision: 1.0
$Purpose:
$Purpose:
-->
-->
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:fields>
<bm:fields>
<bm:field
name=
"bp_id"
databaseType=
"NUMBER"
datatype=
"java.lang.Long"
physicalName=
"BP_ID"
prompt=
"HLS_BP_MASTER.BP_ID"
/>
<bm:field
name=
"bp_id"
databaseType=
"NUMBER"
datatype=
"java.lang.Long"
physicalName=
"BP_ID"
prompt=
"HLS_BP_MASTER.BP_ID"
/>
...
...
src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_hd_batch.lwm
View file @
38806c66
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
<bm:field
name=
"creation_by"
databaseType=
"NUMBER"
datatype=
"java.lang.Long"
physicalName=
"CREATION_BY"
prompt=
"ACR_INVOICE_HD_BATCH.CREATION_BY"
/>
<bm:field
name=
"creation_by"
databaseType=
"NUMBER"
datatype=
"java.lang.Long"
physicalName=
"CREATION_BY"
prompt=
"ACR_INVOICE_HD_BATCH.CREATION_BY"
/>
<bm:field
name=
"last_updated_date"
databaseType=
"DATE"
datatype=
"java.util.Date"
physicalName=
"LAST_UPDATED_DATE"
prompt=
"ACR_INVOICE_HD_BATCH.LAST_UPDATED_DATE"
/>
<bm:field
name=
"last_updated_date"
databaseType=
"DATE"
datatype=
"java.util.Date"
physicalName=
"LAST_UPDATED_DATE"
prompt=
"ACR_INVOICE_HD_BATCH.LAST_UPDATED_DATE"
/>
</bm:fields>
</bm:fields>
<bm:features>
<bm:features>
<f:standard-who/>
<f:standard-who/>
</bm:features>
</bm:features>
...
...
src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_sys_user_lov.lwm
View file @
38806c66
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
$Revision: 1.0
$Revision: 1.0
$Purpose:
$Purpose:
-->
-->
<bm:model
xmlns:bm=
"http://www.
leaf
-framework.org/schema/bm"
>
<bm:model
xmlns:bm=
"http://www.
aurora
-framework.org/schema/bm"
>
<bm:operations>
<bm:operations>
<bm:operation
name=
"query"
>
<bm:operation
name=
"query"
>
<bm:query-sql>
<![CDATA[
<bm:query-sql>
<![CDATA[
...
...
src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.bm
View file @
38806c66
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
$Revision: 1.0
$Revision: 1.0
$Purpose:
$Purpose:
-->
-->
<bm:model
xmlns:bm=
"http://www.
leaf
-framework.org/schema/bm"
>
<bm:model
xmlns:bm=
"http://www.
aurora
-framework.org/schema/bm"
>
<bm:operations>
<bm:operations>
<bm:operation
name=
"query"
>
<bm:operation
name=
"query"
>
<bm:query-sql>
<![CDATA[
<bm:query-sql>
<![CDATA[
...
...
src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.lwm
View file @
38806c66
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
$Revision: 1.0
$Revision: 1.0
$Purpose:
$Purpose:
-->
-->
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:operations>
<bm:operations>
<bm:operation
name=
"query"
>
<bm:operation
name=
"query"
>
...
...
src/main/webapp/WEB-INF/classes/acr/ACR514/acr_invoice_reverse.lwm
View file @
38806c66
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
$Revision: 1.0
$Revision: 1.0
$Purpose:
$Purpose:
-->
-->
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
>
<bm:operations>
<bm:operations>
<bm:operation
name=
"query"
>
<bm:operation
name=
"query"
>
...
...
src/main/webapp/modules/acr/ACR310/acr_invoice_query.lview
View file @
38806c66
...
@@ -33,8 +33,7 @@
...
@@ -33,8 +33,7 @@
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
$('ACR310_RESULT_acr_invoice_hd_layout_grid_id')._export('xls', '应收发票查询');
$('ACR310_RESULT_acr_invoice_hd_layout_grid_id')._export('xls', '应收发票查询');
};
};
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
...
...
src/main/webapp/modules/acr/ACR512/acr_invoice_update_detail.lview
View file @
38806c66
...
@@ -77,7 +77,6 @@
...
@@ -77,7 +77,6 @@
Leaf.request({
Leaf.request({
url: $('acr512_invoice_ln_update_1_link').getUrl(),
url: $('acr512_invoice_ln_update_1_link').getUrl(),
para: {
para: {
invoice_hd_id: invoice_hd_id,
invoice_hd_id: invoice_hd_id,
merge_flag: $(acr_invoice_hd_ds_id).getCurrentRecord().get('merge_flag')
merge_flag: $(acr_invoice_hd_ds_id).getCurrentRecord().get('merge_flag')
},
},
...
...
src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
View file @
38806c66
...
@@ -247,7 +247,6 @@
...
@@ -247,7 +247,6 @@
<!--
<!--
<a:toolbarButton click="acr512_invoice_submit" text="HLS.SUBMIT"/>
<a:toolbarButton click="acr512_invoice_submit" text="HLS.SUBMIT"/>
-->
-->
</a:screenTopToolbar>
</a:screenTopToolbar>
<a:form
marginWidth=
"200"
padding=
"0"
title=
"应收发票维护"
>
<a:form
marginWidth=
"200"
padding=
"0"
title=
"应收发票维护"
>
<a:hBox
labelSeparator=
" "
>
<a:hBox
labelSeparator=
" "
>
...
...
src/main/webapp/modules/acr/ACR513/acr_invoice_confirm.lview
View file @
38806c66
...
@@ -302,7 +302,6 @@
...
@@ -302,7 +302,6 @@
<a:grid
id=
"acr513_invoice_grid_id"
bindTarget=
"acr513_invoice_result_ds"
marginHeight=
"225"
<a:grid
id=
"acr513_invoice_grid_id"
bindTarget=
"acr513_invoice_result_ds"
marginHeight=
"225"
marginWidth=
"30"
navBar=
"true"
>
marginWidth=
"30"
navBar=
"true"
>
<a:columns>
<a:columns>
<a:column
name=
"document_number"
lock=
"true"
prompt=
"HLS.DOCUMENT_NUMBER"
<a:column
name=
"document_number"
lock=
"true"
prompt=
"HLS.DOCUMENT_NUMBER"
renderer=
"acr513_document_number_render"
width=
"120"
/>
renderer=
"acr513_document_number_render"
width=
"120"
/>
<a:column
name=
"invoice_bp_name"
autoAdjust=
"false"
prompt=
"HLS.CUSTOMER_NAME"
showTitle=
"true"
<a:column
name=
"invoice_bp_name"
autoAdjust=
"false"
prompt=
"HLS.CUSTOMER_NAME"
showTitle=
"true"
...
...
src/main/webapp/modules/cont/CON3200/con_re_print_entrance.lview
View file @
38806c66
...
@@ -18,13 +18,11 @@
...
@@ -18,13 +18,11 @@
function open_contract_win(ds_id, record_id) {
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var record = $(ds_id).findById(record_id);
var param = record.data;
var param = record.data;
debugger;
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_code'] = 'CON3200N';
param['function_usage'] = 'MODIFY';
param['function_usage'] = 'MODIFY';
}
}
else{
else{
debugger;
param['function_code'] = 'CON3200Q';
param['function_code'] = 'CON3200Q';
param['function_usage'] = 'QUERY';
param['function_usage'] = 'QUERY';
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment