From ab440f3a09ae3c17e3e4d436ce98cd687ab666bb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 三月 2021 09:59:45 +0800
Subject: [PATCH] #
---
src/main/webapp/views/safeSto/safeSto.html | 7 ++++++-
src/main/webapp/static/js/safeSto/safeSto.js | 10 ++++------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/static/js/safeSto/safeSto.js b/src/main/webapp/static/js/safeSto/safeSto.js
index 38994b5..d79a870 100644
--- a/src/main/webapp/static/js/safeSto/safeSto.js
+++ b/src/main/webapp/static/js/safeSto/safeSto.js
@@ -20,14 +20,12 @@
cellMinWidth: 50,
cols: [[
{type: 'numbers', fixed: 'left'}
+ ,{field: 'node_name', align: 'center',title: '璐т綅'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
- // ,{field: 'nodeId$', align: 'center',title: '鍏宠仈璐т綅'}
- ,{field: 'node_name', align: 'center',title: '璐т綅'}
- ,{field: 'safe_qua', align: 'center',title: '瀹夊叏搴撳瓨'}
- ,{field: 'amount', align: 'center',title: '瀹為檯搴撳瓨'}
- ,{field: 'progress', align: 'center',title: '杩涘害', templet: '#progressTpl'}
-
+ ,{field: 'progress', align: 'center',title: '浣跨敤鎯呭喌', templet: '#progressTpl'}
+ ,{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}
]],
request: {
diff --git a/src/main/webapp/views/safeSto/safeSto.html b/src/main/webapp/views/safeSto/safeSto.html
index 4acfd8a..e3fb3c2 100644
--- a/src/main/webapp/views/safeSto/safeSto.html
+++ b/src/main/webapp/views/safeSto/safeSto.html
@@ -9,6 +9,11 @@
<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">
+ <style>
+ .layui-progress {
+ margin-top: 10px;
+ }
+ </style>
</head>
<body>
@@ -66,7 +71,7 @@
<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 layuiadmin-order-progress">
<div class="layui-progress-bar layui-bg-blue" lay-percent= {{ d.progress }}></div>
</div>
</script>
--
Gitblit v1.9.1