From d41358fce9a436d81b9341d06fc1d8f3ddff92ff Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html | 132 ++++++++++++++++++++++++++-----------------
1 files changed, 80 insertions(+), 52 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
index ef5c817..1fa75eb 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_edit.html
@@ -39,16 +39,16 @@
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
<div class="ibox float-e-margins">
<input hidden id="id" value="${data.id}">
- <input hidden id="roleType" value="${roleType}">
<div class="ibox-content">
<div class="form-horizontal" id="carInfoForm">
@if(roleType == 1){
<div class="form-group" id="provinceCode">
<label class="col-sm-3 control-label">*所在省：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TQuestion.oneChange()">
+ <select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TQuestion.oneChange(this)">
+ <option value="">请选择省</option>
@for(obj in list){
- <option value="${obj.provinceCode}" ${obj.province == data.province ? 'selected=selected' : ''}>${obj.province}</option>
+ <option style="width: 300px" value="${obj.code}" ${obj.name == data.province ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
@@ -57,71 +57,99 @@
<div class="form-group" id="cityCode">
<label class="col-sm-3 control-label">*所在市：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="cCode" name="cCode" onchange="TQuestion.oneChangeNext(this)">
- @for(obj in cities){
- <option value="${obj.cityCode}" ${obj.city == data.city ? 'selected=selected' : ''}>${obj.city}</option>
+ <select style="width: 300px" class="form-control" id="cCode" name="cCode" >
+ @for(obj in city){
+ <option style="width: 300px" value="${obj.code}"${obj.name == data.province ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
</div>
@}
- @if(roleType != 3){
+
+
<div class="form-group" >
- <label class="col-sm-3 control-label">*所属门店：</label>
+ <label class="col-sm-3 control-label">*姓名：</label>
+ <div class="col-sm-9" style="display: flex;">
+ <input style="width: 300px" class="form-control" value="${data.name}" id="learnerName" placeholder="请输入姓名" type="text">
+ </div>
+ </div>
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">*生日：</label>
+ <div class="col-sm-9" style="display: flex;">
+ <input style="width: 300px" class="form-control" value="${birthday}" id="birthday" placeholder="请选择" type="date">
+ </div>
+ </div>
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">*性别：</label>
<div class="col-sm-9">
- <select style="width: 300px" class="form-control" id="store" name="account">
- @for(obj in stores){
- <option value="${obj.id}" ${obj.id == data.storeId ? 'selected=selected' : ''}>${obj.name}</option>
+ <select style="width: 300px" class="form-control" id="gender" name = "gender">
+ <option value="" style="color: #b6b6b6" disabled selected>请选择性别</option>
+ <option value="1" ${data.gender == 1 ? 'selected=selected' : ''}>男</option>
+ <option value="2" ${data.gender == 2 ? 'selected=selected' : ''}>女</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">*联系电话：</label>
+ <div class="col-sm-9" style="display: flex;">
+ <input style="width: 300px" class="form-control" value="${data.phone}" id="phone" placeholder="请输入联系电话" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*销售人员：</label>
+ <div class="col-sm-9">
+ <select style="width: 300px" class="form-control" id="salesmanUserName" name="salesmanUserName">
+ <option value="">请选择</option>
+ @for(obj in sales){
+ <option style="width: 300px" value="${obj.id}" ${obj.id == data.salesmanUserId ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
</div>
+ @if(isVip == 1){
+ <div class="form-horizontal" id="carInfoForm1">
+ <h2>会员信息</h2>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*到期时间：</label>
+ <div class="col-sm-9" style="display: flex;">
+ <input style="width: 300px" class="form-control" value="${vipEndTime}" id="vipEndTime" placeholder="请选择" type="date">
+ </div>
+ </div>
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">*性别：</label>
+ <div class="col-sm-9">
+ <select style="width: 300px" class="form-control" id="viplevelId" name = "gender">
+ <option value="" style="color: #b6b6b6" disabled selected>请选择性别</option>
+ <option value="1" ${data.viplevelId == 1 ? 'selected=selected' : ''}>青铜</option>
+ <option value="2" ${data.viplevelId == 2 ? 'selected=selected' : ''}>白银</option>
+ <option value="3" ${data.viplevelId == 3 ? 'selected=selected' : ''}>黄金</option>
+ </select>
+ </div>
+ </div>
+ </div>
@}
- <div class="form-group" >
- <label class="col-sm-3 control-label">*家长姓名：</label>
- <div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" value="${data.parentName}" class="form-control" id="parentName" placeholder="请输入家长姓名" type="text">
- </div>
- </div>
-
- <div class="form-group" >
- <label class="col-sm-3 control-label">*家长联系方式：</label>
- <div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" value="${data.phone}" class="form-control" id="phone" placeholder="请输入家长联系方式" type="text">
- </div>
- </div>
-
- <div class="form-group" >
- <label class="col-sm-3 control-label">*学员姓名：</label>
- <div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" value="${data.learnerName}" class="form-control" id="learnerName" placeholder="请输入学员姓名" type="text">
- </div>
- </div>
-
- <div class="form-group" >
- <label class="col-sm-3 control-label">*学员年龄：</label>
- <div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" value="${data.learnerAge}" class="form-control" id="learnerAge" placeholder="请输入学员年龄" type="text">
- </div>
- </div>
-
- <div class="form-group" >
- <label class="col-sm-3 control-label">*学员生日：</label>
- <div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" value="${birthday}" class="form-control" id="birthday" placeholder="请选择" type="date">
- </div>
- </div>
-
- <div class="form-group" >
- <label class="col-sm-3 control-label">*预约时间：</label>
- <div class="col-sm-9" style="display: flex;">
- <input style="width: 300px" value="${appointmentTime}" class="form-control" id="appointmentTime" placeholder="请选择" type="datetime-local">
+ <div class="form-horizontal" id="carInfoForm2">
+ <h2>学员信息</h2>
+ <div class="form-group" style="display: flex">
+ @for(obj in students){
+ <label class="col-sm-3 control-label">*姓名：</label>
+ <div class="col-sm-9">
+ <input style="width: 300px" class="form-control" value="${obj.name}" id="studentName" type="text">
+ </div>
+ <label class="col-sm-3 control-label">*联系电话：</label>
+ <div class="col-sm-9">
+ <input style="width: 300px" class="form-control" value="${obj.phone}" id="studentPhone" type="text">
+ </div>
+ <#button btnCss="info" name="查看详情" id="ensure" icon="fa-check" clickFun="TQuestion.studentInfo(${obj.id})"/>
+ @}
</div>
</div>
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5" >
- <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TQuestion.addSubmit()"/>
+ @if(type == 1){
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TQuestion.updateSubmit()"/>
+ @}
<#button btnCss="danger" name="关闭" id="cancel" icon="fa-eraser" clickFun="TQuestion.close()"/>
</div>
</div>
@@ -131,7 +159,7 @@
</div>
-<script src="${ctxPath}/modular/system/bodySideAppointment/tBodySideAppointment_edit.js"></script>
+<script src="${ctxPath}/modular/system/appUser/tAppUser.js"></script>
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
--
Gitblit v1.7.1