From f065f051e4b4791d1f1657ce46cbf2e4de469ef7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 06 十月 2025 19:54:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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 f18d924..75756e2 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
@@ -140,7 +140,6 @@
TGoodsInfoDlg.selecUserOpt = function (arrays){
//获取所有的值
var subArr= this.storeIds;
- console.log(subArr)
$(".timeClass").each(function () {
subArr.push($(this).find("input[name*='id']").val());
});
@@ -163,11 +162,16 @@
'</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
}
}
+ console.log("添加门店后的场地数组和门店数组")
+ console.log(this.storeIds)
+ console.log(this.siteIds)
$("#coun").append(str);
}
-TGoodsInfoDlg.selecUserOpt1 = function (arrays){
- console.log("进入")
- console.log(arrays)
+TGoodsInfoDlg.selecUserOpt1 = function (arr){
+ console.log(arr)
+ console.log("返回的数组")
+ console.log("此时的site集合")
+ console.log(this.siteIds)
//获取所有的值
var subArr= this.siteIds;
console.log(subArr)
@@ -175,25 +179,33 @@
subArr.push($(this).find("input[name*='id']").val());
});
var str = '';
- for(var i in arrays){
+ this.siteIds = [];
+ for(var i in arr){
var b = true;
for(var j in subArr){
- if(arrays[i].id === Number(subArr[j])){
+ if(arr[i].id === Number(subArr[j])){
b = false;
break
}
}
if(b){
- this.siteIds.push(arrays[i].id)
+ console.log("push前")
+ console.log(this.siteIds)
+
+ this.siteIds.push(arr[i].id);
+ console.log("场地push")
+ console.log(arr[i].id)
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><input type="hidden" id="siteName" name="siteName" value="'+arrays[i].siteName+'">' + arrays[i].siteName +
- '<td><input type="hidden" id="ids" name="ids" value="'+arrays[i].ids+'">' + arrays[i].ids +
+ '<td><input type="hidden" id="id" name="id" value="'+arr[i].id+'"><input type="hidden" id="provinceCity" name="provinceCity" value="'+arr[i].provinceCity+'">' + arr[i].provinceCity + '</td>' +
+ '<td><input type="hidden" id="accountName" name="accountName" value="'+arr[i].accountName+'">' + arr[i].accountName + '</td>' +
+ '<td><input type="hidden" id="name" name="name" value="'+arr[i].name+'">' + arr[i].name +
+ '<td><input type="hidden" id="siteName" name="siteName" value="'+arr[i].siteName+'">' + arr[i].siteName +
+ '<td><input type="hidden" id="ids" name="ids" value="'+arr[i].ids+'">' + arr[i].ids +
'</td><td><button onclick="deleteSub1(this)">移除</button></td></tr>';
}
}
+ console.log("这是场地ids")
+ console.log(this.siteIds)
$("#coun1").append(str);
}
function deleteSub(e) {
@@ -677,6 +689,9 @@
}
TGoodsInfoDlg.addSubmit1 = function() {
+ console.log("看看门店ids和场地ids")
+ console.log(this.siteIds)
+ console.log(this.storeIds)
var company = 3;
var radioButtons = document.getElementsByName("company");
for (var i = 0; i < radioButtons.length; i++) {
@@ -840,6 +855,10 @@
sites = this.siteIds.join(',');
console.log('sites--===--',sites)
}
+ if ($("#userType").val() == 3){
+
+ sites = this.siteIds.join(',');
+ }
let text = TGoodsInfoDlg.editor.getContent();
console.log(text)
if(text==""){
@@ -885,7 +904,6 @@
ajax.set("typeAll",3);
ajax.set("name",name);
ajax.set("price",price);
- ajax.set("sites",sites);
ajax.set("type",type);
ajax.set("integral",integral);
ajax.set("cash",cash);
@@ -897,6 +915,7 @@
ajax.set("startTime",startTime);
ajax.set("useScope",company);
ajax.set("cityIds",cts);
+ ajax.set("sites",sites);
ajax.set("storeIds",stores);
ajax.set("text",text);
ajax.set("sort",sort);
@@ -959,6 +978,7 @@
}
console.log("结果图片")
console.log(imgOne)
+ let name = $("#name").val();
let quantityIssued = $("#quantityIssued").val();
let pickUpQuantity = $("#pickUpQuantity").val();
let editor = jQuery.trim(TGoodsInfoDlg.editor.getContent());
@@ -992,6 +1012,7 @@
},function(data){
Feng.error("修改失败!" + data.responseJSON.message + "!");
});
+ ajax.set("name",name);
ajax.set("pointMerchandiseId",goodsId);
ajax.set("quantityIssued",quantityIssued);
ajax.set("pickUpQuantity",pickUpQuantity);
--
Gitblit v1.7.1