From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 362 ++++++++++++++++++++++-----------------------------
1 files changed, 157 insertions(+), 205 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
index ee82233..1a40591 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
@@ -16,9 +16,7 @@
* 验证数据是否为空
*/
TGoodsInfoDlg.validate = function () {
- $('#carInfoForm').data("bootstrapValidator").resetForm();
- $('#carInfoForm').bootstrapValidator('validate');
- return $("#carInfoForm").data('bootstrapValidator').isValid();
+
};
/**
@@ -127,9 +125,10 @@
this.layerIndex = index;
}
TGoodsInfoDlg.selecUserOpt = function (arrays){
- console.log(arrays)
+
//获取所有的值
var subArr= this.storeIds;
+ console.log(subArr)
$(".timeClass").each(function () {
subArr.push($(this).find("input[name*='id']").val());
});
@@ -147,11 +146,12 @@
str += '<tr class="timeClass">' +
'<td><input type="hidden" id="id" name="id" value="'+arrays[i].id+'"><input type="hidden" id="provinceCity" name="provinceCity" value="'+arrays[i].provinceCity+'">' + arrays[i].provinceCity + '</td>' +
'<td><input type="hidden" id="accountName" name="accountName" value="'+arrays[i].accountName+'">' + arrays[i].accountName + '</td>' +
- '<td><input type="hidden" id="name" name="name" value="'+arrays[i].name+'">' + arrays[i].name + '</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
+ '<td><input type="hidden" id="name" name="name" value="'+arrays[i].name+'">' + arrays[i].name +
+ '<td><input type="hidden" id="ids" name="ids" value="'+arrays[i].ids+'">' + arrays[i].ids +
+ '</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
}
}
$("#coun").append(str);
- console.log('storeIds',this.storeIds)
}
function deleteSub(e) {
console.log(e);
@@ -244,12 +244,21 @@
*/
TGoodsInfoDlg.addSubmit = function() {
+
this.clearData();
this.collectData();
- if(!this.validate()){
- return ;
- }
+ const quantityIssuedInput = document.getElementById('quantityIssued');
+ const pickUpQuantityInput = document.getElementById('pickUpQuantity');
+ const quantityIssued2 = Number(quantityIssuedInput.value);
+ const pickUpQuantity2 = Number(pickUpQuantityInput.value);
+
+ if (isNaN(quantityIssued2) || isNaN(pickUpQuantity2)) {
+ } else if (quantityIssued2 >= pickUpQuantity2) {
+ } else {
+ Feng.error("发放数量必须大于等于限领数量")
+ return
+ }
let typeAll = document.querySelector('input[name="type"]:checked').value;
if(typeAll==2){
let pCode = $("#pCode").val()
@@ -370,9 +379,19 @@
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tGoods/add", function(data){
if(data=="5001"){
- Feng.error("改账号已经存在");
- }else
- if(data.code == 200){
+ Feng.info("改账号已经存在");
+ }else if(data=="5003"){
+ console.log("请选择相同运营商门店")
+ Feng.info("请选择相同运营商门店");
+
+ }else if (data==5009){
+ Feng.error("有效期开始时间不应小于假期课开始时间");
+ return;
+ }else if (data==5008){
+ Feng.error("有效期结束时间不应大于假期课结束时间");
+ return;
+ }
+ else if(data.code == 200){
if(language==1){
Feng.success("添加成功!");
}else if(language==2){
@@ -388,6 +407,11 @@
},function(data){
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
+ var selectElement = document.getElementById("coursePackageId");
+ var selectedText = selectElement.options[selectElement.selectedIndex].text;
+
+ ajax.set("name",selectedText);
+
ajax.set("typeAll",typeAll);
ajax.set("provinceCode",pCode);
ajax.set("cityCode",cCode);
@@ -543,10 +567,22 @@
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tGoods/add", function(data){
+ console.log("看看返回参数")
+ console.log(data)
if(data=="5001"){
- Feng.error("改账号已经存在");
- }else
- if(data.code == 200){
+ Feng.error("该账号已经存在");
+ return;
+ }else if(data=="5003"){
+ console.log("请选择相同运营商门店")
+ Feng.error("请选择相同运营商门店");
+ return;
+ }else if (data==5009){
+ Feng.error("有效期开始时间不应小于假期课开始时间");
+ return;
+ }else if (data==5008){
+ Feng.error("有效期结束时间不应大于假期课结束时间");
+ return;
+ } else if(data.code == 200){
if(language==1){
Feng.success("添加成功!");
}else if(language==2){
@@ -557,7 +593,9 @@
window.parent.TPointProducts.table.refresh();
TGoodsInfoDlg.close();
}else{
+ console.log("走这里")
Feng.error(data.msg);
+ return;
}
},function(data){
@@ -588,174 +626,41 @@
}
TGoodsInfoDlg.addSubmit1 = function() {
-
+ let company = 3;
this.clearData();
this.collectData();
- if(!this.validate()){
- return ;
+ var cityIds = [];
+ var cts = "";
+ if (company === '2'){
+ var myselect=document.getElementById('cityData');
+ var seCity = myselect.options[myselect.selectedIndex].value;
+ if (seCity === null || seCity === undefined || seCity === ''){
+ return Feng.error('请选中一个省市');
+ }
+ cityIds.push(seCity);
+ console.log("看看num")
+ console.log(num)
+ if (num > 0){
+ for (let i = 1; i <= num; i++) {
+ var insSelect=document.getElementById('cityData'+i);
+ var inData = insSelect.options[insSelect.selectedIndex].value;
+ if (inData !== undefined || inData !== null || inData !== ''){
+ cityIds.push(inData);
+ }
+ }
+
+
+ }else {
+ // 如果只有一个城市，则将cts设置为字符串
+ if (cityIds.length === 1) {
+ cts = cityIds[0];
+ } else {
+ cts = cityIds.join(',');
+ }
+ }
}
- let typeAll = document.querySelector('input[name="type"]:checked').value;
- if(typeAll==2){
- let pCode = $("#pCode").val()
- let cCode = $("#cCode").val()
- if(pCode==''){
- Feng.info("请选择省")
- return;
- }
- if(cCode==''){
- Feng.info("请选择市")
- return;
- }
- let storeId = $("#storeId").val()
- if(storeId==''){
- Feng.info("请选择门店")
- return;
- }
- let coursePackageTypeId = $("#coursePackageTypeId").val()
- if(coursePackageTypeId==''){
- Feng.info("请选择课包类型")
- return;
- }
- let coursePackageId = $("#coursePackageId").val()
- if(coursePackageId==''){
- Feng.info("请选择课包")
- return;
- }
- let coursePackageConfigId = $("#coursePackageConfigId").val()
- if(coursePackageConfigId==''){
- Feng.info("请选择课时数")
- return;
- }
- let price = $("#price1").val()
- if(price==''){
- Feng.info("请填写原价")
- return;
- }
let type = document.querySelector('input[name="redemptionMethod"]:checked').value;
- if(type==''){
- Feng.info("请选择兑换方式")
- return;
- }
- let integral='';
- let cash='';
- if(type==1){
- integral = $("#integral1").val()
- if(integral==''){
- Feng.info("请填写所需积分")
- return;
- }
- }
- if(type==2){
- integral = $("#integral1").val()
- if(integral==''){
- Feng.info("请填写所需积分")
- return;
- }
- cash = $("#cash1").val()
- if(cash==''){
- Feng.info("请填写所需现金")
- return;
- }
- }
-
- let cover1 = $("#cover1").val()
- // if(cover1==''){
- // Feng.info("请上传封面")
- // return;
- // }
- var goodImgs = this.goodsPicArray1;
- var imgOne ="";
- if(goodImgs.length==0){
- }else {
- for (let i = 0; i <goodImgs.length; i++) {
- if(i==goodImgs.length-1){
- imgOne += (goodImgs[i].response)
- }else {
- imgOne+=(goodImgs[i].response+",")
- }
- }
- }
-
- let userPopulation = document.querySelector('input[name="userPopulation"]:checked').value;
-
- if(userPopulation==''){
- Feng.info("请选择用户人群")
- return;
- }
-
- let quantityIssued = $("#quantityIssued1").val()
- if(quantityIssued==''){
- Feng.info("请填写发放数量")
- return;
- }
- let pickUpQuantity = $("#pickUpQuantity1").val()
- if(pickUpQuantity==''){
- Feng.info("请填写限领数量")
- return;
- }
- let startTime = $("#startTime1").val()
- if(startTime==''){
- Feng.info("请选择有效期")
- return;
- }
- let text = TGoodsInfoDlg.editor1.getContent();
- console.log(text)
- if(text==""){
- Feng.info("请输入兑换说明")
- return;
- }
-
- let sort = $("#sort1").val()
- if(sort==''){
- Feng.info("请填写排序")
- return;
- }
-
-
- //提交信息
- var ajax = new $ax(Feng.ctxPath + "/tGoods/add", function(data){
- if(data=="5001"){
- Feng.error("改账号已经存在");
- }else
- if(data.code == 200){
- if(language==1){
- Feng.success("添加成功!");
- }else if(language==2){
- Feng.success("Successfully added!");
- }else {
- Feng.success("Sangat berhasil ditambah!");
- }
- window.parent.TPointProducts.table.refresh();
- TGoodsInfoDlg.close();
- }else{
- Feng.error(data.msg);
- }
- },function(data){
- Feng.error("添加失败!" + data.responseJSON.message + "!");
- });
- ajax.set("typeAll",typeAll);
- ajax.set("provinceCode",pCode);
- ajax.set("cityCode",cCode);
- ajax.set("storeId",storeId);
- ajax.set("coursePackageTypeId",coursePackageTypeId);
- ajax.set("coursePackageId",coursePackageId);
- ajax.set("coursePackageConfigId",coursePackageConfigId);
- ajax.set("price",price);
- ajax.set("type",type);
- ajax.set("integral",integral);
- ajax.set("cash",cash);
- ajax.set("cover",cover1);
- ajax.set("imgOne",imgOne);
- ajax.set("userPopulation",userPopulation);
- ajax.set("quantityIssued",quantityIssued);
- ajax.set("pickUpQuantity",pickUpQuantity);
- ajax.set("startTime",startTime);
- ajax.set("text",text);
- ajax.set("sort",sort);
- ajax.start();
-
- }else {
let name = $("#name").val()
if(name==''){
Feng.info("请填写商品名称")
@@ -836,8 +741,7 @@
return;
}
- var cityIds = [];
- var cts = "";
+
// var myselect=document.getElementById('cityData');
// var seCity = myselect.options[myselect.selectedIndex].value;
// if (seCity === null || seCity === undefined || seCity === ''){
@@ -860,7 +764,15 @@
const commaSeparatedString = this.goodsPicArray.join(',');
-
+ var stores = "";
+ if (company === 3 && $("#userType").val()!="3"){
+ console.log('3---this.storeIds',this.storeIds);
+ if (TGoodsInfoDlg.storeIds.length === 0 ){
+ return Feng.error('请至少选择一个门店');
+ }
+ stores = this.storeIds.join(',');
+ console.log('stores--===--',stores)
+ }
let text = TGoodsInfoDlg.editor.getContent();
console.log(text)
if(text==""){
@@ -878,6 +790,9 @@
var ajax = new $ax(Feng.ctxPath + "/tGoods/add", function(data){
if(data=="5001"){
Feng.error("改账号已经存在");
+ }else if(data=="5003"){
+ Feng.info("请选择相同运营商门店");
+
}else
if(data.code == 200){
if(language==1){
@@ -896,10 +811,12 @@
},function(data){
Feng.error("添加失败!" + data.responseJSON.message + "!");
});
- ajax.set("typeAll",typeAll);
+ console.log("看看城市ids")
+ console.log(cts);
+ ajax.set("typeAll",3);
ajax.set("name",name);
ajax.set("price",price);
- ajax.set("type",3);
+ ajax.set("type",type);
ajax.set("integral",integral);
ajax.set("cash",cash);
ajax.set("cover",cover1);
@@ -908,17 +825,13 @@
ajax.set("quantityIssued",quantityIssued);
ajax.set("pickUpQuantity",pickUpQuantity);
ajax.set("startTime",startTime);
- ajax.set("useScope",1);
+ ajax.set("useScope",company);
ajax.set("cityIds",cts);
- ajax.set("storeIds","");
+ ajax.set("storeIds",stores);
ajax.set("text",text);
ajax.set("sort",sort);
ajax.set("cardType",document.querySelector('input[name="type"]:checked').value);
ajax.start();
-
- }
-
-
}
/**
* 删除图片的函数
@@ -936,10 +849,46 @@
TGoodsInfoDlg.editSubmit = function() {
let cover = $("#cover").val();
let goodsId = $("#goodsId").val();
- var productImages = "";
- if (TGoodsInfoDlg.goodsPicArray.length > 0){
- productImages = TGoodsInfoDlg.goodsPicArray.join(',');
+ var goodImgs = TGoodsInfoDlg.goodsPicArray;
+
+ if(goodImgs.length==0){
+ Feng.info("请上传实景图")
+ return;
}
+
+
+ const quantityIssuedInput = document.getElementById('quantityIssued');
+ const pickUpQuantityInput = document.getElementById('pickUpQuantity');
+
+ const quantityIssued1 = Number(quantityIssuedInput.value);
+ const pickUpQuantity1 = Number(pickUpQuantityInput.value);
+
+ if (isNaN(quantityIssued1) || isNaN(pickUpQuantity1)) {
+ Feng.error("优惠卷数量必须为数字")
+ console.log('Both quantityIssued and pickUpQuantity must be numbers.');
+ return
+ } else if (quantityIssued1 >= pickUpQuantity1) {
+
+ console.log('quantityIssued is greater than pickUpQuantity.');
+ } else {
+
+ Feng.error("发放数量必须大于限领数量")
+ return
+ console.log('quantityIssued is not greater than pickUpQuantity.');
+ }
+ var imgOne ="";
+ console.log(goodImgs)
+ console.log(goodImgs.length)
+ for (let i = 0; i <goodImgs.length; i++) {
+ console.log(goodImgs[i].response,11)
+ if(i==goodImgs.length-1){
+ imgOne += (goodImgs[i].response)
+ }else {
+ imgOne+=(goodImgs[i].response+",")
+ }
+ }
+ console.log("结果图片")
+ console.log(imgOne)
let quantityIssued = $("#quantityIssued").val();
let pickUpQuantity = $("#pickUpQuantity").val();
let editor = jQuery.trim(TGoodsInfoDlg.editor.getContent());
@@ -953,10 +902,9 @@
if (pickUpQuantity === undefined || pickUpQuantity === null || pickUpQuantity === ''){
return Feng.error('限领数量不能为空！');
}
- let quantityHas = $("#quantityHas").val();
- if (quantityIssued <= quantityHas){
- return Feng.error('发放数量小于已领数量!');
- }
+
+
+
if (editor === undefined || editor === null || editor === ''){
@@ -979,7 +927,7 @@
ajax.set("pickUpQuantity",pickUpQuantity);
ajax.set("redemptionInstructions",editor);
ajax.set("cover",cover);
- ajax.set("productImages",productImages);
+ ajax.set("productImages",imgOne);
ajax.set("sort",sort);
ajax.start();
}
@@ -996,7 +944,6 @@
TGoodsInfoDlg.editor = UE.getEditor('editor');
TGoodsInfoDlg.editor1 = UE.getEditor('editor1');
getProvince(null);
- Feng.initValidator("carInfoForm", TGoodsInfoDlg.validateFields);
var drivingLicensePhoto = new $WebUpload("drivingLicensePhoto");
drivingLicensePhoto.setUploadBarId("progressBar");
drivingLicensePhoto.init();
@@ -1009,7 +956,7 @@
/**
* 选择分公司后执行
*/
-TGoodsInfoDlg.oneChange = function () {
+TGoodsInfoDlg.oneChange = function (e) {
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tCity/onChange", function(data){
if(data!=null){
@@ -1034,7 +981,7 @@
}
TGoodsInfoDlg.storeChange = function (e) {
var oneId=$(e).val();
- var ajax = new $ax(Feng.ctxPath + "/tCity/storeChange", function(data){
+ var ajax = new $ax(Feng.ctxPath + "/coursePackage/queryStore", function(data){
if(data!=null){
if(language==1){
var content='<option value="">选择门店</option>';
@@ -1049,12 +996,12 @@
$("#storeId").empty().append(content);
}
});
- ajax.set("oneId",oneId);
+ ajax.set("cityCode",oneId);
ajax.start();
}
TGoodsInfoDlg.packageChange = function (e) {
var oneId=$(e).val();
- var ajax = new $ax(Feng.ctxPath + "/tCity/packageChange", function(data){
+ var ajax = new $ax(Feng.ctxPath + "/coursePackage/queryCoursePackageLists", function(data){
if(data!=null){
if(language==1){
var content='<option value="">选择课包</option>';
@@ -1063,15 +1010,20 @@
}else {
var content='<option value="">Pilih franchisee Anda</option>';
}
- $.each(data, function(k,v) {
+ $.each(data.rows, function(k,v) {
content += "<option value='"+v.id+"'>"+v.name+"</option>";
});
$("#coursePackageId").empty().append(content);
}
});
- ajax.set("oneId",oneId);
+ ajax.set("coursePackageTypeId",oneId);
+ ajax.set("order","desc");
+ ajax.set("offset",0);
+ ajax.set("limit",100);
ajax.start();
}
+
+
TGoodsInfoDlg.timeChange = function (e) {
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tCity/timeChange", function(data){
@@ -1084,7 +1036,7 @@
var content='<option value="">Pilih franchisee Anda</option>';
}
$.each(data, function(k,v) {
- content += "<option value='"+v.id+"'>"+v.classHours+"</option>";
+ content += "<option value='"+v.id+"'>"+v.value+"</option>";
});
$("#coursePackageConfigId").empty().append(content);
}
--
Gitblit v1.7.1