From ddbb38c54db9c3670e5ff53f4bf713525de1099d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 14 十一月 2023 09:12:10 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 84 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 22 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 3fcfaf9..b1a3aab 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
@@ -253,6 +253,27 @@
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){
let pCode = $("#pCode").val()
@@ -394,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);
@@ -550,7 +576,7 @@
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tGoods/add", function(data){
if(data=="5001"){
- Feng.error("改账号已经存在");
+ Feng.error("该账号已经存在");
}else if(data=="5003"){
console.log("请选择相同运营商门店")
Feng.info("请选择相同运营商门店");
@@ -598,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()){
@@ -628,13 +654,9 @@
}else {
// 如果只有一个城市，则将cts设置为字符串
if (cityIds.length === 1) {
- console.log("是1吗？")
cts = cityIds[0];
- console.log(cts)
} else {
- console.log("走下面了")
cts = cityIds.join(',');
- console.log(cts)
}
}
}
@@ -744,7 +766,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('请至少选择一个门店');
@@ -834,6 +856,27 @@
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)
@@ -860,14 +903,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('发放数量小于已领数量!');
- }
+
+
@@ -921,7 +958,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){
@@ -946,7 +983,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>';
@@ -961,12 +998,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>';
@@ -975,13 +1012,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) {
@@ -996,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