From 10fab70085bf8590a07aa29f6bb7095d57b47156 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Tue, 27 Aug 2024 11:17:51 +0800
Subject: [PATCH] no message

---
 .../delivery/maintainPresidentPayFee2Page.xml |   8 +-
 .../delivery/maintainPresidentPayFee3Page.xml |   7 +-
 .../delivery/maintainPresidentPayFeePage.xml  |   7 +-
 .../delivery/maintainPresidentPayFeePage.xml  | 151 ------------------
 4 files changed, 19 insertions(+), 154 deletions(-)
 delete mode 100644 target/jjwms/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml

diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee2Page.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee2Page.xml
index 94f67ee..8da2669 100644
--- a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee2Page.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee2Page.xml
@@ -34,8 +34,10 @@ feeName.name
                  <text id="fee.invoiceNo" title="发票号" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
             	 <dateRanger id="fee.paymentDate" title="fee.paymentDate" row="4" 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="fee.creatDate" title="fee.creatDate" row="5" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin2" toDate="end2"/>
+                 <dateRanger id="fee.presidentDate" title="审核时间" row="6" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin3" toDate="end3"/>
             
-                <checkbox id="ordersAll" title="ordersAll" row="6" col="1" defaultValue="true" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
+            
+                <checkbox id="ordersAll" title="ordersAll" row="7" col="1" defaultValue="true" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
             
             </inputUIs>
         </search>
@@ -58,6 +60,7 @@ feeName.name
  fee.invoiceType,
  fee.description,
  fee.paymentDate,
+ TO_CHAR(fee.presidentDate, 'YYYY-MM-DD'),
  fee.creatPeople,
  fee.creatDate,
  'FEE',
@@ -84,6 +87,8 @@ feeName.name
  /~end1: AND trunc(fee.paymentDate) <= {end1} ~/
  /~begin2: AND trunc(fee.creatDate) >= {begin2} ~/
  /~end2: AND trunc(fee.creatDate) <= {end2} ~/
+ /~begin3: AND trunc(fee.presidentDate) >= {begin3} ~/
+ /~end3: AND trunc(fee.presidentDate) <= {end3} ~/
  order by fee.billCode desc
 		]]></datasource>
         <columns>
@@ -105,6 +110,7 @@ feeName.name
             <column id="fee.invoiceType" title="fee.invoiceType" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="fee.description" title="fee.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="fee.paymentDate" title="fee.paymentDate" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.presidentDate" title="审核时间" 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="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee3Page.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee3Page.xml
index 4a835ee..a3767e4 100644
--- a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee3Page.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFee3Page.xml
@@ -34,8 +34,9 @@ feeName.name
                  <text id="fee.invoiceNo" title="发票号" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
             	 <dateRanger id="fee.paymentDate" title="fee.paymentDate" row="4" 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="fee.creatDate" title="fee.creatDate" row="5" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin2" toDate="end2"/>
+            	 <dateRanger id="fee.presidentDate" title="审核时间" row="6" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin3" toDate="end3"/>
             
-                <checkbox id="ordersAll" title="ordersAll" row="6" col="1" defaultValue="true" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
+                <checkbox id="ordersAll" title="ordersAll" row="7" col="1" defaultValue="true" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
             
             </inputUIs>
         </search>
@@ -58,6 +59,7 @@ feeName.name
  fee.invoiceType,
  fee.description,
  fee.paymentDate,
+ TO_CHAR(fee.presidentDate, 'YYYY-MM-DD'),
  fee.creatPeople,
  fee.creatDate,
  'FEE',
@@ -84,6 +86,8 @@ feeName.name
  /~end1: AND trunc(fee.paymentDate) <= {end1} ~/
  /~begin2: AND trunc(fee.creatDate) >= {begin2} ~/
  /~end2: AND trunc(fee.creatDate) <= {end2} ~/
+ /~begin3: AND trunc(fee.presidentDate) >= {begin3} ~/
+ /~end3: AND trunc(fee.presidentDate) <= {end3} ~/
  order by fee.billCode desc
 		]]></datasource>
         <columns>
@@ -105,6 +109,7 @@ feeName.name
             <column id="fee.invoiceType" title="fee.invoiceType" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="fee.description" title="fee.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="fee.paymentDate" title="fee.paymentDate" visible="true" horizonAlign="center" verticalAlign="middle"/>
+            <column id="fee.presidentDate" title="审核时间" 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="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml
index d697b17..7744ced 100644
--- a/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml
@@ -34,8 +34,9 @@ feeName.name
                  <text id="fee.invoiceNo" title="发票号" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
             	 <dateRanger id="fee.paymentDate" title="fee.paymentDate" row="4" 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="fee.creatDate" title="fee.creatDate" row="5" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin2" toDate="end2"/>
+            	 <dateRanger id="fee.presidentDate" title="审核时间" row="6" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin3" toDate="end3"/>
             
-                <checkbox id="ordersAll" title="ordersAll" row="6" col="1" defaultValue="true" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
+                <checkbox id="ordersAll" title="ordersAll" row="7" col="1" defaultValue="true" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
             
             </inputUIs>
         </search>
@@ -58,6 +59,7 @@ feeName.name
  fee.invoiceType,
  fee.description,
  fee.paymentDate,
