From d2995b74511cb1f1ce1609ff55bc219e96d7f5a1 Mon Sep 17 00:00:00 2001 From: LiFan <2308045698@qq.com> Date: 星期五, 12 七月 2024 11:25:11 +0800 Subject: [PATCH] update --- jrj/project/business/Enquiry/ViewPictures.cpp | 5 +++-- jrj/project/business/Enquiry/PriceList.PurcharItemSelect.cpp | 1 + jrj/project/business/Enquiry/PriceList.PurcharItemSelectEx.cpp | 1 + jrj/ext-jrj/ext-jrj.vcxproj | 12 ++++++------ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj index 252fb63..b3d7b17 100644 --- a/jrj/ext-jrj/ext-jrj.vcxproj +++ b/jrj/ext-jrj/ext-jrj.vcxproj @@ -303,7 +303,7 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\project\business\Enquiry\EnquiryEx.quote.vx.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\project\business\Enquiry\Entity.Product.Select.cpp"> @@ -311,19 +311,19 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\project\business\Enquiry\PriceList.PurcharItemSelect.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\project\business\Enquiry\PriceList.PurcharItemSelectEx.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\project\business\Enquiry\ProductSchema.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\project\business\Enquiry\ProductSchemaSelect.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\project\business\Enquiry\SKU.PictureView.Product3.cpp"> @@ -331,7 +331,7 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\project\business\Enquiry\ViewPictures.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\project\business\Expense\BasicFare.cpp"> diff --git a/jrj/project/business/Enquiry/PriceList.PurcharItemSelect.cpp b/jrj/project/business/Enquiry/PriceList.PurcharItemSelect.cpp index e467b33..dd32ebb 100644 --- a/jrj/project/business/Enquiry/PriceList.PurcharItemSelect.cpp +++ b/jrj/project/business/Enquiry/PriceList.PurcharItemSelect.cpp @@ -76,6 +76,7 @@ arg.AddArg(L"result", content); CloseWindow(); + return 1; } //命令发布函数 int OnCmdDispatch(xstring comdid) diff --git a/jrj/project/business/Enquiry/PriceList.PurcharItemSelectEx.cpp b/jrj/project/business/Enquiry/PriceList.PurcharItemSelectEx.cpp index 3aabbc9..c5c8d58 100644 --- a/jrj/project/business/Enquiry/PriceList.PurcharItemSelectEx.cpp +++ b/jrj/project/business/Enquiry/PriceList.PurcharItemSelectEx.cpp @@ -75,6 +75,7 @@ arg.AddArg(L"process", L"ok"); arg.AddArg(L"result", content); CloseWindow(); + return 1; } //命令发布函数 diff --git a/jrj/project/business/Enquiry/ViewPictures.cpp b/jrj/project/business/Enquiry/ViewPictures.cpp index 6e186df..55b3b0c 100644 --- a/jrj/project/business/Enquiry/ViewPictures.cpp +++ b/jrj/project/business/Enquiry/ViewPictures.cpp @@ -4,6 +4,7 @@ #include <wobject/xdouble.hpp> #include <xcontrol/xlayersheet.hpp> #include <xcontrol/xdatetimepick.hpp> +#include <xcontrol/ximageview.hpp> #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp" #include "viewobject/view.base.hpp" @@ -45,9 +46,9 @@ int OnShowImage(xstring skuid) { - imageview im = GetControl(L"im1"); + ximageview im = GetControl(L"im1"); //im.RemoveImage(); - im.ResetEx(); + im.Reset(); xml xp ; -- Gitblit v1.9.3