From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js
index f8b2538..172d53e 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js
@@ -17,8 +17,10 @@
{field: 'selectItem', checkbox: true},
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '所在省市', field: 'provinceCity', visible: true, align: 'center', valign: 'middle'},
+ {title: '所属运营商', field: 'account', visible: true, align: 'center', valign: 'middle'},
{title: '门店名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
{title: '场地名称', field: 'siteName', visible: true, align: 'center', valign: 'middle'},
+ {title: '闸机ids', field: 'ids', visible: true, align: 'center', valign: 'middle'},
];
};
@@ -52,25 +54,28 @@
var name ='';
for(var i in selected){
if(typeof selected[i].id != "undefined"){
- console.log( selected[i].ids,55555)
- name = selected[0].accountName
- if(name!=selected[i].accountName){
+ name = selected[0].account
+ if(name!=selected[i].account){
Feng.info("请选择相同运营商场地")
return ;
}
+ console.log("arr push")
+ console.log(selected[i].id)
arr.push({
id: selected[i].id,
provinceCity: typeof selected[i].provinceCity != "undefined" ? selected[i].provinceCity : "",
- accountName: typeof selected[i].accountName != "undefined" ? selected[i].accountName : "",
+ accountName: typeof selected[i].account != "undefined" ? selected[i].account : "",
name: typeof selected[i].name != "undefined" ? selected[i].name : "",
siteName: typeof selected[i].siteName != "undefined" ? selected[i].siteName : "",
ids:typeof selected[i].ids != "undefined" ? selected[i].ids : "",
})
}
}
+ console.log("返回之前的数组")
+ console.log(arr)
window.parent.TGoodsInfoDlg.selecUserOpt1(arr);
TStoreProvince.storeOfClosePage();
-}
+};
--
Gitblit v1.7.1