From 31ce6be2d56798d9509e6d90335999064351f7f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 10 十二月 2024 16:06:26 +0800
Subject: [PATCH] 12.10

---
 ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization_info.js |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization_info.js b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization_info.js
index 08d21e5..6de5aa2 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization_info.js
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/generalization/generalization_info.js
@@ -114,6 +114,7 @@
     });
 
     var startTime1 = $("#startTime").val();
+    var effective = $("#effective11").val();
     var time = startTime1.split(" - ");
     var startTime = time[0] + " 00:00:00";
     var endTime = time[1] + " 23:59:59";
@@ -129,6 +130,7 @@
     this.set('couponId',couponId);
     this.set('startTime',startTime);
     this.set('endTime',endTime);
+    this.set('effective',effective);
     ajax.set(this.generalizationInfoData);
     ajax.start();
 }
@@ -143,6 +145,8 @@
     if(!this.validate()){
         return ;
     }
+    var effective = $("#effective11").val();
+
     var couponId=null;
     $(".siteClass").each(function () {
         couponId = $(this).find("input[name*='id']").val()
@@ -165,6 +169,7 @@
     this.set('couponId',couponId);
     this.set('startTime',startTime);
     this.set('endTime',endTime);
+    this.set('effective',effective);
     ajax.set(this.generalizationInfoData);
     ajax.start();
 }
@@ -220,10 +225,10 @@
  */
 GeneralizationInfoDlg.selectCouponOpt9=function(id,insertTime,couponUseType,money,effective,receive){
     if(receive == null || receive == "" || receive == undefined){
-        receive = "-";
+        receive = 0;
     }
 
-    // 0="通用券" 1="专车券" 2="出租券" 3="直通车出行券" 7="接送机出行券"
+    // 0="通用券" 1="专车券" 2="出租券" 3="跨城出行券" 7="接送机出行券"
     var type = "";
     if(couponUseType == 0){
         type = '<td><input type="hidden" id="couponUseType" name="couponUseType" value="'+couponUseType+'">通用券</td>';
@@ -232,7 +237,7 @@
     }else if(couponUseType == 2){
         type = '<td><input type="hidden" id="couponUseType" name="couponUseType" value="'+couponUseType+'">出租券</td>';
     }else if(couponUseType == 3){
-        type = '<td><input type="hidden" id="couponUseType" name="couponUseType" value="'+couponUseType+'">直通车出行券</td>';
+        type = '<td><input type="hidden" id="couponUseType" name="couponUseType" value="'+couponUseType+'">跨城出行券</td>';
     }else{
         type = '<td><input type="hidden" id="couponUseType" name="couponUseType" value="'+couponUseType+'">接送机出行券</td>';
     }
@@ -242,7 +247,7 @@
         '<input type="hidden" id="insertTime" name="insertTime" value="'+insertTime+'">' + insertTime + '</td>' +
         type +
         '<td><input type="hidden" id="money" name="money" value="'+money+'">' + money + '</td>' +
-        '<td><input type="hidden" id="effective" name="effective" value="'+effective+'">' + effective + "天"+'</td>' +
+        // '<td><input type="hidden" id="effective" name="effective" value="'+effective+'">' + effective + "天"+'</td>' +
         '<td><input type="hidden" id="receive" name="receive" value="'+receive+'">' + receive + '</td>' +
         // '</tr>';
         '<td><button onclick="deleteSub(this)">移除</button></td></tr>';
@@ -275,7 +280,7 @@
  * @param money
  */
 GeneralizationInfoDlg.selectCouponOpt1=function(id,couponUseType,couponType,money,name){
-    $("#content3Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":"直通车出行券");
+    $("#content3Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":couponUseType==7?"接送机出行券":"跨城出行券");
     $("#content3Num3").val(couponType==1?"抵扣":"满减");
     $("#content3Num4").val(money);
     $("#content3CouponId").val(id);

--
Gitblit v1.7.1