From eac42eeaaf043ea0929c92211f32fdc67d443a59 Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Sat, 14 Apr 2018 14:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.139518?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj                    | 4 +++-
 .../Pages/B3YunKen/Overlays/ReturnInStoreEdit_Ext.cs          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index c9cc022..2faed3e 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
@@ -267,7 +267,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Pages\B3YunKen\Dialogs\ReturnInStore_CustomerAcceptDialog.xml" />
+    <EmbeddedResource Include="Pages\B3YunKen\Dialogs\ReturnInStore_CustomerAcceptDialog.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3YunKen\Dialogs\ReturnApplication_CustomerAcceptDialog.xml" />
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ReturnInStoreEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ReturnInStoreEdit_Ext.cs
index ffc40a6..9d538fa 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ReturnInStoreEdit_Ext.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ReturnInStoreEdit_Ext.cs
@@ -16,8 +16,10 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
 
     protected override void BeforeDetailGridApplyLayout(DFEditGrid dFEditGrid)
     {
+      dFEditGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("OutCode"));
       dFEditGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("CustomerAccept_ID"));
-
+      dFEditGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("Accept_Code"));
+      dFEditGrid.Columns.Add(new DFEditGridColumn<DFValueLabel>("OutStore_Code"));
     }
 
     protected override void AddDetailBtnHPanel(HLayoutPanel hPanel, Func<DFEditGrid> getDetailGrid)