From 74b4d4c5b3f085374eaa93b95ed97bea54309833 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 24 八月 2021 16:03:36 +0800
Subject: [PATCH] #
---
src/main/webapp/views/waitMatin/waitMatin.html | 138 +++++++++++++++++++++++++--------------------
1 files changed, 77 insertions(+), 61 deletions(-)
diff --git a/src/main/webapp/views/waitMatin/waitMatin.html b/src/main/webapp/views/waitMatin/waitMatin.html
index c6ec045..3695672 100644
--- a/src/main/webapp/views/waitMatin/waitMatin.html
+++ b/src/main/webapp/views/waitMatin/waitMatin.html
@@ -25,9 +25,9 @@
<div class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label w-auto">璇剧▼鍚嶇О锛�</label>
+ <label class="layui-form-label w-auto">鍗曟嵁缂栧彿锛�</label>
<div class="layui-input-inline mr0">
- <input name="experimentTypeName" class="layui-input" type="text" placeholder="杈撳叆璇剧▼鍚嶇О"/>
+ <input name="experimentTypeName" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
</div>
</div>
<div class="layui-inline">
@@ -39,61 +39,34 @@
</div>
</div>
</div>
- <table id="eCourseTable" lay-filter="eCourseTable"></table>
+ <table id="waitMatin" lay-filter="waitMatin"></table>
</div>
</div>
</div>
-
-
-<!-- 鎼滅储鏍� -->
-<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="bill_no" placeholder="鍗曟嵁缂栧彿" autocomplete="off">
- </div>
- </div>
- <!-- 鏃ユ湡鑼冨洿 -->
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" id="modi_time" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
- </div>
- <!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item">
- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
- </div>
-</div>
-
-<!-- 琛ㄦ牸 -->
-<div class="layui-form">
- <table class="layui-hide" id="waitMatin" lay-filter="waitMatin"></table>
-</div>
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
- </div>
-</script>
-
+<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<!-- 琛ㄦ牸鎿嶄綔鍒� -->
+<script type="text/html" id="tbLook">
+ <span class="layui-text">
+ <a href="javascript:;" lay-event="look">
+ <i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鍗曟嵁鏄庣粏
+ </a>
+ </span>
</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>
<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/waitMatin/waitMatin.js" charset="utf-8"></script>
+<!--<script type="text/javascript" src="../../static/js/waitMatin/waitMatin.js" charset="utf-8"></script>-->
<script>
- layui.use(['layer', 'form', 'table', 'util', 'admin'], function () {
+ var pageCurr;
+ layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+ }).use(['layer', 'form', 'table', 'util', 'admin'], function () {
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
@@ -105,21 +78,43 @@
var insTb = table.render({
elem: '#waitMatin',
url: baseUrl+'/waitMatin/head/page/auth',
+ headers: {token: localStorage.getItem('token')},
page: true,
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
{field: 'billNo', title: '鍗曟嵁缂栧彿', sort: true},
- {field: 'billType$', align: 'center', title: '绫诲瀷'},
+ {field: 'billType$', align: 'center', title: '绫诲瀷', minWidth: 140, width: 140},
// {align: 'center', title: '鏄熸湡', templet: '#eCourseTbWeek', minWidth: 350, width: 350},
- {align: 'center', title: '鏄庣粏', toolbar: '#eCourseTbLook', minWidth: 140, width: 140},
+ {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 140, width: 140},
{
- field: 'createTime', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
+ field: 'appeTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
return util.toDateString(d.createTime);
}, width: 180
},
- {align: 'center', title: '鎿嶄綔', toolbar: '#eCourseTbBar', minWidth: 130, width: 130}
- ]]
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate', minWidth: 130, width: 130}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function (res) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ }
});
// 鎼滅储
@@ -133,14 +128,14 @@
});
// 宸ュ叿鏉＄偣鍑讳簨浠�
- table.on('tool(eCourseTable)', function (obj) {
+ table.on('tool(waitMatin)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
- if (layEvent == 'edit') {
+ if (layEvent === 'edit') {
showEditModel(data);
- } else if (layEvent == 'del') {
+ } else if (layEvent === 'del') {
doDel(data.experimentTypeId);
- } else if (layEvent == 'look') {
+ } else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
var offset = $a.offset();
var top = offset.top;
@@ -148,7 +143,7 @@
layer.open({
type: 1,
title: false,
- area: '530px',
+ area: '630px',
offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -157,18 +152,39 @@
success: function (layero) {
table.render({
elem: '#lookSSXMTable',
- url: '../../json/e-course-tb2.json?experimentTypeId=' + data.experimentTypeId,
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/waitMatin/list/auth',
+ where: {
+ bill_no: data.billNo
+ },
page: true,
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'experimentName', title: '椤圭洰鍚嶇О', sort: true},
+ {field: 'matNo', title: '鐗╂枡缂栫爜'},
+ {field: 'matName', title: '鐗╂枡鍚嶇О', width: 160},
+ {field: 'qty', title: '鏁伴噺'},
{
- field: 'createTime', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
+ field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
return util.toDateString(d.createTime);
- }
+ }, width: 180
}
]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
done: function () {
$(layero).find('.layui-table-view').css('margin', '0');
},
@@ -183,7 +199,7 @@
function showEditModel(expTpe) {
admin.open({
type: 1,
- title: (expTpe ? '淇敼' : '娣诲姞') + '瀹為獙璇剧▼',
+ title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
content: $('#eCourseEditDialog').html(),
area: '700px',
success: function (layero, dIndex) {
--
Gitblit v1.9.1