From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js | 526 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 343 insertions(+), 183 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
index f69558a..d994f41 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackage_info.js
@@ -48,7 +48,9 @@
* 提交添加用户
*/
CoursePackageInfo.addSubmit = function () {
-
+ let objectType= $('#objectType').val();
+ console.log("看看角色类型")
+ console.log(objectType)
let province = $('#provinceCode option:checked').text();
let provinceCode = $('#provinceCode').val();
let city = $('#cityCode option:checked').text();
@@ -119,14 +121,18 @@
couponIds: typeof counpons == "undefined" ? 0 : counpons
});
});
- if(null == provinceCode || '' == provinceCode){
- Feng.error("所在省不能为空");
- return
+
+ if (objectType==1){
+ if(null == provinceCode || '' == provinceCode){
+ Feng.error("所在省不能为空");
+ return
+ }
+ if(null == cityCode || '' == cityCode){
+ Feng.error("所在市不能为空");
+ return
+ }
}
- if(null == cityCode || '' == cityCode){
- Feng.error("所在市不能为空");
- return
- }
+
if(null == storeId || '' == storeId){
Feng.error("所属门店不能为空");
return
@@ -148,6 +154,327 @@
return
}
+
+
+ var checkboxes1 = document.getElementsByName('payType');
+ var isChecked1 = false;
+
+ for (var i = 0; i < checkboxes1.length; i++) {
+ if (checkboxes1[i].checked) {
+ isChecked1 = true;
+ break;
+ }
+ }
+
+ console.log("看看选中")
+ console.log(isChecked1)
+ if (isChecked1) {
+ console.log("At least one checkbox is selected.");
+ } else {
+ Feng.error("请选择支付方式")
+ return;
+ }
+
+
+ var checkboxes = document.getElementsByName('payType');
+ var isChecked = false;
+ var isChecked1 = false;
+
+ for (var i = 0; i < checkboxes.length; i++) {
+ if (checkboxes[i].checked && checkboxes[i].value === '1') {
+ isChecked = true;
+ break;
+ }
+ }
+
+ for (var i = 0; i < checkboxes.length; i++) {
+ if (checkboxes[i].checked && checkboxes[i].value === '2') {
+ isChecked1 = true;
+ break;
+ }
+ }
+
+ if (isChecked1) {
+ var elements3 = document.getElementsByClassName('paiCoin');
+
+ for (var i = 0; i < elements3.length; i++) {
+ var value = elements3[i].value.trim();
+
+ if (value === '') {
+ Feng.error("请输入玩湃币价格")
+ return;
+ // Value is empty
+ // Perform your desired action
+ } else {
+ // Value is not empty
+ // Perform other actions
+ }
+ }
+
+
+ }
+
+
+
+ if (isChecked) {
+ var elements2 = document.getElementsByClassName('cash');
+
+ for (var i = 0; i < elements2.length; i++) {
+ var value = elements2[i].value.trim();
+
+ if (value === '') {
+ Feng.error("请输入现金价格")
+ return;
+ // Value is empty
+ // Perform your desired action
+ } else {
+ // Value is not empty
+ // Perform other actions
+ }
+ }
+
+
+ }
+
+ if (type == 1 ) {
+ var elements1 = document.getElementsByClassName('classNumber');
+
+ for (var i = 0; i < elements1.length; i++) {
+ var value = elements1[i].value.trim();
+
+ if (value === '') {
+ Feng.error("请输入课时数")
+ return;
+ // Value is empty
+ // Perform your desired action
+ } else {
+ // Value is not empty
+ // Perform other actions
+ }
+ }
+
+
+
+
+ var elements = document.querySelectorAll('[name="classStartTime"]');
+ var isEmpty = false;
+
+ for (var i = 0; i < elements.length; i++) {
+ if (elements[i].value.trim() === '') {
+ isEmpty = true;
+ break;
+ }
+ }
+
+ if (isEmpty) {
+ Feng.error("请输入上课时间")
+ return;
+ console.log("At least one element with the name 'yourName' is empty.");
+ } else {
+ console.log("All elements with the name 'yourName' are filled.");
+ }
+
+
+
+ if (null == maxSubscribeNumber || '' == maxSubscribeNumber) {
+ Feng.error("最多预约人数不能为空");
+ return
+ }
+ if (null == codeTime || '' == codeTime) {
+ Feng.error("扣除课时数不能为空");
+ return
+ }
+ if (null == classStartTime || '' == classStartTime) {
+ Feng.error("上课时间不能为空");
+ return
+ }
+ if (null == classWeeks || '' == classWeeks) {
+ Feng.error("上课时间不能为空");
+ return
+ }
+
+
+
+ if (null == validDays || '' == validDays) {
+ Feng.error("课时有效期不能为空");
+ return
+ }
+ }
+ classWeeks = classWeeks.substring(0, classWeeks.length - 1);
+
+ if(null == coverDrawing || '' == coverDrawing){
+ Feng.error("课包封面不能为空");
+ return
+ }
+
+ if(null == introduceDrawing || '' == introduceDrawing){
+ Feng.error("课包介绍不能为空");
+ return
+ }
+
+
+ let obj = {
+ province: province,
+ provinceCode: provinceCode,
+ city: city,
+ cityCode: cityCode,
+ storeId: storeId,
+ coursePackageTypeId: coursePackageTypeId,
+ name: name,
+ siteId: siteId,
+ coachId: coachId,
+ maxSubscribeNumber: maxSubscribeNumber,
+ classStartTime: classStartTime,
+ codeTime:codeTime,
+ // classStartTime: classStartTime.split(" - ")[0],
+ // classEndTime: classStartTime.split(" - ")[1],
+ classWeeks: classWeeks,
+ coverDrawing: coverDrawing,
+ detailDrawing: imgOne,
+ introduceDrawing: introduceDrawing,
+ sort: sort,
+ validDays: validDays,
+ coursePackagePaymentConfig: JSON.stringify(price),
+ type:type,
+ holitime:holitime
+ }
+
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/coursePackage/addCoursePackage", function (data) {
+ if(data.code == 200){
+ Feng.success("添加成功!");
+ CoursePackageInfo.close();
+ window.parent.CoursePackage.table.refresh();
+ }else{
+ Feng.error(data.msg);
+ }
+ }, function (data) {
+ Feng.error("添加失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set(obj);
+ ajax.start();
+};
+
+/**
+ * 提交修改
+ */
+CoursePackageInfo.editSubmit = function () {
+ let id = $('#id').val();
+ let province = $('#provinceCode option:checked').text();
+ let provinceCode = $('#provinceCode').val();
+ let city = $('#cityCode option:checked').text();
+ let cityCode = $('#cityCode').val();
+ let storeId = $('#storeId').val();
+ let coursePackageTypeId = $('#coursePackageTypeId').val();
+ let name = $('#name').val();
+ let siteId = $('#siteId').val();
+ let coachId = $('#coachId').val();
+ let maxSubscribeNumber = $('#maxSubscribeNumber').val();
+ let codeTime = $('#codeTime').val();
+ let type = $('#type').val();
+
+
+
+
+ var goodImgs = CoursePackageInfo.goodsPicArray1;
+ // if(goodImgs.length==0){
+ // Feng.info("请上传赛事活动图片")
+ // return;
+ // }
+ var imgOne ="";
+ for (let i = 0; i <goodImgs.length; i++) {
+ if(i==goodImgs.length-1){
+ imgOne += (goodImgs[i].response)
+ }else {
+ imgOne+=(goodImgs[i].response+",")
+ }
+
+ }
+
+
+ var inputElements = document.querySelectorAll('input[name="classStartTime"]');
+ var classStartTime = JSON.stringify(Array.from(inputElements).map(function(element) {
+ return element.value;
+ }))
+ console.log("看下修改后的时间");
+ console.log(classStartTime)
+ // let classStartTime = $('#classStartTime').val();
+ let classWeeks = '';
+ $('input[name="classWeeks"]:checked').each(function (index, e) {
+ classWeeks += $(e).val() + ";";
+ })
+ let coverDrawing = $('#coverDrawing').val();
+ let detailDrawing = $('#detailDrawing').val();
+ let introduceDrawing = $('#introduceDrawing').val();
+ let sort = $('#sort').val();
+ let validDays = $('#validDays').val();
+ // let counpons = $($(e).find(".counpons")).val();
+
+ let price = [];
+ $('#price>.form-group').each(function (i, e) {
+ let classHours = $($(e).find(".classNumber_span input[class='classNumber']")[0]).val();
+ let cash = $($(e).find(".cash_span input[class='cash']")[0]).val();
+ let paiCoin = $($(e).find(".paiCoin_span input[class='paiCoin']")[0]).val();
+ let counpons = $($(e).find(".counpons")).val();
+
+
+
+ price.push({
+ classHours: classHours,
+ cashPayment: typeof cash == "undefined" ? 0 : cash,
+ playPaiCoin: typeof paiCoin == "undefined" ? 0 : paiCoin,
+ couponIds: typeof counpons == "undefined" ? 0 : counpons
+
+ })
+ });
+
+ if ($('#objectType').val() == 1) {
+ if (null == provinceCode || '' == provinceCode) {
+ Feng.error("所在省不能为空");
+ return
+ }
+ if (null == cityCode || '' == cityCode) {
+ Feng.error("所在市不能为空");
+ return
+ }
+ }
+
+ if(null == storeId || '' == storeId){
+ Feng.error("所属门店不能为空");
+ return
+ }
+ if(null == coursePackageTypeId || '' == coursePackageTypeId){
+ Feng.error("课程类型不能为空");
+ return
+ }
+ if(null == name || '' == name){
+ Feng.error("课包名称不能为空");
+ return
+ }
+ if(null == siteId || '' == siteId){
+ Feng.error("上课场地不能为空");
+ return
+ }
+ if(null == coachId || '' == coachId){
+ Feng.error("授课教师不能为空");
+ return
+ }
+ // if(null == maxSubscribeNumber || '' == maxSubscribeNumber){
+ // Feng.error("最多预约人数不能为空");
+ // return
+ // }
+ // if(null == codeTime || '' == codeTime){
+ // Feng.error("扣除课时不能为空");
+ // return
+ // }
+ // if(null == classStartTime || '' == classStartTime){
+ // Feng.error("上课时间不能为空");
+ // return
+ // }
+ // if(null == classWeeks || '' == classWeeks){
+ // Feng.error("周不能为空");
+ // return
+ // }
if (type == 1 ) {
var checkboxes1 = document.getElementsByName('payType');
@@ -260,7 +587,7 @@
if (isEmpty) {
Feng.error("请输入上课时间")
- return;
+ return;
console.log("At least one element with the name 'yourName' is empty.");
} else {
console.log("All elements with the name 'yourName' are filled.");
@@ -273,7 +600,7 @@
return
}
if (null == codeTime || '' == codeTime) {
- Feng.error("扣除课时数不能为空不能为空");
+ Feng.error("扣除课时数不能为空");
return
}
if (null == classStartTime || '' == classStartTime) {
@@ -292,177 +619,8 @@
return
}
}
- classWeeks = classWeeks.substring(0, classWeeks.length - 1);
-
- if(null == coverDrawing || '' == coverDrawing){
- Feng.error("课包封面不能为空");
- return
- }
-
- if(null == introduceDrawing || '' == introduceDrawing){
- Feng.error("课包介绍不能为空");
- return
- }
- let obj = {
- province: province,
- provinceCode: provinceCode,
- city: city,
- cityCode: cityCode,
- storeId: storeId,
- coursePackageTypeId: coursePackageTypeId,
- name: name,
- siteId: siteId,
- coachId: coachId,
- maxSubscribeNumber: maxSubscribeNumber,
- classStartTime: classStartTime,
- codeTime:codeTime,
- // classStartTime: classStartTime.split(" - ")[0],
- // classEndTime: classStartTime.split(" - ")[1],
- classWeeks: classWeeks,
- coverDrawing: coverDrawing,
- detailDrawing: imgOne,
- introduceDrawing: introduceDrawing,
- sort: sort,
- validDays: validDays,
- coursePackagePaymentConfig: JSON.stringify(price),
- type:type,
- holitime:holitime
- }
-
- //提交信息
- var ajax = new $ax(Feng.ctxPath + "/coursePackage/addCoursePackage", function (data) {
- if(data.code == 200){
- Feng.success("添加成功!");
- CoursePackageInfo.close();
- window.parent.CoursePackage.table.refresh();
- }else{
- Feng.error(data.msg);
- }
- }, function (data) {
- Feng.error("添加失败!" + data.responseJSON.message + "!");
- });
- ajax.set(obj);
- ajax.start();
-};
-
-/**
- * 提交修改
- */
-CoursePackageInfo.editSubmit = function () {
- let id = $('#id').val();
- let province = $('#provinceCode option:checked').text();
- let provinceCode = $('#provinceCode').val();
- let city = $('#cityCode option:checked').text();
- let cityCode = $('#cityCode').val();
- let storeId = $('#storeId').val();
- let coursePackageTypeId = $('#coursePackageTypeId').val();
- let name = $('#name').val();
- let siteId = $('#siteId').val();
- let coachId = $('#coachId').val();
- let maxSubscribeNumber = $('#maxSubscribeNumber').val();
- let codeTime = $('#codeTime').val();
- let type = $('#type').val();
-
-
-
-
- var goodImgs = CoursePackageInfo.goodsPicArray1;
- // if(goodImgs.length==0){
- // Feng.info("请上传赛事活动图片")
- // return;
- // }
- var imgOne ="";
- for (let i = 0; i <goodImgs.length; i++) {
- if(i==goodImgs.length-1){
- imgOne += (goodImgs[i].response)
- }else {
- imgOne+=(goodImgs[i].response+",")
- }
-
- }
-
- let holitime = $('#holitime').val();
-
- var inputElements = document.querySelectorAll('input[name="classStartTime"]');
- let classStartTime = JSON.stringify(Array.from(inputElements).map(function(element) {
- return element.value;
- }))
-
- // let classStartTime = $('#classStartTime').val();
- let classWeeks = '';
- $('input[name="classWeeks"]:checked').each(function (index, e) {
- classWeeks += $(e).val() + ";";
- })
- let coverDrawing = $('#coverDrawing').val();
- let detailDrawing = $('#detailDrawing').val();
- let introduceDrawing = $('#introduceDrawing').val();
- let sort = $('#sort').val();
- let validDays = $('#validDays').val();
- // let counpons = $($(e).find(".counpons")).val();
-
- let price = [];
- $('#price>.form-group').each(function (i, e) {
- let classHours = $($(e).find(".classNumber_span input[class='classNumber']")[0]).val();
- let cash = $($(e).find(".cash_span input[class='cash']")[0]).val();
- let paiCoin = $($(e).find(".paiCoin_span input[class='paiCoin']")[0]).val();
- let counpons = $($(e).find(".counpons")).val();
-
-
-
- price.push({
- classHours: classHours,
- cashPayment: typeof cash == "undefined" ? 0 : cash,
- playPaiCoin: typeof paiCoin == "undefined" ? 0 : paiCoin,
- couponIds: typeof counpons == "undefined" ? 0 : counpons
-
- })
- });
- if(null == provinceCode || '' == provinceCode){
- Feng.error("所在省不能为空");
- return
- }
- if(null == cityCode || '' == cityCode){
- Feng.error("所在市不能为空");
- return
- }
- if(null == storeId || '' == storeId){
- Feng.error("所属门店不能为空");
- return
- }
- if(null == coursePackageTypeId || '' == coursePackageTypeId){
- Feng.error("课程类型不能为空");
- return
- }
- if(null == name || '' == name){
- Feng.error("课包名称不能为空");
- return
- }
- if(null == siteId || '' == siteId){
- Feng.error("上课场地不能为空");
- return
- }
- if(null == coachId || '' == coachId){
- Feng.error("授课教师不能为空");
- return
- }
- // if(null == maxSubscribeNumber || '' == maxSubscribeNumber){
- // Feng.error("最多预约人数不能为空");
- // return
- // }
- // if(null == codeTime || '' == codeTime){
- // Feng.error("扣除课时不能为空");
- // return
- // }
- // if(null == classStartTime || '' == classStartTime){
- // Feng.error("上课时间不能为空");
- // return
- // }
- // if(null == classWeeks || '' == classWeeks){
- // Feng.error("周不能为空");
- // return
- // }
classWeeks = classWeeks.substring(0, classWeeks.length - 1);
if(null == coverDrawing || '' == coverDrawing){
@@ -481,7 +639,7 @@
// Feng.error("课时有效期不能为空");
// return
// }
-
+ let holitime = $('#holitime').val();
let obj = {
id: id,
province: province,
@@ -505,10 +663,12 @@
sort: sort,
validDays: validDays,
coursePackagePaymentConfig: JSON.stringify(price),
- holitime:holitime
+ holitime:$("#holitime").val()
}
-
- console.log("======="+obj)
+ console.log("看看")
+ console.log("======="+holitime)
+ console.log(holitime)
+ console.log($("#holitime").val())
//提交信息
var ajax = new $ax(Feng.ctxPath + "/coursePackage/updateCoursePackage", function (data) {
--
Gitblit v1.7.1