Skip to content

S
Skyeye

doc_wei / Skyeye

通知 1175
Star 154
Fork 127
S
Skyeye
提交 309657b7 编写于 作者: doc_wei's avatar doc_wei
浏览文件
操作

会员信息修改

上级 05e49bba
隐藏空白更改
内联 并排
Showing with 121 addition and 227 deletion
erp/src/main/resources/template/js/erpcommon/calculatePrice.js
浏览文件 @ 309657b7
......@@ -144,10 +144,15 @@ function calculatedTotalPrice() {
taxLastMoneyPrice += parseFloat($("#taxLastMoney" + thisRowKey).val());
});
// 优惠率计算
var discount = parseFloat(isNull($(".discount").val()) ? 0 : $(".discount").val());
// 输出优惠金额
var discountMoney = (taxLastMoneyPrice * discount / 100).toFixed(2);
var discountMoney
if ($(".discount").length > 0) {
// 优惠率计算
var discount = parseFloat(isNull($(".discount").val()) ? 0 : $(".discount").val());
// 输出优惠金额
discountMoney = (taxLastMoneyPrice * discount / 100).toFixed(2);
} else {
discountMoney = $(".discountMoney").val();
}
$(".discountMoney").html(discountMoney);
taxLastMoneyPrice.toFixed(2);
// 返回最终金额
......
erp/src/main/resources/template/js/retailReturns/retailReturnsList.js
浏览文件 @ 309657b7
......@@ -6,23 +6,19 @@ layui.config({
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
laydate = layui.laydate,
table = layui.table;
var serviceClassName = sysServiceMation["putIsRetailReturns"]["key"];
authBtn('1571814098548');//新增
authBtn('1572242758657');//导出
laydate.render({elem: '#operTime', range: '~'});
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'retailreturns001',
url: sysMainMation.erpBasePath + 'retailreturns001',
where: getTableParams(),
even: true,
page: true,
......@@ -30,29 +26,31 @@ layui.config({
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
{ field: 'defaultNumber', title: '单据编号', align: 'left', rowspan: '2', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
{ field: 'oddNumber', title: '单据编号', align: 'left', rowspan: '2', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}},
{ field: 'supplierName', title: '会员', align: 'left', rowspan: '2', width: 150 },
{ title: '审批模式', align: 'center', colspan: '2'},
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function (d) {
return activitiUtil.showStateName(d.state, d.submitType);
{ field: 'holderMation', title: '会员', align: 'left', width: 150, templet: function (d) {
return d.holderMation.name;
}},
{ field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
{ field: 'changeAmount', title: '退款', align: 'left', rowspan: '2', width: 120 },
{ field: 'operPersonName', title: '操作人', align: 'left', rowspan: '2', width: 100},
{ field: 'operTime', title: '单据日期', align: 'center', rowspan: '2', width: 140 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', align: 'center', width: 200, toolbar: '#tableBar'}
],[
{ field: 'submitType', title: '提交模式', align: 'left', width: 120, templet: function (d) {
return erpOrderUtil.getSubmitTypeName(d);
{ field: 'totalPrice', title: '退款总金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'processInstanceId', title: '流程实例id', align: 'left', width: 120, templet: function (d) {
return erpOrderUtil.getProcessInstanceIdBySubmitType(d);
}}
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', align: 'center', width: 200, toolbar: '#tableBar'}
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
......@@ -60,16 +58,18 @@ layui.config({
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'delete') { //删除
deletemember(data);
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'details') { //详情
details(data);
} else if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'submitToSave') { //提交
subExamine(data);
} else if (layEvent === 'subExamine') { //提交审核
subExamine(data);
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
......@@ -78,25 +78,23 @@ layui.config({
}
});
// 删除
function deletemember(data) {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2023042400009', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "retailReturnsAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 编辑
function edit(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/retailReturns/retailReturnsEdit.html",
url: systemCommonUtil.getUrl('FP2023042400010&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "retailReturnsEdit",
area: ['90vw', '90vh'],
......@@ -108,9 +106,8 @@ layui.config({
// 详情
function details(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/retailReturns/retailReturnsDetails.html",
url: systemCommonUtil.getUrl('FP2023042400011&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "retailReturnsDetails",
area: ['90vw', '90vh'],
......@@ -118,57 +115,16 @@ layui.config({
}});
}
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: "../../tpl/retailReturns/retailReturnsAdd.html",
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "retailReturnsAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
form.render();
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()})
}
return false;
});
$("body").on("click", "#reloadTable", function() {
loadTable();
});
// 刷新
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
//导出excel
$("body").on("click", "#downloadExcel", function () {
postDownLoadFile({
url : flowableBasePath + 'retailreturns005',
params: getTableParams(),
method : 'post'
});
});
function getTableParams() {
var startTime = "";
var endTime = "";
if (!isNull($("#operTime").val())) {
startTime = $("#operTime").val().split('~')[0].trim() + ' 00:00:00';
endTime = $("#operTime").val().split('~')[1].trim() + ' 23:59:59';
}
return {
defaultNumber: $("#defaultNumber").val(),
startTime: startTime,
endTime: endTime
};
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('retailReturnsList', {});
......
member/src/main/resources/template/js/member/memberSearchChoose.js
浏览文件 @ 309657b7
......@@ -13,127 +13,79 @@ layui.config({
table = layui.table;
// 设置提示信息
var s = "会员选择规则：1.单选，双击指定行数据即可选中";
var s = "会员选择规则：1.单选，双击指定行数据即可选中；2.只有启用状态的会员可以选择";
s += '如没有查到要选择的会员，请检查会员信息是否满足当前规则。';
$("#showInfo").html(s);
initTable();
function initTable(){
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: shopBasePath + 'member001',
where: getTableParams(),
even: true,
page: true,
limits: [8, 16, 24, 32, 40, 48, 56],
limit: 8,
cols: [[
{ type: 'radio', fixed: 'left'},
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' },
{ field: 'contacts', title: '会员称呼', align: 'left', width: 140, fixed: 'left', templet: function (d) {
return '<a lay-event="select" class="notice-title-click">' + d.contacts + '</a>';
}},
{ field: 'phone', title: '联系电话', align: 'center', width: 100},
{ field: 'email', title: '电子邮箱', align: 'left', width: 120},
{ field: 'address', title: '地址', align: 'left', width: 100},
{ field: 'enabled', title: '状态', align: 'center', width: 80, templet: function (d) {
if(d.enabled == '1'){
return "<span class='state-up'>启用</span>";
} else if (d.enabled == '2'){
return "<span class='state-down'>禁用</span>";
} else {
return "<span class='state-error'>参数错误</span>";
}
}},
]],
done: function(res, curr, count){
matchingLanguage();
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: shopBasePath + 'member001',
where: getTableParams(),
even: true,
page: true,
limits: [8, 16, 24, 32, 40, 48, 56],
limit: 8,
cols: [[
{ type: 'radio', fixed: 'left'},
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' },
{ field: 'name', title: '会员称呼', align: 'left', width: 140, fixed: 'left' },
{ field: 'phone', title: '联系电话', align: 'center', width: 100 },
{ field: 'email', title: '电子邮箱', align: 'left', width: 120 },
{ field: 'address', title: '地址', align: 'left', width: 100 },
{ field: 'enabled', title: '状态', align: 'center', width: 80, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonEnable", 'id', d.enabled, 'name');
}},
]],
done: function(res, curr, count){
matchingLanguage();
for (var i = 0; i < res.rows.length; i++) {
// 禁用的不可选中
if(res.rows[i].enabled == 2){
systemCommonUtil.disabledRow(res.rows[i].LAY_TABLE_INDEX, 'radio');
}
for (var i = 0; i < res.rows.length; i++) {
// 禁用的不可选中
if(res.rows[i].enabled == 2){
systemCommonUtil.disabledRow(res.rows[i].LAY_TABLE_INDEX, 'radio');
}
}
$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){
var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
if(!dubClick.find("input[type='radio']").prop("disabled")) {
dubClick.find("input[type='radio']").prop("checked", true);
form.render();
var chooseIndex = JSON.stringify(dubClick.data('index'));
var obj = res.rows[chooseIndex];
parent.sysMemberUtil.memberMation = obj;
$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){
var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
if(!dubClick.find("input[type='radio']").prop("disabled")) {
dubClick.find("input[type='radio']").prop("checked", true);
form.render();
var chooseIndex = JSON.stringify(dubClick.data('index'));
var obj = res.rows[chooseIndex];
parent.sysMemberUtil.memberMation = obj;
parent.refreshCode = '0';
parent.layer.close(index);
}
});
parent.refreshCode = '0';
parent.layer.close(index);
}
});
$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){
var click = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
if(!click.find("input[type='radio']").prop("disabled")) {
click.find("input[type='radio']").prop("checked", true);
form.render();
}
})
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'select') { //详情
details(data);
}
});
form.render();
}
// 详情
function details(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/member/memberInfo.html",
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "memberinfo",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}
});
}
$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){
var click = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
if(!click.find("input[type='radio']").prop("disabled")) {
click.find("input[type='radio']").prop("checked", true);
form.render();
}
})
form.render();
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入名称", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
return false;
});
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
var contacts = $("#contacts").val();
var phone = $("#phone").val();
var email = $("#email").val();
if(isNull(contacts) && isNull(phone) && isNull(email)){
contacts = "!-!!@#$%^&*";
}
return {
contacts: contacts,
phone: phone,
email: email,
};
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('memberSearchChoose', {});
......
member/src/main/resources/template/tpl/member/memberSearchChoose.html
浏览文件 @ 309657b7
......@@ -7,34 +7,15 @@
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
<div class="winui-tip alert-info" id="showInfo">
</div>
<form class="layui-form layui-form-pane" action="" autocomplete="off">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">会员称呼</label>
<div class="layui-input-inline">
<input type="text" id="contacts" name="contacts" placeholder="请输入会员称呼" class="layui-input" />
</div>
<label class="layui-form-label">手机号码</label>
<div class="layui-input-inline">
<input type="text" id="phone" name="phone" placeholder="请输入手机号码" class="layui-input" />
</div>
<label class="layui-form-label">电子邮箱</label>
<div class="layui-input-inline">
<input type="text" id="email" name="email" placeholder="请输入电子邮箱" class="layui-input" />
</div>
<button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
<button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
</div>
</div>
</form>
<div class="winui-tip alert-info" id="showInfo">
会员选择规则：
1.单选，双击指定行数据即可选中；
2.只有启用状态的会员可以选择。
如没有查到要选择的会员，请检查会员信息是否满足当前规则。
</div>
<div class="winui-toolbar">
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
</div>
</div>
<div style="margin:auto 10px;">
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或