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 | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 5778de5..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
@@ -179,6 +179,7 @@
subArr.push($(this).find("input[name*='id']").val());
});
var str = '';
+ this.siteIds = [];
for(var i in arr){
var b = true;
for(var j in subArr){
@@ -188,6 +189,9 @@
}
}
if(b){
+ console.log("push前")
+ console.log(this.siteIds)
+
this.siteIds.push(arr[i].id);
console.log("场地push")
console.log(arr[i].id)
@@ -851,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==""){
@@ -970,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());
@@ -1003,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