From 0481353111afb43a2322e18530dde26f1d841ead Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:15:34 +0800
Subject: [PATCH] 代码调整
---
ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js | 116 ++++++----------------------------------------------------
1 files changed, 12 insertions(+), 104 deletions(-)
diff --git a/ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js b/ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
index f40f158..1e3d9a5 100644
--- a/ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
+++ b/ManagementTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js
@@ -153,9 +153,7 @@
.set('scopeCode')
.set('idCardPositive')
.set('idCardReverse')
- .set('serviceScope')
- .set('scale')
- .set('companyInfo');
+ .set('serviceScope');
}
/**
@@ -182,19 +180,19 @@
if (1 == zc){
var zcPercent = $("#zcPercent").val();
if ("" == zcPercent){
- Feng.info("快车比例抽成不能为空!");
+ Feng.info("专车比例抽成不能为空!");
return;
}else if (!regDouble.test(zcPercent)) {
- Feng.info("快车比例抽成格式不正确!");
+ Feng.info("专车比例抽成格式不正确!");
return;
}
}else if (2 == zc){
var zcMoney = $("#zcMoney").val();
if ("" == zcMoney){
- Feng.info("快车固定金额抽成不能为空!");
+ Feng.info("专车固定金额抽成不能为空!");
return;
}else if (!regDouble.test(zcMoney)) {
- Feng.info("快车固定金额抽成格式不正确!");
+ Feng.info("专车固定金额抽成格式不正确!");
return;
}
}
@@ -270,29 +268,6 @@
}
}
var checkbox6 = $('#checkbox6').prop('checked');
- var checkbox7 = $('#checkbox7').prop('checked');
- if (checkbox7) {
- var dcx = $("input[name='dcx']:checked").val();
- if (1 == dcx){
- var dcxPercent = $("#dcxPercent").val();
- if ("" == dcxPercent){
- Feng.info("95128电召比例抽成不能为空!");
- return;
- }else if (!regDouble.test(dcxPercent)) {
- Feng.info("95128电召比例抽成格式不正确!");
- return;
- }
- }else if (2 == dcx){
- var dcxMoney = $("#dcxMoney").val();
- if ("" == dcxMoney){
- Feng.info("95128电召固定金额抽成不能为空!");
- return;
- }else if (!regDouble.test(dcxMoney)) {
- Feng.info("95128电召固定金额抽成格式不正确!");
- return;
- }
- }
- }
var subArr=[];
$(".timeClass").each(function () {
@@ -379,18 +354,6 @@
}else{
ajax.set("isCharter",2);
}
- if (checkbox7){
- var dcx = $("input[name='dcx']:checked").val();
- ajax.set("isOnCallFixedOrProportional",dcx);
- if (1 == dcx){
- ajax.set("onCallMoney",$("#dcxPercent").val());
- }else if (2 == dcx) {
- ajax.set("onCallMoney",$("#dcxMoney").val());
- }
- ajax.set("isOnCall",1);
- }else{
- ajax.set("isOnCall",2);
- }
ajax.set("isNeedFerry",isNeedFerry);
ajax.set("subArr",JSON.stringify(subArr));
@@ -423,19 +386,19 @@
if (1 == zc){
var zcPercent = $("#zcPercent").val();
if ("" == zcPercent){
- Feng.info("快车比例抽成不能为空!");
+ Feng.info("专车比例抽成不能为空!");
return;
}else if (!regDouble.test(zcPercent)) {
- Feng.info("快车比例抽成格式不正确!");
+ Feng.info("专车比例抽成格式不正确!");
return;
}
}else if (2 == zc){
var zcMoney = $("#zcMoney").val();
if ("" == zcMoney){
- Feng.info("快车固定金额抽成不能为空!");
+ Feng.info("专车固定金额抽成不能为空!");
return;
}else if (!regDouble.test(zcMoney)) {
- Feng.info("快车固定金额抽成格式不正确!");
+ Feng.info("专车固定金额抽成格式不正确!");
return;
}
}
@@ -511,29 +474,6 @@
}
}
var checkbox6 = $('#checkbox6').prop('checked');
- var checkbox7 = $('#checkbox7').prop('checked');
- if (checkbox7) {
- var dcx = $("input[name='dcx']:checked").val();
- if (1 == dcx){
- var dcxPercent = $("#dcxPercent").val();
- if ("" == dcxPercent){
- Feng.info("95128电召比例抽成不能为空!");
- return;
- }else if (!regDouble.test(dcxPercent)) {
- Feng.info("95128电召比例抽成格式不正确!");
- return;
- }
- }else if (2 == dcx){
- var dcxMoney = $("#dcxMoney").val();
- if ("" == dcxMoney){
- Feng.info("95128电召固定金额抽成不能为空!");
- return;
- }else if (!regDouble.test(dcxMoney)) {
- Feng.info("95128电召固定金额抽成格式不正确!");
- return;
- }
- }
- }
var subArr=[];
$(".timeClass").each(function () {
@@ -620,18 +560,6 @@
}else{
ajax.set("isCharter",2);
}
- if (checkbox7){
- var dcx = $("input[name='dcx']:checked").val();
- ajax.set("isOnCallFixedOrProportional",dcx);
- if (1 == dcx){
- ajax.set("onCallMoney",$("#dcxPercent").val());
- }else if (2 == dcx) {
- ajax.set("onCallMoney",$("#dcxMoney").val());
- }
- ajax.set("isOnCall",1);
- }else{
- ajax.set("isOnCall",2);
- }
ajax.set("isNeedFerry",isNeedFerry);
ajax.set("subArr",JSON.stringify(subArr));
@@ -652,7 +580,7 @@
idCardReverse.init();
});
-//快车
+//专车
TCompanyInfoDlg.checkbox1 = function () {
var checkbox1 = $('#checkbox1').prop('checked');
if (checkbox1){
@@ -704,15 +632,6 @@
$("#bcDiv").show();
} else {
$("#bcDiv").hide();
- }
-}
-//95128电召
-TCompanyInfoDlg.checkbox7 = function () {
- var checkbox7 = $('#checkbox7').prop('checked');
- if (checkbox7){
- $("#dcxDiv").show();
- } else {
- $("#dcxDiv").hide();
}
}
//省改变
@@ -790,19 +709,8 @@
'<input type="hidden" id="areaCode" name="areaCode" value="'+area+'">'+provinceValue+cityValue+areaValue+'</td>' +
'<td><button onclick="deleteSub(this)">移除</button></td></tr>';
$("#conn").append(str);
-};
+}
function deleteSub(e) {
-
- var ajax = new $ax(Feng.ctxPath + '/tCompany/searchArea', function (data) {
- if (data === "该区域正被打车卡使用，不允许移除"){
- Feng.error(data);
- return false;
- }else {
- $(e).parent().parent().remove();
- }
- });
- ajax.set("companyId",$("#id").val()); /// 适用地区id
- ajax.set("id",$($(e).parent('td').prev('td').find('input')[0]).val()); /// 适用地区id
- ajax.start();
+ $(e).parent().parent().remove();
}
\ No newline at end of file
--
Gitblit v1.7.1