From d08ed14d6a4589c034140fdc8ac04a277c8e4b36 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期一, 13 十月 2025 11:24:07 +0800
Subject: [PATCH] 添加福祉车爬楼机费和向转运隐藏成交价格
---
admin_save.gds | 10 ++
m_DispatchOrder.gds | 11 ++
inc/function.gds | 3
web.config | 6
Report_MileageMan3_Data.php | 54 +++++++------
ServiceOrder_Data.gds | 26 ++++-
Report_DispatchDetailed_Data.php | 76 +++++++++---------
7 files changed, 110 insertions(+), 76 deletions(-)
diff --git a/Report_DispatchDetailed_Data.php b/Report_DispatchDetailed_Data.php
index 3d2c514..45e0867 100644
--- a/Report_DispatchDetailed_Data.php
+++ b/Report_DispatchDetailed_Data.php
@@ -266,7 +266,7 @@
,ServiceOrdTraDistance,DispatchOrdCarID,DispatchOrd_NS_Time,DispatchOrdActualDate,DispatchOrd_OAName,DispatchOrd_OAEntourage,FromHQ_is,FromHQ2_is,ServiceOrdPtName,ServiceOrdPtServices,ServiceOrdTraVia,ServiceOrdTraEnd
,HopsProvince=hospA.HopsProvince,HopsCity=hospA.HopsCity,HopsArea=hospA.HopsArea,HospName=hospA.HospName
,HopsProvinceIn=hospB.HopsProvince,HopsCityIn=hospB.HopsCity,HopsAreaIn=hospB.HopsArea,HospNameIn=hospB.HospName,ServiceOrdTaskRemarks
- ,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID
+ ,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID,ServiceOrdStairClimberPrice
,row_number() over (order by ServiceOrd_CC_Time desc) n $sqlWhere";
//闄勫姞缁撴灉SQL
//$Additional_sql = ",ServiceOrderStateTXT=(select vtext from dictionary where vtitle='ServiceOrderState' and vID=ServiceOrdState),ServiceOrd_SaleName=(select OA_Name from OA_User where OA_User_ID=ServiceOrd_Sale_ID),ServiceOrd_CCName=(select OA_Name from OA_User where OA_User_ID=ServiceOrd_CC_ID),DispatchOrd_NSName=(select OA_Name from OA_User where OA_User_ID=DispatchOrd_NS_ID),ServiceOrdSource=(select vtext from dictionary where vtitle='OrdSource' and vID=ServiceOrdSource) ,HospNameA=(select HospName from HospData where HospID=ServiceOrdPtOutHospID),HospNameB=(select HospName from HospData where HospID=ServiceOrdPtInHospID),PaidType=(SELECT STUFF(( select ',' + vtext from PaidMoney,dictionary where vtitle='PaidMoneyType' and vType>=1 and vID=PaidMoneyType and PaidMoney<>0 and ServiceOrdIDDt=ServiceOrdID GROUP BY vtext FOR XML PATH('')), 1, 1, '') AS PaidType),HospDepartmentName=isnull((select top 1 vtext from dictionary where vtitle='HospitalDepartment' and ServiceOrdPtServicesID=vID),''),HospDepartmentInName=isnull((select top 1 vtext from dictionary where vtitle='HospitalDepartment' and ServiceOrdPtInServicesID=vID),''),isRespirator=AMV_is,EntourageName='--',MessageCountInt=FromHQ_is,Stime2='--'";
@@ -304,7 +304,7 @@
,ServiceOrdTraDistance,DispatchOrdCarID,DispatchOrd_NS_Time,DispatchOrdActualDate,DispatchOrd_OAName,DispatchOrd_OAEntourage,FromHQ_is,FromHQ2_is,ServiceOrdPtName,ServiceOrdPtServices,ServiceOrdTraVia,ServiceOrdTraEnd
,HopsProvince=hospA.HopsProvince,HopsCity=hospA.HopsCity,HopsArea=hospA.HopsArea,HospName=hospA.HospName
,HopsProvinceIn=hospB.HopsProvince,HopsCityIn=hospB.HopsCity,HopsAreaIn=hospB.HopsArea,HospNameIn=hospB.HospName,ServiceOrdTaskRemarks
- ,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID
+ ,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID,ServiceOrdStairClimberPrice
,row_number() over (order by DispatchOrd_NS_Time desc) n $sqlWhere";
//闄勫姞缁撴灉SQL
$Additional_sql = ",DispatchOrdStateTXT=(select vtext from dictionary where vtitle='DispatchOrdState' and vID=DispatchOrdState)
@@ -386,7 +386,7 @@
$data = sqlsrv_query($conn,$sql);
if($data == true){
//琛ㄥご
- $FormArray[0]=array("搴忓彿","鏈嶅姟鍗曞彿","璋冨害鍗曞彿","绾у埆","鍒嗗尯","棰勭害绫诲瀷","璋冨害鍗曠姸鎬�","鏃ユ湡","鏃堕棿","鐝","鑱旂郴浜�","鑱旂郴鐢佃瘽","鎮ｈ�呭鍚�","閿�鍞�","浠嬬粛浜�","瀹㈡湇","璋冨害","鏉ユ簮","鏄惁浼佸井鎴愪氦","涓昏浼佸井瀹㈡湇","鍏朵粬浼佸井瀹㈡湇","鎯呮櫙缂栧彿","浼佸井缁╂晥","鎬婚儴涓嬪彂","鏀彺鎬婚儴","鎵垮寘缁�","鍖哄煙","绫诲瀷","鍑哄彂鐪佷唤","鍑哄彂甯�","鍑哄彂鍖�","杞嚭鍖婚櫌","杞嚭绉戝","杞嚭搴婁綅","杞叆鐪佷唤","杞叆甯�","杞叆鍖�","杞叆鍖婚櫌","杞叆绉戝","鎬绘垚浜や环","绯荤粺鎶ヤ环鍙傝��","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","璺濈(鍏噷)","鏀粯鏂瑰紡","浣跨敤鍛煎惛鏈�","杞︾墝","鍑鸿溅鎴愬憳","鍑鸿溅宀椾綅","鍖绘姢鍑鸿溅鏃堕棿(鍒嗛挓)","寮�鍗曚汉","寮�鍗曚汉鎻愭垚姣斾緥","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�");
+ $FormArray[0]=array("搴忓彿","鏈嶅姟鍗曞彿","璋冨害鍗曞彿","绾у埆","鍒嗗尯","棰勭害绫诲瀷","璋冨害鍗曠姸鎬�","鏃ユ湡","鏃堕棿","鐝","鑱旂郴浜�","鑱旂郴鐢佃瘽","鎮ｈ�呭鍚�","閿�鍞�","浠嬬粛浜�","瀹㈡湇","璋冨害","鏉ユ簮","鏄惁浼佸井鎴愪氦","涓昏浼佸井瀹㈡湇","鍏朵粬浼佸井瀹㈡湇","鎯呮櫙缂栧彿","浼佸井缁╂晥","鎬婚儴涓嬪彂","鏀彺鎬婚儴","鎵垮寘缁�","鍖哄煙","绫诲瀷","鍑哄彂鐪佷唤","鍑哄彂甯�","鍑哄彂鍖�","杞嚭鍖婚櫌","杞嚭绉戝","杞嚭搴婁綅","杞叆鐪佷唤","杞叆甯�","杞叆鍖�","杞叆鍖婚櫌","杞叆绉戝","鎬绘垚浜や环","鐖ゼ鏈鸿垂","绯荤粺鎶ヤ环鍙傝��","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","璺濈(鍏噷)","鏀粯鏂瑰紡","浣跨敤鍛煎惛鏈�","杞︾墝","鍑鸿溅鎴愬憳","鍑鸿溅宀椾綅","鍖绘姢鍑鸿溅鏃堕棿(鍒嗛挓)","寮�鍗曚汉","寮�鍗曚汉鎻愭垚姣斾緥","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�");
if ($is_CSV==1){array_push($FormArray[0],"浠诲姟澶囨敞");}
$FormArrayX=count($FormArray[0]);
if (sqlsrv_rows_affected($data)==0) {
@@ -515,58 +515,60 @@
$FormArray[$i][37]=$HospNameIn;
$FormArray[$i][38]=$rs['HospDepartmentInName'];
$FormArray[$i][39]=round($rs['OrdTraPrice'],2);
+ $ServiceOrdStairClimberPrice=$rs['ServiceOrdStairClimberPrice'];
+ $FormArray[$i][40]=floatval(number_format($ServiceOrdStairClimberPrice,2,".",""));
if (!empty($rs['OrderPrice_Auto'])) {$OrderPrice_Auto=round($rs['OrderPrice_Auto'],2);}else{$OrderPrice_Auto='--';}
- $FormArray[$i][40]=$OrderPrice_Auto;
- $FormArray[$i][41]=round($rs['AddMoney1'],2);
- $FormArray[$i][42]=round($rs['AddMoney2'],2);
- $FormArray[$i][43]=round($rs['AddMoney3'],2);
- $FormArray[$i][44]=str_replace("鍏噷","",$rs['ServiceOrdTraDistance']);
- $FormArray[$i][45]=$rs['PaidType'];
- $FormArray[$i][46]=$isRespirator;
- $FormArray[$i][47]=CarDataA($rs['DispatchOrdCarID'],'','CarLicense');
- $FormArray[$i][48]=$rs['EntourageName'];
- $FormArray[$i][49]=$rs['EntouragePost'];
- $FormArray[$i][50]=$rs['Stime2'];
+ $FormArray[$i][41]=$OrderPrice_Auto;
+ $FormArray[$i][42]=round($rs['AddMoney1'],2);
+ $FormArray[$i][43]=round($rs['AddMoney2'],2);
+ $FormArray[$i][44]=round($rs['AddMoney3'],2);
+ $FormArray[$i][45]=str_replace("鍏噷","",$rs['ServiceOrdTraDistance']);
+ $FormArray[$i][46]=$rs['PaidType'];
+ $FormArray[$i][47]=$isRespirator;
+ $FormArray[$i][48]=CarDataA($rs['DispatchOrdCarID'],'','CarLicense');
+ $FormArray[$i][49]=$rs['EntourageName'];
+ $FormArray[$i][50]=$rs['EntouragePost'];
+ $FormArray[$i][51]=$rs['Stime2'];
$rs2=getDispatchOrderStaff($ServiceOrdID, $conn);
//濡傛灉 $rs2 涓虹┖锛岃缃粯璁ゅ��
if (empty($rs2)) {
- $FormArray[$i][51]='--';
- $FormArray[$i][52]='';
+ $FormArray[$i][52]='--';
+ $FormArray[$i][53]='';
}else{
- $FormArray[$i][51]=isset($rs2['Opener'])?$rs2['Opener']:'--';
- $FormArray[$i][52]=isset($rs2['OpenerCommissionRatio'])?$rs2['OpenerCommissionRatio']:'';
+ $FormArray[$i][52]=isset($rs2['Opener'])?$rs2['Opener']:'--';
+ $FormArray[$i][53]=isset($rs2['OpenerCommissionRatio'])?$rs2['OpenerCommissionRatio']:'';
}
if (!empty($rs2['entourage'])) {
//$rs2['entourage']鐨勯暱搴�
- $FormArray[$i][53]='--';
- $FormArray[$i][54]='';
- $FormArray[$i][55]='--';
- $FormArray[$i][56]='';
- $FormArray[$i][57]='--';
- $FormArray[$i][58]='';
- $FormArray[$i][59]='--';
- $FormArray[$i][60]='';
+ $FormArray[$i][54]='--';
+ $FormArray[$i][55]='';
+ $FormArray[$i][56]='--';
+ $FormArray[$i][57]='';
+ $FormArray[$i][58]='--';
+ $FormArray[$i][59]='';
+ $FormArray[$i][60]='--';
+ $FormArray[$i][61]='';
$j=0;
foreach ($rs2['entourage'] as $key => $value) {
- $FormArray[$i][53+$j*2]=$value['Follower'];
- $FormArray[$i][54+$j*2]=$value['FollowerRatio'];
+ $FormArray[$i][54+$j*2]=$value['Follower'];
+ $FormArray[$i][55+$j*2]=$value['FollowerRatio'];
$j++;
}
}else{
- $FormArray[$i][53]='--';
- $FormArray[$i][54]='';
- $FormArray[$i][55]='--';
- $FormArray[$i][56]='';
- $FormArray[$i][57]='--';
- $FormArray[$i][58]='';
- $FormArray[$i][59]='--';
- $FormArray[$i][60]='';
+ $FormArray[$i][54]='--';
+ $FormArray[$i][55]='';
+ $FormArray[$i][56]='--';
+ $FormArray[$i][57]='';
+ $FormArray[$i][58]='--';
+ $FormArray[$i][59]='';
+ $FormArray[$i][60]='--';
+ $FormArray[$i][61]='';
}
- if ($is_CSV==1){$FormArray[$i][61]=$rs['ServiceOrdTaskRemarks'];}
+ if ($is_CSV==1){$FormArray[$i][62]=$rs['ServiceOrdTaskRemarks'];}
$i++;
//鍐欏叆鏁扮粍--End
diff --git a/Report_MileageMan3_Data.php b/Report_MileageMan3_Data.php
index 814fd31..3bd5e1d 100644
--- a/Report_MileageMan3_Data.php
+++ b/Report_MileageMan3_Data.php
@@ -110,7 +110,7 @@
,ServiceOrdAreaType,ServiceOrdType,DispatchOrd_NS_Time=convert(char,DispatchOrd_NS_Time,120),TimeLength_Program,TimeLength_ICU,TimeLength_Wait,EntourageOT_is,EntourageOT2_is,EntourageBetimesHH,EntourageState_Time,Entourage_Time=convert(char,Entourage_Time,120)
,EntourageOA_DepartmentName,EntourageOutHosp,EntourageInHosp,DispatchOrdPerfomance
,ConversionDistance,EntourageOT_Money,Stretcher_Money,EntourageMileageFactor,EntourageMileageEdit
- ,ServiceOrdPtOutHosp,ServiceOrdTraVia,ServiceOrdPtInHosp,ServiceOrdTraEnd
+ ,ServiceOrdPtOutHosp,ServiceOrdTraVia,ServiceOrdPtInHosp,ServiceOrdTraEnd,ServiceOrdStairClimberPrice
from DispatchOrd_Entourage,DispatchOrd,ServiceOrder
where ServiceOrdID=ServiceOrdIDDt and DispatchOrdID=DispatchOrdIDDt and DispatchOrdState in (8,9) and EntourageState<>4".$OAOccupationSQL." and DispatchOrd_NS_Time ".$SqlOrdDateType.$searchSql." order by EntourageOAid,DispatchOrd_NS_Time";
//echo $sql;exit;
@@ -118,7 +118,7 @@
if($data == true){
$FormArray=array();
//琛ㄥご
- $FormArray[0]=array("鍛樺伐濮撳悕","鎵�灞為儴闂�","鏃ユ湡","鍗曞彿","鎬绘垚浜や环","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","鍖哄煙","绫诲瀷","杞嚭鍖婚櫌","杞嚭鍦板潃","杞叆鍖婚櫌","杞叆鍦板潃","鐝","鍑鸿溅鏃堕棿","鏀惰溅鏃堕棿","鍔犵彮鏃堕暱","鍑鸿溅閲岀▼","鏀惰溅閲岀▼","瀹為檯鍏噷","棰勪及璺濈","娲诲姩淇濋殰","灞呭ICU","绛夊緟","灞呭ICU缁╂晥","鎷呮灦璐硅鎻�","璁㈠崟鎻愭垚");
+ $FormArray[0]=array("鍛樺伐濮撳悕","鎵�灞為儴闂�","鏃ユ湡","鍗曞彿","鎬绘垚浜や环","鐖ゼ鏈鸿垂","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","鍖哄煙","绫诲瀷","杞嚭鍖婚櫌","杞嚭鍦板潃","杞叆鍖婚櫌","杞叆鍦板潃","鐝","鍑鸿溅鏃堕棿","鏀惰溅鏃堕棿","鍔犵彮鏃堕暱","鍑鸿溅閲岀▼","鏀惰溅閲岀▼","瀹為檯鍏噷","棰勪及璺濈","娲诲姩淇濋殰","灞呭ICU","绛夊緟","灞呭ICU缁╂晥","鎷呮灦璐硅鎻�","璁㈠崟鎻愭垚");
$FormArrayX=count($FormArray[0]);
if (sqlsrv_rows_affected($data)==0) {
@@ -173,6 +173,7 @@
$EntourageOT_Money = $rs['EntourageOT_Money']; //鍔犵彮璐�/椤圭洰璐�
$EntourageMileageEdit = $rs['EntourageMileageEdit']; //淇敼鎻愭垚閲戦
$Entourage_Time = $rs['Entourage_Time'];
+ $ServiceOrdStairClimberPrice = $rs['ServiceOrdStairClimberPrice']; //鐖ゼ鏈轰环鏍�
//鍔犵彮鍑鸿溅缁╂晥1.1鍊�,瓒�12鐐瑰嚭杞�1.2鍊�
$EntourageDKPOTScale = 1;
If ($EntourageOT2_is==1 And date("H:i",strtotime($Entourage_Time))<"07:00") {
@@ -255,35 +256,36 @@
$FormArray[$i][2]=date("Y-m-d",strtotime($DispatchOrd_NS_Time));
$FormArray[$i][3]="<a href=DispatchOrder.gds?DispatchOrdID=".$DispatchOrdID."&OrdDateType=4&OrdClassList=&h_menu1_1=1 target=_blank>".$DispatchOrdNo."</a>";
$FormArray[$i][4]=floatval(number_format(($ServiceOrdTraTxnPrice+$AddMoney2+$AddMoney3),2,".",""));
- $FormArray[$i][5]=floatval(number_format($AddMoney1,2,".",""));
- $FormArray[$i][6]=floatval(number_format($AddMoney2,2,".",""));
- $FormArray[$i][7]=floatval(number_format($AddMoney3,2,".",""));
- $FormArray[$i][8]=$ArrayOrdAreaType[$ServiceOrdAreaType];
- $FormArray[$i][9]=$ArrayOrdType[$ServiceOrdType];
- $FormArray[$i][10]=$EntourageOutHosp;
- $FormArray[$i][11]=$ServiceOrdTraVia;
- $FormArray[$i][12]=$EntourageInHosp;
- $FormArray[$i][13]=$ServiceOrdTraEnd;
- $FormArray[$i][14]=date("H:i",strtotime($DispatchOrd_NS_Time))>"08:30" && date("H:i",strtotime($DispatchOrd_NS_Time))<"17:30" ? "鐧界彮" : "澶滅彮";
- $FormArray[$i][15]=$DispatchOrdActualDate;
- $FormArray[$i][16]=$DispatchOrdReturnDate;
+ $FormArray[$i][5]=floatval(number_format($ServiceOrdStairClimberPrice,2,".",""));
+ $FormArray[$i][6]=floatval(number_format($AddMoney1,2,".",""));
+ $FormArray[$i][7]=floatval(number_format($AddMoney2,2,".",""));
+ $FormArray[$i][8]=floatval(number_format($AddMoney3,2,".",""));
+ $FormArray[$i][9]=$ArrayOrdAreaType[$ServiceOrdAreaType];
+ $FormArray[$i][10]=$ArrayOrdType[$ServiceOrdType];
+ $FormArray[$i][11]=$EntourageOutHosp;
+ $FormArray[$i][12]=$ServiceOrdTraVia;
+ $FormArray[$i][13]=$EntourageInHosp;
+ $FormArray[$i][14]=$ServiceOrdTraEnd;
+ $FormArray[$i][15]=date("H:i",strtotime($DispatchOrd_NS_Time))>"08:30" && date("H:i",strtotime($DispatchOrd_NS_Time))<"17:30" ? "鐧界彮" : "澶滅彮";
+ $FormArray[$i][16]=$DispatchOrdActualDate;
+ $FormArray[$i][17]=$DispatchOrdReturnDate;
//$FormArray[$i][14]=floatval(number_format($OTTime/60/60,1,".","")); //鍔犻暱鏃堕暱-灏忔椂
if (isDepartment("070122")==1) {
- $FormArray[$i][17]=time2second($OTTime); //鍔犻暱鏃堕暱-X澶灏忔椂X鍒嗛挓
+ $FormArray[$i][18]=time2second($OTTime); //鍔犻暱鏃堕暱-X澶灏忔椂X鍒嗛挓
}else{
- $FormArray[$i][17]="--";
+ $FormArray[$i][18]="--";
}
- $FormArray[$i][18]=floatval(number_format($DispatchOrdTraStreetMileage,2,".",""));
- $FormArray[$i][19]=floatval(number_format($DispatchOrdTraEndMileage,2,".",""));
- $FormArray[$i][20]=floatval(number_format($DispatchOrdMileage,2,".",""));
- $FormArray[$i][21]=floatval(number_format($OrdDistance,2,".",""));
+ $FormArray[$i][19]=floatval(number_format($DispatchOrdTraStreetMileage,2,".",""));
+ $FormArray[$i][20]=floatval(number_format($DispatchOrdTraEndMileage,2,".",""));
+ $FormArray[$i][21]=floatval(number_format($DispatchOrdMileage,2,".",""));
+ $FormArray[$i][22]=floatval(number_format($OrdDistance,2,".",""));
- $FormArray[$i][22]=floatval(number_format($TimeLength_Program,2,".",""));
- $FormArray[$i][23]=floatval(number_format($TimeLength_ICU,2,".",""));
- $FormArray[$i][24]=floatval(number_format($TimeLength_Wait,2,".",""));
- $FormArray[$i][25]=floatval(number_format($TimeLength_ICU_Money,2,".",""));
- $FormArray[$i][26]=floatval(number_format($Stretcher_Money,2,".",""));
- $FormArray[$i][27]=floatval(number_format($EntourageDKP_Money,2,".",""));
+ $FormArray[$i][23]=floatval(number_format($TimeLength_Program,2,".",""));
+ $FormArray[$i][24]=floatval(number_format($TimeLength_ICU,2,".",""));
+ $FormArray[$i][25]=floatval(number_format($TimeLength_Wait,2,".",""));
+ $FormArray[$i][26]=floatval(number_format($TimeLength_ICU_Money,2,".",""));
+ $FormArray[$i][27]=floatval(number_format($Stretcher_Money,2,".",""));
+ $FormArray[$i][28]=floatval(number_format($EntourageDKP_Money,2,".",""));
$i++;
diff --git a/ServiceOrder_Data.gds b/ServiceOrder_Data.gds
index 1430151..840baf2 100644
--- a/ServiceOrder_Data.gds
+++ b/ServiceOrder_Data.gds
@@ -67,7 +67,12 @@
ServiceOrdTraOfferPrice=rs("ServiceOrdTraOfferPrice") '鏍囧噯鎶ヤ环
ServiceOrdTraTxnPrice = rs("ServiceOrdTraTxnPrice") '鎴愪氦浠�
SettlementPrice = rs("SettlementPrice") '缁撶畻浠�
- ServiceOrdTraPrePayment=rs("ServiceOrdTraPrePayment") '闇�棰勪粯娆鹃噾棰�
+ ServiceOrdTraPrePayment = rs("ServiceOrdTraPrePayment") '闇�棰勪粯娆鹃噾棰�
+ If Not IsNull(rs("ServiceOrdStairClimberPrice")) Then
+ ServiceOrdStairClimberPrice=rs("ServiceOrdStairClimberPrice") '鐖ゼ鏈轰环鏍�
+ Else
+ ServiceOrdStairClimberPrice=0 '鐖ゼ鏈轰环鏍奸粯璁や负0
+ End If
ServiceOrdTraPaidPrice= rs("ServiceOrdTraPaidPrice") '宸叉敮浠橀噾棰�
ServiceOrdPoints = rs("ServiceOrdPoints") '浣跨敤绉垎
ServiceOrdTraPriceReason=rs("ServiceOrdTraPriceReason")'宸环鍘熷洜
@@ -133,7 +138,8 @@
If ServiceOrdTraUnitPrice="" Then ServiceOrdTraUnitPrice=0
If ServiceOrdTraOfferPrice="" Then ServiceOrdTraOfferPrice=0
If ServiceOrdTraTxnPrice="" Then ServiceOrdTraTxnPrice=0
-If ServiceOrdTraPrePayment="" Then ServiceOrdTraPrePayment=0
+ If ServiceOrdTraPrePayment="" Then ServiceOrdTraPrePayment=0
+ If ServiceOrdStairClimberPrice="" Then ServiceOrdStairClimberPrice=0 '鐖ゼ鏈轰环鏍奸粯璁ゅ��
If ServiceOrdTraProvince<>"" Then ProvinceCityID=ServiceOrdTraProvince
If ServiceOrdTraCity<>"" Then ProvinceCityID=ServiceOrdTraCity
If TEL_Time="" Then TEL_Time=now()
@@ -1379,11 +1385,17 @@
</div>
<div class="label" style="float: left;margin-left:224px;">
- <label for="input-small">闇�棰勪粯娆�:</label>
- </div>
- <div class="input" style="float:left;margin-left: 60px;">
- <input type="text" id="ServiceOrdTraPrePayment" name="ServiceOrdTraPrePayment" class="small<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " valid"%>" style="width:138px;" onkeyup="value=value.replace(/[^\d.]/g,'')" onblur="value=value.replace(/[^\d.]/g,'')" value="<%=MoneyCheck(ServiceOrdTraPrePayment,0)%>"<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " readonly=""true""" %> onchange="upperCase(this.name)">
- </div>
+ <label for="input-small">闇�棰勪粯娆�:</label>
+ </div>
+ <div class="input" style="float:left;margin-left: 60px;">
+ <input type="text" id="ServiceOrdTraPrePayment" name="ServiceOrdTraPrePayment" class="small<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " valid"%>" style="width:138px;" onkeyup="value=value.replace(/[^\d.]/g,'')" onblur="value=value.replace(/[^\d.]/g,'')" value="<%=MoneyCheck(ServiceOrdTraPrePayment,0)%>"<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " readonly=""true""" %> onchange="upperCase(this.name)">
+ </div>
+ <div class="label" style="float: left;margin-left:590px;">
+ <label for="input-small">鐖ゼ鏈轰环鏍�:</label>
+ </div>
+ <div class="input" style="float:left;margin-left: 226px;">
+ <input type="text" id="ServiceOrdStairClimberPrice" name="ServiceOrdStairClimberPrice" class="small<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " valid"%>" style="width:138px;" onkeyup="value=value.replace(/[^\d.]/g,'')" onblur="value=value.replace(/[^\d.]/g,'')" value="<%=MoneyCheck(ServiceOrdStairClimberPrice,0)%>"<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " readonly=""true""" %> onchange="upperCase(this.name)">
+ </div>
<%If SettlementPrice>0 Then%>
<div class="label" style="float: left;margin-left:448px;">
<label for="input-small">缁撶畻浠�:</label>
diff --git a/admin_save.gds b/admin_save.gds
index cf5812d..2a2eb16 100644
--- a/admin_save.gds
+++ b/admin_save.gds
@@ -808,6 +808,7 @@
ServiceOrdTraOfferPrice = SafeRequest(Request.form("ServiceOrdTraOfferPrice")) '鏍囧噯鎶ヤ环
ServiceOrdTraTxnPrice = SafeRequest(Request.form("ServiceOrdTraTxnPrice")) '鎴愪氦浠�
ServiceOrdTraPrePayment = SafeRequest(Request.form("ServiceOrdTraPrePayment")) '闇�棰勪粯娆�
+ServiceOrdStairClimberPrice = SafeRequest(Request.form("ServiceOrdStairClimberPrice")) '鐖ゼ鏈轰环鏍�
SettlementPrice = SafeRequest(Request.form("SettlementPrice")) '缁撶畻浠�
ServiceOrdTraPriceReason= SafeRequest(Request.form("ServiceOrdTraPriceReason")) '宸环鍘熷洜
TEL_Phone = SafeRequest(Request.form("Phone")) '鏉ョ數鐢佃瘽
@@ -844,10 +845,12 @@
If ServiceOrdTraOfferPrice="" Then ServiceOrdTraOfferPrice=0
If ServiceOrdTraTxnPrice="" Then ServiceOrdTraTxnPrice=0
If ServiceOrdTraPrePayment="" Then ServiceOrdTraPrePayment=0
+If ServiceOrdStairClimberPrice="" Then ServiceOrdStairClimberPrice=0
If SettlementPrice="" Then SettlementPrice=0
If InStr(ServiceOrdTraTxnPrice,",")>0 Then ServiceOrdTraTxnPrice=Replace(ServiceOrdTraTxnPrice,",","")
If InStr(ServiceOrdTraOfferPrice,",")>0 Then ServiceOrdTraOfferPrice=Replace(ServiceOrdTraOfferPrice,",","")
If InStr(ServiceOrdTraPrePayment,",")>0 Then ServiceOrdTraPrePayment=Replace(ServiceOrdTraPrePayment,",","")
+If InStr(ServiceOrdStairClimberPrice,",")>0 Then ServiceOrdStairClimberPrice=Replace(ServiceOrdStairClimberPrice,",","")
If InStr(SettlementPrice,",")>0 Then SettlementPrice=Replace(SettlementPrice,",","")
If ServiceOrdState="" Then ServiceOrdState=1
'If InStr(ServiceOrdTraDistance,"鍏噷")>0 Then ServiceOrdTraDistance=Replace(ServiceOrdTraDistance,"鍏噷","")
@@ -1041,7 +1044,7 @@
rs.close()
'鍐欏叆鏂版湇鍔″崟
-sql="insert into ServiceOrder (ServiceOrdUserID,ServiceOrdClass,ServiceOrdAreaType,ServiceOrdType,ServiceOrdState,ServiceOrdStartDate,ServiceOrdApptDate,ServiceOrdCoName,ServiceOrdCoPhone,ServiceOrdCoTies,ServiceOrdPtName,ServiceOrdPtAge,ServiceOrdPtKG,ServiceOrdPtSex,ServiceOrdPtNat,ServiceOrdPtIDCard,ServiceOrdPtOutHospID,ServiceOrdPtOutHosp,ServiceOrdPtInHospID,ServiceOrdPtInHosp,ServiceOrdPtServices,ServiceOrdPtServicesID,ServiceOrdPtInServices,ServiceOrdPtInServicesID,ServiceOrdPtDiagnosis,ServiceOrdPtCondition,ServiceOrdTaskRemarks,ServiceOrdPtDoctor,ServiceOrdPtDoctorPhone,ServiceOrdTraProvince,ServiceOrdTraCity,ServiceOrdTraStreet,ServiceOrdTraStreetCoo,ServiceOrdTraEnd,ServiceOrdTraEndCoo,ServiceOrdTraVia,ServiceOrdViaDistance,ServiceOrdTraDistance,ServiceOrdTraDuration,ServiceOrdTraUnitPrice,ServiceOrdTraOfferPrice,ServiceOrdTraTxnPrice,ServiceOrdTraPrePayment,SettlementPrice,ServiceOrdTraPriceReason,ServiceOrd_CC_ID,ServiceOrd_CC_Time,ServiceOrdNo,ServiceOrd_Sale_ID,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID,ServiceOrdIntroducer,ServiceOrdUnitID,ServiceOrdVIP,ServiceOrdOperationRemarks,ServiceOrdEstimatedOrderDate,ServiceOrdSource,OrderLevel,ServiceOrdDepartureType,ConditionLevel,DirectionType,FromHQ2_is,OrderPrice_Auto) values ("&UserID&",'"&ServiceOrdClass&"',"&ServiceOrdAreaType&","&ServiceOrdType&","&ServiceOrdState&",'"&ServiceOrdStartDate&"','"&ServiceOrdApptDate&"','"&ServiceOrdCoName&"','"&ServiceOrdCoPhone&"','"&ServiceOrdCoTies&"','"&ServiceOrdPtName&"','"&ServiceOrdPtAge&"','"&ServiceOrdPtKG&"','"&ServiceOrdPtSex&"','"&ServiceOrdPtNat&"','"&ServiceOrdPtIDCard&"',"&ServiceOrdPtOutHospID_New&","&ServiceOrdPtOutHospID&","&ServiceOrdPtInHospID_New&","&ServiceOrdPtInHospID&",'"&ServiceOrdPtServices&"',"&ServiceOrdPtServicesID&",'"&ServiceOrdPtInServices&"',"&ServiceOrdPtInServicesID&",'"&ServiceOrdPtDiagnosis&"','"&ServiceOrdPtCondition&"','"&ServiceOrdTaskRemarks&"','"&ServiceOrdPtDoctor&"','"&ServiceOrdPtDoctorPhone&"','"&ServiceOrdTraProvince&"','"&ServiceOrdTraCity&"','"&ServiceOrdTraStreet&"','"&ServiceOrdTraStreetCoo&"','"&ServiceOrdTraEnd&"','"&ServiceOrdTraEndCoo&"','"&ServiceOrdTraVia&"','"&ServiceOrdViaDistance&"','"&ServiceOrdTraDistance&"','"&ServiceOrdTraDuration&"',"&ServiceOrdTraUnitPrice&","&ServiceOrdTraOfferPrice&","&ServiceOrdTraTxnPrice&","&ServiceOrdTraPrePayment&","&SettlementPrice&",'"&ServiceOrdTraPriceReason&"',"&ServiceOrd_CC_ID&",getdate(),"&ServiceOrdNo&","&ServiceOrd_Sale_ID&","&ServiceOrd_work_ID&",'"&ServiceOrd_work_IDs&"',"&ServiceOrd_work_is&","&CommissionScenarioID&",'"&ServiceOrdIntroducer&"',"&ServiceOrdUnitID&","&ServiceOrdVIP&",'"&ServiceOrdOperationRemarks&"','"&ServiceOrdEstimatedOrderDate&"',"&ServiceOrdSource&","&OrderLevel&","&ServiceOrdDepartureType&","&ConditionLevel&","&DirectionType&","&FromHQ2_is&","&OrderPrice_Auto&")"
+sql="insert into ServiceOrder (ServiceOrdUserID,ServiceOrdClass,ServiceOrdAreaType,ServiceOrdType,ServiceOrdState,ServiceOrdStartDate,ServiceOrdApptDate,ServiceOrdCoName,ServiceOrdCoPhone,ServiceOrdCoTies,ServiceOrdPtName,ServiceOrdPtAge,ServiceOrdPtKG,ServiceOrdPtSex,ServiceOrdPtNat,ServiceOrdPtIDCard,ServiceOrdPtOutHospID,ServiceOrdPtOutHosp,ServiceOrdPtInHospID,ServiceOrdPtInHosp,ServiceOrdPtServices,ServiceOrdPtServicesID,ServiceOrdPtInServices,ServiceOrdPtInServicesID,ServiceOrdPtDiagnosis,ServiceOrdPtCondition,ServiceOrdTaskRemarks,ServiceOrdPtDoctor,ServiceOrdPtDoctorPhone,ServiceOrdTraProvince,ServiceOrdTraCity,ServiceOrdTraStreet,ServiceOrdTraStreetCoo,ServiceOrdTraEnd,ServiceOrdTraEndCoo,ServiceOrdTraVia,ServiceOrdViaDistance,ServiceOrdTraDistance,ServiceOrdTraDuration,ServiceOrdTraUnitPrice,ServiceOrdTraOfferPrice,ServiceOrdTraTxnPrice,ServiceOrdTraPrePayment,ServiceOrdStairClimberPrice,SettlementPrice,ServiceOrdTraPriceReason,ServiceOrd_CC_ID,ServiceOrd_CC_Time,ServiceOrdNo,ServiceOrd_Sale_ID,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID,ServiceOrdIntroducer,ServiceOrdUnitID,ServiceOrdVIP,ServiceOrdOperationRemarks,ServiceOrdEstimatedOrderDate,ServiceOrdSource,OrderLevel,ServiceOrdDepartureType,ConditionLevel,DirectionType,FromHQ2_is,OrderPrice_Auto) values ("&UserID&",'"&ServiceOrdClass&"',"&ServiceOrdAreaType&","&ServiceOrdType&","&ServiceOrdState&",'"&ServiceOrdStartDate&"','"&ServiceOrdApptDate&"','"&ServiceOrdCoName&"','"&ServiceOrdCoPhone&"','"&ServiceOrdCoTies&"','"&ServiceOrdPtName&"','"&ServiceOrdPtAge&"','"&ServiceOrdPtKG&"','"&ServiceOrdPtSex&"','"&ServiceOrdPtNat&"','"&ServiceOrdPtIDCard&"',"&ServiceOrdPtOutHospID_New&","&ServiceOrdPtOutHospID&","&ServiceOrdPtInHospID_New&","&ServiceOrdPtInHospID&",'"&ServiceOrdPtServices&"',"&ServiceOrdPtServicesID&",'"&ServiceOrdPtInServices&"',"&ServiceOrdPtInServicesID&",'"&ServiceOrdPtDiagnosis&"','"&ServiceOrdPtCondition&"','"&ServiceOrdTaskRemarks&"','"&ServiceOrdPtDoctor&"','"&ServiceOrdPtDoctorPhone&"','"&ServiceOrdTraProvince&"','"&ServiceOrdTraCity&"','"&ServiceOrdTraStreet&"','"&ServiceOrdTraStreetCoo&"','"&ServiceOrdTraEnd&"','"&ServiceOrdTraEndCoo&"','"&ServiceOrdTraVia&"','"&ServiceOrdViaDistance&"','"&ServiceOrdTraDistance&"','"&ServiceOrdTraDuration&"',"&ServiceOrdTraUnitPrice&","&ServiceOrdTraOfferPrice&","&ServiceOrdTraTxnPrice&","&ServiceOrdTraPrePayment&","&ServiceOrdStairClimberPrice&","&SettlementPrice&",'"&ServiceOrdTraPriceReason&"',"&ServiceOrd_CC_ID&",getdate(),"&ServiceOrdNo&","&ServiceOrd_Sale_ID&","&ServiceOrd_work_ID&",'"&ServiceOrd_work_IDs&"',"&ServiceOrd_work_is&","&CommissionScenarioID&",'"&ServiceOrdIntroducer&"',"&ServiceOrdUnitID&","&ServiceOrdVIP&",'"&ServiceOrdOperationRemarks&"','"&ServiceOrdEstimatedOrderDate&"',"&ServiceOrdSource&","&OrderLevel&","&ServiceOrdDepartureType&","&ConditionLevel&","&DirectionType&","&FromHQ2_is&","&OrderPrice_Auto&")"
'Response.write sql&"<BR>"
objConn.Execute sql
sql="select top 1 ServiceOrdID from ServiceOrder where ServiceOrdCoPhone='"&ServiceOrdCoPhone&"' order by ServiceOrdID desc"
@@ -1287,6 +1290,7 @@
ServiceOrdTraOfferPrice = SafeRequest(Request.form("ServiceOrdTraOfferPrice")) '鏍囧噯鎶ヤ环
ServiceOrdTraTxnPrice = SafeRequest(Request.form("ServiceOrdTraTxnPrice")) '鎴愪氦浠�
ServiceOrdTraPrePayment = SafeRequest(Request.form("ServiceOrdTraPrePayment")) '闇�棰勪粯娆�
+ServiceOrdStairClimberPrice = SafeRequest(Request.form("ServiceOrdStairClimberPrice")) '鐖ゼ鏈轰环鏍�
SettlementPrice = SafeRequest(Request.form("SettlementPrice")) '缁撶畻浠�
ServiceOrdTraPriceReason= SafeRequest(Request.form("ServiceOrdTraPriceReason")) '宸环鍘熷洜
TEL_Phone = SafeRequest(Request.form("Phone")) '鏉ョ數鐢佃瘽
@@ -1332,6 +1336,7 @@
If ServiceOrdTraOfferPrice="" Then ServiceOrdTraOfferPrice=0
If ServiceOrdTraTxnPrice="" Then ServiceOrdTraTxnPrice=0
If ServiceOrdTraPrePayment="" Then ServiceOrdTraPrePayment=0
+If ServiceOrdStairClimberPrice="" Then ServiceOrdStairClimberPrice=0
If SettlementPrice="" Then SettlementPrice=0
If ServiceOrdState="" Then ServiceOrdState=1
If ServiceOrd_Sale_ID="" Then ServiceOrd_Sale_ID="null"
@@ -1383,6 +1388,7 @@
SMT=3
ServiceOrdTraPrePayment=Replace(ServiceOrdTraPrePayment,",","")
+If InStr(ServiceOrdStairClimberPrice,",")>0 Then ServiceOrdStairClimberPrice=Replace(ServiceOrdStairClimberPrice,",","")
SettlementPrice=Replace(SettlementPrice,",","")
ServiceOrdTraOfferPrice=Replace(ServiceOrdTraOfferPrice,",","")
ServiceOrdTraTxnPrice=Replace(ServiceOrdTraTxnPrice,",","")
@@ -1652,7 +1658,7 @@
If ServiceOrdPtInServices<>"銆愰殣銆�" Then CoSql=CoSql&",ServiceOrdPtInServices='"&ServiceOrdPtInServices&"'"
'淇敼鏈嶅姟鍗�(鑷姩瀹℃牳)
-sql="update ServiceOrder set ServiceOrdClass='"&ServiceOrdClass&"',ServiceOrdAreaType="&ServiceOrdAreaType&",ServiceOrdType="&ServiceOrdType&",ServiceOrdApptDate='"&ServiceOrdApptDate&"',ServiceOrdEstimatedOrderDate='"&ServiceOrdEstimatedOrderDate&"',ServiceOrdCoTies='"&ServiceOrdCoTies&"',ServiceOrdPtSex='"&ServiceOrdPtSex&"',ServiceOrdPtNat='"&ServiceOrdPtNat&"',ServiceOrdPtIDCard='"&ServiceOrdPtIDCard&"',ServiceOrdPtOutHospID="&ServiceOrdPtOutHospID_New&",ServiceOrdPtOutHosp="&ServiceOrdPtOutHospID&",ServiceOrdPtInHospID="&ServiceOrdPtInHospID_New&",ServiceOrdPtInHosp="&ServiceOrdPtInHospID&",ServiceOrdPtDiagnosis='"&ServiceOrdPtDiagnosis&"',ServiceOrdPtCondition='"&ServiceOrdPtCondition&"',ServiceOrdTaskRemarks='"&ServiceOrdTaskRemarks&"',ServiceOrdPtDoctor='"&ServiceOrdPtDoctor&"',ServiceOrdPtDoctorPhone='"&ServiceOrdPtDoctorPhone&"',ServiceOrdTraProvince='"&ServiceOrdTraProvince&"',ServiceOrdTraCity='"&ServiceOrdTraCity&"',ServiceOrdTraStreet='"&ServiceOrdTraStreet&"',ServiceOrdTraStreetCoo='"&ServiceOrdTraStreetCoo&"',ServiceOrdTraEnd='"&ServiceOrdTraEnd&"',ServiceOrdTraEndCoo='"&ServiceOrdTraEndCoo&"',ServiceOrdTraVia='"&ServiceOrdTraVia&"',ServiceOrdViaDistance='"&ServiceOrdViaDistance&"',ServiceOrdTraDistance='"&ServiceOrdTraDistance&"',ServiceOrdTraDuration='"&ServiceOrdTraDuration&"',ServiceOrdTraUnitPrice="&ServiceOrdTraUnitPrice&",ServiceOrdTraOfferPrice="&ServiceOrdTraOfferPrice&",ServiceOrdTraTxnPrice="&ServiceOrdTraTxnPrice&",ServiceOrdTraPrePayment="&ServiceOrdTraPrePayment&",SettlementPrice="&SettlementPrice&",ServiceOrdTraPriceReason='"&ServiceOrdTraPriceReason&"',ServiceOrd_CC_ID="&ServiceOrd_CC_ID&",ServiceOrd_Sale_ID="&ServiceOrd_Sale_ID&",ServiceOrdIntroducer='"&ServiceOrdIntroducer&"',ServiceOrd_work_ID="&ServiceOrd_work_ID&",ServiceOrd_work_IDs='"&ServiceOrd_work_IDs&"',ServiceOrd_work_is="&ServiceOrd_work_is&",CommissionScenarioID="&CommissionScenarioID&",ServiceOrdUnitID="&ServiceOrdUnitID&""&ServiceOrdSql&",ServiceOrdVIP="&ServiceOrdVIP&SqlVisit&",ServiceOrdOperationRemarks='"&ServiceOrdOperationRemarks&"',ServiceOrdSource="&ServiceOrdSource&",OrderLevel="&OrderLevel&",ServiceOrdDepartureType="&ServiceOrdDepartureType&",ConditionLevel="&ConditionLevel&",DirectionType="&DirectionType&",ServiceOrdPtKG='"&ServiceOrdPtKG&"',FromHQ2_is="&FromHQ2_is&CoSql&ServiceOrdNo_UPSql&" where ServiceOrdID="&ServiceOrdID
+sql="update ServiceOrder set ServiceOrdClass='"&ServiceOrdClass&"',ServiceOrdAreaType="&ServiceOrdAreaType&",ServiceOrdType="&ServiceOrdType&",ServiceOrdApptDate='"&ServiceOrdApptDate&"',ServiceOrdEstimatedOrderDate='"&ServiceOrdEstimatedOrderDate&"',ServiceOrdCoTies='"&ServiceOrdCoTies&"',ServiceOrdPtSex='"&ServiceOrdPtSex&"',ServiceOrdPtNat='"&ServiceOrdPtNat&"',ServiceOrdPtIDCard='"&ServiceOrdPtIDCard&"',ServiceOrdPtOutHospID="&ServiceOrdPtOutHospID_New&",ServiceOrdPtOutHosp="&ServiceOrdPtOutHospID&",ServiceOrdPtInHospID="&ServiceOrdPtInHospID_New&",ServiceOrdPtInHosp="&ServiceOrdPtInHospID&",ServiceOrdPtDiagnosis='"&ServiceOrdPtDiagnosis&"',ServiceOrdPtCondition='"&ServiceOrdPtCondition&"',ServiceOrdTaskRemarks='"&ServiceOrdTaskRemarks&"',ServiceOrdPtDoctor='"&ServiceOrdPtDoctor&"',ServiceOrdPtDoctorPhone='"&ServiceOrdPtDoctorPhone&"',ServiceOrdTraProvince='"&ServiceOrdTraProvince&"',ServiceOrdTraCity='"&ServiceOrdTraCity&"',ServiceOrdTraStreet='"&ServiceOrdTraStreet&"',ServiceOrdTraStreetCoo='"&ServiceOrdTraStreetCoo&"',ServiceOrdTraEnd='"&ServiceOrdTraEnd&"',ServiceOrdTraEndCoo='"&ServiceOrdTraEndCoo&"',ServiceOrdTraVia='"&ServiceOrdTraVia&"',ServiceOrdViaDistance='"&ServiceOrdViaDistance&"',ServiceOrdTraDistance='"&ServiceOrdTraDistance&"',ServiceOrdTraDuration='"&ServiceOrdTraDuration&"',ServiceOrdTraUnitPrice="&ServiceOrdTraUnitPrice&",ServiceOrdTraOfferPrice="&ServiceOrdTraOfferPrice&",ServiceOrdTraTxnPrice="&ServiceOrdTraTxnPrice&",ServiceOrdTraPrePayment="&ServiceOrdTraPrePayment&",ServiceOrdStairClimberPrice="&ServiceOrdStairClimberPrice&",SettlementPrice="&SettlementPrice&",ServiceOrdTraPriceReason='"&ServiceOrdTraPriceReason&"',ServiceOrd_CC_ID="&ServiceOrd_CC_ID&",ServiceOrd_Sale_ID="&ServiceOrd_Sale_ID&",ServiceOrdIntroducer='"&ServiceOrdIntroducer&"',ServiceOrd_work_ID="&ServiceOrd_work_ID&",ServiceOrd_work_IDs='"&ServiceOrd_work_IDs&"',ServiceOrd_work_is="&ServiceOrd_work_is&",CommissionScenarioID="&CommissionScenarioID&",ServiceOrdUnitID="&ServiceOrdUnitID&""&ServiceOrdSql&",ServiceOrdVIP="&ServiceOrdVIP&SqlVisit&",ServiceOrdOperationRemarks='"&ServiceOrdOperationRemarks&"',ServiceOrdSource="&ServiceOrdSource&",OrderLevel="&OrderLevel&",ServiceOrdDepartureType="&ServiceOrdDepartureType&",ConditionLevel="&ConditionLevel&",DirectionType="&DirectionType&",ServiceOrdPtKG='"&ServiceOrdPtKG&"',FromHQ2_is="&FromHQ2_is&CoSql&ServiceOrdNo_UPSql&" where ServiceOrdID="&ServiceOrdID
'&",ServiceOrd_AP_Check=1,ServiceOrd_AP_Time=getdate(),ServiceOrd_AP_ID="&session("adminID")
'Response.Write sql
objConn.Execute sql
diff --git a/inc/function.gds b/inc/function.gds
index 3a1cf97..1ee9893 100644
--- a/inc/function.gds
+++ b/inc/function.gds
@@ -3367,6 +3367,9 @@
'閲戦鍘绘帀灏忔暟鐐�
function MoneyCheck(v,t)
+ If IsNull(v) Or v="" Then
+ v = 0
+ End If
If InStr(CStr(v),".")>0 Then
If t=1 then
MoneyCheck=FormatCurrency(v,2,-1)
diff --git a/m_DispatchOrder.gds b/m_DispatchOrder.gds
index 1f2a43d..eb3b1db 100644
--- a/m_DispatchOrder.gds
+++ b/m_DispatchOrder.gds
@@ -636,8 +636,12 @@
<%End If%>
<%'鏀粯鎯呭喌
If (DispatchOrdState>=5 And DispatchOrdState<=9) And ServiceOrdTraTxnPrice<>"" And CInt(session("adminID"))=CInt(EntourageLeadID) then%>
+ <%If ServiceOrdType="27" Then%>
+ <div class="os_shopname">鎴愪氦浠凤細銆愰殣銆�<%If ServiceOrdTraPaidPrice<>"" Then%><%If StretcherMoney<>"" And StretcherMoney>0 Then%> 闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%><%End if%> 宸叉敮浠橈細銆愰殣銆�<%End if%><%If ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice>0 Then%><br>鏈敮浠橈細銆愰殣銆�</div>
+ <%Else%>
<div class="os_shopname"></div>
<div class="os_shopname">杞繍璐圭敤锛�<%=FormatCurrency(ServiceOrdTraTxnPrice,-1,-1)%><%If StretcherMoney<>"" And StretcherMoney>0 Then%> 闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%><%End if%><%If ServiceOrdTraPaidPrice<>"" Then%> 宸叉敮浠橈細<%=FormatCurrency(ServiceOrdTraPaidPrice,-1,-1)%><%End if%>
+ <%End if%>
<%If (ServiceOrdTraTxnPrice+StretcherMoney)-ServiceOrdTraPaidPrice>0 And 1=2 Then%><br>鐜版敮浠橈細
<select name="PaidMoneyType" id="PaidMoneyType" style="-webkit-appearance: none;outline: none;border: none;font-size: 14px;" >
<option value="">璇烽�夋嫨</option>
@@ -654,11 +658,15 @@
<input name="PaidMoneyType" id="PaidMoneyType" type="hidden" value="">
<input name="PaidMoney" id="PaidMoney" type="hidden" value="0">
<%End if%>
+ <%End if%>
</div>
<%ElseIf ServiceOrdTraTxnPrice<>"" And ServiceOrdTraTxnPrice<>"0" Then%>
<div class="os_shopname"></div>
+ <%If ServiceOrdType="27" Then%>
+ <div class="os_shopname">鎴愪氦浠凤細銆愰殣銆�<%If ServiceOrdTraPaidPrice<>"" Then%><%If StretcherMoney<>"" And StretcherMoney>0 Then%> 闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%><%End if%> 宸叉敮浠橈細銆愰殣銆�<%End if%><%If ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice>0 Then%><br>鏈敮浠橈細銆愰殣銆�</div>
+ <%Else%>
<div class="os_shopname">鎴愪氦浠凤細<%=FormatCurrency(ServiceOrdTraTxnPrice,-1,-1)%><%If ServiceOrdTraPaidPrice<>"" Then%><%If StretcherMoney<>"" And StretcherMoney>0 Then%> 闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%><%End if%> 宸叉敮浠橈細<%=FormatCurrency(ServiceOrdTraPaidPrice,-1,-1)%><%End if%><%If ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice>0 Then%><br>鏈敮浠橈細<%=FormatCurrency(ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice,-1,-1)%>
-
+ <%End If%>
<%If ServiceOrdTraTxnPrice>0 And ServiceOrdTraPaidPrice<ServiceOrdTraTxnPrice And DispatchOrdCoPhone<>"" And (NEWOrder<>"" Or DispatchOrdState=8) Then%> <a onclick="JS_SMSCreateSave('<%=DispatchOrdCoPhone%>','[Pay|0|<%=ServiceOrdID%>] ')">鍙戜粯<label style="color: #ff0000;">鍏ㄦ</label>鐭俊</a>
<script>
//鍙戦�佺煭淇�
@@ -672,6 +680,7 @@
<%End If%>
<%End if%></div>
+ <%End If%>
<%
UserPointsCost=0 '绉垎鎴愭湰
UserPoints=0 '鐢ㄦ埛绉垎
diff --git a/web.config b/web.config
index bf26950..c2144f7 100644
--- a/web.config
+++ b/web.config
@@ -8,10 +8,10 @@
</system.web>
<system.webServer>
<fastCgi>
- <application fullPath="D:\project\鎬ユ晳杞繍\code\php\php-cgi.exe" monitorChangesTo="php.ini" activityTimeout="600" requestTimeout="600" instanceMaxRequests="10000">
+ <application fullPath="C:\php\php-cgi.exe" monitorChangesTo="php.ini" activityTimeout="600" requestTimeout="600" instanceMaxRequests="10000">
<environmentVariables>
<environmentVariable name="PHP_FCGI_MAX_REQUESTS" value="10000" />
- <environmentVariable name="PHPRC" value="D:\project\鎬ユ晳杞繍\code\php" />
+ <environmentVariable name="PHPRC" value="C:\php" />
</environmentVariables>
</application>
</fastCgi>
@@ -29,7 +29,7 @@
<handlers>
<remove name="php" />
<remove name="FastCGI" />
- <add name="php" path="*.php" verb="*" modules="FastCgiModule" scriptProcessor="D:\project\鎬ユ晳杞繍\code\php\php-cgi.exe" resourceType="File" requireAccess="Script" />
+ <add name="php" path="*.php" verb="*" modules="FastCgiModule" scriptProcessor="C:\php\php-cgi.exe" resourceType="File" requireAccess="Script" />
<add name="gds" path="*.gds" verb="GET,HEAD,POST" modules="IsapiModule" scriptProcessor="%windir%\system32\inetsrv\asp.dll" resourceType="File" requireAccess="Script" preCondition="bitness64" />
</handlers>
<httpErrors errorMode="DetailedLocalOnly" />
--
Gitblit v1.9.1