From 25314b5ee613c48e7db31138d7fcb8abc4c536be Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 14 一月 2024 20:15:05 +0800
Subject: [PATCH] # 功能完善
---
src/main/webapp/views/pla/sellout.html | 175 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 134 insertions(+), 41 deletions(-)
diff --git a/src/main/webapp/views/pla/sellout.html b/src/main/webapp/views/pla/sellout.html
index 0341eea..72e7672 100644
--- a/src/main/webapp/views/pla/sellout.html
+++ b/src/main/webapp/views/pla/sellout.html
@@ -17,54 +17,65 @@
<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">
- <input id="orderNo" class="layui-input" type="text" lay-verify="required" >
- </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>
+ <label class="layui-form-label"><span class="not-null">*</span>璁㈠崟銆�鍙凤細</label>
<div class="layui-input-inline cool-auto-complete">
- <input id="customer" class="layui-input" type="text" style="display: none" lay-verify="required">
- <input id="customerV" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
+ <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="locOwnerQueryBylocOwner" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locOwnerQueryBylocOwnerSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ <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>
+ <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="phone" class="layui-input" type="text" lay-verify="required" readonly="readonly">
+ <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"><span class="not-null">*</span>瀹㈡埛鍦板潃锛�</label>
+ <label class="layui-form-label">瀹㈡埛鍦板潃锛�</label>
<div class="layui-input-inline">
- <input id="addr" class="layui-input" type="text" lay-verify="required" readonly="readonly">
+ <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="weight" class="layui-input" type="text" lay-verify="required" placeholder="KG">
+ <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"><span class="not-null">*</span>璋冩嫧鍒般��锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="allocate" class="layui-input" type="text" style="display: none" lay-verify="required">
- <input id="allocateV" 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="configTypeQueryByAllocate" data-value="allocate" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="configTypeQueryByAllocateSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <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;">
@@ -106,16 +117,43 @@
<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",
@@ -164,30 +202,66 @@
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 () {
- for(var i in checkData){
- checkData[i].packageType = $('#packageTypeV').val();
- checkData[i].zpalletType = $('#zpalletTypeV').val();
- checkData[i].filmWrap = $('#filmWrapV').val();
- checkData[i].step = 3;
+ if($('#maktxV').val() != checkData[0].brand){
+ layer.msg("閫変腑鐨勫簱瀛樼墝鍙蜂笌璁㈠崟鐗屽彿涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨璁㈠崟");
+ return;
}
- checkData[0].type = 'sellOut';
+ for (var i in checkData){
+ checkData[i].type = 'sellOut';
+ 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;
+ }
- checkData[0].orderNo = $('#orderNo').val();
- checkData[0].customer = $('#customerV').val();
- checkData[0].phone = $('#phone').val();
- checkData[0].addr = $('#addr').val();
- checkData[0].orderWeight = $('#weight').val();
- checkData[0].allocate = $('#allocateV').val();
- checkData[0].memo = $('#memo').val();
if(!deliveryTime){
layer.msg("璇烽�夋嫨鍙戣揣鏃堕棿");
return;
}
- checkData[0].pakoutTime = deliveryTime;
$.ajax({
url: baseUrl+"/pla/sellout/auth",
@@ -212,6 +286,25 @@
})
});
+ 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() {
--
Gitblit v1.9.1