会员信息修改

309657b7 · Skyeye云 · 05e49bba · 309657b7 · 309657b7 · 309657b7
4 changed file
--- a/erp/src/main/resources/template/js/erpcommon/calculatePrice.js
+++ b/erp/src/main/resources/template/js/erpcommon/calculatePrice.js
@@ -144,10 +144,15 @@ function calculatedTotalPrice() {
 		taxLastMoneyPrice += parseFloat($("#taxLastMoney" + thisRowKey).val());
 	});
-	// 优惠率计算
+	var discountMoney
-	var discount = parseFloat(isNull($(".discount").val()) ? 0 : $(".discount").val());
+	if ($(".discount").length > 0) {
-	// 输出优惠金额
+		// 优惠率计算
-	var discountMoney = (taxLastMoneyPrice * discount / 100).toFixed(2);
+		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);
 	// 返回最终金额

--- a/erp/src/main/resources/template/js/retailReturns/retailReturnsList.js
+++ b/erp/src/main/resources/template/js/retailReturns/retailReturnsList.js
@@ -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) {
+            { field: 'oddNumber', title: '单据编号', align: 'left', rowspan: '2', width: 200, templet: function (d) {
-		        return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
+		        return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
 		    }},
-            { field: 'supplierName', title: '会员', align: 'left', rowspan: '2', width: 150 },
+            { field: 'holderMation', title: '会员', align: 'left', width: 150, templet: function (d) {
-            { title: '审批模式', align: 'center', colspan: '2'},
+                return d.holderMation.name;
-            { field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function (d) {
-                return activitiUtil.showStateName(d.state, d.submitType);
            }},
-            { field: 'totalPrice', title: '合计金额', align: 'left', rowspan: '2', width: 120},
+            { field: 'totalPrice', title: '退款总金额', align: 'left', width: 120 },
-            { field: 'changeAmount', title: '退款', align: 'left', rowspan: '2', width: 120 },
+            { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
-            { field: 'operPersonName', title: '操作人', align: 'left', rowspan: '2', width: 100},
+            { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
-            { field: 'operTime', title: '单据日期', align: 'center', rowspan: '2', width: 140 },
+                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
-            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', align: 'center', width: 200, toolbar: '#tableBar'}
+            }},
-        ],[
+            { field: 'state', title: '状态', width: 90, templet: function (d) {
-            { field: 'submitType', title: '提交模式', align: 'left', width: 120, templet: function (d) {
+                return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
-                return erpOrderUtil.getSubmitTypeName(d);
            }},
-            { field: 'processInstanceId', title: '流程实例id', align: 'left', width: 120, templet: function (d) {
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
-                return erpOrderUtil.getProcessInstanceIdBySubmitType(d);
+            { 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);
+            erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() {
-        } else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
+                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) {
+    $("body").on("click", "#addBean", function() {
-        erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
+        _openNewWindows({
-            loadTable();
+            url:  systemCommonUtil.getUrl('FP2023042400009', null),
-        });
+            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
-    }
+            pageId: "retailReturnsAdd",
+            area: ['90vw', '90vh'],
-    // 提交数据
+            callBack: function (refreshCode) {
-	function subExamine(data) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
-        erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
+                loadTable();
-            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 = "";
+        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
-        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
-    	};
    }
    exports('retailReturnsList', {});

--- a/member/src/main/resources/template/js/member/memberSearchChoose.js
+++ b/member/src/main/resources/template/js/member/memberSearchChoose.js
@@ -13,127 +13,79 @@ layui.config({
 		table = layui.table;
 	// 设置提示信息
-	var s = "会员选择规则：1.单选，双击指定行数据即可选中";
+	var s = "会员选择规则：1.单选，双击指定行数据即可选中；2.只有启用状态的会员可以选择";
 	s += '如没有查到要选择的会员，请检查会员信息是否满足当前规则。';
 	$("#showInfo").html(s);
-	initTable();
+	table.render({
-	function initTable(){
+		id: 'messageTable',
-		table.render({
+		elem: '#messageTable',
-		    id: 'messageTable',
+		method: 'post',
-		    elem: '#messageTable',
+		url: shopBasePath + 'member001',
-		    method: 'post',
+		where: getTableParams(),
-		    url: shopBasePath + 'member001',
+		even: true,
-		    where: getTableParams(),
+		page: true,
-			even: true,
+		limits: [8, 16, 24, 32, 40, 48, 56],
-		    page: true,
+		limit: 8,
-		    limits: [8, 16, 24, 32, 40, 48, 56],
+		cols: [[
-		    limit: 8,
+			{ type: 'radio', fixed: 'left'},
-		    cols: [[
+			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' },
-		    	{ type: 'radio', fixed: 'left'},
+			{ field: 'name', title: '会员称呼', align: 'left', width: 140, fixed: 'left' },
-				{ title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' },
+			{ field: 'phone', title: '联系电话', align: 'center', width: 100 },
-				{ field: 'contacts', title: '会员称呼', align: 'left', width: 140, fixed: 'left', templet: function (d) {
+			{ field: 'email', title: '电子邮箱', align: 'left', width: 120 },
-					return '<a lay-event="select" class="notice-title-click">' + d.contacts + '</a>';
+			{ field: 'address', title: '地址', align: 'left', width: 100 },
-				}},
+			{ field: 'enabled', title: '状态', align: 'center', width: 80, templet: function (d) {
-				{ field: 'phone', title: '联系电话', align: 'center', width: 100},
+					return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonEnable", 'id', d.enabled, 'name');
-				{ field: 'email', title: '电子邮箱', align: 'left', width: 120},
+			}},
-				{ field: 'address', title: '地址', align: 'left', width: 100},
+		]],
-				{ field: 'enabled', title: '状态', align: 'center', width: 80, templet: function (d) {
+		done: function(res, curr, count){
-					if(d.enabled == '1'){
+			matchingLanguage();
-						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();
-				for (var i = 0; i < res.rows.length; i++) {
+			for (var i = 0; i < res.rows.length; i++) {
-					// 禁用的不可选中
+				// 禁用的不可选中
-					if(res.rows[i].enabled == 2){
+				if(res.rows[i].enabled == 2){
-						systemCommonUtil.disabledRow(res.rows[i].LAY_TABLE_INDEX, 'radio');
+					systemCommonUtil.disabledRow(res.rows[i].LAY_TABLE_INDEX, 'radio');
-					}
 				}
+			}
-				$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){
+			$('#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");
+				var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
-					if(!dubClick.find("input[type='radio']").prop("disabled")) {
+				if(!dubClick.find("input[type='radio']").prop("disabled")) {
-						dubClick.find("input[type='radio']").prop("checked", true);
+					dubClick.find("input[type='radio']").prop("checked", true);
-						form.render();
+					form.render();
-						var chooseIndex = JSON.stringify(dubClick.data('index'));
+					var chooseIndex = JSON.stringify(dubClick.data('index'));
-						var obj = res.rows[chooseIndex];
+					var obj = res.rows[chooseIndex];
-						parent.sysMemberUtil.memberMation = obj;
+					parent.sysMemberUtil.memberMation = obj;
-						parent.refreshCode = '0';
+					parent.refreshCode = '0';
-						parent.layer.close(index);
+					parent.layer.close(index);
-					}
+				}
-				});
+			});
-				$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){
+			$('#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");
+				var click = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
-					if(!click.find("input[type='radio']").prop("disabled")) {
+				if(!click.find("input[type='radio']").prop("disabled")) {
-						click.find("input[type='radio']").prop("checked", true);
+					click.find("input[type='radio']").prop("checked", true);
-						form.render();
+					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) {
-			}
-		});
-	}
-	form.render();
+			initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入名称", function () {
-	form.on('submit(formSearch)', function (data) {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
-		if (winui.verifyForm(data.elem)) {
+			});
-			table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
 		}
-		return false;
 	});
-	 $("body").on("click", "#reloadTable", function() {
+	form.render();
-    	loadTable();
+	$("body").on("click", "#reloadTable", function() {
-    });
+		loadTable();
+	});
-    function loadTable() {
+	function loadTable() {
-    	table.reloadData("messageTable", {where: getTableParams()});
+		table.reloadData("messageTable", {where: getTableParams()});
-    }
+	}
 	function getTableParams() {
-		var contacts = $("#contacts").val();
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
-		var phone = $("#phone").val();
-		var email = $("#email").val();
-		if(isNull(contacts) && isNull(phone) && isNull(email)){
-			contacts = "!-!!@#$%^&*";
-		}
-		return {
-			contacts: contacts,
-			phone: phone,
-			email: email,
-		};
 	}
    exports('memberSearchChoose', {});

--- a/member/src/main/resources/template/tpl/member/memberSearchChoose.html
+++ b/member/src/main/resources/template/tpl/member/memberSearchChoose.html
@@ -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 class="winui-tip alert-info" id="showInfo">
+        会员选择规则：
+        1.单选，双击指定行数据即可选中；
-		</div>
+        2.只有启用状态的会员可以选择。
-	    <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>
    <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;">