+ TO_CHAR(fee.presidentDate, 'YYYY-MM-DD'),
  fee.creatPeople,
  fee.creatDate,
  'FEE',
@@ -82,6 +84,8 @@ feeName.name
  /~end1: AND trunc(fee.paymentDate) <= {end1} ~/
  /~begin2: AND trunc(fee.creatDate) >= {begin2} ~/
  /~end2: AND trunc(fee.creatDate) <= {end2} ~/
+ /~begin3: AND trunc(fee.presidentDate) >= {begin3} ~/
+ /~end3: AND trunc(fee.presidentDate) <= {end3} ~/
  order by fee.billCode desc
 		]]></datasource>
         <columns>
@@ -103,6 +107,7 @@ feeName.name
             <column id="fee.invoiceType" title="fee.invoiceType" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="fee.description" title="fee.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
             <column id="fee.paymentDate" title="fee.paymentDate" visible="true" horizonAlign="center" verticalAlign="middle"/>
+        	<column id="fee.presidentDate" title="审核时间" 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="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
diff --git a/target/jjwms/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml b/target/jjwms/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml
deleted file mode 100644
index d697b17..0000000
--- a/target/jjwms/WEB-INF/classes/config/origen/delivery/maintainPresidentPayFeePage.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pages>
-    <maintainPage id="maintainPresidentPayFeePage" title="maintainPresidentPayFeePage" 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" isPrecision="true"/>
-            	<list id="fee.status" title="费用状态" defaultValue="" row="1" col="2" span="1"  width="120" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false">
-                    <hql><![CDATA[ SELECT 
- c.name,
- c.name
- FROM CommonCode c 
- WHERE 1=1
- and c.name in ('副总提交','总经理审核')
- and c.disabled=0 
- and c.codeType='费用状态' 
- ]]></hql>
-                </list>
-                <text id="wldw" title="往来单位" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" />
-                 
-            <remote id="fee.feeName.id" title="fee.feeName" row="2" col="2" 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>
-               	
-                <inputUIs>
-                    <text id="feeName.name" title="feeName.name" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false"/>
-                </inputUIs>
-                 </remote>
-                 <text id="fee.invoiceNo" title="发票号" row="3" col="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="true"/>
-            	 <dateRanger id="fee.paymentDate" title="fee.paymentDate" row="4" 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="fee.creatDate" title="fee.creatDate" row="5" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="begin2" toDate="end2"/>
-            
-                <checkbox id="ordersAll" title="ordersAll" row="6" col="1" defaultValue="true" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
-            
-            </inputUIs>
-        </search>
-        <datasource type="hql"><![CDATA[SELECT 
- fee.id,
- fee.billCode,
- fee.client.name,
- fee.company.name,
- fee.purpose,
- fee.feeName.name,
- fee.status,
- round(fee.tax,2),
- fee.quantity,
- fee.price,
- round(fee.feeMenoy,2),
- round(fee.actualMoney,2),
- fee.bz,
- fee.payment,
- fee.invoiceNo,
- fee.invoiceType,
- fee.description,
- fee.paymentDate,
- fee.creatPeople,
- fee.creatDate,
- 'FEE',
- 'FEE'
- FROM Fee  fee
- left join fee.company
- left join fee.feeName
- left join fee.client
- WHERE 1=1 
- and fee.status  in('副总提交','总经理审核')
- and fee.payOrReceive='应付'
- 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
-		]]></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.company.name" title="fee.company.name" width="150" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="fee.purpose" title="fee.purpose" 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.status" width="80" title="fee.status" visible="true" horizonAlign="center" verticalAlign="middle" />
-            <column id="fee.tax" width="80" title="fee.tax" 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.actualMoney" width="100" title="fee.actualMoney" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="fee.bz" title="fee.bz" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="fee.payment" title="fee.payment" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="fee.invoiceNo" title="fee.invoiceNo" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="fee.invoiceType" title="fee.invoiceType" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="fee.description" title="fee.description" visible="true" horizonAlign="center" verticalAlign="middle"/>
-            <column id="fee.paymentDate" title="fee.paymentDate" 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="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
-			<column id="checkImageDown" width="80" title="checkImageDown" visible="true" horizonAlign="left" format="downloadPictureFormatter"/>
-         </columns>
-        <buttons>
-            <commit id="returnZJL" title="退回副总" enableType="multi" invisible="false" confirmMessage="确认是否退回?">
-            	<enableExpression><![CDATA[${fee.status} == '副总提交']]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="returnZJL" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
-                </forwards>
-            </commit>
-            <commit id="presidentExamine1" title="总经理审核" enableType="multi" invisible="false" confirmMessage="确认是否审核?">
-            	<enableExpression><![CDATA[${fee.status} == '副总提交']]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="presidentExamine" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
-                </forwards>
-            </commit>
-            <commit id="presidentExamine2" title="总经理退回" enableType="multi" invisible="false" confirmMessage="确认是否退回?">
-            	<enableExpression><![CDATA[${fee.status} == '总经理审核']]></enableExpression>
-                <mappings>
-                    <mapping id="ids" className="list"/>
-                </mappings>
-                <actions>
-                    <action managerName="customsOrderManager" methodName="presidentEeist" parameter="ids"/>
-                </actions>
-                <forwards>
-                    <forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
-                </forwards>
-            </commit>
-            
-        </buttons>
-    </maintainPage>
-</pages>