From 8616db4ff233414053845a742058197691aafd99 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 02 七月 2020 16:35:04 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/trayCode/trayCode.js | 57 +++++++++--
/dev/null | 120 ------------------------
src/main/java/com/zy/asrs/entity/param/TrayCodeParam.java | 37 +++++++
src/main/webapp/views/trayCode/trayCode.html | 28 +++++
src/main/java/com/zy/asrs/controller/TrayCodeController.java | 13 +-
5 files changed, 116 insertions(+), 139 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
index e404fc4..41da46b 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -12,6 +12,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.TrayCode;
+import com.zy.asrs.entity.param.TrayCodeParam;
import com.zy.asrs.service.TrayCodeService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -124,17 +125,15 @@
return R.ok();
}
- @RequestMapping(value = "/trayCode/print/preview")
+ @PostMapping(value = "/trayCode/print/preview")
@ManagerAuth
- public R printPreview(@RequestParam String startNo,
- @RequestParam Integer count,
- @RequestParam Integer type) {
- if (count <= 0) {
+ public R printPreview(@RequestParam TrayCodeParam param) {
+ if (param.getCount() <= 0) {
return R.error("鏁伴噺蹇呴』澶т簬闆�");
}
List<Map<String, Object>> res = new ArrayList<>();
- for (int i = 0; i<count; i++) {
- res.add(Cools.add("item", String.valueOf(Integer.parseInt(startNo)+i)));
+ for (int i = 0; i<param.getCount(); i++) {
+ res.add(Cools.add("item", String.valueOf(Integer.parseInt(param.getStartNo())+i)));
}
return R.ok().add(res);
}
diff --git a/src/main/java/com/zy/asrs/entity/param/TrayCodeParam.java b/src/main/java/com/zy/asrs/entity/param/TrayCodeParam.java
new file mode 100644
index 0000000..687638c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TrayCodeParam.java
@@ -0,0 +1,37 @@
+package com.zy.asrs.entity.param;
+
+/**
+ * Created by vincent on 2020/7/2
+ */
+public class TrayCodeParam {
+
+ private String startNo;
+
+ private Integer count;
+
+ private Integer type;
+
+ public String getStartNo() {
+ return startNo;
+ }
+
+ public void setStartNo(String startNo) {
+ this.startNo = startNo;
+ }
+
+ public Integer getCount() {
+ return count;
+ }
+
+ public void setCount(Integer count) {
+ this.count = count;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+}
diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index 91b56e2..5d5d836 100644
--- a/src/main/webapp/static/js/trayCode/trayCode.js
+++ b/src/main/webapp/static/js/trayCode/trayCode.js
@@ -104,12 +104,12 @@
// 鐢熸垚鎵樼洏鐮�
case "btnTray":
layer.open({
- type: 2,
+ type: 1,
title: '鐢熸垚鎵樼洏鐮�',
offset: '100px',
area: ['360px'],
shade: 0.1,
- content: 'tray.html',
+ content: $('#print-windows'),
success: function(layero, index){
layer.iframeAuto(index)
},
@@ -295,18 +295,51 @@
,range: true
});
+ form.on('submit(print)', function (data) {
+ // $.ajax({
+ // url: baseUrl+"/trayCode/print/preview",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: {
+ // startNo: $('#startNo'),
+ // count: $('#count'),
+ // type: $("input[name='type']:checked").val()
+ // },
+ // method: 'POST',
+ // async: false,
+ // success: function (res) {
+ // if (res.code === 200){
+ // for (let i=0;i<res.data.length;i++){
+ // res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1¶m="+res.data[i].item;
+ // }
+ // var tpl = $('#trayCodeTemplate').html();
+ // var template = Handlebars.compile(tpl);
+ // var html = template(res);
+ // let box = $("#printBox");
+ // // box.html(html);
+ // // box.show();
+ // // box.print();
+ // // box.hide();
+ // // parent.layer.close(parent.layer.getFrameIndex(window.name));
+ // } else if (res.code === 403){
+ // top.location.href = baseUrl+"/";
+ // }else {
+ // layer.msg(res.msg)
+ // }
+ // }
+ // })
+ });
+
+
});
-function printPreview(content) {
- var tpl = $('#trayCodeTemplate').html();
- var template = Handlebars.compile(tpl);
- var html = template(content);
- let box = $("#printBox");
- box.html(html);
- box.show();
- box.print();
- box.hide();
-}
+
+$('#print').click(function () {
+
+});
+
+$('#cancel').click(function () {
+ // layer.close(layer.getFrameIndex(window.name));
+})
// 鍏抽棴鍔ㄤ綔
$(document).on('click','#data-detail-close', function () {
diff --git a/src/main/webapp/views/trayCode/tray.html b/src/main/webapp/views/trayCode/tray.html
deleted file mode 100644
index bd53dcc..0000000
--- a/src/main/webapp/views/trayCode/tray.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>鎵樼洏绠＄悊</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <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">
- <link rel="stylesheet" href="../../static/css/print.css" media="all">
- <style>
- .layui-form {
- padding: 25px 30px 0 0;
- }
- .layui-form-label {
- padding: 8px 15px;
- box-sizing: content-box;
- -webkit-box-sizing: content-box;
- }
- .layui-form-required:before {
- content: "*";
- display: inline-block;
- font-family: SimSun,serif;
- margin-right: 4px;
- font-size: 14px;
- line-height: 1;
- color: #ed4014;
- }
- .layui-input {
- height: 36px;
- border-radius: 4px;
- }
- .cool-button-contain {
- text-align: right;
- margin: 20px 0;
- }
- .layui-form-radio>i:hover, .layui-form-radioed>i {
- color: #007bff;
- }
- .layui-btn {
- height: 36px;
- line-height: 36px;
- border-radius: 4px;
- box-shadow: 0 1px 0 rgba(0,0,0,.03);
- }
- .layui-btn-primary:hover {
- border-color: #777777;
- }
- </style>
-</head>
-<body>
-<form class="layui-form">
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璧峰搴忓垪:</label>
- <div class="layui-input-block">
- <input name="startNo" placeholder="璇疯緭鍏ヨ捣濮嬪簭鍒楀彿" class="layui-input" lay-verify="required|number" autocomplete="off">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鏁伴噺:</label>
- <div class="layui-input-block">
- <input name="count" type="number" placeholder="璇疯緭鍏ユ暟閲�" class="layui-input" lay-verify="required|number" autocomplete="off">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐮佺被鍨�:</label>
- <div class="layui-input-block">
- <input type="radio" name="type" value="1" title="鏉″舰鐮�" checked="">
- <input type="radio" name="type" value="2" title="浜岀淮鐮�">
- </div>
- </div>
- <div class="layui-form-item cool-button-contain">
- <button class="layui-btn layui-btn-normal" id="print" lay-filter="print" lay-submit="">鎵撳嵃</button>
- <button class="layui-btn layui-btn-primary" id="cancel">鍙栨秷</button>
- </div>
-</form>
-</body>
-<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/jquery/jQuery.print.js"></script>
-<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></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>
- layui.use(['form'], function() {
- let $ = layui.jquery;
- let form = layui.form;
-
- form.on('submit(print)', function (data) {
- $.ajax({
- url: baseUrl+"/trayCode/print/preview",
- headers: {'token': localStorage.getItem('token')},
- data: data.field,
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200){
- for (let i=0;i<res.data.length;i++){
- res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1¶m="+res.data[i].item;
- }
- parent.printPreview(res);
- // parent.layer.close(parent.layer.getFrameIndex(window.name));
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- });
-
- $('#cancel').click(function () {
- parent.layer.close(parent.layer.getFrameIndex(window.name));
- })
-
- });
-</script>
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/trayCode/trayCode.html b/src/main/webapp/views/trayCode/trayCode.html
index 31cd466..a60f312 100644
--- a/src/main/webapp/views/trayCode/trayCode.html
+++ b/src/main/webapp/views/trayCode/trayCode.html
@@ -62,6 +62,34 @@
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+<div id="print-windows" style="display: none">
+ <form class="layui-form" >
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璧峰搴忓垪:</label>
+ <div class="layui-input-block">
+ <input id="startNo" name="startNo" placeholder="璇疯緭鍏ヨ捣濮嬪簭鍒楀彿" class="layui-input" lay-verify="required|number" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鏁伴噺:</label>
+ <div class="layui-input-block">
+ <input id="count" name="count" type="number" placeholder="璇疯緭鍏ユ暟閲�" class="layui-input" lay-verify="required|number" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐮佺被鍨�:</label>
+ <div class="layui-input-block">
+ <input type="radio" name="type" value="1" title="鏉″舰鐮�" checked="">
+ <input type="radio" name="type" value="2" title="浜岀淮鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item cool-button-contain">
+ <button class="layui-btn layui-btn-normal" id="print" >鎵撳嵃</button>
+ <button class="layui-btn layui-btn-primary" id="cancel">鍙栨秷</button>
+ </div>
+ </form>
+</div>
+
</body>
<script type="text/template" id="trayCodeTemplate">
{{#each data}}
--
Gitblit v1.9.1