From b59678b87404226862ef6af36038ca3c0b19ae89 Mon Sep 17 00:00:00 2001
From: doom4ster <doom4ster@gmail.com>
Date: 星期五, 14 七月 2017 09:49:31 +0800
Subject: [PATCH] CB_IMGPSScan.cab ver2.0.1.22  修正縮圖影像在補件中刪除問題

---
 CB_IMGPSScanImp.dcu |    0 
 CB_IMGPSScan.ocx    |    0 
 CB_IMGPSScan.dproj  |    4 ++--
 CB_IMGPSScan.res    |    0 
 CB_IMGPSScanImp.pas |   21 +++++++++++++++++----
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CB_IMGPSScan.dproj b/CB_IMGPSScan.dproj
index 42e7593..a5a440e 100644
--- a/CB_IMGPSScan.dproj
+++ b/CB_IMGPSScan.dproj
@@ -94,7 +94,7 @@
 						<VersionInfo Name="MajorVer">2</VersionInfo>
 						<VersionInfo Name="MinorVer">0</VersionInfo>
 						<VersionInfo Name="Release">1</VersionInfo>
-						<VersionInfo Name="Build">21</VersionInfo>
+						<VersionInfo Name="Build">22</VersionInfo>
 						<VersionInfo Name="Debug">False</VersionInfo>
 						<VersionInfo Name="PreRelease">False</VersionInfo>
 						<VersionInfo Name="Special">False</VersionInfo>
@@ -106,7 +106,7 @@
 					<VersionInfoKeys>
 						<VersionInfoKeys Name="CompanyName"/>
 						<VersionInfoKeys Name="FileDescription"/>
-						<VersionInfoKeys Name="FileVersion">2.0.1.21</VersionInfoKeys>
+						<VersionInfoKeys Name="FileVersion">2.0.1.22</VersionInfoKeys>
 						<VersionInfoKeys Name="InternalName"/>
 						<VersionInfoKeys Name="LegalCopyright"/>
 						<VersionInfoKeys Name="LegalTrademarks"/>
diff --git a/CB_IMGPSScan.ocx b/CB_IMGPSScan.ocx
index 69e9629..34c0cf4 100644
--- a/CB_IMGPSScan.ocx
+++ b/CB_IMGPSScan.ocx
Binary files differ
diff --git a/CB_IMGPSScan.res b/CB_IMGPSScan.res
index db5ebbb..2376753 100644
--- a/CB_IMGPSScan.res
+++ b/CB_IMGPSScan.res
Binary files differ
diff --git a/CB_IMGPSScanImp.dcu b/CB_IMGPSScanImp.dcu
index d6e9801..fbff670 100644
--- a/CB_IMGPSScanImp.dcu
+++ b/CB_IMGPSScanImp.dcu
Binary files differ
diff --git a/CB_IMGPSScanImp.pas b/CB_IMGPSScanImp.pas
index 91d21bb..6841dcf 100644
--- a/CB_IMGPSScanImp.pas
+++ b/CB_IMGPSScanImp.pas
@@ -3362,11 +3362,13 @@
   PM604.Visible := False;  //歪斜矯正
   PM605.Visible := False;  //刪除
   if ((NowDocNo = 'Attach') or (NowDocNo = 'S_Attach')) and (FCustDocYN <> 'N') then
+  begin
     PM602.Visible := True;  //自行定義文件名稱
-  //PM603.Visible := True;  //掃描替換此頁
-  PM604.Visible := True;  //歪斜矯正
-  PM601.Visible := True;  //歸類
-  PM605.Visible := True;  //刪除
+    //PM603.Visible := True;  //掃描替換此頁
+    PM604.Visible := True;  //歪斜矯正
+    PM601.Visible := True;  //歸類
+    PM605.Visible := True;  //刪除
+  end;
 
   if CheckSelectImg_UseCase(DisplayPath,NowCaseNo) then //選擇的影像不可有引用的
   begin
@@ -3378,6 +3380,17 @@
     PM601.Enabled := True;  //歸類
     PM605.Enabled := True;  //刪除
   end;
+
+  if FMode='ESCAN' then
+  begin
+    PM605.Enabled:=False;
+  end;
+
+  if FImgDelete='Y' then
+  begin
+    PM605.Enabled:=True;
+  end;
+
 end;
 
 procedure TCB_IMGPSScanX.PrePageBtnClick(Sender: TObject);

--
Gitblit v1.8.0