From 7d22ca5a1c9416e84430a3997664e17861a2951e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js | 374 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 270 insertions(+), 104 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
index 50515ed..3c3ed88 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
@@ -15,7 +15,7 @@
TQuestion.initColumn = function () {
return [
{field: 'selectItem', checkbox: true},
- {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '省', field: 'province', visible: roleType==1?true:false, align: 'center', valign: 'middle'},
{title: '市', field: 'city', visible: roleType==1?true:false, align: 'center', valign: 'middle'},
{title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle'},
@@ -32,13 +32,23 @@
return {1:"是",0:"否"}[data]
}
},
- {title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle',
+ {title: '注册时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
+ {title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',
formatter:function (data) {
- return {1:"正常",2:"冻结",3:"已删除"}[data]
+ return {1:"正常",2:"冻结",3:"已注销"}[data]
}}
];
};
+TQuestion.close = function() {
+ // window.parent.layer.close();
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+
+ // parent.layer.close(window.parent.parent.TQuestion.layerIndex);
+ // console.log("======"+window.parent.TQuestion.layerIndex)
+ // window.close();
+}
/**
* 检查是否选中
*/
@@ -61,6 +71,7 @@
* 点击添加
*/
TQuestion.openAdd = function () {
+
var index = layer.open({
type: 2,
title: '添加分类',
@@ -79,7 +90,7 @@
TQuestion.openChange = function () {
var selected = $('#' + this.id).bootstrapTable('getSelections');
if(selected.length >1 ){
- Feng.info("只能选择一个问题进行编辑！");
+ Feng.info("只能选择一个用户进行编辑！");
}else {
if (this.check()){
var selected = $('#' + this.id).bootstrapTable('getSelections');
@@ -89,7 +100,7 @@
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/bodySideAppointment/update/' + TQuestion.seItem.id
+ content: Feng.ctxPath + '/appUser/update/' + TQuestion.seItem.id+"/"+1
});
this.layerIndex = index;
}
@@ -97,25 +108,85 @@
};
/**
+ * 查看详情
+ */
+TQuestion.openInfo = function () {
+ var selected = $('#' + this.id).bootstrapTable('getSelections');
+ if(selected.length >1 ){
+ Feng.info("只能选择一个用户进行查看！");
+ }else {
+ if (this.check()){
+ var selected = $('#' + this.id).bootstrapTable('getSelections');
+ var index = layer.open({
+ type: 2,
+ title: '编辑分类',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/appUser/update/' + TQuestion.seItem.id+"/"+2
+ });
+ this.layerIndex = index;
+ }
+ }
+};
+/**
+ * 查看学员详情
+ */
+TQuestion.studentInfo = function (e) {
+ var index = layer.open({
+ type: 2,
+ title: '详情',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tStudent/tStudent_info/' + e
+ });
+ this.layerIndex = index;
+};
+/**
+ * 添加学员
+ */
+TQuestion.openAddStudent = function (e) {
+ var selected = $('#' + this.id).bootstrapTable('getSelections');
+ if(selected.length >1 ){
+ Feng.info("只能选择一个用户进行添加学员！");
+ }else {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '详情',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/appUser/addStudent/' + TQuestion.seItem.id
+ });
+ this.layerIndex = index;
+ }
+ }
+};
+/**
* 上架
*/
TQuestion.onShelf = function () {
if (this.check()){
var selected = $('#' + this.id).bootstrapTable('getSelections');
-
- var ids=[];
+ const data1 = {
+ ids:[],
+ state:null
+ };
selected.forEach(function(obj) {
var id = obj.id;
- ids.push(id);
+ data1.ids.push(id);
});
+ data1.state = 1;
$.ajax({
- url: Feng.ctxPath + "/bodySideAppointment/changeState",
+ url: Feng.ctxPath + "/appUser/changeState",
type: "POST",
contentType: "application/json", // 设置请求头的 Content-Type
- data: JSON.stringify(ids), // 将数据转换为 JSON 字符串
+ data: JSON.stringify(data1), // 将数据转换为 JSON 字符串
success: function(response) {
- Feng.success("修改成功!");
+ Feng.success("解冻成功!");
TQuestion.search();
},
@@ -133,7 +204,6 @@
* 下架
*/
TQuestion.offShelf = function () {
-
if (this.check()){
var selected = $('#' + this.id).bootstrapTable('getSelections');
const data1 = {
@@ -145,13 +215,15 @@
data1.ids.push(id);
});
data1.state = 2;
+ console.log("看看")
+ console.log(data1)
$.ajax({
- url: Feng.ctxPath + "/bodySideAppointment/changeState",
+ url: Feng.ctxPath + "/appUser/changeState",
type: "POST",
contentType: "application/json", // 设置请求头的 Content-Type
data: JSON.stringify(data1), // 将数据转换为 JSON 字符串
success: function(response) {
- Feng.success("修改成功!");
+ Feng.success("冻结成功!");
TQuestion.search();
},
error: function(xhr, status, error) {
@@ -217,48 +289,24 @@
});
}
};
-TQuestion.oneChange = function () {
- var province = $('#pCode option:selected').text();
- var citySelect = document.getElementById("cCode");
- var ajax = new $ax(Feng.ctxPath + "/tSite/getCity", function(data){
+
+
+
+TQuestion.oneChange = function (e) {
+ var oneId=$(e).val();
+ console.log(oneId)
+ console.log("!!!!!!!!!!!!!")
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange", function(data){
if(data!=null){
var content='<option value="">选择市</option>';
$.each(data, function(k,v) {
- content += "<option value='"+v.cityCode+"'>"+v.city+"</option>";
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
});
$("#cCode").empty().append(content);
}
});
- if (province === ""){
- citySelect.innerHTML = '<option value="">请先选择省</option>';
- }
- ajax.set("province",province);
+ ajax.set("oneId",oneId);
ajax.start();
-};
-
-TQuestion.oneChangeNext = function (e) {
- var oneId=$(e).val();
- var city = $('#cCode option:selected').text();
-
- var citySelect = document.getElementById("account");
- var storeSelect = document.getElementById("store");
- if (oneId === ""){
- citySelect.innerHTML = '<option style="width: 300px" value="">请先选择省/市</option>';
- storeSelect.innerHTML = '<option style="width: 300px" value="">请先选择省/市</option>';
- }
- var ajax1 = new $ax(Feng.ctxPath + "/tSite/storeChangeNext", function(data){
- if(data!=null && data.length !== 0){
- var content='<option value="">选择门店</option>';
- $.each(data, function(k,v) {
- content += "<option style='width: 300px' value='"+v.id+"'>"+v.name+"</option>";
- });
- $("#store").empty().append(content);
- }else {
- storeSelect.innerHTML = '<option value="">当前所选市没有门店</option>';
- }
- });
- ajax1.set("oneId",city);
- ajax1.start();
};
TQuestion.addSubmit = function(){
var data = {
@@ -267,32 +315,23 @@
provinceCode:"",
city:"",
cityCode:"",
- storeId:null,
- storeName:"",
- parentName:"",
phone:"",
- learnerName:"",
- learnerAge:null,
+ name:"",
birthday:"",
- appointmentTime:"",
- status:null,
- state:null
+ gender:null,
+ salesmanUserId:null
+
};
- data.id = $("#name").val()
data.province = $('#pCode option:selected').text();
data.provinceCode = $("#pCode").val()
data.city = $('#cCode option:selected').text();
data.cityCode = $("#cCode").val()
- data.storeId = $("#store").val()
- data.storeName = $('#store option:selected').text();
- data.parentName = $("#parentName").val()
data.phone = $("#phone").val()
- data.learnerName = $("#learnerName").val()
- data.learnerAge = $("#learnerAge").val()
+ data.name = $("#learnerName").val()
data.birthday = $("#birthday").val()
- data.appointmentTime = $("#appointmentTime").val().replace("T"," ")
- console.log("看看")
- console.log(data.appointmentTime);
+ data.gender = $("#gender").val()
+ data.salesmanUserId = $("#salesmanUserName").val()
+
if($("#pCode").val()==''){
Feng.info("请选择省")
return;
@@ -301,44 +340,119 @@
Feng.info("请选择市")
return;
}
- if($("#store").val()=='' ){
- Feng.info("请选择门店")
- return;
- }
- if($("#parentName").val()=='' ){
- Feng.info("请输入家长姓名")
- return;
- }
-
if($("#phone").val()=='' ){
- Feng.info("请输入家长联系方式")
+ Feng.info("请输入联系方式")
return;
}
if($("#learnerName").val()=='' ){
Feng.info("请输入学员姓名")
return;
}
- if($("#learnerAge").val()=='' ){
- Feng.info("请输入学员年龄")
- return;
- }
if($("#birthday").val()=='' ){
- Feng.info("请选择学员生日")
+ Feng.info("请选择生日")
return;
}
- if($("#appointmentTime").val()=='' ){
- Feng.info("请选择预约时间")
+ if($("#gender").val()=='' ){
+ Feng.info("请选择性别")
return;
}
+ if($("#salesmanUserName").val()=='' ){
+ Feng.info("请选择销售人员")
+ return;
+ }
+
$.ajax({
url: Feng.ctxPath + "/appUser/addAppUser" ,
type: "POST",
data: JSON.stringify(data),
contentType: "application/json",
success: function (response) {
- window.parent.TQuestion.table.refresh();
- TQuestion.close();
- Feng.success("添加成功");
+ if (response=="5001"){
+ Feng.error("当前手机号 已被注册")
+ }else{
+ window.parent.TQuestion.table.refresh();
+ layer.closeAll('page');
+ TQuestion.close();
+ Feng.success("添加成功");
+ window.close();
+ }
+
+ },
+ error: function (xhr, status, error) {
+ Feng.error("添加失败！" + error);
+ }
+ });
+
+};
+TQuestion.addStudentSubmit = function(){
+ var data = {
+ appUserId:null,
+ phone:"",
+ name:"",
+ birthday:"",
+ sex:null,
+ idCard:"",
+ lateralSurface:"",
+ weight:null,
+ height:null,
+ state:1,
+
+ };
+ data.phone = $("#phone").val()
+ data.name = $("#name").val()
+ data.birthday = $("#birthday").val()
+ data.sex = $("#gender").val()
+ data.idCard = $("#idCard").val()
+ data.appUserId = $("#userId").val()
+ data.lateralSurface = $("#img").val()
+ data.weight = $("#weight").val()
+ data.height = $("#height").val()
+
+
+
+
+ if($("#learnerName").val()=='' ){
+ Feng.info("请输入学员姓名")
+ return;
+ }
+ if($("#birthday").val()=='' ){
+ Feng.info("请选择生日")
+ return;
+ }
+ if($("#gender").val()=='' ){
+ Feng.info("请选择性别")
+ return;
+ }
+ if($("#height").val()==''){
+ Feng.info("请输入身高")
+ return;
+ }
+ if($("#weight").val()==''){
+ Feng.info("请输入体重")
+ return;
+ }
+ if($("#phone").val()=='' ){
+ Feng.info("请输入联系方式")
+ return;
+ }
+ if($("#idCard").val()=='' ){
+ Feng.info("请输入身份证号")
+ return;
+ }
+ if($("#img").val()=='' ){
+ Feng.info("请上传体测表")
+ return;
+ }
+
+ $.ajax({
+ url: Feng.ctxPath + "/appUser/addAppUserStudent" ,
+ type: "POST",
+ data: JSON.stringify(data),
+ contentType: "application/json",
+ success: function (response) {
+ window.parent.TQuestion.table.refresh();
+ TQuestion.close();
+ Feng.success("添加成功");
},
error: function (xhr, status, error) {
Feng.error("添加失败！" + error);
@@ -349,41 +463,79 @@
TQuestion.updateSubmit = function(){
var data = {
id:null,
+ province:"",
+ provinceCode:"",
+ city:"",
+ cityCode:"",
+ phone:"",
name:"",
- position:"",
- sort:"",
+ birthday:"",
+ gender:null,
+ salesmanUserId:null
+
};
- data.name = $("#name").val()
- data.position = $("#position").val()
- data.sort = $("#sort").val()
- data.id = $("#dataId").val()
- if($("#name").val()==''){
- Feng.info("请输入分类名称")
+ data.id = $("#id").val()
+ data.province = $('#pCode option:selected').text();
+ data.provinceCode = $("#pCode").val()
+ data.city = $('#cCode option:selected').text();
+ data.cityCode = $("#cCode").val()
+ data.phone = $("#phone").val()
+ data.name = $("#learnerName").val()
+ data.birthday = $("#birthday").val()
+ data.gender = $("#gender").val()
+ data.salesmanUserId = $("#salesmanUserName").val()
+
+ if($("#pCode").val()==''){
+ Feng.info("请选择省")
return;
}
if($("#cCode").val()==''){
- Feng.info("请选择所在位置")
+ Feng.info("请选择市")
return;
}
- if($("#account").val()=='' ){
- Feng.info("请输入排序")
+ if($("#phone").val()=='' ){
+ Feng.info("请输入联系方式")
return;
}
+ if($("#learnerName").val()=='' ){
+ Feng.info("请输入学员姓名")
+ return;
+ }
+ if($("#birthday").val()=='' ){
+ Feng.info("请选择生日")
+ return;
+ }
+ if($("#gender").val()=='' ){
+ Feng.info("请选择性别")
+ return;
+ }
+ if($("#salesmanUserName").val()=='' ){
+ Feng.info("请选择销售人员")
+ return;
+ }
+
$.ajax({
- url: Feng.ctxPath + "/benefits/addBenefits" ,
+ url: Feng.ctxPath + "/appUser/addAppUser" ,
type: "POST",
data: JSON.stringify(data),
contentType: "application/json",
success: function (response) {
- window.parent.TQuestion.table.refresh();
- TQuestion.close();
- Feng.success("添加成功");
+ if (response=="5001"){
+ Feng.error("当前手机号 已被注册")
+ }else{
+ window.parent.TQuestion.table.refresh();
+ TQuestion.close();
+ Feng.success("添加成功");
+ }
+
},
error: function (xhr, status, error) {
Feng.error("添加失败！" + error);
}
});
+
};
+
/**
* 查询列表
*/
@@ -398,9 +550,7 @@
TQuestion.table.refresh({query: queryData});
};
-TQuestion.close = function() {
- parent.layer.close(window.parent.TQuestion.layerIndex);
-}
+
/**
* 重置搜索
*/
@@ -414,10 +564,26 @@
TQuestion.search(null);
};
-
+function UploadFileFn(){
+ $('#upFile').click();
+}
$(function () {
var defaultColunms = TQuestion.initColumn();
var table = new BSTable(TQuestion.id, "/appUser/listAll", defaultColunms);
table.setPaginationType("client");
TQuestion.table = table.init();
+ var carPhoto = new $WebUpload("img");
+ carPhoto.setUploadBarId("progressBar");
+ carPhoto.init();
+
+ // //提交信息
+ // var ajax = new $ax(Feng.ctxPath + "/operatorUser/mgtShopAuth", function (data) {
+ // Feng.success("添加成功!");
+ // window.parent.Course.table.refresh();
+ // CourseInfo.close();
+ // }, function (data) {
+ // Feng.error("添加失败!" + data.responseJSON.message + "!");
+ // });
+ // ajax.start();
+
});
--
Gitblit v1.7.1