From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 101 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 78 insertions(+), 23 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 0243903..a0ed109 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
@@ -127,9 +127,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 +148,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,11 +246,33 @@
*/
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)) {
+ Feng.error("优惠卷数量必须为数字")
+ console.log('Both quantityIssued and pickUpQuantity must be numbers.');
+ } else if (quantityIssued2 >= pickUpQuantity2) {
+
+ console.log('quantityIssued is greater than pickUpQuantity.');
+ } else {
+
+ Feng.error("发放数量必须大于等于限领数量")
+ return
+ console.log('quantityIssued is not greater than pickUpQuantity.');
+ }
+
+
let typeAll = document.querySelector('input[name="type"]:checked').value;
if(typeAll==2){
@@ -370,9 +394,12 @@
//提交信息
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.code == 200){
if(language==1){
Feng.success("添加成功!");
}else if(language==2){
@@ -388,6 +415,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);
@@ -545,6 +577,10 @@
var ajax = new $ax(Feng.ctxPath + "/tGoods/add", function(data){
if(data=="5001"){
Feng.error("改账号已经存在");
+ }else if(data=="5003"){
+ console.log("请选择相同运营商门店")
+ Feng.info("请选择相同运营商门店");
+
}else
if(data.code == 200){
if(language==1){
@@ -588,7 +624,7 @@
}
TGoodsInfoDlg.addSubmit1 = function() {
- let company = document.querySelector('input[name="company"]:checked').value;
+ let company = 3;
this.clearData();
this.collectData();
if(!this.validate()){
@@ -734,7 +770,7 @@
var stores = "";
- if (company === '3'){
+ if (company === 3 && $("#userType").val()!="3"){
console.log('3---this.storeIds',this.storeIds);
if (TGoodsInfoDlg.storeIds.length === 0 ){
return Feng.error('请至少选择一个门店');
@@ -759,6 +795,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){
@@ -821,6 +860,25 @@
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.');
+ } else if (quantityIssued1 >= pickUpQuantity1) {
+
+ console.log('quantityIssued is greater than pickUpQuantity.');
+ } else {
+
+ Feng.error("发放数量必须大于限领数量")
+ console.log('quantityIssued is not greater than pickUpQuantity.');
+ }
var imgOne ="";
console.log(goodImgs)
console.log(goodImgs.length)
@@ -847,14 +905,8 @@
if (pickUpQuantity === undefined || pickUpQuantity === null || pickUpQuantity === ''){
return Feng.error('限领数量不能为空！');
}
- let quantityHas = $("#quantityHas").val();
- if (quantityIssued <= quantityHas){
- return Feng.error('发放数量小于已领数量!');
- }
- let nums = $("#nums").val();
- if (quantityIssued <= nums){
- return Feng.error('发放数量小于已领数量!');
- }
+
+
@@ -908,7 +960,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){
@@ -933,7 +985,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>';
@@ -948,12 +1000,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>';
@@ -962,13 +1014,16 @@
}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) {
@@ -983,7 +1038,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+"'>"+v+"</option>";
});
$("#coursePackageConfigId").empty().append(content);
}
--
Gitblit v1.7.1