From 41532aaf0077936a2e3505c7238cff3ff8296991 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <Jin980303>
Date: Fri, 26 Sep 2025 15:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=94=E6=94=B6=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8=E6=98=8E=E7=BB=86=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delivery/maintainReceiveFeeDetailPage.xml | 80 +++++++++++++++++++
 .../classes/config/origen/menuConfig.xml      |  1 +
 2 files changed, 81 insertions(+)
 create mode 100644 src/webapp/WEB-INF/classes/config/origen/delivery/maintainReceiveFeeDetailPage.xml

diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainReceiveFeeDetailPage.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainReceiveFeeDetailPage.xml
new file mode 100644
index 0000000..b462cc6
--- /dev/null
+++ b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainReceiveFeeDetailPage.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+    <maintainPage id="maintainReceiveFeeDetailPage" title="应收费用明细管理" autoQuery="false">
+        <search>
+            <inputUIs>
+            	<text id="fee.billCode" title="业务编号" row="1" col="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" />
+                <text id="fee.client.name" title="customsOrder.client.name" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
+              
+
+
+            	<remote id="fee.feeName.id" title="fee.feeName" row="2" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"  manualEditable="true" displayColumn="2" percentSignPosition="both" displayedTableHead="序号,代码,名称">
+                <hql><![CDATA[ SELECT 
+feeName.id,
+feeName.code,
+feeName.name
+ FROM FeeType feeName
+ WHERE upper(feeName.code||feeName.name ) like upper(:param)  AND feeName.disabled=0 
+ /~account.name: AND account.name like {account.name}~/]]></hql>
+
+                 </remote>
+            	 
+            	 <dateRanger id="fee.creatDate" title="fee.creatDate" row="3" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin1" toDate="end1"/>
+        		 <dateRanger id="billFee.issuingDate" title="开票日期" row="4" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin2" toDate="end2"/>
+        		
+        		  
+            </inputUIs>
+        </search>
+        <datasource type="hql"><![CDATA[SELECT  
+ fee.id,
+ fee.billCode,
+ fee.client.name,
+ fee.feeName.name,
+ fee.quantity,
+ fee.price,
+ round(fee.feeMenoy,2),
+ round(fee.tax,2),
+ fee.bz,
+ fee.creatPeople,
+ fee.creatDate, 
+ fee.billFee.issuingDate,
+ fee.description
+ FROM Fee  fee
+ left join fee.feeName 
+ left join fee.client
+ left join fee.billFee
+ WHERE 1=1 
+ and fee.payOrReceive='应收'
+ 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 fee.billCode like ({fee.billCode})~/
+ /~fee.feeName.id: and fee.feeName.id = {fee.feeName.id}~/
+ /~fee.client.name: and fee.client.name like ({fee.client.name})~/
+ /~begin1: AND trunc(fee.creatDate) >= {begin1} ~/
+ /~end1: AND trunc(fee.creatDate) <= {end1} ~/
+ /~begin2: AND trunc(billFee.issuingDate) >= {begin2} ~/
+ /~end2: AND trunc(billFee.issuingDate) <= {end2} ~/
+ order by fee.billCode desc
+		]]></datasource>
+        <columns>
+            <column id="fee.id" title="fee.id" visible="false" horizonAlign="center" verticalAlign="middle" sortIndex="1" sortType="DESC"/>
+            <column id="fee.billCode" title="业务编号" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.client.name" title="委托方" width="150"  visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.feeName.name" width="150" title="fee.feeName.name" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.quantity" title="fee.quantity" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.price" title="fee.price" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.feeMenoy" width="80" title="fee.feeMenoy" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.tax" width="80" title="fee.tax" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.bz" title="fee.bz" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.creatPeople" title="fee.creatPeople" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.creatDate" title="fee.creatDate" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="billFee.issuingDate" title="开票日期" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.description" title="fee.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
+        	</columns>
+        <buttons>
+          
+        </buttons>
+    </maintainPage>
+</pages>
diff --git a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
index 008bf17..fb4e1dd 100644
--- a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
@@ -138,6 +138,7 @@
      <menuItem title="开票管理" pageId="maintainReceiveBillFeePage"/>
      <menuItem title="收款管理" pageId="maintainReceiveBillFee2Page"/>
      <menuItem title="结算账单管理" pageId="maintainReceiveBillFee3Page"/>
+      <menuItem title="应收费用明细管理" pageId="maintainReceiveFeeDetailPage"/>
      <menuItem title="wtfBillFeeReportPage" pageId="wtfBillFeeReportPage"/> 
      <menuItem title="payOrReceiveFeeReportPage" pageId="payOrReceiveFeeReportPage"/>
     </menuItem>