From b6fdaf9d936cda0c3882012ee5ea3ab2dc822866 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期四, 28 九月 2023 12:05:10 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/order/order.js | 18 ++++++++++-------- src/main/webapp/static/js/order/orderLog.js | 4 ++-- src/main/webapp/views/order/order.html | 6 ++++++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js index 5335546..0eca922 100644 --- a/src/main/webapp/static/js/order/order.js +++ b/src/main/webapp/static/js/order/order.js @@ -104,7 +104,8 @@ } else if (layEvent === 'exportData') { doExport(obj); } else if (layEvent === 'complete') { - doModify(data.id, 4); + console.log(data) + doModify(data.id, 4,); } else if (layEvent === 'look') { var $a = $(obj.tr).find('a[lay-event="look"]'); var offset = $a.offset(); @@ -468,11 +469,11 @@ } // 淇敼璁㈠崟鐘舵�� - function doModify(orderId, settle) { - layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧锛�', { - shade: .1, - skin: 'layui-layer-admin' - }, function (i) { + function doModify(orderId, settle,memo) { + layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧?',{ + title: '纭畾瑕佹墜鍔ㄥ畬缁撳悧?', + content: $('#modi').html(), + },function (i) { layer.close(i); layer.load(2); $.ajax({ @@ -480,7 +481,8 @@ headers: {'token': localStorage.getItem('token')}, data: { id: orderId, - settle: settle + settle: settle, + memo: $('#memo').val() }, method: 'POST', success: function (res) { @@ -499,7 +501,7 @@ } } }) - }); + }) } // 浠诲姟杩芥函 diff --git a/src/main/webapp/static/js/order/orderLog.js b/src/main/webapp/static/js/order/orderLog.js index 0337c7f..a014b39 100644 --- a/src/main/webapp/static/js/order/orderLog.js +++ b/src/main/webapp/static/js/order/orderLog.js @@ -49,8 +49,8 @@ {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160}, {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200}, {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160}, - {field: 'memo', align: 'center',title: '澶囨敞', hide: true}, - {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 280} + {field: 'memo', align: 'center',title: '澶囨敞', hide: false}, + //{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 280} ]], request: { pageName: 'curr', diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html index 631856c..c0f2d76 100644 --- a/src/main/webapp/views/order/order.html +++ b/src/main/webapp/views/order/order.html @@ -143,6 +143,12 @@ {{# } }} >{{d.settle$}}</span> </script> +<script type="text/html" id="modi"> + <label class="layui-form-label">瀹岀粨澶囨敞锛�</label> + <div class="layui-input-block"> + <input id="memo" name="memo" placeholder="鎵嬪姩瀹岀粨澶囨敞" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/> + </div> +</script> <!-- 琛ㄥ崟寮圭獥 --> <script type="text/html" id="editDialog"> <form id="editForm" lay-filter="editForm" class="layui-form model-form"> -- Gitblit v1.9.1