From ba54348ac94b02cf06dd9beb3f13037f6e05a4b5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 20 五月 2023 16:55:39 +0800
Subject: [PATCH] WMS任务列表查看任务
---
src/main/webapp/views/wmsWrk/wmsWrk.html | 1 +
src/main/webapp/views/wrkMast/wrkMast.html | 5 +++++
src/main/webapp/static/wms/js/wrkMast/wrkMast.js | 5 ++++-
src/main/resources/mapper/WrkMastMapper.xml | 1 +
src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js | 17 +++++++++++++++++
5 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 54bace6..32279a3 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -59,6 +59,7 @@
<!-- <result column="Pdc_type" property="PdcType" />-->
<result column="ctn_no" property="ctnNo" />
<result column="full_plt" property="fullPlt" />
+ <result column="wms_wrk_no" property="wmsWrkNo" />
</resultMap>
diff --git a/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js b/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js
index f6beca5..f6328e0 100644
--- a/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js
+++ b/src/main/webapp/static/wms/js/wmsWrk/wmsWrk.js
@@ -1,4 +1,6 @@
var pageCurr;
+var wmsWrkNo;
+var wrkNo;
layui.config({
base: baseUrl + "/static/wms/layui/lay/modules/"
}).extend({
@@ -281,6 +283,21 @@
})
});
break;
+ case "wrkMastShow"://鏌ョ湅浠诲姟
+ wmsWrkNo = data.wmsWrkNo;
+ wrkNo = data.wrkNo;
+ // 寮瑰眰鏄剧ず
+ layer.open({
+ type: 2,
+ title: '鏌ョ湅浠诲姟',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../wrkMast/wrkMast.html',
+ success: function (layero, index) {
+ }
+ });
+ break;
}
});
diff --git a/src/main/webapp/static/wms/js/wrkMast/wrkMast.js b/src/main/webapp/static/wms/js/wrkMast/wrkMast.js
index e702b10..597c68c 100644
--- a/src/main/webapp/static/wms/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/wms/js/wrkMast/wrkMast.js
@@ -1,5 +1,6 @@
var pageCurr;
var wrkNo;
+var wmsWrkNo;
layui.config({
base: baseUrl + "/static/wms/layui/lay/modules/"
}).extend({
@@ -12,12 +13,14 @@
var form = layui.form;
$('#wrkNo').val(parent.wrkNo);
+ $('#wmsWrkNo').val(parent.wmsWrkNo);
+
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#wrkMast',
headers: {token: localStorage.getItem('token')},
url: baseUrl + '/wrkMast/list/auth',
- where: {wrk_no: parent.wrkNo},
+ where: {wrk_no: parent.wrkNo, wms_wrk_no: parent.wmsWrkNo},
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
diff --git a/src/main/webapp/views/wmsWrk/wmsWrk.html b/src/main/webapp/views/wmsWrk/wmsWrk.html
index 33528be..5d3c3a7 100644
--- a/src/main/webapp/views/wmsWrk/wmsWrk.html
+++ b/src/main/webapp/views/wmsWrk/wmsWrk.html
@@ -60,6 +60,7 @@
{{#if (d.wmsStatus === 1 || d.wmsStatus === 0) { }}
<li><a lay-event="distribute">娲惧彂</a></li>
{{# } }}
+ <li><a lay-event="wrkMastShow">鏌ョ湅浠诲姟</a></li>
<li><a lay-event="complete">瀹岀粨</a></li>
<li><a lay-event="cancel">鍙栨秷</a></li>
</ul>
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 2abbbaf..ecef5f2 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -54,6 +54,11 @@
<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="wms_wrk_no" id="wmsWrkNo" placeholder="WMS浠诲姟鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="浠诲姟鍙�" autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1