From 81f34d2473f338acbcc3d833052a5e0d4f052a29 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 三月 2021 09:16:40 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/PriorMapper.xml | 2 +-
src/main/webapp/views/safeSto/safeSto.html | 6 ++++++
src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java | 2 +-
src/main/webapp/static/js/safeSto/safeSto.js | 14 ++++----------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java b/src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java
index 15c73ef..9c1f828 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/SafeStoDo.java
@@ -16,6 +16,6 @@
private Double amount;
- private String pe;
+ private String progress;
}
diff --git a/src/main/resources/mapper/PriorMapper.xml b/src/main/resources/mapper/PriorMapper.xml
index 1dc19d2..6a857bc 100644
--- a/src/main/resources/mapper/PriorMapper.xml
+++ b/src/main/resources/mapper/PriorMapper.xml
@@ -49,7 +49,7 @@
mp.matnr,
mp.safe_qua,
ls.amount,
- (cast(round((ls.amount/(mp.safe_qua*1.0))*100,2) as varchar)+'%') as pe
+ (cast(round((ls.amount/(mp.safe_qua*1.0))*100,2) as varchar)+'%') as progress
from man_prior mp
inner join
(
diff --git a/src/main/webapp/static/js/safeSto/safeSto.js b/src/main/webapp/static/js/safeSto/safeSto.js
index 1fc4a07..8b53428 100644
--- a/src/main/webapp/static/js/safeSto/safeSto.js
+++ b/src/main/webapp/static/js/safeSto/safeSto.js
@@ -1,10 +1,11 @@
var pageCurr;
-layui.use(['table','laydate', 'form'], function(){
+layui.use(['table','laydate', 'form', 'element'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
+ var element = layui.element;
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -25,7 +26,7 @@
,{field: 'nodeId', align: 'center',title: '璐т綅鍚嶇О'}
,{field: 'safeQua', align: 'center',title: '瀹夊叏搴撳瓨'}
,{field: 'amount', align: 'center',title: '瀹為檯搴撳瓨'}
- ,{field: 'pe', align: 'center',title: '杩涘害'}
+ ,{field: 'progress', align: 'center',title: '杩涘害', templet: '#progressTpl'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
@@ -48,16 +49,9 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
+ element.render('progress')
pageCurr=curr;
limit();
- form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
- res.data[_index][data.value] = 'Y';
- }else{
- res.data[_index][data.value] = 'N';
- }
- });
}
});
diff --git a/src/main/webapp/views/safeSto/safeSto.html b/src/main/webapp/views/safeSto/safeSto.html
index 18a2e9c..360c746 100644
--- a/src/main/webapp/views/safeSto/safeSto.html
+++ b/src/main/webapp/views/safeSto/safeSto.html
@@ -65,6 +65,12 @@
<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>
</script>
+<script type="text/html" id="progressTpl">
+ <div class="layui-progress layuiadmin-order-progress" lay-filter="progress-"+ {{ d.orderid }} +"">
+ <div class="layui-progress-bar layui-bg-blue" lay-percent= {{ d.progress }}></div>
+ </div>
+</script>
+
<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>
--
Gitblit v1.9.1