From 4d4b7420ed65a304921a3de201c9f23e91da064b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 12 五月 2024 13:55:28 +0800
Subject: [PATCH] 5.11
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java | 22 +
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/tUser.html | 75 ++++++
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice_info.js | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice.js | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js | 15 +
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java | 5
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html | 1
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSmallPrice_edit.html | 182 +++++++++++++++
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js | 412 ++++++++++++++++++++++++++++++++++
9 files changed, 713 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
index fd0f70a..1d4a4a3 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
@@ -45,6 +45,11 @@
return PREFIX + "sysRedPacketRecord.html";
}
+ @RequestMapping("/tUser")
+ public String tUser() {
+ return PREFIX + "tUser.html";
+ }
+
/**
* 跳转到添加
*/
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
index 38514c8..c260e41 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -107,7 +107,7 @@
//查询所有专车车型
Integer objectId = ShiroKit.getUser().getObjectId();
List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", objectId).ne("state", 3));
- List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1));
+ List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("isPackage", 1).eq("state", 1));
List<TServerCarmodel> serverCarmodels = new ArrayList<>();
for(TServerCarmodel tsc : modelList){
boolean b = true;
@@ -245,6 +245,26 @@
return SUCCESS_TIP;
}
+ @RequestMapping(value = "/smallupdate")
+ @ResponseBody
+ public Object smallupdate(TSystemPrice tSystemPrice) {
+ TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
+ if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
+ //判断当前公司是否添加过该专车车型价格配置
+ int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
+ .eq("isPackage", 1)
+ .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
+ .eq("companyId",ShiroKit.getUser().getObjectId())
+ .last(" and not FIND_IN_SET(state,'3')"));
+ if (count > 0){
+ TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
+ return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
+ }
+ }
+ tSystemPriceService.updateById(tSystemPrice);
+ return SUCCESS_TIP;
+ }
+
/**
* 修改状态
*/
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html
index 4752c82..f081a85 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html
@@ -20,6 +20,7 @@
<div class="hidden-xs" id="SysRedPacketRecordTableToolbar" role="group">
@if(shiro.hasPermission("/sysRedPacketRecord/add")){
<#button name="添加" icon="fa-plus" clickFun="SysRedPacketRecord.openAddSysRedPacketRecord()"/>
+ <#button name="指定派发" icon="fa-plus" clickFun="SysRedPacketRecord.userList()"/>
@}
@if(shiro.hasPermission("/sysRedPacketRecord/update")){
<#button name="修改" icon="fa-edit" clickFun="SysRedPacketRecord.openSysRedPacketRecordDetail()" space="true"/>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/tUser.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/tUser.html
new file mode 100644
index 0000000..7aa0ebb
--- /dev/null
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/tUser.html
@@ -0,0 +1,75 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="注册时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="id" name="用户ID" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nickName" name="昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="isAuth" name="是否实名认证" >
+ <option value="">全部</option>
+ <option value="1">否</option>
+ <option value="2">是</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TUser.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TUser.resetSearch()" space="true"/>
+ </div>
+ <div class="col-sm-3">
+ <input type="file" name="file" style="width:0px;height:0px;" id="uploadEventFile" onchange="TUser.exportUser()">
+ </div>
+ </div>
+ <div class="hidden-xs" id="TUserTableToolbar" role="group">
+
+ </div>
+ <#table id="TUserTable"/>
+<!-- <#button name="冻结" icon="fa-remove" clickFun="TUser.freezeUser()" space="true"/>-->
+<!-- <#button name="解冻" icon="fa-remove" clickFun="TUser.trawUser()" space="true"/>-->
+
+ <div style="display: flex; justify-content: center;">
+ <button type="button" class="btn btn-primary button-margin" onclick="TUser.freezeUser()" id="">
+ <i class="fa fa-remove"></i> 冻结
+ </button>
+ </div>
+
+
+
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysRedPacketRecord/tUser.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSmallPrice_edit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSmallPrice_edit.html
new file mode 100644
index 0000000..43b1504
--- /dev/null
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSmallPrice_edit.html
@@ -0,0 +1,182 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="specialPriceInfoForm">
+ <label style="display: none;" id="id">${item.id}</label>
+ <div class="row">
+ <div class="col-sm-111">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-10">
+ <select class="form-control" id="serverCarModelId" name="serverCarModelId" disabled style="width: 200px;">
+ <option value="">选择车型</option>
+ @for(obj in modelList!){
+ <option value="${obj.id}" ${obj.id == item.serverCarModelId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">运价类型说明：</label>
+ <div class="col-sm-10">
+ <textarea class="form-control" id="fareTypeNote" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote}</textarea>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">起步价设置：</label>
+ <div class="col-sm-10">
+ 起步价为 <input type="text" oninput="checkIsYuan(this)" name="num1" id="num1" value="${json.num1}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" oninput="checkIsGongLi(this)" name="num2" id="num2" value="${json.num2}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" oninput="checkIsMinute(this)" name="num3" id="num3" value="${json.num3}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">里程费设置：</label>
+ <div class="col-sm-10">
+ 超过起步里程后每公里 <input type="text" oninput="checkIsYuan(this)" name="num4" id="num4" value="${json.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">时长费设置：</label>
+ <div class="col-sm-10">
+ 超过起步时长后每分钟 <input type="text" oninput="checkIsYuan(this)" name="num5" id="num5" value="${json.num5}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">等待费设置：</label>
+ <div class="col-sm-10">
+ 司机到达预约地点 <input type="text" oninput="checkIsMinute(this)" name="num6" id="num6" value="${json.num6}" class="form-control newWidth" placeholder="最多3位数"/> 分钟过后开始收取等待费,
+ 为 <input type="text" oninput="checkIsYuan(this)" name="num7" id="num7" value="${json.num7}" class="form-control newWidth" placeholder="最多3位数"/> 元/分,不足一分钟按照一分钟计算
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">远途费设置：</label>
+ <div class="col-sm-10">
+ 总里程超过 <input type="text" oninput="checkIsGongLi(this)" name="num8" id="num8" value="${json.num8}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" oninput="checkIsGongLi(this)" name="num9" id="num9" value="${json.num9}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num10" id="num10" value="${json.num10}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 超过 <input type="text" disabled oninput="checkIsGongLi(this)" name="num11" id="num11" value="${json.num11}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" oninput="checkIsGongLi(this)" name="num12" id="num12" value="${json.num12}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num13" value="${json.num13}" id="num13" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ <br>
+ 超过 <input type="text" disabled oninput="checkIsGongLi(this)" name="num14" id="num14" value="${json.num14}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num15" id="num15" value="${json.num15}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+ <!--
+ <div class="form-group">
+ <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
+ <div class="col-sm-10">
+ <input type="text" name="num16" id="num16" value="${json.num16}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" oninput="checkIsYuan(this)" name="num17" id="num17" value="${json.num17}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 里程费为每公里 <input type="text" oninput="checkIsYuan(this)" name="num18" id="num18" value="${json.num18}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" oninput="checkIsYuan(this)" name="num19" id="num19" value="${json.num19}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 远途费为每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num20" id="num20" value="${json.num20}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num21" id="num21" value="${json.num21}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num22" id="num22" value="${json.num22}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+ -->
+ <div class="form-group">
+ <label class="col-sm-2 control-label">高峰期费用设置：</label>
+ <div class="col-sm-10">
+ <input type="text" name="num23" id="num23" value="${json.num23}" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num24" id="num24" value="${json.num24}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" oninput="checkIsYuan(this)" name="num25" id="num25" value="${json.num25}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 里程费为每公里 <input type="text" oninput="checkIsYuan(this)" name="num26" id="num26" value="${json.num26}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" oninput="checkIsYuan(this)" name="num27" id="num27" value="${json.num27}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 远途费为每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num28" id="num28" value="${json.num28}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num29" id="num29" value="${json.num29}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num30" id="num30" value="${json.num30}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ </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="TSystemPriceInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSystemPriceInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/tSmallPrice_info.js"></script>
+<script type="text/javascript">
+ laydate.render({
+ elem: '#num16'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ laydate.render({
+ elem: '#num23'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ laydate.render({
+ elem: '#num24'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+
+ var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
+ var regInt = /^[0-9]{0,3}$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】输入框不能超过3位数,保留两位小数");
+ }
+ }
+ function checkIsGongLi(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【公里】输入框不能超过3位数,保留两位小数");
+ }
+ if (obj.id == "num9"){
+ $("#num11").val(num);
+ }else if (obj.id == "num12"){
+ $("#num14").val(num);
+ }
+ }
+ function checkIsMinute(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("【分钟】输入框不能超过3位数");
+ }
+ }
+
+</script>
+@}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js
index 5a19b08..29a9b55 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js
@@ -13,6 +13,7 @@
*/
SysRedPacketRecord.initColumn = function () {
return [
+ {field: 'selectItem', radio: true},
{title: '', field: 'id', visible: false, align: 'center', valign: 'middle'},
{title: '添加时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
{title: '红包名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
@@ -40,6 +41,20 @@
];
};
+SysRedPacketRecord.userList= function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/sysRedPacketRecord/tUser'
+ });
+ this.layerIndex = index;
+ }
+};
+
/**
* 检查是否选中
*/
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js
new file mode 100644
index 0000000..e0dde2d
--- /dev/null
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js
@@ -0,0 +1,412 @@
+/**
+ * 用户管理管理初始化
+ */
+var TUser = {
+ id: "TUserTable", //表格id
+ seItem: null, //选中的条目
+ table: null,
+ layerIndex: -1
+};
+
+/**
+ * 鼠标悬停提示框 class .toolTip 为无效样式，作用于个别选择器使用
+ */
+TUser.tooltip = function(){
+ $(".toolTip").tooltip();
+};
+
+/**
+ * 初始化表格的列
+ */
+TUser.initColumn = function () {
+ return [
+ {field: 'selectItem', checkbox: true},
+ {title: '注册时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle',width:'10%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.insertTime != '' && row.insertTime != null) {
+ var time = row.insertTime.replace(" ",'<br>');
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.insertTime + '" onfocus="TUser.tooltip()">' + time + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '用户ID', field: 'id', visible: true, align: 'center', valign: 'middle',width:'8%'},
+ /* {title: '注册地IP', field: 'registIp', visible: true, align: 'center', valign: 'middle',width:'5%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.registIp != '' && row.registIp != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.registIp + '" onfocus="TUser.tooltip()">' + row.registIp + '</p>']
+ }
+ return btn;
+ }
+ },*/
+ {title: '注册地所<br/>属分公司ID', field: 'companyId', visible: false, align: 'center', valign: 'middle',width:'8%'},
+ {title: '注册地所<br/>属分公司', field: 'companyName', visible: true, align: 'center', valign: 'middle',width:'8%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.companyName != '' && row.companyName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.companyName + '" onfocus="TUser.tooltip()">' + row.companyName + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '昵称', field: 'nickName', visible: true, align: 'center', valign: 'middle',width:'10%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.nickName != '' && row.nickName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.nickName + '" onfocus="TUser.tooltip()">' + row.nickName + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '手机号', field: 'phone', visible: true, align: 'center', valign: 'middle',width:'8%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.phone != '' && row.phone != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.phone + '" onfocus="TUser.tooltip()">' + row.phone + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '邮箱', field: 'email', visible: true, align: 'center', valign: 'middle',width:'8%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.email != '' && row.email != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.email + '" onfocus="TUser.tooltip()">' + row.email + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '紧急联系人<br/>姓名', field: 'emergencyContact', visible: true, align: 'center', valign: 'middle',width:'8%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.emergencyContact != '' && row.emergencyContact != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.emergencyContact + '" onfocus="TUser.tooltip()">' + row.emergencyContact + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '紧急联系人<br/>电话', field: 'emergencyContactNumber', visible: true, align: 'center', valign: 'middle',width:'8%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.emergencyContactNumber != '' && row.emergencyContactNumber != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.emergencyContactNumber + '" onfocus="TUser.tooltip()">' + row.emergencyContactNumber + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '是否实<br/>名认证', field: 'isAuth', visible: true, align: 'center', valign: 'middle',width:'5%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.isAuth != '' && row.isAuth != null) {
+ if (row.isAuth == 1){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="否" onfocus="TUser.tooltip()">否</p>']
+ } else if (row.isAuth == 2){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="是" onfocus="TUser.tooltip()">是</p>']
+ }
+ }
+ return btn;
+ }
+ },
+ {title: '历史出<br/>行次数', field: 'historyNum', visible: true, align: 'center', valign: 'middle',width:'5%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.historyNum != '' && row.historyNum != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.historyNum + '" onfocus="TUser.tooltip()">' + row.historyNum + '</p>']
+ }else {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="0" onfocus="TUser.tooltip()">0</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '历史消费', field: 'consumptionNum', visible: true, align: 'center', valign: 'middle',width:'5%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.consumptionNum != '' && row.consumptionNum != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="¥' + row.consumptionNum + '" onfocus="TUser.tooltip()">¥' + row.consumptionNum + '</p>']
+ }else {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="¥0.00" onfocus="TUser.tooltip()">¥0.00</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '积分', field: 'integral', visible: true, align: 'center', valign: 'middle',width:'5%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.integral != '' && row.integral != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.integral + '" onfocus="TUser.tooltip()">' + row.integral + '</p>']
+ }else {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="0" onfocus="TUser.tooltip()">0</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '备注', field: 'remark', visible: true, align: 'center', valign: 'middle',width:'10%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.remark != '' && row.remark != null){
+ var str = row.remark;
+ if (row.remark.length > 10){
+ str = row.remark.substring(0,10)+"...";
+ }
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.remark + '" onfocus="TUser.tooltip()">' + str + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',width:'5%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.state != '' && row.state != null) {
+ if (row.state == 1){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color: #0d8ddb;" title="正常" onfocus="TUser.tooltip()">正常</p>']
+ } else if (row.state == 2){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color: red;" title="冻结" onfocus="TUser.tooltip()">冻结</p>']
+ }
+ }
+ return btn;
+ }
+ }
+ ];
+};
+
+/**
+ * 检查是否选中
+ */
+TUser.check = function () {
+ var selected = $('#' + this.id).bootstrapTable('getSelections');
+ if(selected.length == 0){
+ Feng.info("请先选中表格中的某一记录！");
+ return false;
+ }else{
+ TUser.seItem = selected;
+ return true;
+ }
+};
+
+/**
+ * 修改余额
+ */
+TUser.updateBalance = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '修改余额',
+ area: ['800px', '420px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tUser/tUser_updateBalance/'+ TUser.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
+/**
+ * 修改密码
+ */
+TUser.updatePassword = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '修改密码',
+ area: ['800px', '420px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tUser/tUser_updatePassword/'+ TUser.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
+/**
+ * 查看分享信息
+ */
+TUser.inviteInfo=function(){
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '邀请信息',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tUser/inviteInfo/'+ TUser.seItem.id
+ });
+ this.layerIndex = index;
+
+ }
+};
+
+/**
+ * 打开查看用户管理详情
+ */
+TUser.userDetail = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '用户详情',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tUser/tUser_userDetail/' + TUser.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
+
+/**
+ * 冻结用户
+ */
+TUser.freezeUser = function () {
+ if (this.check()) {
+ const ids = TUser.seItem.map(item => item.id);
+ console.log(ids)
+ console.log(window.parent.SysRedPacketRecord.seItem.id)
+ // TUser.close();
+
+ var ajax = new $ax(Feng.ctxPath + "/sysRedPacketRecord/direct", function(data){
+ Feng.success("派发成功!");
+ TUser.close();
+ },function(data){
+ Feng.error("派发失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("ids",JSON.stringify(ids));
+ ajax.set("redId",window.parent.SysRedPacketRecord.seItem.id)
+ ajax.start();
+
+
+ }
+};
+
+TUser.close = function() {
+ parent.layer.close(window.parent.SysRedPacketRecord.layerIndex);
+}
+/**
+ * 解冻用户
+ */
+TUser.trawUser = function () {
+ if (this.check()) {
+ var nickname = TUser.seItem.nickName;
+ if (nickname == "" || nickname == null || nickname == undefined) {
+ nickname = "该用户";
+ } else {
+ nickname = "【" + nickname + "】";
+ }
+ if (TUser.seItem.state != 2) {
+ swal("启用失败", "【冻结】状态下才能执行此操作", "warning");
+ return;
+ } else {
+ var index = layer.open({
+ type: 2,
+ title: '解冻用户',
+ area: ['800px', '420px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tUser/tUser_optUser/' + TUser.seItem.id +"/"+2
+ });
+ this.layerIndex = index;
+ }
+ }
+};
+
+/**
+ * 查询用户管理列表
+ */
+TUser.search = function () {
+ var queryData = {};
+ queryData['insertTime'] = $("#insertTime").val();
+ queryData['id'] = $("#id").val();
+ queryData['nickName'] = $("#nickName").val();
+ queryData['phone'] = $("#phone").val();
+ queryData['isAuth'] = $("#isAuth").val();
+ queryData['state'] = $("#state").val();
+ TUser.table.refresh({query: queryData});
+};
+TUser.resetSearch = function () {
+ $("#insertTime").val("");
+ $("#id").val("");
+ $("#nickName").val("");
+ $("#phone").val("");
+ $("#isAuth").val("");
+ $("#state").val("");
+ TUser.search();
+};
+
+$(function () {
+ var defaultColunms = TUser.initColumn();
+ var table = new BSTable(TUser.id, "/tUser/list", defaultColunms);
+ // 设置物理分页server（逻辑分页client）
+ table.setPaginationType("server");
+ TUser.table = table.init();
+});
+
+/**
+ * 下载模板
+ */
+TUser.uploadUserModel = function () {
+ window.location.href = Feng.ctxPath + "/tUser/uploadUserModel";
+}
+
+var agreement = function(){
+ this.init = function(){
+ //模拟上传excel
+ $("#uploadEventBtn").unbind("click").bind("click",function(){
+ $("#uploadEventFile").click();
+ });
+ };
+}
+/**
+ * 导入合同
+ */
+TUser.exportUser = function () {
+ var uploadEventFile = $("#uploadEventFile").val();
+ if(uploadEventFile == ''){
+ Feng.info("请选择Excel,再上传");
+ }else if(uploadEventFile.lastIndexOf(".xls")<0){//可判断以.xls和.xlsx结尾的excel
+ Feng.info("只能上传Excel文件");
+ }else{
+ var url = Feng.ctxPath + '/tUser/exportUser';
+ var file = document.querySelector('input[name=file]').files[0];
+ var reader = new FileReader();
+ if (file) {
+ var formData = new FormData();
+ formData.append("myfile", file);
+ this.sendAjaxRequest(url, 'POST', formData);
+ }
+ }
+}
+TUser.sendAjaxRequest = function(url,type,data){
+ $.ajax({
+ url : url,
+ type : type,
+ data : data,
+ success : function(result) {
+ if(result.code==500) {
+ Feng.info(result.message);
+ }else {
+ Feng.success("导入成功!");
+ }
+ TUser.table.refresh();
+ },
+ error : function() {
+ Feng.error("excel上传失败!");
+ },
+ cache : false,
+ contentType : false,
+ processData : false
+ });
+};
+
+var agreement;
+$(function(){
+ agreement = new agreement();
+ agreement.init();
+});
+
+/**
+ * 导出车辆操作
+ */
+TUser.outUser = function () {
+ var operation = function() {
+ window.location.href = Feng.ctxPath + "/tUser/outUser";
+ };
+ Feng.confirm("是否确认导出用户信息?", operation);
+}
\ No newline at end of file
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice.js
index da14a2b..dd8ef03 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice.js
@@ -90,7 +90,7 @@
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tSystemPrice/tSystemPrice_update/' + TSystemPrice.seItem.id
+ content: Feng.ctxPath + '/tSystemPrice/tSmallPrice_update/' + TSystemPrice.seItem.id
});
this.layerIndex = index;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice_info.js
index f47f8ab..e5d6df3 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSmallPrice_info.js
@@ -454,7 +454,7 @@
content += '}';
console.log(content);
//提交信息
- var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/update", function(data){
+ var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/smallupdate", function(data){
if (500 == data.code){
Feng.error(data.message);
return;
--
Gitblit v1.7.1