From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
index 864806e..d3ede42 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
@@ -24,13 +24,7 @@
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{
title: '所属运营商', field: 'operator', visible: objectType==3?false:true, align: 'center', valign: 'middle',
- formatter: function(value, row, index) {
- if (!value || value.trim() === '' || value.trim() === 0) {
- return '平台';
- } else {
- return value;
- }
- }
+
},
{
title: '省', field: 'province', visible: objectType === 1 ? true : false, align: 'center', valign: 'middle', width: '20%',
@@ -178,9 +172,9 @@
oneId=0;
console.log("选中是平台");
} else {
+ oneId = 1;
console.log("运营商");
console.log(oneId)
-
}
var ajax = new $ax(Feng.ctxPath + "/tSite/getChangeOne", function(data){
if(data!=null){
@@ -205,12 +199,11 @@
}
});
- if (typeof(oneId) == "undefined"){
+ if (oneId == "1"){
console.log("===============")
oneId = $("#yys").val()
var button = document.getElementById("yys");
button.removeAttribute("disabled");
-
}
ajax.set("oneId",oneId);
@@ -447,6 +440,7 @@
imgs:"",
reservation:"",
isCanBeBooked:"",
+ type:"",
};
data.province = $("#pCode").val()
@@ -476,6 +470,15 @@
data.isCanBeBooked= reservation;
console.log("看看是否可预约值")
console.log(reservation);
+ var checkbox = document.querySelector('input[name="pt"]');
+ if (checkbox.checked) {
+ data.type = 1
+ console.log("选中是平台");
+ data.operatorId = 0;
+ } else {
+ console.log("运营商");
+ data.type = 2;
+ }
if (reservation == 1) {
if (data.typeName === "智慧场地") {
console.log("===========这是智慧球场")
@@ -548,9 +551,6 @@
SelectValue= yys
}
data.operatorId= SelectValue;
-
-
-
let num24 = $('input[name="name1"]');
var nextName="";
for (let i = 0; i < num24.length; i++) {
--
Gitblit v1.7.1