From ce76deb5e43603203df80ed4d02ab3feac8b6731 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期三, 06 三月 2024 10:24:28 +0800 Subject: [PATCH] # --- src/main/webapp/views/pla/sellout1.html | 340 ++++++++++++++++++++++++++++++++++++++++++++++++ src/main/webapp/static/js/pla/plaDetl.js | 26 +- src/main/webapp/static/js/saasLog/saasLog.js | 2 src/main/webapp/static/js/common.js | 26 +- 4 files changed, 367 insertions(+), 27 deletions(-) diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index d447604..ee0a000 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -290,23 +290,23 @@ ,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷',edit:true} ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷',edit:true} ,{field: 'filmWrap', align: 'center',title: '缂犺啘',edit:true,hide:true} - ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚,g/10min',edit:true} - ,{field: 'water', align: 'center',title: '姘村垎,ppm', hide:true,edit:true} - ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣,鈩�',edit:true} - ,{field: 'vadf1', align: 'center',title: '鎸ュ彂娈�,%', hide:true,edit:true} - ,{field: 'vadf2', align: 'center',title: '鍒嗚В娈�,%', hide:true,edit:true} + ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛実/10min',edit:true} + ,{field: 'water', align: 'center',title: '姘村垎锛宲pm', hide:true,edit:true} + ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛屸剝',edit:true} + ,{field: 'vadf1', align: 'center',title: '鎸ュ彂娈碉紝%', hide:true,edit:true} + ,{field: 'vadf2', align: 'center',title: '鍒嗚В娈碉紝%', hide:true,edit:true} ,{field: 'yellowness', align: 'center',title: '榛勫害',edit:true} - ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴�,%',edit:true} + ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紝%',edit:true} ,{field: 'l', align: 'center',title: 'L*', hide:true,edit:true} ,{field: 'a', align: 'center',title: 'a*', hide:true,edit:true} ,{field: 'b', align: 'center',title: 'b*', hide:true,edit:true} - ,{field: 'fillIn', align: 'center',title: '濉厖,%',hide:true,edit:true} - ,{field: 'str1', align: 'center',title: '鎷変几寮哄害,MPa',hide:true,edit:true} - ,{field: 'str2', align: 'center',title: '鏂浼搁暱鐜�,%',hide:true,edit:true} - ,{field: 'str3', align: 'center',title: '缂哄彛鍐插嚮,KJ/m2',hide:true,edit:true} - ,{field: 'str4', align: 'center',title: '缁村崱,鈩�',hide:true,edit:true} - ,{field: 'str5', align: 'center',title: '鍗婄粨鏅舵椂闂�,min',hide:true,edit:true} - ,{field: 'str6', align: 'center',title: '缁撴櫠搴�.%',hide:true,edit:true} + ,{field: 'fillIn', align: 'center',title: '濉厖锛�%',hide:true,edit:true} + ,{field: 'str1', align: 'center',title: '鎷変几寮哄害锛孧Pa',hide:true,edit:true} + ,{field: 'str2', align: 'center',title: '鏂浼搁暱鐜囷紝%',hide:true,edit:true} + ,{field: 'str3', align: 'center',title: '缂哄彛鍐插嚮锛孠J/m2',hide:true,edit:true} + ,{field: 'str4', align: 'center',title: '缁村崱锛屸剝',hide:true,edit:true} + ,{field: 'str5', align: 'center',title: '鍗婄粨鏅舵椂闂达紝min',hide:true,edit:true} + ,{field: 'str6', align: 'center',title: '缁撴櫠搴︼紝%',hide:true,edit:true} ,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��',edit:true} ,{field: 'problem', align: 'center',title: '澶囨敞',edit:true,hide:true} ,{field: 'direction', align: 'center',title: '搴旂敤鏂瑰悜',edit:true,hide:true} diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js index c54b440..2167eca 100644 --- a/src/main/webapp/static/js/pla/plaDetl.js +++ b/src/main/webapp/static/js/pla/plaDetl.js @@ -24,23 +24,23 @@ ,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷',edit:true} ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷',edit:true} ,{field: 'filmWrap', align: 'center',title: '缂犺啘',edit:true,hide:true} - ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚,g/10min',edit:true} - ,{field: 'water', align: 'center',title: '姘村垎,ppm', hide:true,edit:true} - ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣,鈩�',edit:true} - ,{field: 'vadf1', align: 'center',title: '鎸ュ彂娈�,%', hide:true,edit:true} - ,{field: 'vadf2', align: 'center',title: '鍒嗚В娈�,%', hide:true,edit:true} + ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛実/10min',edit:true} + ,{field: 'water', align: 'center',title: '姘村垎锛宲pm', hide:true,edit:true} + ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛屸剝',edit:true} + ,{field: 'vadf1', align: 'center',title: '鎸ュ彂娈碉紝%', hide:true,edit:true} + ,{field: 'vadf2', align: 'center',title: '鍒嗚В娈碉紝%', hide:true,edit:true} ,{field: 'yellowness', align: 'center',title: '榛勫害',edit:true} - ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴�,%',edit:true} + ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紝%',edit:true} ,{field: 'l', align: 'center',title: 'L*', hide:true,edit:true} ,{field: 'a', align: 'center',title: 'a*', hide:true,edit:true} ,{field: 'b', align: 'center',title: 'b*', hide:true,edit:true} - ,{field: 'fillIn', align: 'center',title: '濉厖,%',hide:true,edit:true} - ,{field: 'str1', align: 'center',title: '鎷変几寮哄害,MPa',hide:true,edit:true} - ,{field: 'str2', align: 'center',title: '鏂浼搁暱鐜�,%',hide:true,edit:true} - ,{field: 'str3', align: 'center',title: '缂哄彛鍐插嚮,KJ/m2',hide:true,edit:true} - ,{field: 'str4', align: 'center',title: '缁村崱,鈩�',hide:true,edit:true} - ,{field: 'str5', align: 'center',title: '鍗婄粨鏅舵椂闂�,min',hide:true,edit:true} - ,{field: 'str6', align: 'center',title: '缁撴櫠搴�.%',hide:true,edit:true} + ,{field: 'fillIn', align: 'center',title: '濉厖锛�%',hide:true,edit:true} + ,{field: 'str1', align: 'center',title: '鎷変几寮哄害锛孧Pa',hide:true,edit:true} + ,{field: 'str2', align: 'center',title: '鏂浼搁暱鐜囷紝%',hide:true,edit:true} + ,{field: 'str3', align: 'center',title: '缂哄彛鍐插嚮锛孠J/m2',hide:true,edit:true} + ,{field: 'str4', align: 'center',title: '缁村崱锛屸剝',hide:true,edit:true} + ,{field: 'str5', align: 'center',title: '鍗婄粨鏅舵椂闂达紝min',hide:true,edit:true} + ,{field: 'str6', align: 'center',title: '缁撴櫠搴︼紝%',hide:true,edit:true} ,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��',edit:true} ,{field: 'problem', align: 'center',title: '澶囨敞',edit:true,hide:true} ,{field: 'direction', align: 'center',title: '搴旂敤鏂瑰悜',edit:true,hide:true} diff --git a/src/main/webapp/static/js/saasLog/saasLog.js b/src/main/webapp/static/js/saasLog/saasLog.js index a10be60..d22e9cd 100644 --- a/src/main/webapp/static/js/saasLog/saasLog.js +++ b/src/main/webapp/static/js/saasLog/saasLog.js @@ -25,7 +25,7 @@ totalRow: true, // 寮�鍚悎璁¤ limit: 15, limits: [15, 30, 50, 100, 200, 500], - // toolbar: '#toolbar', + toolbar: '#toolbar', cellMinWidth: 50, height: 'full-120', cols: [[ diff --git a/src/main/webapp/views/pla/sellout1.html b/src/main/webapp/views/pla/sellout1.html new file mode 100644 index 0000000..8f64ff7 --- /dev/null +++ b/src/main/webapp/views/pla/sellout1.html @@ -0,0 +1,340 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../static/css/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/common.css" media="all"> +</head> +<body> + +<!-- 璇︽儏 --> +<div id="data-detail" class="layer_self_wrap"> + <form id="detail" class="layui-form" style="text-align: center"> + <div class="layui-form layui-card-header"> + <div class="layui-inline" style="width:83%;margin-top: 0px;margin-bottom: 5px;"> + <label class="layui-form-label"><span class="not-null">*</span>璁㈠崟銆�鍙凤細</label> + <div class="layui-input-inline cool-auto-complete"> + <input id="orderNo" class="layui-input" type="text" style="display: none" lay-verify="required"> + <input id="orderNoV" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="orderQueryByorderId" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="orderQueryByorderIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-inline" style="width:40%;margin-top: 0px;margin-bottom: 5px;"> + <label class="layui-form-label"><span class="not-null">*</span>鐗屻��銆�鍙凤細</label> + <div class="layui-input-inline cool-auto-complete"> + <input id="maktx" class="layui-input" type="text" style="display: none" lay-verify="required"> + <input id="maktxV" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="orderDetlQueryByMaktx" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="orderDetlQueryByMaktxSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-inline" style="width:40%; margin-bottom: 5px;"> + <label class="layui-form-label"><span class="not-null">*</span>璁㈠崟閲嶉噺锛�</label> + <div class="layui-input-inline"> + <input id="weight" class="layui-input" type="text" lay-verify="required" readonly="readonly"> + </div> + </div> + <div class="layui-inline" style="width:40%;margin-top: 0px;margin-bottom: 5px;"> + <label class="layui-form-label">瀹㈡埛鍚嶇О锛�</label> + <div class="layui-input-inline"> + <input id="customer" class="layui-input" type="text" readonly="readonly"> + </div> + </div> + <div class="layui-inline" style="width:40%;margin-top: 0px;margin-bottom: 5px;"> + <label class="layui-form-label">瀹㈡埛鐢佃瘽锛�</label> + <div class="layui-input-inline"> + <input id="phone" class="layui-input" type="text" readonly="readonly"> + </div> + </div> + <div class="layui-inline" style="width:83%; margin-bottom: 5px;"> + <label class="layui-form-label">瀹㈡埛鍦板潃锛�</label> + <div class="layui-input-inline"> + <input id="addr" class="layui-input" type="text" readonly="readonly"> + </div> + </div> + <div class="layui-inline" style="width:83%; margin-bottom: 5px;"> + <label class="layui-form-label"><span class="not-null">*</span>鍙戣揣閲嶉噺锛�</label> + <div class="layui-input-inline"> + <input id="qtyWeight" class="layui-input" type="text" lay-verify="required" readonly="readonly"> + </div> + </div> + </div> + <div class="layui-form layui-card-header"> + <div class="layui-inline" style="width:83%; margin-bottom: 5px;"> + <label class="layui-form-label">璋冩嫧銆�鍒帮細</label> + <div class="layui-input-inline"> + <input id="allocate" class="layui-input" type="text" readonly="readonly"> + </div> + </div> + <div class="layui-inline" style="width:83%; margin-bottom: 5px;"> + <label class="layui-form-label"></span>澶囥��銆�娉細</label> + <div class="layui-input-inline"> + <input id="memo" class="layui-input" type="text"> + </div> + </div> + </div> + + <div class="layui-form layui-card-header" > + <label class="layui-form-label"><span class="not-null">*</span>閫夋嫨鍙戣揣鏃堕棿锛�</label> </br> + <i class="layui-icon layui-icon-date" style="font-size: 30px; color: #3F3F3F;"></i> + <div class="layui-form-item"> + <button id="btn-day1-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">浠婂ぉ涓嬪崍 80 鉁�</button> + <button id="btn-day2-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鏄庡ぉ涓嬪崍</button> + <button id="btn-day3-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鍚庡ぉ涓嬪崍</button> + <button id="btn-day4-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鍚庡ぉ涓嬪崍</button> + </div> + <div class="layui-form-item "> + <button id="btn-day1-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">浠婂ぉ涓嬪崍</button> + <button id="btn-day2-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鏄庡ぉ涓嬪崍</button> + <button id="btn-day3-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鍚庡ぉ涓嬪崍</button> + <button id="btn-day4-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鍚庡ぉ涓嬪崍</button> + </div> + </div> + + <div id="data-detail-btn" class="layui-btn-container layui-form-item"> + <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div> + <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div> + <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div> + </div> + + </form> +</div> +</body> +<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> +<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/pla/plaDetl.js" charset="utf-8"></script> + +<!-- 琛ㄥ崟寮圭獥 --> +<script type="text/html" id="editDialog"> + <form id="editForm" lay-filter="editForm" class="layui-form" style="text-align: center"> + <table class="layui-table" id="detailTable" lay-filter="detailTable"></table> + <div class="layui-btn-container layui-form-item"> + <button class="layui-btn layui-btn-normal" type="button" lay-submit ew-event="closeDialog">鍙栨秷</button> + <button class="layui-btn layui-btn-normal" type="button" lay-submit lay-filter="detailEditSubmit" lay-submit>淇濆瓨</button> + </div> + </form> +</script> + + +</html> +<script> + + $('body').keydown(function () { + if (event.keyCode === 13) { + return; + } + }); + + var checkData = []; + var detailData = []; + var deliveryTime; + function child(data){ + checkData = data; + var allWeight = 0; + for (var i in checkData){ + allWeight += (checkData[i].weightAnfme - checkData[i].qtyAnfme) + } + $('#qtyWeight').val(allWeight); + delivery(); + + } + + //鏄剧ず4澶╁唴棰勭害鍑哄簱鐨勬椂闂� + function delivery(){ + $.ajax({ + url: baseUrl+"/plaQty/delivery/auth", + headers: {'token': localStorage.getItem('token')}, + contentType:'application/json;charset=UTF-8', + method: 'POST', + async: false, + success: function (res) { + if (res.code === 200){ + $('#btn-day1-am').text(res.data[0].text); + $('#btn-day1-pm').text(res.data[1].text); + $('#btn-day2-am').text(res.data[2].text); + $('#btn-day2-pm').text(res.data[3].text); + $('#btn-day3-am').text(res.data[4].text); + $('#btn-day3-pm').text(res.data[5].text); + $('#btn-day4-am').text(res.data[6].text); + $('#btn-day4-pm').text(res.data[7].text); + $("#btn-day1-am").hover(function(){ + $(this).attr("title", res.data[0].user); + }, function(){ + $(this).removeAttr("title"); + }); + + } else if (res.code === 403){ + layer.msg(res.msg, {icon: 2}) + return; + }else { + layer.msg(res.msg, {icon: 2}) + return; + } + } + }) + } + + $('.delivery').click(function (){ + delivery(); + deliveryTime = this.textContent; + this.append(' 鉁�'); + $('.delivery').addClass('layui-btn-primary'); + this.classList.remove('layui-btn-primary'); + + }) + + layui.use(['table','laydate', 'form'], function(){ + var form = layui.form; + var layer = layui.layer; + var table = layui.table; + + form.on('submit(edit)', function () { + var dataList = []; + for (var i in checkData){ + var data = { + "batch" : checkData[i].batch, + "packageNo" : checkData[i].packageNo, + "weight" : checkData[i].weightAnfme - checkData[i].qtyAnfme, + } + dataList.push(data); + } + if(detailData.length > 0){ + dataList = detailData; + } + layer.open({ + type: 1, + title: "鏁伴噺淇敼", + content: $('#editDialog').html(), + area: '700px', + success: function (layero, dIndex) { + // 鏄庣粏琛ㄦ牸 + tableIns = table.render({ + elem: '#detailTable', + data: dataList, + limit: 100, + even: true, + cellMinWidth: 50, + cols: [[ + {field: 'batch', title: '鎵瑰彿', width: 160}, + {field: 'packageNo', title: '鍖呭彿', width: 200}, + {field: 'weight', title: '鏁伴噺',edit: true}, + ]], + }); + } + }) + }) + + // 鏁版嵁鎻愪氦鍔ㄤ綔 + form.on('submit(save)', function () { + + if($('#maktxV').val() != checkData[0].brand){ + layer.msg("閫変腑鐨勫簱瀛樼墝鍙蜂笌璁㈠崟鐗屽彿涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨璁㈠崟"); + return; + } + + for (var i in checkData){ + checkData[i].orderNo = $('#orderNoV').val(); + checkData[i].customer = $('#customer').val(); + checkData[i].phone = $('#phone').val(); + checkData[i].addr = $('#addr').val(); + checkData[i].orderWeight = detailData[i] ? detailData[i].weight : checkData[i].weightAnfme; + checkData[i].allocate = $('#allocate').val(); + checkData[i].memo = $('#memo').val(); + checkData[i].pakoutTime = deliveryTime; + } + + if(!deliveryTime){ + layer.msg("璇烽�夋嫨鍙戣揣鏃堕棿"); + return; + } + + $.ajax({ + url: baseUrl+"/pla/sellout/auth", + headers: {'token': localStorage.getItem('token')}, + data: JSON.stringify(checkData), + contentType:'application/json;charset=UTF-8', + method: 'POST', + async: false, + success: function (res) { + if (res.code === 200){ + layer.msg("淇敼鎴愬姛"); + tableReload(true); + parent.clearTable(); + } else if (res.code === 403){ + layer.msg(res.msg, {icon: 2}) + return; + }else { + layer.msg(res.msg, {icon: 2}) + return; + } + parent.layer.closeAll(); + } + }) + }); + + form.on('submit(detailEditSubmit)', function () { + + detailData = table.cache.detailTable; + var allWeight = +0; + for (var i in checkData){ + //妫�娴嬩慨鏀圭殑鏁伴噺鏄惁灏忎簬绛変簬鏈�澶у彲鍑哄簱鏁伴噺 + if(detailData[i].weight <= checkData[i].weightAnfme - checkData[i].qtyAnfme){ + checkData[i].orderWeight = detailData[i].weight; + allWeight = allWeight + Number(detailData[i].weight); + }else { + layer.msg("鎵瑰彿锛�" + detailData[i].batch + "锛屽寘鍙凤細" + detailData[i].packageNo + "鍙嚭搴撻噸閲忓皬浜庝慨鏀瑰悗鐨勬暟閲忥紝璇烽噸鏂板~鍐�"); + return; + } + } + $('#qtyWeight').val(allWeight); + layer.closeAll(); + }) + + + function tableReload(child) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + (child ? parent.tableIns : tableIns).reload({ + where: searchData, + page: { + curr: 1 + }, + done: function (res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + if (res.data.length === 0 && count !== 0) { + tableIns.reload({ + where: searchData, + page: { + curr: pageCurr-1 + } + }); + pageCurr -= 1; + } + limit(child); + } + }); + } + + }) + +</script> + -- Gitblit v1.9.1