From 5495ff9d968cb582c6b54324e74e92c0b3597ff2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 09 九月 2024 17:21:25 +0800
Subject: [PATCH] #优化
---
src/main/webapp/views/wrkMast/wrkMast.html | 2
src/main/webapp/views/wrkMast/wrkMast_detail.html | 169 +++---------------------------------------
src/main/webapp/static/js/wrkMast/wrkMast.js | 18 ++++
src/main/java/com/zy/asrs/controller/WrkMastController.java | 15 +++
4 files changed, 48 insertions(+), 156 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 3a6a9c5..5fdb84b 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -10,6 +10,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasWrkStatus;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
@@ -128,6 +129,20 @@
}
return R.ok(result);
}
+ @RequestMapping(value = "/sheetWrkMastQuery/auth")
+ @ManagerAuth
+ public R querySheet(String condition) {
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (int i = 0;i<6;i++){
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setSheetNo(String.valueOf(i));
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkMast.getSheetNo());
+ map.put("value", wrkMast.getSheetNo$());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
@RequestMapping(value = "/wrkMast/check/column/auth")
@ManagerAuth
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 8565ac7..7bf1dfc 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -274,6 +274,24 @@
table.on('tool(wrkMast)', function(obj){
let data = obj.data;
switch (obj.event) {
+ case 'upSheetNo':
+ layer.open({
+ type: 2,
+ title: '淇敼宸ヤ綔妗ｇ殑鏈烘鑷傜浉鍏冲弬鏁�',
+ maxmin: true,
+ area: ['500px', top.detailHeight],
+ shadeClose: false,
+ content: 'wrkMast_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-save', index).hide();
+ setFormVal(layer.getChildFrame('#detail', index), data, false);
+ top.convertDisabled(layer.getChildFrame('#locNo', index), true);
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
// 鏄庣粏灞曠ず
case 'detlShow':
wrkNo = data.wrkNo;
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 77b804b..3c84201 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -97,6 +97,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
+ <button class="layui-btn layui-btn-normal" id="btn-update-sheet-no" lay-event="upSheetNo"><i class="layui-icon"></i>sheet</button>
<button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon"></i>澧炲姞浼樺厛绾�</button>
<button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon"></i>闄嶄綆浼樺厛绾�</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
@@ -119,6 +120,7 @@
{{#if (d.takeNone === 'Y' && d.wrkSts === 12) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-error" lay-event="takeNone">绌烘搷浣�</a>
{{# } }}
+ <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="upSheetNo">arm</a>
<a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
diff --git a/src/main/webapp/views/wrkMast/wrkMast_detail.html b/src/main/webapp/views/wrkMast/wrkMast_detail.html
index 79601ad..b030be8 100644
--- a/src/main/webapp/views/wrkMast/wrkMast_detail.html
+++ b/src/main/webapp/views/wrkMast/wrkMast_detail.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="en">
+<html lang="en" xmlns="http://www.w3.org/1999/html">
<head>
<meta charset="utf-8">
<title></title>
@@ -14,175 +14,32 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
- <form id="detail" class="layui-form">
- <div class="layui-inline" style="width:31%;">
+ <form id="detail" class="layui-form" style="height: 100%">
+ <div class="layui-inline" >
<label class="layui-form-label"><span class="not-null">*</span>宸� 浣� 鍙凤細</label>
<div class="layui-input-inline">
- <input id="wrkNo" class="layui-input" type="text" onkeyup="check(this.id, 'wrkMast')">
+ <input id="wrkNo" class="layui-input" disabled =鈥渄isabled鈥� onkeyup="check(this.id, 'wrkMast')">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">宸ヤ綔鐘舵�侊細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="wrkSts" class="layui-input" type="text" style="display: none">
- <input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏈烘鑷傦細</label>
+ <div class="layui-input-inline cool-auto-complete" style="height: 200px">
+ <input id="sheetNo" class="layui-input" name="sheet_no" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="sheetNo$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ <input class="cool-auto-complete-window-input" data-key="sheetWrkMastQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="sheetWrkMastQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
</select>
</div>
</div>
</div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍏ュ嚭搴撶被鍨嬶細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="ioType" class="layui-input" type="text" style="display: none">
- <input id="ioType$" 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="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳璋ㄦ厧淇敼锛侊紒锛�
</div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍫� 鍨� 鏈猴細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="crnNo" class="layui-input" type="text" style="display: none">
- <input id="crnNo$" 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="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">浼� 鍏� 绾э細</label>
- <div class="layui-input-inline">
- <input id="ioPri" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鐩爣搴撲綅锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="locNo" class="layui-input" type="text" style="display: none">
- <input id="locNo$" 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="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鐩� 鏍� 绔欙細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="staNo" class="layui-input" type="text" style="display: none">
- <input id="staNo$" 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="basDevpQueryBystaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basDevpQueryBystaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">婧愩��銆�绔欙細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="sourceStaNo" class="layui-input" type="text" style="display: none">
- <input id="sourceStaNo$" 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="basDevpQueryBysourceStaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basDevpQueryBysourceStaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">婧� 搴� 浣嶏細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="sourceLocNo" class="layui-input" type="text" style="display: none">
- <input id="sourceLocNo$" 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="locMastQueryBysourceLocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryBysourceLocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鎷ｃ��銆�鏂欙細</label>
- <div class="layui-input-inline">
- <input id="picking" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">閫�銆�銆�鍑猴細</label>
- <div class="layui-input-inline">
- <input id="exitMk" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">绌恒��銆�鏉匡細</label>
- <div class="layui-input-inline">
- <input id="emptyMk" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">宸ヤ綔鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="ioTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label" style="font-size: x-small">鍫嗗灈鏈哄惎鍔ㄦ椂闂达細</label>
- <div class="layui-input-inline">
- <input id="crnStrTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label" style="font-size: x-small">鍫嗗灈鏈哄仠姝㈡椂闂达細</label>
- <div class="layui-input-inline">
- <input id="crnEndTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鎷ｆ枡鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="refIotime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">澶囥��銆�娉細</label>
- <div class="layui-input-inline">
- <input id="memo" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鏉°��銆�鐮侊細</label>
- <div class="layui-input-inline">
- <input id="barcode" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">婊°��銆�鏉匡細</label>
- <div class="layui-input-inline">
- <input id="fullPlt" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
-
-
- <hr class="layui-bg-gray">
-
<div id="data-detail-btn" class="layui-btn-container layui-form-item">
<div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
<div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
<div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
- </div>
-
- <div id="prompt">
- 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
</div>
</form>
</div>
--
Gitblit v1.9.1