From 96da1824f8f45a9ab2b1bbe562ceb509e2706d2f Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Sat, 20 Jan 2018 11:39:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4=E5=8D=95No?=
 =?UTF-8?q?.45560?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3YunKen/Overlays/OrderEdit_Ext.cs        | 12 +++++++++++-
 .../Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs | 13 ++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/OrderEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/OrderEdit_Ext.cs
index 961f9ef..e21aeda 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/OrderEdit_Ext.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/OrderEdit_Ext.cs
@@ -38,10 +38,20 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
         idCard.OnClientSelected += @"var idCard = this.front.value;
 simpleRestCall('/MainSystem/B3_YunKen/Rpcs/DriverRpc/GetDriverInfoByIDCard',[idCard],
 function(result){
-if(result!=null){
+if(result.ID != null && result.ID != undefined){
 __DFContainer.getControl('Driver_ID').fill(result.ID,result.Name);
+}else{
+__DFContainer.getControl('Driver_ID').fill('','');
+}
+if(result.DriverCard != null && result.DriverCard != undefined){
 __DFContainer.setValue('DriverCard',result.DriverCard);
+}else{
+__DFContainer.setValue('DriverCard','');
+}
+if(result.DriverPhone != null && result.DriverPhone != undefined){
 __DFContainer.setValue('DriverPhone',result.Telephone);
+}else{
+__DFContainer.setValue('DriverPhone','');
 }
 },{ });";
       }
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
index f61fd48..e463272 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
@@ -52,11 +52,22 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
         idCard.OnClientSelected += @"var idCard = this.front.value;
 simpleRestCall('/MainSystem/B3_YunKen/Rpcs/DriverRpc/GetDriverInfoByIDCard',[idCard],
 function(result){
-if(result!=null){
+if(result.ID != null && result.ID != undefined){
 __DFContainer.getControl('Driver_ID').fill(result.ID,result.Name);
+}else{
+__DFContainer.getControl('Driver_ID').fill('','');
+}
+if(result.DriverCard != null && result.DriverCard != undefined){
 __DFContainer.setValue('DriverCard',result.DriverCard);
+}else{
+__DFContainer.setValue('DriverCard','');
+}
+if(result.DriverPhone != null && result.DriverPhone != undefined){
 __DFContainer.setValue('DriverPhone',result.Telephone);
+}else{
+__DFContainer.setValue('DriverPhone','');
 }
+
 },{ });";
       }
       //选择运输车辆带出发动机号、车架号、挂车车牌号