From 9c136468a14593e795e1e0548dc904ce95629d7f Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 26 三月 2021 13:05:13 +0800 Subject: [PATCH] # --- src/main/resources/mapper/PriorMapper.xml | 14 ++++---------- src/main/webapp/views/safeSto/safeSto.html | 24 +++++++----------------- src/main/webapp/static/js/safeSto/safeSto.js | 20 ++------------------ 3 files changed, 13 insertions(+), 45 deletions(-) diff --git a/src/main/resources/mapper/PriorMapper.xml b/src/main/resources/mapper/PriorMapper.xml index fe74bea..1a8958b 100644 --- a/src/main/resources/mapper/PriorMapper.xml +++ b/src/main/resources/mapper/PriorMapper.xml @@ -26,17 +26,11 @@ <sql id="pageCondition"> - <if test="loc_no != null and loc_no != ''"> - and mld.loc_no like concat('%',#{loc_no},'%') - </if> <if test="matnr != null and matnr != ''"> - and mld.matnr like concat('%',#{matnr},'%') + and mp.matnr like concat('%',#{matnr},'%') </if> - <if test="maktx != null and maktx != ''"> - and mld.maktx like concat('%',#{maktx},'%') - </if> - <if test="startTime!=null and endTime!=null"> - and mld.update_time between #{startTime} and #{endTime} + <if test="node_id != null and node_id != ''"> + and mp.node_id like concat('%',#{node_id},'%') </if> </sql> @@ -54,7 +48,7 @@ ISNULL((cast(round((ls.amount/(mp.safe_qua*1.0))*100,2) as varchar)+'%'), '0.00%') as progress, case when isnull(round((ls.amount/mp.safe_qua),2),0) > 1 then 1 - when isnull(round((ls.amount/mp.safe_qua),2),0) > 0.5 then 2 + when isnull(round((ls.amount/mp.safe_qua),2),0) > 0.75 then 2 else 3 end as status from man_prior mp diff --git a/src/main/webapp/static/js/safeSto/safeSto.js b/src/main/webapp/static/js/safeSto/safeSto.js index d9146a0..0433bd8 100644 --- a/src/main/webapp/static/js/safeSto/safeSto.js +++ b/src/main/webapp/static/js/safeSto/safeSto.js @@ -22,11 +22,11 @@ ,{field: 'node_name', align: 'center',title: '璐т綅'} ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'} ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'} - ,{field: 'progress', align: 'center',title: '浣跨敤鎯呭喌', templet: '#progressTpl'} + ,{field: 'progress', align: 'center',title: '浣跨敤鎯呭喌', templet: '#progressTpl', width: 350} ,{field: 'status', align: 'center',title: '璀︽姤', templet: '#statusTpl', width: 100} ,{field: 'safe_qua', align: 'center',title: '瀹夊叏搴撳瓨閲�', style: 'font-weight: bold'} ,{field: 'amount', align: 'center',title: '褰撳墠搴撳瓨閲�', style: 'font-weight: bold'} - ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150} + ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120} ]], request: { pageName: 'curr', @@ -196,22 +196,6 @@ where: searchData, page: { curr: pageCurr - }, - 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); } }); } diff --git a/src/main/webapp/views/safeSto/safeSto.html b/src/main/webapp/views/safeSto/safeSto.html index 7009dc2..0482142 100644 --- a/src/main/webapp/views/safeSto/safeSto.html +++ b/src/main/webapp/views/safeSto/safeSto.html @@ -21,18 +21,7 @@ <div id="search-box" class="layui-form layui-card-header"> <div class="layui-inline"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="uuid" placeholder="缂栧彿" autocomplete="off"> - </div> - </div> - <div class="layui-inline"> - <div class="layui-input-inline cool-auto-complete"> - <input id="matId" class="layui-input" name="mat_id" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none"> - <input id="matId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍏宠仈鍟嗗搧" onfocus=this.blur()> - <div class="cool-auto-complete-window"> - <input class="cool-auto-complete-window-input" data-key="matQueryBymatId" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="matQueryBymatIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> + <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off"> </div> </div> <div class="layui-inline"> @@ -67,8 +56,9 @@ </script> <script type="text/html" id="operate"> - <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a> - <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a> + {{# if(d.status > 1){ }} + <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="detail">琛ヤ粨</a> + {{# } }} </script> <script type="text/html" id="progressTpl"> <div class="layui-progress layuiadmin-order-progress"> @@ -77,11 +67,11 @@ </script> <script type="text/html" id="statusTpl"> {{# if(d.status == 1){ }} - <button class="layui-btn layui-btn-normal layui-btn-xs">婊′粨</button> + <button class="layui-btn layui-btn-primary layui-btn-xs">婊′粨</button> {{# } else if(d.status == 2){ }} - <button class="layui-btn layui-btn-primary layui-btn-xs">瀹夊叏</button> + <button class="layui-btn layui-btn-normal layui-btn-xs">瀹夊叏</button> {{# } else{ }} - <button class="layui-btn layui-btn-warm layui-btn-xs">鍗遍櫓</button> + <button class="layui-btn layui-btn-danger layui-btn-xs">鍗遍櫓</button> {{# } }} </script> -- Gitblit v1.9.1