diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee2Page.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee2Page.xml new file mode 100644 index 0000000..94f67ee --- /dev/null +++ b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee2Page.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + = {begin1} ~/ + /~end1: AND trunc(fee.paymentDate) <= {end1} ~/ + /~begin2: AND trunc(fee.creatDate) >= {begin2} ~/ + /~end2: AND trunc(fee.creatDate) <= {end2} ~/ + order by fee.billCode desc + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee3Page.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee3Page.xml new file mode 100644 index 0000000..4a835ee --- /dev/null +++ b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee3Page.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + and fee.paymentDate is not null + and (fee.status not in ('总经理审核') or ( /~ordersAll: {ordersAll} = true~/ )) + and (fee.client.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) + or 0=(select nvl(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) + ) + /~fee.billCode: and upper(fee.billCode) like upper({fee.billCode})~/ + /~wldw: and fee.company.name like upper({wldw})~/ + /~fee.feeName.id: and fee.feeName.id = {fee.feeName.id}~/ + /~fee.status: and fee.status = {fee.status}~/ + /~fee.invoiceNo: and upper(fee.invoiceNo) like upper({fee.invoiceNo})~/ + /~begin1: AND trunc(fee.paymentDate) >= {begin1} ~/ + /~end1: AND trunc(fee.paymentDate) <= {end1} ~/ + /~begin2: AND trunc(fee.creatDate) >= {begin2} ~/ + /~end2: AND trunc(fee.creatDate) <= {end2} ~/ + order by fee.billCode desc + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml index 5860b51..3d8564f 100644 --- a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml +++ b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml @@ -129,6 +129,8 @@ + +