From b32697542f61ab9f6579aed1321d2916dd278eb5 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 07 七月 2023 17:16:48 +0800
Subject: [PATCH] 出入库测试
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 10
igds-web/src/main/resources/static/admin/inout/out-card-back.js | 2
igds-web/src/main/resources/templates/admin/inout/out-register.html | 1
igds-web/src/main/resources/templates/admin/inout/out-card-back.html | 595 +++++++++++++++++++++++----------------------
igds-web/src/main/resources/templates/admin/inout/out-handle.html | 12
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 4
igds-web/src/main/resources/templates/test/print-out.html | 98 +++++++
igds-web/src/main/resources/static/admin/inout/out-weight.js | 40 ++
igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java | 2
9 files changed, 450 insertions(+), 314 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java b/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
index 08d75f9..fa0b43a 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
@@ -14,7 +14,7 @@
/**
* 榛樿鍑哄簱杩囩鍗�
*/
- public static String OUT_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>鍑哄簱绉伴噸鍗�</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'瀹嬩綋';padding-top:15px}.div-tit{padding-top:10px}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}table{width:100%;border-right:1px solid;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>鐧昏鏃堕棿锛歳egisterTime</span><span class='sp1'>瀹屾垚鏃堕棿锛歝ompleteTime</span><span class='sp1'>鍑哄簱鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>鍙戣揣鍗曚綅</td><td colspan='3'width='37.5%'>deptName</td><td width='12.5%'>鏀惰揣鍗曚綅</td><td colspan='3'width='37.5%'>customerName</td></tr><tr><td width='12.5%'>鎵胯繍浜�</td><td width='12.5%'>driverName</td><td width='12.5%'>绮鍝佺</td><td width='12.5%'>foodVariety</td><td width='12.5%'>鍑哄簱浠撳簱</td><td width='12.5%'>depotName</td><td width='12.5%'>绮浜у湴</td><td width='12.5%'>foodLocation</td></tr><tr><td>鎵胯繍杞︾墝</td><td>plateNum</td><td>姣涢噸(KG)</td><td>fullWeight</td><td>鐨噸(KG)</td><td>emptyWeight</td><td>鍑�閲�(KG)</td><td>netWeight</td></tr><tr><td>澶囨敞</td><td colspan='3'>remark</td><td>姘村垎澧為噸(KG)</td><td>deWet</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span class='sp2'>淇濈鍛橈細handleUser</span><span class='sp2'>鎵胯繍浜猴細</span></div></body></html>";
+ public static String OUT_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'><title>鍑哄簱绉伴噸鍗�</title><style>body {text-align: center;padding: 10px} .tit {margin: 10px;font-size: 24px;font-family: '瀹嬩綋';padding-top: 15px} .div-tit {padding-top: 10px} .sp1 {width: 50%;float: left;padding-bottom: 10px} .sp2 {width: 25%;float: left;text-align: center} table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px} table td {border-left: 1px solid;border-top: 1px solid;height: 38px}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>鐧昏鏃堕棿锛歳egisterTime</span><span class='sp1'>鍑哄簱鍗曞彿锛歴erId</span></div><table cellspacing='0' cellpadding='0'><tr><td width='12.5%'>鍙戣揣鍗曚綅</td><td colspan='3' width='37.5%'>deptName</td><td width='12.5%'>鏀惰揣鍗曚綅</td><td colspan='3' width='37.5%'>customerName</td></tr><tr><td width='12.5%'>鎵胯繍浜�</td><td width='12.5%'>driverName</td><td width='12.5%'>绮鍝佺</td><td width='12.5%'>foodVariety</td><td width='12.5%'>鍑哄簱浠撳簱</td><td width='12.5%'>depotName</td><td width='12.5%'>绮浜у湴</td><td width='12.5%'>foodLocation</td></tr><tr><td>鎵胯繍杞︾墝</td><td>plateNum</td><td>姣涢噸(KG)</td><td>fullWeight</td><td>鐨噸(KG)</td><td>emptyWeight</td><td>鍑�閲�(KG)</td><td>netWeight</td></tr><tr><td>鍏朵粬鎵ｉ噸(KG)</td><td>deOther</td><td>鍊间粨鎵ｉ噸(KG)</td><td>deHandle</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td><td colspan=\"2\"></td></tr><tr><td>澶囨敞</td><td colspan='7'>remark</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span class='sp2'>淇濈鍛橈細handleUser</span><span class='sp2'>鎵胯繍浜猴細driverName</span></div><br></body><div style=\"padding-top: 10px\"><span></span></div><div style=\"text-align: left;font-size: 12px\"><span>娉細</span></div><div style=\"text-align: left;font-size: 12px\"><span>1.鍑�閲�=姣涢噸-鐨噸锛�</span></div><div style=\"text-align: left;font-size: 12px\"><span>2.鍑哄簱閲嶉噺=鍑�閲�-鎬绘墸閲嶏紱缁撶畻閲嶉噺=鍑�閲�-鎬绘墸閲嶏紱</span></div><div style=\"text-align: left;font-size: 12px\"><span>3.鐧借仈锛堝瓨鏍癸級锛岀孩鑱旓紙璁拌处锛夛紝榛勮仈锛堝鎴蜂繚鐣欙級</span></div></html>";
/**
* 榛樿楠屾鍗�
*/
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 3154877..da85c44 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -1020,8 +1020,8 @@
}
}
- public void initInoutWeight(List<InoutConf> listInoutConf,String sort) {
- inoutEventControl.initInoutWeight(listInoutConf,sort);
+ public void initInoutWeight(List<InoutConf> listInoutConf, String sort) {
+ inoutEventControl.initInoutWeight(listInoutConf, sort);
}
}
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
index 39ad1ad..9023442 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -148,7 +148,7 @@
*/
public String outWeightBill(InoutData data) {
// 鑾峰彇琛ㄥ崟鏁版嵁
- WeightBill bill = this.createBillData(data, "鍑哄簱绉伴噸鍗�");
+ WeightBill bill = this.createBillData(data, "鍑哄簱鍒掔爜鍗�");
//榛樿妯＄増
String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT;
@@ -190,7 +190,7 @@
htmlStr = htmlStr.replace("fullTime", bill.getFullTime());
htmlStr = htmlStr.replace("emptyTime", bill.getEmptyTime());
htmlStr = htmlStr.replace("serId", bill.getSerId());
- htmlStr = htmlStr.replace("specType", bill.getSpecType());
+// htmlStr = htmlStr.replace("specType", bill.getSpecType());
htmlStr = htmlStr.replace("customerName", bill.getCustomerName());
htmlStr = htmlStr.replace("deptName", bill.getUnitName());
@@ -212,13 +212,13 @@
new DecimalFormat("0").format(bill.getNetWeight()));
htmlStr = htmlStr.replace("remark", bill.getRemark());
- htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
+// htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
htmlStr = htmlStr.replace("settleWeight",
new DecimalFormat("0").format(bill.getSettleWeight()));
-
+ htmlStr = htmlStr.replace("deHandle", bill.getDeHandle() + "");
htmlStr = htmlStr.replace("handleUser", bill.getHandleUser());
htmlStr = htmlStr.replace("deSum", bill.getDeSum() + "");
-
+ htmlStr = htmlStr.replace("deOther", bill.getDeOther() + "");
htmlStr = htmlStr.replace("price", bill.getPrice());
htmlStr = htmlStr.replace("settleMoney", bill.getSettleMoney() + "");
htmlStr = htmlStr.replace("wet", bill.getWet() + "");
diff --git a/igds-web/src/main/resources/static/admin/inout/out-card-back.js b/igds-web/src/main/resources/static/admin/inout/out-card-back.js
index afb7878..d64a8ee 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-card-back.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-card-back.js
@@ -116,7 +116,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout-report/inout-bill-weight",
+ url: "../../basic/inout/report/bill-weight",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(recordData),
diff --git a/igds-web/src/main/resources/static/admin/inout/out-weight.js b/igds-web/src/main/resources/static/admin/inout/out-weight.js
index ac45a64..f044d4d 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-weight.js
@@ -264,7 +264,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../inout/api/ic-card-num",
+ url: "../../inout/api/get-icCard",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: param,
@@ -388,10 +388,11 @@
});
}
-// 鎵撳嵃杩囩鍗�
+
+// 鐐瑰嚮鎵撳嵃锛岀郴缁熷垽鏂槸鍚﹀凡缁忔墽琛屽畬鎴愶紝濡傛灉宸茬粡瀹屾垚锛岀洿鎺ユ墦鍗帮紝濡傛灉鏈畬鎴愬垯鍏堟墽琛屽畬鎴�
function printBill() {
if (!recordData) {
- layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝涓嶆敮鎸佹墦鍗帮紒");
+ alertError("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝鎵撳嵃琚嫆缁濓紒");
return;
}
// 浠庡悗鍙拌幏鍙栨ā鐗堝苟鎵撳嵃
@@ -399,7 +400,27 @@
// 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
Object.assign(recordData, data);
- printBillStep2();
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/report/bill-weight",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(recordData),
+ success: function (result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ alertError(result.msg);
+ } else {
+ layer.msg("寮�濮嬫覆鏌撴墦鍗板崟鈥︹��");
+ printWeight(result.data);
+ }
+ },
+ error: function () {
+ layer.close(index);
+ alertError("鑾峰彇鎵撳嵃妯＄増澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬪師鍥�");
+ }
+ });
}
// 鐐瑰嚮鎵撳嵃锛屽厛鎵ц绯荤粺榛樿鎵ц瀹屾垚鍗″洖鏀�
@@ -407,7 +428,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout-report/inout-bill-weight",
+ url: "../../basic/inout-report/bill-weight",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(recordData),
@@ -599,7 +620,6 @@
fileName: snapData.fileName3
}];
recordData.files = files;
- console.log("out-weight,submit")
var index = layer.load();
$.ajax({
type: "POST",
@@ -624,10 +644,10 @@
});
//浠ヤ笅閫昏緫涓哄鍔犱竴涓闊抽�氱煡鐨勮皟鐢ㄦ柟娉曪紝涓嶈�冭檻杩斿洖缁撴灉
- var curWeight = recordData.fullWeight;
- if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
- curWeight = recordData.emptyWeight;
- }
+ // var curWeight = recordData.fullWeight;
+ // if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
+ // curWeight = recordData.emptyWeight;
+ // }
// var param = {
// sort: $("#scaleName").val(),
// weight: curWeight,
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-card-back.html b/igds-web/src/main/resources/templates/admin/inout/out-card-back.html
index 17e8854..60cd451 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-card-back.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-card-back.html
@@ -1,335 +1,342 @@
<!DOCTYPE html>
<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta name="viewport"
- content="width=device-width, initial-scale=1, maximum-scale=1">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="renderer" content="webkit">
- <title>鍑哄叆搴撶鐞�-鍗″洖鏀�</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1, maximum-scale=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="renderer" content="webkit">
+ <title>鍑哄叆搴撶鐞�-鍗″洖鏀�</title>
- <link rel="stylesheet" type="text/css"
- th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
- <link rel="stylesheet" type="text/css"
- th:href="@{../../static/admin/inout/style.css}">
+ <link rel="stylesheet" type="text/css"
+ th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
+ <link rel="stylesheet" type="text/css"
+ th:href="@{../../static/admin/inout/style.css}">
- <!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
- <script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
- <object id="LODOP_OB"
- classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0
- style="display: none;">
- <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0
- style="display: none;"></embed>
- </object>
+ <!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
+ <script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
+ <object id="LODOP_OB"
+ classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0
+ style="display: none;">
+ <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0
+ style="display: none;"></embed>
+ </object>
- <style>
- .display-none {
- display: none;
- }
+ <style>
+ .display-none {
+ display: none;
+ }
- .rk-step-wrap {
- padding: 0px;
- border-bottom: 0px;
- text-align: center;
- }
+ .rk-step-wrap {
+ padding: 0px;
+ border-bottom: 0px;
+ text-align: center;
+ }
- .qyzj-btnbox .rkbk-quick {
- margin-top: 15px;
- }
- </style>
+ .qyzj-btnbox .rkbk-quick {
+ margin-top: 15px;
+ }
+ </style>
</head>
<body>
<div class="l-container layui-clear">
- <div class="rk-main">
+ <div class="rk-main">
- <div class="qyzj-btnbox layui-clear">
+ <div class="qyzj-btnbox layui-clear">
- <div class="rkbk-quick fl">
- <button class="rkbk-quick-btn layui-btn btn-green"
- onclick="submit()">
- <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 鍑哄簱鏀跺崱
- </button>
- <button class="rkbk-quick-btn layui-btn btn-violet"
- onclick="printBill()">
- <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>
- 鎵撳嵃杩囩鍗�
- </button>
- </div>
+ <div class="rkbk-quick fl">
+ <button class="rkbk-quick-btn layui-btn btn-green"
+ onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 鍑哄簱鏀跺崱
+ </button>
+ <button class="rkbk-quick-btn layui-btn btn-violet"
+ onclick="printBill()">
+ <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>
+ 鎵撳嵃杩囩鍗�
+ </button>
+ </div>
- <!-- 娴佺▼寮曞 -->
- <div class="rk-step-wrap fr">
- <ul class="rk-step">
- <li id="progress-register" class="active rk-step-first">
+ <!-- 娴佺▼寮曞 -->
+ <div class="rk-step-wrap fr">
+ <ul class="rk-step">
+ <li id="progress-register" class="active rk-step-first">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-dengji.png}"/>
</span>
- <p>鍑哄簱鐧昏</p>
- </li>
- <li id="progress-emptyWeight" class="active">
+ <p>鍑哄簱鐧昏</p>
+ </li>
+ <li id="progress-emptyWeight" class="active">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-chengzhong.png}"/>
</span>
- <p>绌鸿溅绉伴噸</p>
- </li>
- <li id="progress-hand" class="active">
+ <p>绌鸿溅绉伴噸</p>
+ </li>
+ <li id="progress-hand" class="active">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-xiehuo.png}"/>
</span>
- <p>鍑哄簱鍊间粨</p>
- </li>
- <li id="progress-fullWeight" class="active">
+ <p>鍑哄簱鍊间粨</p>
+ </li>
+ <li id="progress-fullWeight" class="active">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-chengzhong.png}"/>
</span>
- <p>婊¤溅绉伴噸</p>
- </li>
- <li id="progress-cardBack" class="active">
+ <p>婊¤溅绉伴噸</p>
+ </li>
+ <li id="progress-cardBack" class="active">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-banli.png}"/>
</span>
- <p>绂诲簱纭</p>
- </li>
- </ul>
+ <p>绂诲簱纭</p>
+ </li>
+ </ul>
- </div>
- <!-- 娴佺▼寮曞EDN -->
+ </div>
+ <!-- 娴佺▼寮曞EDN -->
- </div>
+ </div>
- <div class="rkbk-con">
+ <div class="rkbk-con">
- <div class="radius-6 rkbk-left-wrap fl">
- <div class="rkbk-left">
- <div class="rkbk-tit">
- <i></i>
- <h3>鎵胯繍浜轰俊鎭�</h3>
- </div>
- <div class="rkbk-left-form">
- <form class="layui-form" action="" id="form-basic"
- lay-filter="form-basic">
+ <div class="radius-6 rkbk-left-wrap fl">
+ <div class="rkbk-left">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鎵胯繍浜轰俊鎭�</h3>
+ </div>
+ <div class="rkbk-left-form">
+ <form class="layui-form" action="" id="form-basic"
+ lay-filter="form-basic">
- <div class="rkbk-form-box1">
+ <div class="rkbk-form-box1">
- <div class="rkbk-form-left">
+ <div class="rkbk-form-left">
- <div class="layui-form-item">
- <label class="layui-form-label">濮� 鍚�</label>
- <div class="layui-input-block">
- <input type="text" name="userName" placeholder="鑷姩鑾峰彇"
- autocomplete="off" class="layui-input rkbk-search-input" disabled>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">韬唤璇佸彿</label>
- <div class="layui-input-block">
- <input type="text" name="userId" placeholder="鑷姩鑾峰彇"
- autocomplete="off" class="layui-input rkbk-search-input" disabled>
- </div>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">濮� 鍚�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userName" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">韬唤璇佸彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="userId" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鑱旂郴鏂瑰紡</label>
- <div class="layui-input-block">
- <input type="text" name="userContact" placeholder="鑷姩鑾峰彇"
- autocomplete="off" class="layui-input rkbk-search-input" disabled>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍑虹敓鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="text" name="userBirthday"
- placeholder="yyyy-MM-dd" autocomplete="off"
- class="layui-input rkbk-search-input bg-date" id="test1" disabled>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎬� 鍒�</label>
- <div class="layui-input-block rkbk-selBox">
- <input type="radio" name="userSex" value="鐢�" title="鐢�"
- checked disabled> <input type="radio" name="userSex"
- value="濂�" title="濂�" disabled>
- </div>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鑱旂郴鏂瑰紡</label>
+ <div class="layui-input-block">
+ <input type="text" name="userContact" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑虹敓鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="text" name="userBirthday"
+ placeholder="yyyy-MM-dd" autocomplete="off"
+ class="layui-input rkbk-search-input bg-date" id="test1" disabled>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎬� 鍒�</label>
+ <div class="layui-input-block rkbk-selBox">
+ <input type="radio" name="userSex" value="鐢�" title="鐢�"
+ checked disabled> <input type="radio" name="userSex"
+ value="濂�" title="濂�" disabled>
+ </div>
+ </div>
- <div class="layui-form-item">
- <label class="layui-form-label">姘� 鏃�</label>
- <div class="layui-input-block">
- <input type="text" name="userNation" placeholder="鑷姩鑾峰彇"
- autocomplete="off" class="layui-input rkbk-search-input" disabled>
- </div>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">姘� 鏃�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userNation" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
- </div>
- <!--rk-form-left end-->
+ </div>
+ <!--rk-form-left end-->
- <div class="rkbk-photo">
- <a href="#"><img
- th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
- </div>
+ <div class="rkbk-photo">
+ <a href="#"><img
+ th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
+ </div>
- </div>
- <!--rkbk-form-box1 end-->
+ </div>
+ <!--rkbk-form-box1 end-->
- <div class="rkbk-form-box2" style="padding-top: 20px;">
- <div class="layui-form-item">
- <label class="layui-form-label">鍦� 鍧�</label>
- <div class="layui-input-block">
- <input type="text" name="userAddress" placeholder="鑷姩鑾峰彇"
- autocomplete="off" class="layui-input rkbk-search-input" disabled>
- </div>
- </div>
- </div>
- <div class="rkbk-quick layui-text-center">
- <button id="button_readID" type="button"
- onclick="flushIdCard()"
- class="rkbk-quick-btn layui-btn btn-blue">璇诲彇韬唤璇�
- </button>
- </div>
- <!--rkbk-form-box2 end-->
- </form>
+ <div class="rkbk-form-box2" style="padding-top: 20px;">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍦� 鍧�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userAddress" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="rkbk-quick layui-text-center">
+ <button id="button_readID" type="button"
+ onclick="flushIdCard()"
+ class="rkbk-quick-btn layui-btn btn-blue">璇诲彇韬唤璇�
+ </button>
+ </div>
+ <!--rkbk-form-box2 end-->
+ </form>
- </div>
- </div>
+ </div>
+ </div>
- </div>
- <!--rkbk-left end-->
+ </div>
+ <!--rkbk-left end-->
- <div class="radius-6 rkbk-right-wrap fr">
- <div class="rkbk-left">
- <div class="rkbk-tit">
- <i></i>
- <h3>涓氬姟鏁版嵁</h3>
- </div>
+ <div class="radius-6 rkbk-right-wrap fr">
+ <div class="rkbk-left">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>涓氬姟鏁版嵁</h3>
+ </div>
- <div class="rkbk-left-form rkbk-right-form">
- <form class="layui-form" action="" id="form-data"
- lay-filter="form-data">
+ <div class="rkbk-left-form rkbk-right-form">
+ <form class="layui-form" action="" id="form-data"
+ lay-filter="form-data">
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-ID</label>
- <div class="layui-input-block">
- <input type="text" name="id" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-娴佺▼鑺傜偣</label>
- <div class="layui-input-block">
- <input type="text" name="progress" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-涓氬姟绫诲瀷</label>
- <div class="layui-input-block">
- <input type="text" name="type" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item">
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-ID</label>
+ <div class="layui-input-block">
+ <input type="text" name="id" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-娴佺▼鑺傜偣</label>
+ <div class="layui-input-block">
+ <input type="text" name="progress" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-涓氬姟绫诲瀷</label>
+ <div class="layui-input-block">
+ <input type="text" name="type" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
- <input type="button" value="璇诲崱" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()">
- <label class="layui-form-label">鏅烘収鍗″彿</label>
- <div class="layui-input-block">
- <input type="text" name="intelCard" id="intelCard"
- placeholder="鍏堢偣鍑昏鍗★紝鍚庢斁鍗�......" autocomplete="off"
- class="layui-input">
- </div>
- </div>
+ <input type="button" value="璇诲崱" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()">
+ <label class="layui-form-label">鏅烘収鍗″彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="intelCard" id="intelCard"
+ placeholder="鍏堢偣鍑昏鍗★紝鍚庢斁鍗�......" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
- <div class="layui-form-item">
- <input type="button" value="鏌ヨ" class="rkbk-r-btn fr layui-btn" onclick="flushData()">
- <label class="layui-form-label">杞︾墝鍙�</label>
- <div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum"
- placeholder="杈撳叆杞︾墝鍙疯繘琛屾煡璇�" autocomplete="off"
- class="layui-input">
- </div>
- </div>
+ <div class="layui-form-item">
+ <input type="button" value="鏌ヨ" class="rkbk-r-btn fr layui-btn" onclick="flushData()">
+ <label class="layui-form-label">杞︾墝鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" name="plateNum" id="plateNum"
+ placeholder="杈撳叆杞︾墝鍙疯繘琛屾煡璇�" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瑁呭嵏浠撳簱</label>
- <div class="layui-input-block">
- <select name="depotId" id="depotId" disabled>
- <option value="">鑷姩鑾峰彇</option>
- <option th:each="depot,depotSet:${listDepot}"
- th:value="${depot.id}" th:text="${depot.name}"></option>
- </select>
- </div>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瑁呭嵏浠撳簱</label>
+ <div class="layui-input-block">
+ <select name="depotId" id="depotId" disabled>
+ <option value="">鑷姩鑾峰彇</option>
+ <option th:each="depot,depotSet:${listDepot}"
+ th:value="${depot.id}" th:text="${depot.name}"></option>
+ </select>
+ </div>
+ </div>
- <div class="layui-form-item">
- <label class="layui-form-label">绮鍝佺</label>
- <div class="layui-input-block">
- <select name="foodVariety" disabled>
- <option value="">鑷姩鑾峰彇</option>
- <option th:each="dic,dicSet:${listFoodVariety}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
- </select>
- </div>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绮鍝佺</label>
+ <div class="layui-input-block">
+ <select name="foodVariety" disabled>
+ <option value="">鑷姩鑾峰彇</option>
+ <option th:each="dic,dicSet:${listFoodVariety}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
+ </div>
+ </div>
- <div class="layui-form-item">
- <label class="layui-form-label">绮绛夌骇</label>
- <div class="layui-input-block">
- <select name="foodLevel" disabled>
- <option value="">鑷姩鑾峰彇</option>
- <option th:each="dic,dicSet:${listFoodLevel}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
- </select>
- </div>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绮绛夌骇</label>
+ <div class="layui-input-block">
+ <select name="foodLevel" disabled>
+ <option value="">鑷姩鑾峰彇</option>
+ <option th:each="dic,dicSet:${listFoodLevel}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
+ </div>
+ </div>
- <div class="layui-form-item">
- <label class="layui-form-label">寰�鏉ュ崟浣�</label>
- <div class="layui-input-block">
- <input type="text" name="customerName" placeholder="鑷姩鑾峰彇"
- autocomplete="off" class="layui-input rkbk-search-input" disabled>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">绮浜у湴</label>
- <div class="layui-input-block">
- <input type="text" name="foodLocation" placeholder="鑷姩鑾峰彇"
- autocomplete="off" class="layui-input rkbk-search-input" disabled>
- </div>
- </div>
- </form>
- </div>
- </div>
- </div>
- <!--rkbk-right end-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" name="customerName" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绮浜у湴</label>
+ <div class="layui-input-block">
+ <input type="text" name="foodLocation" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
- </div>
- <!--rkbk-con end-->
+ <div class="rkbk-quick layui-text-center">
+ <button class="rkbk-quick-btn layui-btn btn-green" type='button'
+ onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 鍑哄簱鏀跺崱
+ </button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <!--rkbk-right end-->
- </div>
- <!--rk-main end-->
+ </div>
+ <!--rkbk-con end-->
+
+ </div>
+ <!--rk-main end-->
</div>
<!--l-container end-->
<script th:inline="javascript">
- //娴佺▼鐜妭
- var inoutProgress = [[${inoutProgress}]];
- var progress = [[${progress}]];
- var listDepot = [[${listDepot}]];
- //涓氬姟姝ラ
- var bizType = [[${bizType}]];
- var deptId = [[${deptId}]];
- //userId
- var userId = [[${loginUser.username}]];
- var companyId = [[${loginUser.companyId}]];
- //鍑哄叆搴撶被鍨�
- var type = [[${type}]];
- //鍝佺
- var listFoodVariety = [[${listFoodVariety}]];
- var listFoodLevel = [[${listFoodLevel}]];
+ //娴佺▼鐜妭
+ var inoutProgress = [[${inoutProgress}]];
+ var progress = [[${progress}]];
+ var listDepot = [[${listDepot}]];
+ //涓氬姟姝ラ
+ var bizType = [[${bizType}]];
+ var deptId = [[${deptId}]];
+ //userId
+ var userId = [[${loginUser.username}]];
+ var companyId = [[${loginUser.companyId}]];
+ //鍑哄叆搴撶被鍨�
+ var type = [[${type}]];
+ //鍝佺
+ var listFoodVariety = [[${listFoodVariety}]];
+ var listFoodLevel = [[${listFoodLevel}]];
</script>
@@ -342,33 +349,33 @@
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
- <table class="layui-table">
- <colgroup>
- <col width="100">
- </colgroup>
- <tbody>
- <tr>
- <td>杩斿洖淇℃伅</td>
- <td id="resultMsg" style="color: red;font-weight: bold;"></td>
- </tr>
- <tr>
- <td>鎵胯繍浜�</td>
- <td id="resultUserName" style="font-weight: bold;"></td>
- </tr>
- <tr>
- <td>杞︾墝鍙�</td>
- <td id="resultPlateNum" style="font-weight: bold;"></td>
- </tr>
- <tr>
- <td>涓嬩竴姝�</td>
- <td id="resultType" style="font-weight: bold;"></td>
- </tr>
- <tr>
- <td>鏅烘収鍗″彿</td>
- <td id="resultIntelCard" style="font-weight: bold;"></td>
- </tr>
- </tbody>
- </table>
+ <table class="layui-table">
+ <colgroup>
+ <col width="100">
+ </colgroup>
+ <tbody>
+ <tr>
+ <td>杩斿洖淇℃伅</td>
+ <td id="resultMsg" style="color: red;font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>鎵胯繍浜�</td>
+ <td id="resultUserName" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>杞︾墝鍙�</td>
+ <td id="resultPlateNum" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>涓嬩竴姝�</td>
+ <td id="resultType" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>鏅烘収鍗″彿</td>
+ <td id="resultIntelCard" style="font-weight: bold;"></td>
+ </tr>
+ </tbody>
+ </table>
</div>
</body>
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-handle.html b/igds-web/src/main/resources/templates/admin/inout/out-handle.html
index 71e3c86..254ff9e 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-handle.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-handle.html
@@ -444,7 +444,16 @@
<!-- </div>-->
<!-- </div>-->
<!--</div>-->
- <div class="layui-col-xs12">
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">鍊间粨浜�</label>
+ <div class="layui-input-block">
+ <input type="text" name="handleUser" autocomplete="off"
+ placeholder="鎵嬪姩褰曞叆" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs8">
<div class="layui-form-item">
<label class="layui-form-label">鍏朵粬璇存槑</label>
<div class="layui-input-block">
@@ -567,6 +576,7 @@
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/weight.js}"></script>
<script th:src="@{../../static/admin/inout/out-handle.js}"></script>
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-register.html b/igds-web/src/main/resources/templates/admin/inout/out-register.html
index ec8add8..45d8cb2 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-register.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-register.html
@@ -351,6 +351,7 @@
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/video-play.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/out-register.js}"></script>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
diff --git a/igds-web/src/main/resources/templates/test/print-out.html b/igds-web/src/main/resources/templates/test/print-out.html
new file mode 100644
index 0000000..e24257a
--- /dev/null
+++ b/igds-web/src/main/resources/templates/test/print-out.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang='zh-cn'>
+<head>
+ <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
+ <title>鍑哄簱绉伴噸鍗�</title>
+ <style>body {
+ text-align: center;
+ padding: 10px
+ }
+
+ .tit {
+ margin: 10px;
+ font-size: 24px;
+ font-family: '瀹嬩綋';
+ padding-top: 15px
+ }
+
+ .div-tit {
+ padding-top: 10px
+ }
+
+ .sp1 {
+ width: 50%;
+ float: left;
+ padding-bottom: 10px
+ }
+
+ .sp2 {
+ width: 25%;
+ float: left;
+ text-align: center
+ }
+
+ table {
+ width: 100%;
+ border-right: 1px solid;
+ border-bottom: 1px solid;
+ font-size: 14px
+ }
+
+ table td {
+ border-left: 1px solid;
+ border-top: 1px solid;
+ height: 38px
+ }</style>
+</head>
+<body><h1 class='tit'>billTitle</h1>
+<div class='div-tit'><span class='sp1'>鐧昏鏃堕棿锛歳egisterTime</span><span class='sp1'>鍑哄簱鍗曞彿锛歴erId</span></div>
+<table cellspacing='0' cellpadding='0'>
+ <tr>
+ <td width='12.5%'>鍙戣揣鍗曚綅</td>
+ <td colspan='3' width='37.5%'>deptName</td>
+ <td width='12.5%'>鏀惰揣鍗曚綅</td>
+ <td colspan='3' width='37.5%'>customerName</td>
+ </tr>
+ <tr>
+ <td width='12.5%'>鎵胯繍浜�</td>
+ <td width='12.5%'>driverName</td>
+ <td width='12.5%'>绮鍝佺</td>
+ <td width='12.5%'>foodVariety</td>
+ <td width='12.5%'>鍑哄簱浠撳簱</td>
+ <td width='12.5%'>depotName</td>
+ <td width='12.5%'>绮浜у湴</td>
+ <td width='12.5%'>foodLocation</td>
+ </tr>
+ <tr>
+ <td>鎵胯繍杞︾墝</td>
+ <td>plateNum</td>
+ <td>姣涢噸(KG)</td>
+ <td>fullWeight</td>
+ <td>鐨噸(KG)</td>
+ <td>emptyWeight</td>
+ <td>鍑�閲�(KG)</td>
+ <td>netWeight</td>
+ </tr>
+ <tr>
+ <td>鍏朵粬鎵ｉ噸</td>
+ <td>deOther</td>
+ <td>鍊间粨鎵ｉ噸(KG)</td>
+ <td>deHandle</td>
+ <td>缁撶畻閲嶉噺(KG)</td>
+ <td>settleWeight</td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td>澶囨敞</td>
+ <td colspan='7'>remark</td>
+ </tr>
+</table>
+<div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span
+ class='sp2'>淇濈鍛橈細handleUser</span><span class='sp2'>鎵胯繍浜猴細driverName</span></div>
+<br></body>
+<div style="padding-top: 10px"><span></span></div>
+<div style="text-align: left;font-size: 12px"><span>娉細</span></div>
+<div style="text-align: left;font-size: 12px"><span>1.鍑�閲�=姣涢噸-鐨噸锛�</span></div>
+<div style="text-align: left;font-size: 12px"><span>2.鍑哄簱閲嶉噺=鍑�閲�-鎬绘墸閲嶏紱缁撶畻閲嶉噺=鍑�閲�-鎬绘墸閲嶏紱</span></div>
+<div style="text-align: left;font-size: 12px"><span>3.鐧借仈锛堝瓨鏍癸級锛岀孩鑱旓紙璁拌处锛夛紝榛勮仈锛堝鎴蜂繚鐣欙級</span></div>
+</html>
\ No newline at end of file
--
Gitblit v1.9.3