From 6303854b482179fefc3498739aed3f86e930e6fb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 15:30:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js | 195 ++++++++++++++++++++++++++++++------------------
1 files changed, 120 insertions(+), 75 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
index 265d356..1a63206 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
@@ -174,6 +174,58 @@
* 价格规则
*/
TSystemConfig.priceRulesSubmit = function () {
+ var content = {};
+ var ChargeStandard = [];
+ $('.rulesForm').each(function (i, e) {
+ var time = $(e).find("#time");
+ var obj = {};
+ if(null != time && time.length != 0){
+ var num1 = $(time).find('input[name="num1"]').val();
+ var num2 = $(time).find('input[name="num2"]').val();
+ obj.num1 = num1;
+ obj.num2 = num2;
+ }
+ var prices = $(this).find(".prices .price");
+
+ var arr = [];
+ prices.each(function (j, e) {
+ var o = {};
+ var num1 = $(e).find('input[name="num1"]').val();
+ var num2 = $(e).find('input[name="num2"]').val();
+ var num3 = $(e).find('input[name="num3"]').val();
+ o.num1 = num1;
+ o.num2 = num2;
+ o.num3 = num3;
+ arr.push(o);
+ })
+ obj.num3 = arr;
+
+ var num4 = $(this).find('input[name="num4"]').val();
+ var num5 = $(this).find('input[name="num5"]').val();
+ var num6 = $(this).find('input[name="num6"]').val();
+ var num7 = $(this).find('input[name="num7"]').val();
+ var num8 = $(this).find('input[name="num8"]').val();
+ obj.num4 = num4;
+ obj.num5 = num5;
+ obj.num6 = num6;
+ obj.num7 = num7;
+ obj.num8 = num8;
+ ChargeStandard.push(obj);
+ });
+ content.ChargeStandard = ChargeStandard;
+
+ var ExtraCost = {};
+ ExtraCost.num1 = $('#wait').find('input[name="num12"]').val();
+ ExtraCost.num2 = $('#wait').find('input[name="num13"]').val();
+ ExtraCost.num3 = $('#wait').find('input[name="num14"]').val();
+ ExtraCost.num4 = $('#wait').find('input[name="num15"]').val();
+ ExtraCost.num5 = $('#weather').find('input[name="num16"]').val();
+ ExtraCost.num6 = $('#weather').find('input[name="num17"]').val();
+ ExtraCost.num7 = $('#weather').find('input[name="num18"]').val();
+ ExtraCost.num8 = $('#weather').find('input[name="num19"]').val();
+ ExtraCost.num9 = $('#weather').find('input[name="num20"]').val();
+ content.ExtraCost = ExtraCost;
+
var ajax = new $ax(Feng.ctxPath + "/tSystemConfig/systemConfigSubmit", function (data) {
Feng.success("保存成功!");
TSystemConfig.table.refresh();
@@ -181,38 +233,7 @@
Feng.error("保存失败!" + data.responseJSON.message + "!");
});
- var json1=[];
- for (let i = 0; i < $('input[name="num1"]').length; i++) {
- var arr = {}
- arr['num1'] = $($('input[name="num1"]')[i]).val();
- arr['num2'] = $($('input[name="num2"]')[i]).val();
- arr['num3'] = Number($($('input[name="num3"]')[i]).val());
- arr['num4'] = Number($($('input[name="num4"]')[i]).val());
- arr['num5'] = Number($($('input[name="num5"]')[i]).val());
- arr['num6'] = Number($($('input[name="num6"]')[i]).val());
- arr['num7'] = Number($($('input[name="num7"]')[i]).val());
- arr['num8'] = Number($($('input[name="num8"]')[i]).val());
- arr['num9'] = Number($($('input[name="num9"]')[i]).val());
- arr['num10'] = Number($($('input[name="num10"]')[i]).val());
- arr['num11'] = Number($($('input[name="num11"]')[i]).val());
- json1.push(arr)
- }
-
- var ExtraCost = {};
- ExtraCost['num1'] = Number($('#num12').val());
- ExtraCost['num2'] = Number($('#num13').val());
- ExtraCost['num3'] = Number($('#num14').val());
- ExtraCost['num4'] = Number($('#num15').val());
- ExtraCost['num5'] = Number($('#num16').val());
- ExtraCost['num6'] = Number($('#num17').val());
- ExtraCost['num7'] = Number($('#num18').val());
- ExtraCost['num8'] = Number($('#num19').val());
- ExtraCost['num9'] = Number($('#num20').val());
-
- var reqData = {};
- reqData['ChargeStandard'] = json1;
- reqData['ExtraCost'] = ExtraCost;
- ajax.set("content",JSON.stringify(reqData));
+ ajax.set("content",JSON.stringify(content));
ajax.set("type",5);
ajax.start();
};
@@ -241,10 +262,10 @@
TSystemConfig.serviceMgmtSubmit = function () {
var num1 = $("#num1").val();
- var reg=/^1[3-9]\d{9}$/;//由 1-9开头 的正则表达式
+ var reg=/(^1[3-9]\d{9}$)|(^400\d)/;//由 1-9开头 的正则表达式
//先判断是否为整数 在判断 是否在 1-总页 整数范围之内
if(!reg.test(num1)){
- Feng.error("请输入合法手机号!");
+ Feng.error("请输入合法电话号码!");
return;
}
@@ -261,59 +282,83 @@
ajax.start();
};
-TSystemConfig.addBox = function (){
+TSystemConfig.addTime = function (){
var i = $('input[name="num1"]').length + 1;
- var a ="<div>\n" +
- " <div class=\"initialLevel col-sm-12 control-label form-group\" >\n" +
+ var a ="" +
+ "<div class=\"rulesForm\" style=\"border: 1px solid #888888;padding-top: 10px;display: grid;margin: 10px 0px\">" +
+
+ " <div class=\"initialLevel col-sm-12 control-label form-group\" id='time' >\n" +
" <span class=\"control-label\" >时间段</span>\n" +
- " <input class=\"control-label\" id=\"num1-"+i+"\" name=\"num1\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\">\n" +
+ " <input class=\"control-label time-item\" id=\"num1\" name=\"num1\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\" readonly>\n" +
" <span class=\"control-label\" >——</span>\n" +
- " <input class=\"control-label\" id=\"num2-"+i+"\" name=\"num2\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\">\n" +
+ " <input class=\"control-label time-item\" id=\"num2\" name=\"num2\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\" readonly>\n" +
+ " <span class=\"fa fa-remove\" style='position: absolute;right: 20px;color: red;font-size: 20px;' onclick=\"TSystemConfig.delTime(this)\"></span>\n" +
+ " </div>\n" +
+ "<div class='prices'>\n" +
+ " <div class=\"initialLevel col-sm-12 control-label form-group price\" >\n" +
" <span class=\"control-label\" >代驾里程</span>\n" +
- " <input class=\"control-label\" id=\"num3-"+i+"\" name=\"num3\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
- " <span class=\"control-label\" >公里,起步价</span>\n" +
- " <input class=\"control-label\" id=\"num4-"+i+"\" name=\"num4\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
- " <span class=\"control-label\" >元,超出里程每</span>\n" +
- " <input class=\"control-label\" id=\"num5-"+i+"\" name=\"num5\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
- " <span class=\"control-label\" >公里,收费</span>\n" +
- " <input class=\"control-label\" id=\"num6-"+i+"\" name=\"num6\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <input class=\"control-label\" id=\"num1\" name=\"num1\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >公里，至</span>\n" +
+ " <input class=\"control-label\" id=\"num2\" name=\"num2\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >公里，收费</span>\n" +
+ " <input class=\"control-label\" id=\"num3\" name=\"num3\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >元</span>\n" +
+ " <span class=\"fa fa-plus\" onclick=\"TSystemConfig.addBox(this)\"></span>\n" +
+ " </div>\n" +
+ " </div>" +
+ " <div class=\"initialLevel col-sm-12 control-label form-group\" >\n" +
+ " <span class=\"control-label\" >长途里程</span>\n" +
+ " <input class=\"control-label\" id=\"num4\" name=\"num4\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >——</span>\n" +
+ " <input class=\"control-label\" id=\"num5\" name=\"num5\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >公里，费用</span>\n" +
+ " <input class=\"control-label\" id=\"num6\" name=\"num6\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >元，超出里程每</span>\n" +
+ " <input class=\"control-label\" id=\"num7\" name=\"num7\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >公里，收费</span>\n" +
+ " <input class=\"control-label\" id=\"num8\" name=\"num8\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >元</span>\n" +
+ " </div>\n" +
+ "</div>"
+
+ $("#rules").append($(a))
+ lay('.time-item').each(function(){
+ laydate.render({
+ elem: this,
+ type: 'time',
+ format: 'HH:mm',
+ range: false,
+ lang:'zn',
+ trigger: 'click'
+ });
+ });
+}
+
+
+TSystemConfig.addBox = function (e){
+ var a ="<div>\n" +
+ " <div class=\"initialLevel col-sm-12 control-label form-group price\" >\n" +
+ " <span class=\"control-label\" >代驾里程</span>\n" +
+ " <input class=\"control-label\" id=\"num1\" name=\"num1\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >公里，至</span>\n" +
+ " <input class=\"control-label\" id=\"num2\" name=\"num2\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
+ " <span class=\"control-label\" >公里，收费</span>\n" +
+ " <input class=\"control-label\" id=\"num3\" name=\"num3\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
" <span class=\"control-label\" >元</span>\n" +
" <span class=\"fa fa-remove\" onclick=\"TSystemConfig.delBox(this)\"></span>\n" +
" </div>\n" +
- " <div class=\"initialLevel col-sm-12 control-label form-group\" >\n" +
- " <span class=\"control-label\" >长途里程</span>\n" +
- " <input class=\"control-label\" id=\"num7-"+i+"\" name=\"num7\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
- " <span class=\"control-label\" >——</span>\n" +
- " <input class=\"control-label\" id=\"num8-"+i+"\" name=\"num8\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
- " <span class=\"control-label\" >公里,收费</span>\n" +
- " <input class=\"control-label\" id=\"num9-"+i+"\" name=\"num9\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
- " <span class=\"control-label\" >元,超出里程每</span>\n" +
- " <input class=\"control-label\" id=\"num10-"+i+"\" name=\"num10\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
- " <span class=\"control-label\" >公里,收费</span>\n" +
- " <input class=\"control-label\" id=\"num11-"+i+"\" name=\"num11\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
- " <span class=\"control-label\" >元</span>\n" +
- " </div>\n" +
" </div>"
- $("#rules").append($(a))
- // laydate.render({
- // elem: '#num1-'+i,
- // type: 'time',
- // format: 'HH:mm',
- // range: false,
- // lang:'zn'
- // });
- // laydate.render({
- // elem: '#num2-'+i,
- // type: 'time',
- // format: 'HH:mm',
- // range: false,
- // lang:'zn'
- // });
+ $(e).parent('div').parent(".prices").append($(a))
}
+TSystemConfig.delTime = function (o) {
+ $(o).parent("div").parent('.rulesForm').remove()
+};
+
+
TSystemConfig.delBox = function (o) {
- $(o).parent("div").parent("div").remove()
+ $(o).parent("div").remove()
};
TSystemConfig.openOrClose = function () {
--
Gitblit v1.7.1