From dbbd8b7066092b3ce4eab44fa0e2b746dad16a95 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 07 七月 2023 19:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 | 362 ++--
igds-web/src/main/resources/templates/admin/inout/out-register.html | 623 ++++----
igds-web/src/main/resources/static/admin/inout/weight.js | 153 +
igds-web/src/main/resources/templates/admin/inout/out-handle.html | 967 +++++++------
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 7
igds-web/src/main/resources/templates/test/print-out.html | 98 +
igds-web/src/main/resources/static/admin/inout/out-weight.js | 393 ++--
igds-web/src/main/resources/static/admin/inout/in-sample.js | 35
igds-web/src/main/resources/static/admin/inout/out-register.js | 61
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 1
igds-web/src/main/resources/templates/admin/inout/in-register.html | 623 ++++----
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js | 1
igds-web/src/main/resources/templates/admin/inout/out-card-back.html | 595 ++++----
igds-web/src/main/resources/templates/test/qualityReport01.html | 2
igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java | 2
igds-web/src/main/resources/static/admin/inout/out-handle.js | 59
igds-web/src/main/resources/templates/admin/inout/out-weight.html | 292 ++-
18 files changed, 2,349 insertions(+), 1,935 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 051e487..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
@@ -876,7 +876,7 @@
// 璐ㄦ瀹屾垚瑙﹀彂浜嬩欢
- inoutEventControl.onInCheck(data,curProgress,nextProgress);
+ inoutEventControl.onInCheck(data, curProgress, nextProgress);
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
}
@@ -994,7 +994,6 @@
}
/**
- *
* @param param
* @return
*/
@@ -1021,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-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
index fba9706..a29212c 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
@@ -25,6 +25,7 @@
LODOP.PRINT_INIT("璐ㄦ鍗�");
LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4");
LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT", "Full-Page");
LODOP.PREVIEW();
};
print5016CheckBill = function (htmlStr) {
diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
index 8eaa2f6..c732d7a 100644
--- a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -117,6 +117,7 @@
<if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if>
<if test="data.price != null">PRICE_ = #{data.price},</if>
<if test="data.remarks != null">REMARKS_ = #{data.remarks},</if>
+ <if test="data.updateTime != null">UPDATE_TIME_ = #{data.updateTime},</if>
</trim>
WHERE
COMPANY_ID_ =#{data.companyId}
diff --git a/igds-web/src/main/resources/static/admin/inout/in-sample.js b/igds-web/src/main/resources/static/admin/inout/in-sample.js
index cfbf7aa..f727125 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-sample.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-sample.js
@@ -358,4 +358,39 @@
alertError("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯");
}
});
+}
+
+/**
+ * 寮瑰嚭鎻愰啋妗�
+ * @param msg 鎻愰啋淇℃伅
+ * @param data 鏁版嵁淇℃伅锛屽彲鑳戒负绌�
+ */
+function notify(msg, data) {
+ if (data) {
+ //璧嬪��
+ $("#resultMsg").text(msg);
+ $("#resultUserName").text(data.userName);
+ $("#resultPlateNum").text(data.plateNum);
+ if ("IN" == data.type) {
+ $("#resultType").text("鍏ュ簱-" + INOUT_PROGRESS_MSG(data.progress));
+ } else {
+ $("#resultType").text("鍑哄簱-" + INOUT_PROGRESS_MSG(data.progress));
+ }
+ $("#resultIntelCard").text(data.intelCard);
+
+ layer.open({
+ type: 1,
+ offset: ['150px', '200px'],
+ area: '450px;',
+ shade: 0.8,
+ id: 'dialog_notify_info',
+ btn: ['纭畾'],
+ content: $('#dialog-from-notify'),
+ yes: function (index) {
+ layer.closeAll();
+ }
+ });
+ } else {
+ layer.alert(msg, {offset: ['300px', '300px']});
+ }
}
\ No newline at end of file
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 542beed..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
@@ -2,226 +2,226 @@
var layer;
var form;
var recordData = null;
-$(function() {
- layui.use([ 'layer', 'laydate', 'form', 'util' ], function() {
- layer = layui.layer;
- form = layui.form;
- layui.laydate.render({
- elem : '#test1',
- theme : '#7b8e9f'
- });
+$(function () {
+ layui.use(['layer', 'laydate', 'form', 'util'], function () {
+ layer = layui.layer;
+ form = layui.form;
+ layui.laydate.render({
+ elem: '#test1',
+ theme: '#7b8e9f'
+ });
- });
+ });
- showProgress();
+ showProgress();
});
//鎺у埗娴佺▼鐜妭鏄剧ず
function showProgress() {
- if(!inoutProgress){
- return;
- }
+ if (!inoutProgress) {
+ return;
+ }
- if(inoutProgress.indexOf("REGISTER") == -1){
- $("#progress-register").css("display", "none");
- }
- if(inoutProgress.indexOf("WEIGHT_FULL") == -1){
- $("#progress-fullWeight").css("display", "none");
- }
- if(inoutProgress.indexOf("HANDLE") == -1){
- $("#progress-hand").css("display", "none");
- }
- if(inoutProgress.indexOf("WEIGHT_EMPTY") == -1){
- $("#progress-emptyWeight").css("display", "none");
- }
- if(inoutProgress.indexOf("CARD_BACK") == -1){
- $("#progress-cardBack").css("display", "none");
- }
+ if (inoutProgress.indexOf("REGISTER") == -1) {
+ $("#progress-register").css("display", "none");
+ }
+ if (inoutProgress.indexOf("WEIGHT_FULL") == -1) {
+ $("#progress-fullWeight").css("display", "none");
+ }
+ if (inoutProgress.indexOf("HANDLE") == -1) {
+ $("#progress-hand").css("display", "none");
+ }
+ if (inoutProgress.indexOf("WEIGHT_EMPTY") == -1) {
+ $("#progress-emptyWeight").css("display", "none");
+ }
+ if (inoutProgress.indexOf("CARD_BACK") == -1) {
+ $("#progress-cardBack").css("display", "none");
+ }
}
//鏂扮殑璇诲崱鏂瑰紡
function flushICCard() {
- $("#intelCard").val(null);
- resetForm();
- $.ajax({
- type: "GET",
- async: true,
- url: "http://127.0.0.1:9111/ICCARD",
- data: {},
- dataType: "jsonp",
- jsonp: "callback",
- jsonpCallback: "jsonpCallback",
- success: function (json) {
- //console.log(json);
- var data = json.no;
- //console.log(data);
- if (data === "not found") {
- layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
- } else {
- $("#intelCard").val(data);
- flushData();
- }
- },
- error: function () {
- layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
- }
- });
+ $("#intelCard").val(null);
+ resetForm();
+ $.ajax({
+ type: "GET",
+ async: true,
+ url: "http://127.0.0.1:9111/ICCARD",
+ data: {},
+ dataType: "jsonp",
+ jsonp: "callback",
+ jsonpCallback: "jsonpCallback",
+ success: function (json) {
+ //console.log(json);
+ var data = json.no;
+ //console.log(data);
+ if (data === "not found") {
+ layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
+ } else {
+ $("#intelCard").val(data);
+ flushData();
+ }
+ },
+ error: function () {
+ layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
+ }
+ });
}
// 浣跨敤鎻掍欢鑾峰彇鐪佷唤璇�
function flushIdCard() {
- var index = layer.load();
- $.ajax({
- type: "GET",
- async: true,
- url: "http://127.0.0.1:9111/IDCARD",
- data: {},
- dataType: "jsonp",
- jsonp: "callback",
- jsonpCallback: "jsonpCallback",
- success: function (json) {
- layer.close(index);
- var data = json.content;
- if (data === "not found") {
- layer.alert("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛岃鎵嬪姩褰曞叆锛�", {
- offset: ['300px', '300px']
- });
- return;
- }
- $("#userId").val(data.idNum);
- flushData();
- },
- error: function () {
- layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
- offset: ['300px', '300px']
- });
- layer.close(index);
- }
- });
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ async: true,
+ url: "http://127.0.0.1:9111/IDCARD",
+ data: {},
+ dataType: "jsonp",
+ jsonp: "callback",
+ jsonpCallback: "jsonpCallback",
+ success: function (json) {
+ layer.close(index);
+ var data = json.content;
+ if (data === "not found") {
+ layer.alert("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛岃鎵嬪姩褰曞叆锛�", {
+ offset: ['300px', '300px']
+ });
+ return;
+ }
+ $("#userId").val(data.idNum);
+ flushData();
+ },
+ error: function () {
+ layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
+ offset: ['300px', '300px']
+ });
+ layer.close(index);
+ }
+ });
}
// 鎵撳嵃杩囩鍗�
function printBill() {
- if (!recordData) {
- layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝涓嶆敮鎸佹墦鍗帮紒");
- return;
- }
+ if (!recordData) {
+ layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝涓嶆敮鎸佹墦鍗帮紒");
+ return;
+ }
- if(InoutProgress.CARD_BACK != recordData.progress){
- layer.alert("褰撳墠鏁版嵁涓嶅畬鏁达紝涓嶆敮鎸佹墦鍗帮紒");
- return;
- }
+ if (InoutProgress.CARD_BACK != recordData.progress) {
+ layer.alert("褰撳墠鏁版嵁涓嶅畬鏁达紝涓嶆敮鎸佹墦鍗帮紒");
+ return;
+ }
- //浠庡悗鍙拌幏鍙栨ā鐗堝苟鎵撳嵃
- var index = layer.load();
- $.ajax({
- type : "POST",
- url : "../../basic/inout-report/inout-bill-weight",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(recordData),
- success : function(result) {
- if (result.code != "0000") {
- layer.msg(result.msg);
- } else {
- layer.msg("寮�濮嬫覆鏌撴墦鍗板崟鈥︹��");
- printWeight(result.data);
- }
- layer.close(index);
- },
- error : function() {
- layer.close(index);
- layer.msg("鑾峰彇鎵撳嵃妯＄増澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬪師鍥狅紒锛�");
- }
- });
+ //浠庡悗鍙拌幏鍙栨ā鐗堝苟鎵撳嵃
+ 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) {
+ if (result.code != "0000") {
+ layer.msg(result.msg);
+ } else {
+ layer.msg("寮�濮嬫覆鏌撴墦鍗板崟鈥︹��");
+ printWeight(result.data);
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ layer.msg("鑾峰彇鎵撳嵃妯＄増澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬪師鍥狅紒锛�");
+ }
+ });
}
// 鎵撳嵃鎶芥牱鍗�
function showCheck() {
- if (null == recordData) {
- layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝鏃犳硶鏌ョ湅锛�");
- }
+ if (null == recordData) {
+ layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝鏃犳硶鏌ョ湅锛�");
+ }
}
// 琛ㄥ崟娓呯┖
function resetForm() {
- $("#form-data")[0].reset();
- $("#form-basic")[0].reset();
+ $("#form-data")[0].reset();
+ $("#form-basic")[0].reset();
- form.render();
+ form.render();
- recordData = null;
+ recordData = null;
}
// 鏇存柊鏁版嵁淇℃伅
function flushData() {
- var index = layer.load();
- var plateNum = $("#plateNum").val();
- var userId2 = $("#userId").val();
- var intelCard = $("#intelCard").val();
- var param = {
- type : type,
- progress : progress,
- userId: userId2,
- intelCard: intelCard,
- plateNum : plateNum
- };
+ var index = layer.load();
+ var plateNum = $("#plateNum").val();
+ var userId2 = $("#userId").val();
+ var intelCard = $("#intelCard").val();
+ var param = {
+ type: type,
+ progress: progress,
+ userId: userId2,
+ intelCard: intelCard,
+ plateNum: plateNum
+ };
- $.ajax({
- type : "POST",
- url : "../../basic/inout/inout-query-back",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(param),
- success : function(result) {
- if (result.code != "0000") {
- layer.alert(result.msg);
- } else {
- recordData = result.data;
- // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
- form.val("form-data", recordData);
- form.val("form-basic", recordData);
- form.render();
- }
- layer.close(index);
- },
- error : function() {
- layer.close(index);
- layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
- }
- });
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/inout-query-back",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(param),
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.alert(result.msg);
+ } else {
+ recordData = result.data;
+ // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
+ form.val("form-data", recordData);
+ form.val("form-basic", recordData);
+ form.render();
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ }
+ });
}
// 褰撳墠瀹屾垚
function submit(data) {
- if (!recordData) {
- layer.alert("娌℃湁鏁版嵁鍙互鎻愪氦锛侊紒锛�");
- return;
- }
- // 鎻愪氦鏁版嵁姣旇緝鐗规畩锛屼笉鐢ㄨ�冭檻鍩烘湰淇℃伅鎻愪氦
- var index = layer.load();
- var data = form.val("form-data");
- Object.assign(recordData, data);
+ if (!recordData) {
+ layer.alert("娌℃湁鏁版嵁鍙互鎻愪氦锛侊紒锛�");
+ return;
+ }
+ // 鎻愪氦鏁版嵁姣旇緝鐗规畩锛屼笉鐢ㄨ�冭檻鍩烘湰淇℃伅鎻愪氦
+ var index = layer.load();
+ var data = form.val("form-data");
+ Object.assign(recordData, data);
- $.ajax({
- type : "POST",
- url : "../../basic/inout/inout-back-submit",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(recordData),
- success : function(result) {
- if (result.code != "0000") {
- layer.msg(result.msg);
- } else {
- layer.alert("鍗＄墖鍥炴敹鎴愬姛锛�");
- // 閲嶇疆椤甸潰
- resetForm();
- }
- layer.close(index);
- },
- error : function() {
- layer.close(index);
- layer.msg("鍗＄墖鍥炴敹澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
- }
- });
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/submit-card-back",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(recordData),
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.msg(result.msg);
+ } else {
+ layer.alert("鍗＄墖鍥炴敹鎴愬姛锛�");
+ // 閲嶇疆椤甸潰
+ resetForm();
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ layer.msg("鍗＄墖鍥炴敹澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ }
+ });
}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/out-handle.js b/igds-web/src/main/resources/static/admin/inout/out-handle.js
index a7d0091..0985304 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-handle.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-handle.js
@@ -27,11 +27,11 @@
upload.render({
elem: '#kccz-r-btn1',
url: '../file/update-file', //涓婁紶鎺ュ彛
- size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
accept: 'images',
before: function (obj) {
var plateNum = $("#plateNum").val();
- this.data={"plateNum":plateNum}; //鎼哄甫鍙傛暟
+ this.data = {"plateNum": plateNum}; //鎼哄甫鍙傛暟
//棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
obj.preview(function (index, file, result) {
$('#kccz-r-img1').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
@@ -51,11 +51,11 @@
upload.render({
elem: '#kccz-r-btn2',
url: '../file/update-file', //涓婁紶鎺ュ彛
- size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
accept: 'images',
before: function (obj) {
var plateNum = $("#plateNum").val();
- this.data={"plateNum":plateNum}; //鎼哄甫鍙傛暟
+ this.data = {"plateNum": plateNum}; //鎼哄甫鍙傛暟
//棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
obj.preview(function (index, file, result) {
$('#kccz-r-img2').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
@@ -75,11 +75,11 @@
upload.render({
elem: '#kccz-r-btn3',
url: '../file/update-file', //涓婁紶鎺ュ彛
- size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
accept: 'images',
before: function (obj) {
var plateNum = $("#plateNum").val();
- this.data={"plateNum":plateNum}; //鎼哄甫鍙傛暟
+ this.data = {"plateNum": plateNum}; //鎼哄甫鍙傛暟
//棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
obj.preview(function (index, file, result) {
$('#kccz-r-img3').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
@@ -99,33 +99,36 @@
});
showProgress();
-
+ // 鐩戝惉閲嶉噺鍙樺寲
+ $(".weight").blur(function () {
+ deAutoByHandle(this.name)
+ });
//璋冩暣瀛楁涓嶇紪杈�
- $("#depotId").attr("disabled",true);
- $("#foodVariety").attr("disabled",true);
- $("#foodLevel").attr("disabled",true);
+ $("#depotId").attr("disabled", true);
+ $("#foodVariety").attr("disabled", true);
+ // $("#foodLevel").attr("disabled", true);
});
//鎺у埗娴佺▼鐜妭鏄剧ず
function showProgress() {
- if(!inoutProgress){
+ if (!inoutProgress) {
return;
}
- if(inoutProgress.indexOf("REGISTER") == -1){
+ if (inoutProgress.indexOf("REGISTER") == -1) {
$("#progress-register").css("display", "none");
}
- if(inoutProgress.indexOf("WEIGHT_FULL") == -1){
+ if (inoutProgress.indexOf("WEIGHT_FULL") == -1) {
$("#progress-fullWeight").css("display", "none");
}
- if(inoutProgress.indexOf("HANDLE") == -1){
+ if (inoutProgress.indexOf("HANDLE") == -1) {
$("#progress-hand").css("display", "none");
}
- if(inoutProgress.indexOf("WEIGHT_EMPTY") == -1){
+ if (inoutProgress.indexOf("WEIGHT_EMPTY") == -1) {
$("#progress-emptyWeight").css("display", "none");
}
- if(inoutProgress.indexOf("CARD_BACK") == -1){
+ if (inoutProgress.indexOf("CARD_BACK") == -1) {
$("#progress-cardBack").css("display", "none");
}
}
@@ -191,6 +194,13 @@
});
}
+function flushPage() {
+ layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
+ resetForm();
+ layer.close(index);
+ });
+}
+
// 琛ㄥ崟娓呯┖
function resetForm() {
$("#form-data")[0].reset();
@@ -200,6 +210,7 @@
$('#kccz-r-img3').removeAttr('src');
form.render();
recordData = null;
+ $("#text-param").val(null);
}
// 鏇存柊鏁版嵁淇℃伅
@@ -210,8 +221,8 @@
var param = {
type: type,
progress: progress,
- userId:userId2,
- intelCard:intelCard,
+ userId: userId2,
+ intelCard: intelCard,
plateNum: plateNum
};
var index = layer.load();
@@ -223,7 +234,7 @@
data: JSON.stringify(param),
success: function (result) {
if (result.code != "0000") {
- notify(result.msg,result.data);
+ notify(result.msg, result.data);
} else {
recordData = result.data;
// 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
@@ -241,7 +252,7 @@
// 褰撳墠瀹屾垚
function submit() {
- if (null == recordData) {
+ if (!recordData) {
layer.alert("娌℃湁鏁版嵁鍙互鎻愪氦锛侊紒锛�");
return;
}
@@ -262,15 +273,15 @@
$.ajax({
type: "POST",
- url: "../../basic/inout/inout-next-step",
+ url: "../../basic/inout/submit-handle",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(recordData),
success: function (result) {
if (result.code != "0000") {
- notify(result.msg,result.data);
+ notify(result.msg, result.data);
} else {
- notify("鍊间粨瀹屾垚",result.data);
+ notify("鍊间粨瀹屾垚", result.data);
// 閲嶇疆椤甸潰
resetForm();
}
@@ -278,7 +289,7 @@
},
error: function () {
layer.close(index);
- notify("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯",null);
+ notify("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯", null);
}
});
}
diff --git a/igds-web/src/main/resources/static/admin/inout/out-register.js b/igds-web/src/main/resources/static/admin/inout/out-register.js
index f356f99..c47ef6f 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-register.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-register.js
@@ -29,7 +29,7 @@
shadeClose: true,
shade: 0.3,
closeBtn: 2,
- offset: ['50px','50px'],
+ offset: ['50px', '50px'],
area: ['1000px', '640px'],
content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
});
@@ -101,9 +101,10 @@
layer.close(index);
var data = json.content;
if (data === "not found") {
- layer.alert("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�", {
- offset: ['300px', '300px']
- });
+ // layer.alert("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�", {
+ // offset: ['300px', '300px']
+ // });
+ alertError("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�");
return;
}
// 涓存椂璧嬪��
@@ -165,32 +166,45 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../inout/api/flush-lpr",
+ url: "../../inout/api/get-plateNum",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: param,
success: function (result) {
if (result.code != "0000") {
- layer.alert(result.msg, {
- offset: ['300px', '300px']
- });
+ alertError(result.msg);
} else {
- if (result.data.errorMsg) {
- layer.alert(result.data.errorMsg, {
- offset: ['300px', '300px']
- });
- } else {
- $("#plateNum").val(result.data.plateNum);
- }
+ $("#plateNum").val(result.data.plateNum);
+ $("#plateNum2").val(result.data.plateNum);
}
layer.close(index);
},
error: function () {
layer.close(index);
- layer.alert("杞︾墝璇嗗埆澶辫触锛�", {
- offset: ['300px', '300px']
- });
+ alertError("杞︾墝璇嗗埆澶辫触锛�");
}
+ // success: function (result) {
+ // if (result.code != "0000") {
+ // layer.alert(result.msg, {
+ // offset: ['300px', '300px']
+ // });
+ // } else {
+ // if (result.data.errorMsg) {
+ // layer.alert(result.data.errorMsg, {
+ // offset: ['300px', '300px']
+ // });
+ // } else {
+ // $("#plateNum").val(result.data.plateNum);
+ // }
+ // }
+ // layer.close(index);
+ // },
+ // error: function () {
+ // layer.close(index);
+ // layer.alert("杞︾墝璇嗗埆澶辫触锛�", {
+ // offset: ['300px', '300px']
+ // });
+ // }
});
}
@@ -239,15 +253,18 @@
function submit() {
var data = form.val("form-data");
if (!data.userName) {
- notify("鎵胯繍浜轰俊鎭笉鑳戒负绌�", null);
+ // notify("鎵胯繍浜轰俊鎭笉鑳戒负绌�", null);
+ alertError("鎵胯繍浜轰俊鎭笉鑳戒负绌�");
return;
}
if (!data.plateNum) {
- notify("杞︾墝鍙蜂笉鑳戒负绌�", null);
+ alertError("杞︾墝鍙蜂笉鑳戒负绌�");
+ // notify("杞︾墝鍙蜂笉鑳戒负绌�", null);
return;
}
if (!data.intelCard && !data.userId) {
- notify("鏅烘収鍗″彿涓庤韩浠借瘉鍙蜂笉鑳藉悓鏃朵负绌�", null);
+ alertError("鏅烘収鍗″彿涓庤韩浠借瘉鍙蜂笉鑳藉悓鏃朵负绌�");
+ // notify("鏅烘収鍗″彿涓庤韩浠借瘉鍙蜂笉鑳藉悓鏃朵负绌�", null);
return;
}
@@ -299,7 +316,7 @@
$.ajax({
type: "POST",
- url: "../../basic/inout/inout-next-step",
+ url: "../../basic/inout/submit-register",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(data),
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 33fc9cc..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
@@ -34,7 +34,7 @@
shadeClose: true,
shade: 0.3,
closeBtn: 2,
- offset: ['50px','120px'],
+ offset: ['50px', '120px'],
area: ['1000px', '640px'],
content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
});
@@ -48,9 +48,8 @@
// 鐩戝惉閲嶉噺鍙樺寲
$(".weight").blur(function () {
- var name = this.name;
// deAutoByWeight(name);
- deAutoByOut(name);
+ deAutoByOut(this.name)
});
// 鍒濆鍖朩ebSocket
@@ -85,42 +84,42 @@
//鏆傛棤
}
-// 鏍规嵁褰撳墠鎿嶄綔鐨勬寜閽甀D鏇存柊鍏朵粬鎸夐挳鐘舵��
-function flushBtn(btnId) {
- if ("btn-weight" == btnId) {// 绉伴噸鍚庡彲浠ョ偣鍑诲畬鎴愮О閲�
- $("#btn-submit").removeClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", false);
- }
-
- if ("btn-submit" == btnId) {
- $("#btn-submit").addClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", true);
-
- if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {// 鍑哄簱锛屽鏋滄槸绌鸿溅绉伴噸锛屽畬鎴愭敹鐩存帴鍒锋柊椤甸潰
- resetForm();
- } else {
- // 瀹屾垚绉伴噸鍚庢帶鍒舵寜閽�
- $("#btn-weight").addClass("layui-btn-disabled");
- $("#btn-weight").attr("disabled", true);
-
- $("#btn-printBill").removeClass("layui-btn-disabled");
- $("#btn-printBill").attr("disabled", false);
- addDisabled();
- }
- }
- if ("btn-printBill" == btnId) {// 鎵撳嵃杩囩鍗曪紝璇存槑涓氬姟瀹屾垚
- $("#btn-weight").removeClass("layui-btn-disabled");
- $("#btn-weight").attr("disabled", false);
-
- $("#btn-submit").addClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", true);
-
- $("#btn-printBill").addClass("layui-btn-disabled");
- $("#btn-printBill").attr("disabled", true);
- delDisabled();
- resetForm();
- }
-}
+// // 鏍规嵁褰撳墠鎿嶄綔鐨勬寜閽甀D鏇存柊鍏朵粬鎸夐挳鐘舵��
+// function flushBtn(btnId) {
+// if ("btn-weight" == btnId) {// 绉伴噸鍚庡彲浠ョ偣鍑诲畬鎴愮О閲�
+// $("#btn-submit").removeClass("layui-btn-disabled");
+// $("#btn-submit").attr("disabled", false);
+// }
+//
+// if ("btn-submit" == btnId) {
+// $("#btn-submit").addClass("layui-btn-disabled");
+// $("#btn-submit").attr("disabled", true);
+//
+// if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {// 鍑哄簱锛屽鏋滄槸绌鸿溅绉伴噸锛屽畬鎴愭敹鐩存帴鍒锋柊椤甸潰
+// resetForm();
+// } else {
+// // 瀹屾垚绉伴噸鍚庢帶鍒舵寜閽�
+// $("#btn-weight").addClass("layui-btn-disabled");
+// $("#btn-weight").attr("disabled", true);
+//
+// $("#btn-printBill").removeClass("layui-btn-disabled");
+// $("#btn-printBill").attr("disabled", false);
+// addDisabled();
+// }
+// }
+// if ("btn-printBill" == btnId) {// 鎵撳嵃杩囩鍗曪紝璇存槑涓氬姟瀹屾垚
+// $("#btn-weight").removeClass("layui-btn-disabled");
+// $("#btn-weight").attr("disabled", false);
+//
+// $("#btn-submit").addClass("layui-btn-disabled");
+// $("#btn-submit").attr("disabled", true);
+//
+// $("#btn-printBill").addClass("layui-btn-disabled");
+// $("#btn-printBill").attr("disabled", true);
+// delDisabled();
+// resetForm();
+// }
+// }
//鎺у埗娴佺▼鐜妭鏄剧ず
function showProgress() {
@@ -195,17 +194,19 @@
form.render();
// 鐐瑰嚮绉伴噸鏃跺�欒嚜鍔ㄦ姄鎷嶆暟鎹�
- layer.msg("绯荤粺鑷姩鎶撴媿淇濈暀璁板綍鈥︹��");
+ // layer.msg("绯荤粺鑷姩鎶撴媿淇濈暀璁板綍鈥︹��");
snapData = {
companyId: companyId,
deptId: deptId,
progress: recordData.progress,
bizType: bizType,
plateNum: recordData.plateNum,
-
- id1: (null != snapDto1) ? snapDto1.id : null,
- id2: (null != snapDto2) ? snapDto2.id : null,
- id3: (null != snapDto3) ? snapDto3.id : null,
+ id1: snapDto1.id,
+ id2: snapDto2.id,
+ id3: snapDto3.id,
+ // id1: (null != snapDto1) ? snapDto1.id : null,
+ // id2: (null != snapDto2) ? snapDto2.id : null,
+ // id3: (null != snapDto3) ? snapDto3.id : null,
sort: $("#scaleName").val(),
weight: weightDto.weight
@@ -223,7 +224,8 @@
success: function (result) {
layer.close(index);
if (result.code != "0000") {
- layer.alert(result.msg);
+ alertError(result.msg);
+ // layer.alert(result.msg);
} else {
snapData = result.data;
}
@@ -240,14 +242,15 @@
}
// 鍒锋柊鐘舵��
- flushBtn("btn-weight");
+ // flushBtn("btn-weight");
}
+
//鏂扮殑璇诲崱鏂瑰紡
function flushICCard() {
- if(cardDto && cardDto.protocol != "TCP_DEFAULT"){
+ if (cardDto && cardDto.protocol != "TCP_DEFAULT") {
//鍗忚鑾峰彇
flushICCard2();
- }else {
+ } else {
//鏈湴璇诲彇
flushICCard1();
}
@@ -261,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,
@@ -276,7 +279,9 @@
offset: ['300px', '300px']
});
} else {
- $("#intelCard").val(result.data.icCardNo);
+ paramIntelCard = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
+ flushData(paramIntelCard, null);
}
}
layer.close(index);
@@ -294,7 +299,7 @@
* 鏈湴璇诲彇鏅烘収鍗�
*/
function flushICCard1() {
- $("#intelCard").val(null);
+ $("#text-param").val(null);
$("#form-data")[0].reset();
form.render();
recordData = null;
@@ -313,8 +318,9 @@
if (data === "not found") {
layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
} else {
- $("#intelCard").val(data);
- flushData();
+ paramIntelCard = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
+ flushData(paramIntelCard, null);
}
},
error: function () {
@@ -323,7 +329,7 @@
});
}
-// 浣跨敤鎻掍欢鑾峰彇鐪佷唤璇�
+// 浣跨敤鎻掍欢鑾峰彇韬唤璇佸彿
function flushIdCard() {
var index = layer.load();
$.ajax({
@@ -343,8 +349,10 @@
});
return;
}
- $("#userId").val(data.idNum);
- flushData();
+ // $("#userId").val(data.idNum);
+ $("#text-param").text("璇嗗埆韬唤璇侊細" + paramIdCard);
+
+ flushData(null, paramIdCard);
},
error: function () {
layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
@@ -380,10 +388,11 @@
});
}
-// 鎵撳嵃杩囩鍗�
+
+// 鐐瑰嚮鎵撳嵃锛岀郴缁熷垽鏂槸鍚﹀凡缁忔墽琛屽畬鎴愶紝濡傛灉宸茬粡瀹屾垚锛岀洿鎺ユ墦鍗帮紝濡傛灉鏈畬鎴愬垯鍏堟墽琛屽畬鎴�
function printBill() {
if (!recordData) {
- layer.alert("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝涓嶆敮鎸佹墦鍗帮紒");
+ alertError("娌℃湁鑾峰彇鍒颁笟鍔℃暟鎹紝鎵撳嵃琚嫆缁濓紒");
return;
}
// 浠庡悗鍙拌幏鍙栨ā鐗堝苟鎵撳嵃
@@ -391,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("鑾峰彇鎵撳嵃妯＄増澶辫触锛岃鑱旂郴绠＄悊鍛樻煡鐪嬪師鍥�");
+ }
+ });
}
// 鐐瑰嚮鎵撳嵃锛屽厛鎵ц绯荤粺榛樿鎵ц瀹屾垚鍗″洖鏀�
@@ -399,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),
@@ -415,7 +444,7 @@
printWeight(result.data);
}
// 鍒锋柊鎸夐挳
- flushBtn("btn-printBill");
+ // flushBtn("btn-printBill");
}
layer.close(index);
},
@@ -440,26 +469,27 @@
$("#btn-weight").removeClass("layui-btn-disabled");
$("#btn-weight").attr("disabled", false);
- //绌鸿溅鍜屾弧杞﹁閲嶇疆
- updateEditAndProgress();
+ $("#text-param").val('');
- //鎵ｉ噸淇℃伅妗嗘仮澶嶄负鍙紪杈�
- delDisabled();
+ // //绌鸿溅鍜屾弧杞﹁閲嶇疆
+ // updateEditAndProgress();
+ //
+ // //鎵ｉ噸淇℃伅妗嗘仮澶嶄负鍙紪杈�
+ // delDisabled();
}
function flushPage() {
layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
resetForm();
- layer.msg("椤甸潰閲嶇疆瀹屾垚锛岃閲嶆柊鎿嶄綔鈥︹��");
layer.close(index);
});
}
-function flushData() {
+function flushData(intelCard, userIdCard) {
var index = layer.load();
- var userId2 = $("#userId").val();
- var intelCard = $("#intelCard").val();
+ var userId2 = userIdCard;
+ var intelCard = intelCard;
var plateNum = $("#plateNum").val();
var param = {
type: type,
@@ -477,7 +507,7 @@
data: JSON.stringify(param),
success: function (result) {
if (result.code != "0000") {
- notify(result.msg, result.data);
+ notifyProgress(result.msg, result.data);
} else {
recordData = result.data;
// 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
@@ -490,7 +520,8 @@
},
error: function () {
layer.close(index);
- layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ alertError("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯");
+ // layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
}
});
}
@@ -542,37 +573,37 @@
}
// 褰撳墠瀹屾垚
-function submit(data) {
+function submit() {
if (null == recordData) {
- notify("娌℃湁鏁版嵁鍙互鎻愪氦", null);
+ notifyProgress("娌℃湁鏁版嵁鍙互鎻愪氦", null);
return;
}
var data = form.val("form-data");
// 鏍￠獙-鍑哄簱绌鸿溅
if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
if (data.emptyWeight <= 0.0) {
- notify("绌鸿溅绉伴噸淇℃伅蹇呭～锛侊紒", null);
+ notifyProgress("绌鸿溅绉伴噸淇℃伅蹇呭～锛侊紒", null);
return;
}
if (!data.depotId) {
- notify("瑁呭嵏浠撳簱蹇呴』濉啓锛侊紒", null);
+ notifyProgress("瑁呭嵏浠撳簱蹇呴』濉啓锛侊紒", null);
return;
}
if (!data.noticeId) {
- notify("閫氱煡鍗曞繀椤诲～鍐欙紒锛�", null);
+ notifyProgress("閫氱煡鍗曞繀椤诲～鍐欙紒锛�", null);
return;
}
} else {
if (data.fullWeight <= 0.0) {
- notify("婊¤溅绉伴噸淇℃伅蹇呭～锛侊紒", null);
+ notifyProgress("婊¤溅绉伴噸淇℃伅蹇呭～锛侊紒", null);
return;
}
if (!data.foodVariety) {
- notify("绮鍝佺蹇呭～锛侊紒", null);
+ notifyProgress("绮鍝佺蹇呭～锛侊紒", null);
return;
}
if (!data.settleWeight || data.settleWeight <= 0.0) {
- notify("缁撶畻閲嶉噺鍚堣锛岃鏍稿锛侊紒", null);
+ notifyProgress("缁撶畻閲嶉噺鍚堣锛岃鏍稿锛侊紒", null);
return;
}
}
@@ -589,35 +620,34 @@
fileName: snapData.fileName3
}];
recordData.files = files;
-
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout/inout-next-step",
+ url: "../../basic/inout/submit-weight",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(recordData),
success: function (result) {
if (result.code != "0000") {
- notify(result.msg, result.data);
+ notifyProgress(result.msg, result.data);
} else {
- notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
+ notifyProgress("鏁版嵁鎻愪氦鎴愬姛", result.data);
// 鏇存柊鎸夐挳鏄剧ず
- flushBtn("btn-submit");
+ // flushBtn("btn-submit");
}
layer.close(index);
},
error: function () {
layer.close(index);
- notify("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯", null);
+ notifyProgress("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯", null);
}
});
//浠ヤ笅閫昏緫涓哄鍔犱竴涓闊抽�氱煡鐨勮皟鐢ㄦ柟娉曪紝涓嶈�冭檻杩斿洖缁撴灉
- 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,
@@ -635,95 +665,96 @@
// });
}
-
-// ---------------------------閫氱煡鍗�-寮�濮� -------------------//
-// 寮瑰嚭寰�鏉ュ崟浣嶄笅鎷夋
-function showNotice() {
- var index = layer.load();
- var param = {
- type: type
- };
- // 娓叉煋寰�鏉ュ崟浣嶅垪琛�
- table.render({
- elem: '#tableNotice',
- url: '../../basic/inout/list-notice鈥攐ut',
- page: false,
- // skin : "nob",
- // size : 'sm',
- even: true,
- method: 'POST',
- contentType: "application/json;charset=UTF-8",
- cols: [[{
- field: 'name',
- title: '閫氱煡鍗曞悕绉�',
- width: '15%'
- }, {
- field: 'customerName',
- title: '鏀惰揣鍗曚綅'
- }, {
- field: 'depotName',
- title: '浠撳簱鍚嶇О',
- width: '15%'
- }, {
- field: 'foodVarietyName',
- title: '绮鍝佺',
- width: '10%'
- }, {
- field: 'year',
- title: '骞翠唤',
- width: '8%'
- }, {
- field: 'contractName',
- title: '鎵�灞炲悎鍚�'
- }]],
- where: param,
- parseData: function (res) {
- if ("0000" == res.code) {
- return {
- "code": "0",
- "msg": res.msg,
- "data": res.data
- }
- } else {
- return {
- "code": "1",
- "msg": res.msg
- }
- }
- },
- done: function (res) {
- layer.close(index);
- }
- });
-
- //鍙屽嚮鏄剧ず閫変腑鏁版嵁
- table.on('rowDouble(tableNotice)', function (obj) {
- var data = obj.data;
- form.val("form-data", {
- customerId: data.customerId,
- customerName: data.customerName,
- noticeId: data.id,
- foodType: data.foodType,
- foodLevel: data.foodLevel
- });
- // 鍏抽棴
- layer.closeAll();
- });
-
- // 寮瑰嚭瀵硅瘽妗�
- layer.open({
- type: 1,
- offset: ['100px', '250px'],
- title: "鍑哄簱閫氱煡鍗�",
- area: ['900px', '600px'],
- shade: 0,
- content: $('#listNotice'),
- btn: 0,
- btn: ['鍙栨秷'],
- yes: function () {
- layer.closeAll();
- },
- closeBtn: 0
- });
-}
-// ---------------------------閫氱煡鍗� -缁撴潫 -------------------//
\ No newline at end of file
+//-----------------------杞Щ鑷硍eight.js涓�----------------------//
+// // ---------------------------閫氱煡鍗�-寮�濮� -------------------//
+// // 寮瑰嚭寰�鏉ュ崟浣嶄笅鎷夋
+// function showNotice() {
+// var index = layer.load();
+// var param = {
+// type: type
+// };
+// // 娓叉煋寰�鏉ュ崟浣嶅垪琛�
+// table.render({
+// elem: '#tableNotice',
+// url: '../../basic/inout/list-notice-out',
+// page: false,
+// // skin : "nob",
+// // size : 'sm',
+// even: true,
+// method: 'POST',
+// contentType: "application/json;charset=UTF-8",
+// cols: [[{
+// field: 'name',
+// title: '閫氱煡鍗曞悕绉�',
+// width: '15%'
+// }, {
+// field: 'customerName',
+// title: '鏀惰揣鍗曚綅'
+// }, {
+// field: 'depotName',
+// title: '浠撳簱鍚嶇О',
+// width: '15%'
+// }, {
+// field: 'foodVarietyName',
+// title: '绮鍝佺',
+// width: '10%'
+// }, {
+// field: 'year',
+// title: '骞翠唤',
+// width: '8%'
+// }, {
+// field: 'contractName',
+// title: '鎵�灞炲悎鍚�'
+// }]],
+// where: param,
+// parseData: function (res) {
+// if ("0000" == res.code) {
+// return {
+// "code": "0",
+// "msg": res.msg,
+// "data": res.data
+// }
+// } else {
+// return {
+// "code": "1",
+// "msg": res.msg
+// }
+// }
+// },
+// done: function (res) {
+// layer.close(index);
+// }
+// });
+//
+// //鍙屽嚮鏄剧ず閫変腑鏁版嵁
+// table.on('rowDouble(tableNotice)', function (obj) {
+// var data = obj.data;
+// form.val("form-data", {
+// customerId: data.customerId,
+// customerName: data.customerName,
+// noticeId: data.id,
+// foodType: data.foodType,
+// foodLevel: data.foodLevel
+// });
+// // 鍏抽棴
+// layer.closeAll();
+// });
+//
+// // 寮瑰嚭瀵硅瘽妗�
+// layer.open({
+// type: 1,
+// offset: ['100px', '250px'],
+// title: "鍑哄簱閫氱煡鍗�",
+// area: ['900px', '600px'],
+// shade: 0,
+// content: $('#listNotice'),
+// btn: 0,
+// btn: ['鍙栨秷'],
+// yes: function () {
+// layer.closeAll();
+// },
+// closeBtn: 0
+// });
+// }
+//
+// // ---------------------------閫氱煡鍗� -缁撴潫 -------------------//
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/weight.js b/igds-web/src/main/resources/static/admin/inout/weight.js
index fb9d060..a4c137f 100644
--- a/igds-web/src/main/resources/static/admin/inout/weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/weight.js
@@ -42,79 +42,122 @@
*/
function deAutoByOut(name) {
var curData = form.val("form-data");
-
if (curData.fullWeight == 0 || curData.emptyWeight == 0) {
return;
}
- //姹囨�荤粨鏋�
- var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
// 鍑�閲�
var netWeight = curData.fullWeight - curData.emptyWeight;
- //鎵ｆ按鏉�
- var deWet = curData.deWet, deImpurity = curData.deImpurity;
-
if (netWeight <= 0) {
- layer.alert("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
+ alertError("鍑�閲�<=0锛屽綋鍓嶇幆鑺傚瓨鍦ㄩ�昏緫閿欒锛岃鏍稿");
return;
}
+ //鍏朵粬淇℃伅
+ var deHandle = curData.deHandle, dePackage = curData.dePackage, deOther = curData.deOther, settleWeight = 0,
+ recordWeight = 0, deSum = 0;
+ recordWeight = Number(netWeight) - Number(deHandle) - Number(dePackage) - Number(deOther);
+ settleWeight = Number(recordWeight);
+ deSum = Number(deOther) + Number(deHandle)
- var deBase = 0, multiple = 0;
- //姘村垎鏉傝川锛屾洿鏀规瘮渚嬪苟涓旀按鍒嗘墸閲嶈繕娌¤绠楁儏鍐典笅
- if ("fullWeight" == name || null == deWet) {
- var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
- if (checkItem) {
- deBase = Number(curData.wet) - Number(checkItem.upperLimit);
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.ruleNum);//鍊嶆暟
- deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
- }
- }
- //鏉傝川
- if ("fullWeight" == name || null == deImpurity) {
- checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
- if (checkItem) {
- deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.ruleNum);
- deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
- }
- }
-
- /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
- deSum = Number(curData.deOther) + Number(curData.deHandle);
-
-
- if (Number(deWet) > 0) {//澧為噸
- addSum = addSum + Number(deWet);
- } else {
- deSum = deSum + Number(deWet);
- }
-
- if (Number(deImpurity) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deImpurity);
- } else {
- addSum = addSum + Number(deImpurity);
- }
-
+ netWeight = netWeight.toFixed(0);
+ recordWeight = recordWeight.toFixed(0);
+ settleWeight = settleWeight.toFixed(0);
deSum = deSum.toFixed(0);
- /** 澧為噸杞鏁帮紝渚夸簬璁＄畻 */
- addSum = Math.abs(addSum).toFixed(0);
- /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
- recordWeight = Number(netWeight) - Number(deSum);
- /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
- settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
form.val("form-data", {
netWeight: netWeight,
- deImpurity: deImpurity,
- deWet: deWet,
- deSum: deSum,
settleWeight: settleWeight,
- recordWeight: recordWeight
+ recordWeight: recordWeight,
+ deSum: deSum
});
form.render();
}
+// function deAutoByOut(name) {
+// var curData = form.val("form-data");
+//
+// if (curData.fullWeight == 0 || curData.emptyWeight == 0) {
+// return;
+// }
+// //姹囨�荤粨鏋�
+// var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
+// // 鍑�閲�
+// var netWeight = curData.fullWeight - curData.emptyWeight;
+// //鎵ｆ按鏉�
+// var deWet = curData.deWet, deImpurity = curData.deImpurity;
+//
+// if (netWeight <= 0) {
+// layer.alert("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
+// return;
+// }
+//
+// var deBase = 0, multiple = 0;
+// //姘村垎鏉傝川锛屾洿鏀规瘮渚嬪苟涓旀按鍒嗘墸閲嶈繕娌¤绠楁儏鍐典笅
+// if ("fullWeight" == name || null == deWet) {
+// var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
+// if (checkItem) {
+// deBase = Number(curData.wet) - Number(checkItem.upperLimit);
+// if (deBase == 0) return;
+// multiple = parseInt(deBase / checkItem.ruleNum);//鍊嶆暟
+// deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
+// }
+// }
+// //鏉傝川
+// if ("fullWeight" == name || null == deImpurity) {
+// checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
+// if (checkItem) {
+// deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
+// if (deBase == 0) return;
+// multiple = parseInt(deBase / checkItem.ruleNum);
+// deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
+// }
+// }
+//
+// /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
+// deSum = Number(curData.deOther) + Number(curData.deHandle);
+//
+//
+// if (Number(deWet) > 0) {//澧為噸
+// addSum = addSum + Number(deWet);
+// } else {
+// deSum = deSum + Number(deWet);
+// }
+//
+// if (Number(deImpurity) > 0) {//鎵ｉ噸
+// deSum = deSum + Number(deImpurity);
+// } else {
+// addSum = addSum + Number(deImpurity);
+// }
+//
+// deSum = deSum.toFixed(0);
+// /** 澧為噸杞鏁帮紝渚夸簬璁＄畻 */
+// addSum = Math.abs(addSum).toFixed(0);
+// /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
+// recordWeight = Number(netWeight) - Number(deSum);
+// /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
+// settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
+//
+// form.val("form-data", {
+// netWeight: netWeight,
+// deImpurity: deImpurity,
+// deWet: deWet,
+// deSum: deSum,
+// settleWeight: settleWeight,
+// recordWeight: recordWeight
+// });
+// form.render();
+// }
+function deAutoByHandle(name) {
+ var curData = form.val("form-data");
+ var deOther = curData.deOther, deHandle = curData.deHandle;
+ deSum = Number(deOther) + Number(deHandle);
+ deSum = deSum.toFixed(0);
+ form.val("form-data", {
+ deSum: deSum,
+ });
+ form.render();
+
+}
+
/**
* 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
* @param checkItems
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-register.html b/igds-web/src/main/resources/templates/admin/inout/in-register.html
index eb15912..fb23b78 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-register.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-register.html
@@ -1,325 +1,326 @@
<!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>
-<link rel="stylesheet" type="text/css"
- th:href="@{../../static/plugins/layui/css/layui.css}">
-<link rel="stylesheet" type="text/css"
- th:href="@{../../static/admin/inout/style.css}">
+ <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}">
+ <link rel="stylesheet" type="text/css"
+ th:href="@{../../static/admin/inout/style.css}">
-<style>
-.display-none {
- display: none;
-}
+ <style>
+ .display-none {
+ display: none;
+ }
-.kccz-r-con2 {
- padding-right: 120px;
- position: relative;
- margin-top: 10px;
- z-index: 99;
-}
+ .kccz-r-con2 {
+ padding-right: 120px;
+ position: relative;
+ margin-top: 10px;
+ z-index: 99;
+ }
-.kccz-r-vedio {
- width: 100%;
- height: 280px;
- background: #000;
- color: #FFF;
- text-align: center;
-}
+ .kccz-r-vedio {
+ width: 100%;
+ height: 280px;
+ background: #000;
+ color: #FFF;
+ text-align: center;
+ }
-.layui-form-label {
- font-weight: bold;
-}
+ .layui-form-label {
+ font-weight: bold;
+ }
-.iframe-video {
- position: absolute;
- visibility: inherit;
- top: 0px;
- left: 0px;
- z-index: -1;
- width: 100%;
- height: 100%;
-}
+ .iframe-video {
+ position: absolute;
+ visibility: inherit;
+ top: 0px;
+ left: 0px;
+ z-index: -1;
+ width: 100%;
+ height: 100%;
+ }
-.ckdj-radiobox .layui-form-item {
- margin-bottom: 0px;
- margin-top: 10px;
-}
+ .ckdj-radiobox .layui-form-item {
+ margin-bottom: 0px;
+ margin-top: 10px;
+ }
-.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 !important;
-}
+ .qyzj-btnbox .rkbk-quick {
+ margin-top: 15px !important;
+ }
-.color-red {
- color: red !important;
-}
+ .color-red {
+ color: red !important;
+ }
-.layui-form-item .layui-input-inline {
- width: unset;
-}
+ .layui-form-item .layui-input-inline {
+ width: unset;
+ }
-.rkbk-search-input {
- background: #FFF !important;
-}
+ .rkbk-search-input {
+ background: #FFF !important;
+ }
-.rkbk-search-input.bg-date {
- background: #FFF !important;
-}
-</style>
+ .rkbk-search-input.bg-date {
+ background: #FFF !important;
+ }
+ </style>
</head>
<body>
- <div class="l-container layui-clear">
- <div class="rk-main">
+<div class="l-container layui-clear">
+ <div class="rk-main">
- <!-- 鎿嶄綔鑿滃崟-->
- <div class="qyzj-btnbox layui-clear">
- <div class="rkbk-quick fl">
- <button class="rkbk-quick-btn layui-btn btn-red"
- onclick="resetForm()">
- <i><img th:src="@{../../static/images/icon-clear.png}" /></i> 娓呯┖鏁版嵁
- </button>
- <button class="rkbk-quick-btn layui-btn btn-green"
- onclick="submit()">
- <i><img th:src="@{../../static/images/icon-ok.png}" /></i> 瀹屾垚鐧昏
- </button>
- </div>
+ <!-- 鎿嶄綔鑿滃崟-->
+ <div class="qyzj-btnbox layui-clear">
+ <div class="rkbk-quick fl">
+ <button class="rkbk-quick-btn layui-btn btn-red"
+ onclick="resetForm()">
+ <i><img th:src="@{../../static/images/icon-clear.png}"/></i> 娓呯┖鏁版嵁
+ </button>
+ <button class="rkbk-quick-btn layui-btn btn-green"
+ onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 瀹屾垚鐧昏
+ </button>
+ </div>
- <!--娴佺▼寮曞-->
- <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}" />
+ <!--娴佺▼寮曞-->
+ <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-check"><span class="rk-step-span"> <img
- th:src="@{../../static/images/icon-zhijian.png}" />
+ <p>鍏ュ簱鐧昏</p></li>
+ <li id="progress-check"><span class="rk-step-span"> <img
+ th:src="@{../../static/images/icon-zhijian.png}"/>
</span>
- <p>鎵︽牱璐ㄦ</p></li>
- <li id="progress-fullWeight"><span class="rk-step-span">
- <img th:src="@{../../static/images/icon-chengzhong.png}" />
+ <p>鎵︽牱璐ㄦ</p></li>
+ <li id="progress-fullWeight"><span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-chengzhong.png}"/>
</span>
- <p>婊¤溅绉伴噸</p></li>
- <li id="progress-hand"><span class="rk-step-span"> <img
- th:src="@{../../static/images/icon-xiehuo.png}" />
+ <p>婊¤溅绉伴噸</p></li>
+ <li id="progress-hand"><span class="rk-step-span"> <img
+ th:src="@{../../static/images/icon-xiehuo.png}"/>
</span>
- <p>鍏ュ簱鍊间粨</p></li>
- <li id="progress-emptyWeight"><span class="rk-step-span">
- <img th:src="@{../../static/images/icon-chengzhong.png}" />
+ <p>鍏ュ簱鍊间粨</p></li>
+ <li id="progress-emptyWeight"><span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-chengzhong.png}"/>
</span>
- <p>绌鸿溅绉伴噸</p></li>
- <li id="progress-cardBack"><span class="rk-step-span">
- <img th:src="@{../../static/images/icon-banli.png}" />
+ <p>绌鸿溅绉伴噸</p></li>
+ <li id="progress-cardBack"><span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-banli.png}"/>
</span>
- <p>绂诲簱纭</p></li>
- </ul>
- </div>
- <!--娴佺▼寮曞缁撴潫-->
- </div>
+ <p>绂诲簱纭</p></li>
+ </ul>
+ </div>
+ <!--娴佺▼寮曞缁撴潫-->
+ </div>
- <!-- 涓讳綋淇℃伅 -->
- <form class="layui-form" action="" id="form-data"
- lay-filter="form-data">
+ <!-- 涓讳綋淇℃伅 -->
+ <form class="layui-form" action="" id="form-data"
+ lay-filter="form-data">
- <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">
- <div class="rkbk-form-box1">
- <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"
- th:value="${type}" class="layui-input rkbk-search-input">
- </div>
- </div>
+ <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">
+ <div class="rkbk-form-box1">
+ <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"
+ th:value="${type}" class="layui-input rkbk-search-input">
+ </div>
+ </div>
- <div class="rkbk-form-left">
- <div class="layui-form-item">
- <label class="layui-form-label color-red">濮� 鍚嶏細</label>
- <div class="layui-input-block">
- <input type="text" name="userName" id="userName"
- lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
+ <div class="rkbk-form-left">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">濮� 鍚嶏細</label>
+ <div class="layui-input-block">
+ <input type="text" name="userName" id="userName"
+ lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
- <div class="layui-form-item">
- <label class="layui-form-label color-red">韬唤璇佸彿锛�</label>
- <div class="layui-input-block">
- <input type="text" name="userId" id="userId"
- lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鑱旂郴鏂瑰紡锛�</label>
- <div class="layui-input-block">
- <input type="text" name="userContact" id="userContact"
- placeholder="璇疯緭鍏�" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍑虹敓鏃ユ湡锛�</label>
- <div class="layui-input-block">
- <input type="text" name="userBirthday" id="userBirthday"
- placeholder="yyyy-MM-dd" autocomplete="off"
- class="layui-input rkbk-search-input bg-date">
- </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" id="userSex" value="鐢�"
- title="鐢�" checked> <input type="radio"
- name="userSex" value="濂�" title="濂�">
- </div>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">韬唤璇佸彿锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userId" id="userId"
+ lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鑱旂郴鏂瑰紡锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userContact" id="userContact"
+ placeholder="璇疯緭鍏�" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑虹敓鏃ユ湡锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userBirthday" id="userBirthday"
+ placeholder="yyyy-MM-dd" autocomplete="off"
+ class="layui-input rkbk-search-input bg-date">
+ </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" id="userSex" value="鐢�"
+ title="鐢�" checked> <input type="radio"
+ name="userSex" value="濂�" title="濂�">
+ </div>
+ </div>
- <div class="layui-form-item">
- <label class="layui-form-label">姘� 鏃忥細</label>
- <div class="layui-input-block">
- <input type="text" name="userNation" id="userNation"
- placeholder="璇疯緭鍏�" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">姘� 鏃忥細</label>
+ <div class="layui-input-block">
+ <input type="text" name="userNation" id="userNation"
+ placeholder="璇疯緭鍏�" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
- </div>
- <!--rk-form-left end-->
+ </div>
+ <!--rk-form-left end-->
- <div class="rkbk-photo">
- <a href="#"><img id="id_img_pers"
- th:src="@{../../static/images/rkbk-photo_03.png}" /></a>
- </div>
+ <div class="rkbk-photo">
+ <a href="#"><img id="id_img_pers"
+ 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" id="userAddress"
- placeholder="璇疯緭鍏�" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- </div>
- <!--rkbk-form-box2 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" id="userAddress"
+ placeholder="璇疯緭鍏�" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ </div>
+ <!--rkbk-form-box2 end-->
- <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>
+ <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>
- </div>
- </div>
+ </div>
+ </div>
- </div>
- <!--rkbk-left end-->
+ </div>
+ <!--rkbk-left end-->
- <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
- <div class="rkbk-left">
- <div class="rkbk-tit">
- <i></i>
- <h3>鐧昏淇℃伅</h3>
- </div>
+ <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
+ <div class="rkbk-left">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鐧昏淇℃伅</h3>
+ </div>
- <div class="rkbk-left-form rkbk-right-form">
- <div class="layui-form-item">
- <input type="button" value="璇诲崱" class="rkbk-r-btn fr layui-btn"
- onclick="flushICCard()" /> <label
- class="layui-form-label color-red">鏅烘収鍗″彿锛�</label>
- <div class="layui-input-block">
- <input type="text" name="intelCard" id="intelCard" required
- lay-verify="required" placeholder="鍏堟斁鍗★紝鍚庣偣鍑昏鍗�"
- autocomplete="off" class="layui-input rkbk-search-input">
- </div>
- </div>
+ <div class="rkbk-left-form rkbk-right-form">
+ <div class="layui-form-item">
+ <input type="button" value="璇诲崱" class="rkbk-r-btn fr layui-btn"
+ onclick="flushICCard()"/> <label
+ class="layui-form-label color-red">鏅烘収鍗″彿锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="intelCard" id="intelCard" required
+ lay-verify="required" placeholder="鍏堟斁鍗★紝鍚庣偣鍑昏鍗�"
+ 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 layui-btn-normal"
- onclick="getPlateNum()" /> <label
- class="layui-form-label color-red">杩愯緭杞︾墝锛�</label>
- <div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum"
- placeholder="鏃犺溅鐗岃溅杈嗭紝濉啓 鏃犺溅鐗�" lay-verify="required"
- 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 layui-btn-normal"
+ onclick="getPlateNum()"/> <label
+ class="layui-form-label color-red">杩愯緭杞︾墝锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="plateNum" id="plateNum"
+ placeholder="鏃犺溅鐗岃溅杈嗭紝濉啓 鏃犺溅鐗�" lay-verify="required"
+ autocomplete="off" class="layui-input rkbk-search-input">
+ </div>
+ </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">杩愯緭宸ュ叿锛�</label>
- <div class="layui-input-block">
- <input type="radio" name="transType" value="1" title="姹借溅"
- checked> <input type="radio" name="transType"
- value="2" title="鐏溅"> <input type="radio"
- name="transType" value="3" title="杞埞"> <input
- type="radio" name="transType" value="9" title="鍏朵粬">
- </div>
- </div>
- </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩愯緭宸ュ叿锛�</label>
+ <div class="layui-input-block">
+ <input type="radio" name="transType" value="1" title="姹借溅"
+ checked> <input type="radio" name="transType"
+ value="2" title="鐏溅"> <input type="radio"
+ name="transType" value="3"
+ title="杞埞"> <input
+ type="radio" name="transType" value="9" title="鍏朵粬">
+ </div>
+ </div>
+ </div>
- </div>
- </div>
+ </div>
+ </div>
- <!-- 瑙嗛 -->
- <div class="rkbk-left">
- <div class="rkbk-tit">
- <i></i>
- <h3>鐧昏瑙嗛</h3>
- </div>
- <div class="kccz-r-con2">
- <div class="kccz-r-vedio" id="kccz-r-video1"></div>
- <div class="kccz-r-btnbox">
- <div class="kccz-r-div">
- <span id="plateNum2">鏈瘑鍒�</span>
- <p>杞︾墝璇嗗埆</p>
- </div>
-
- <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10"> <span class="kccz-r-pz"></span>
- <p>绯荤粺鑷姩鎶撴媿</p>
- </a>
-
- </div>
- </div>
- </div>
- </div>
- <!--rkbk-right end-->
- </div>
- <!--rkbk-con end-->
- </form>
- </div>
- <!--rk-main end-->
+ <!-- 瑙嗛 -->
+ <div class="rkbk-left">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鐧昏瑙嗛</h3>
+ </div>
+ <div class="kccz-r-con2">
+ <div class="kccz-r-vedio" id="kccz-r-video1"></div>
+ <div class="kccz-r-btnbox">
+ <div class="kccz-r-div">
+ <span id="plateNum2">鏈瘑鍒�</span>
+ <p>杞︾墝璇嗗埆</p>
+ </div>
+ <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10"> <span
+ class="kccz-r-pz"></span>
+ <p>绯荤粺鑷姩鎶撴媿</p>
+ </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--rkbk-right end-->
+ </div>
+ <!--rkbk-con end-->
+ </form>
+ </div>
+ <!--rk-main end-->
- </div>
- <!--l-container end-->
+</div>
+<!--l-container end-->
- <script th:inline="javascript">
+<script th:inline="javascript">
//娴佺▼鐜妭
var inoutProgress = [[${inoutProgress}]];
//褰撳墠鑺傜偣
@@ -336,44 +337,44 @@
var ship = null; //鏄惁鑸硅繍椤甸潰鏍囪瘑
</script>
- <script th:src="@{../../static/plugins/layui/layui.js}"></script>
- <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/video-play.js}"></script>
- <script th:src="@{../../static/admin/inout/inout-common.js}"></script>
- <script th:src="@{../../static/admin/inout/in-register.js}"></script>
+<script th:src="@{../../static/plugins/layui/layui.js}"></script>
+<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/video-play.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
+<script th:src="@{../../static/admin/inout/in-register.js}"></script>
- <!-- 寮瑰嚭妗嗙殑淇℃伅 -->
- <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>
- </div>
+<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
+<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>
+</div>
</body>
</html>
\ No newline at end of file
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 cde472f..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
@@ -1,503 +1,574 @@
<!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}">
- <style>
- .display-none {
- display: none;
- }
+ <style>
+ .display-none {
+ display: none;
+ }
- .layui-select-disabled .layui-disabled {
- color: #000 !important;
- }
+ .layui-select-disabled .layui-disabled {
+ color: #000 !important;
+ }
- .depot-food input {
- line-height: 34px;
- padding-right: 10px;
- font-size: 16px;
- color: #666;
- background: #eff4f6;
- }
+ .depot-food input {
+ line-height: 34px;
+ padding-right: 10px;
+ font-size: 16px;
+ color: #666;
+ background: #eff4f6;
+ }
+ #text-param {
+ font-size: 14px;
+ color: red;
+ padding-left: 10px;
+ }
- .rk-step-wrap {
- padding: 0px;
- border-bottom: 0px;
- text-align: center;
- }
+ .rk-step-wrap {
+ padding: 0px;
+ border-bottom: 0px;
+ text-align: center;
+ }
- .qyzj-btnbox {
- margin-top: 10px;
- }
+ .kccz-left-box2 {
+ height: 560px;
+ }
- .qyzj-btnbox .rkbk-quick {
- margin-top: 20px;
- }
+ .qyzj-btnbox {
+ margin-top: 10px;
+ }
- .kccz-data-btnbox {
- min-height: 38px;
- padding-top: 2px;
- }
- .kccz-con {
- margin: 15px 0;
- }
- .rkbk-search-btn {
- width: 100px;
- }
- </style>
+ .qyzj-btnbox .rkbk-quick {
+ margin-top: 20px;
+ }
+
+ .kccz-data-btnbox {
+ min-height: 38px;
+ padding-top: 2px;
+ }
+
+ .kccz-con {
+ margin: 15px 0;
+ }
+
+ .rkbk-search-btn {
+ width: 100px;
+ height: 30px;
+ line-height: 30px;
+ font-size: 16px;
+ }
+
+ .kccz-r-btnbox {
+ width: 86px !important;
+ }
+
+ .kccz-r-btn {
+ width: 86px !important;
+ }
+
+ .rkbk-search-input {
+ background: #FFF !important;
+ }
+
+ .color-red {
+ color: red !important;
+ }
+
+ .r-240 {
+ right: 240px;
+ }
+
+ .r-120 {
+ right: 120px;
+ }
+
+ </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 btn-sm"
- onclick="submit()">
- <i><img th:src="@{../../static/images/icon-ok.png}"/></i>鍊间粨瀹屾垚
- </button>
- </div>
+ <div class="rkbk-quick fl">
+ <button class="rkbk-quick-btn layui-btn btn-green btn-sm"
+ onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i>鍊间粨瀹屾垚
+ </button>
+ <button class="rkbk-quick-btn layui-btn btn-violet btn-sm"
+ onclick="flushPage()">
+ <i><img th:src="@{../../static/images/icon-shuaxin2.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">
+ <p>鍑哄簱鍊间粨</p>
+ </li>
+ <li id="progress-fullWeight">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-chengzhong.png}"/>
</span>
- <p>婊¤溅绉伴噸</p>
- </li>
- <li id="progress-cardBack">
+ <p>婊¤溅绉伴噸</p>
+ </li>
+ <li id="progress-cardBack">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-banli.png}"/>
</span>
- <p>绂诲簱纭</p>
- </li>
- </ul>
- </div>
+ <p>绂诲簱纭</p>
+ </li>
+ </ul>
+ </div>
- <!-- 娴佺▼寮曞 END -->
+ <!-- 娴佺▼寮曞 END -->
- </div>
- <!--qyzj-btnbox end-->
+ </div>
+ <!--qyzj-btnbox end-->
- <div class="kccz-con">
- <div class="kccz-left radius-6 fl bg-fff">
+ <div class="kccz-con">
+ <div class="kccz-left radius-6 fl bg-fff">
- <div class="kccz-left-box2 ">
+ <div class="kccz-left-box2 radius-6">
- <div class="rkbk-tit">
- <i></i>
- <h3>鍑哄簱淇℃伅</h3>
- </div>
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鍑哄簱淇℃伅<span id="text-param"></span></h3>
+ <div>
+ <input type="button" value="璇绘櫤鎱у崱"
+ class="rkbk-search-btn layui-btn r-240" onclick="flushICCard()">
+ <input type="button" value="璇昏韩浠借瘉"
+ class="rkbk-search-btn layui-btn r-120" onclick="flushIdCard()">
+ <input type="button" value="鎵嬪姩鏌ヨ"
+ class="rkbk-search-btn layui-btn" onclick="flushData()">
- <div class="kccz-data-form layui-row">
- <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>
+ </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="kccz-data-form layui-row">
+ <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="type" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-閫氱煡鍗昳d</label>
- <div class="layui-input-block">
- <input type="text" name="noticeId" 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-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">韬唤璇佸彿</label>
- <div class="layui-input-block">
- <input type="text" name="userId" id="userId"
- placeholder="鎵胯繍浜鸿韩浠借瘉鍙�" autocomplete="off" class="layui-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 display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-閫氱煡鍗昳d</label>
+ <div class="layui-input-block">
+ <input type="text" name="noticeId" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+
+ <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="userName" id="userName"
+ placeholder="涓嶅彲缂栬緫" autocomplete="off" class="layui-input" disabled>
+ </div>
+ </div>
- </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">杞︾墝鍙�</label>
- <div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum"
- autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
+ <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="plateNum" id="plateNum"
+ placeholder="鑷姩甯﹀叆/鎵嬪姩褰曞叆" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <div class="layui-col-xs4 kccz-data-btnbox">
- <input type="button" value="璇昏韩浠借瘉"
- class="rkbk-search-btn layui-btn"
- onclick="flushIdCard()">
- </div>
- <div class="layui-col-xs4 kccz-data-btnbox">
- <input type="button" value="璇诲崱"
- class="rkbk-search-btn layui-btn"
- onclick="flushICCard()">
- </div>
- <div class="layui-col-xs4 kccz-data-btnbox">
- <input type="button" value="鏌� 璇�"
- class="rkbk-search-btn layui-btn" onclick="flushData()">
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <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>
+ <!-- <div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <div class="layui-col-xs4 kccz-data-btnbox">-->
+ <!-- <input type="button" value="璇昏韩浠借瘉"-->
+ <!-- class="rkbk-search-btn layui-btn"-->
+ <!-- onclick="flushIdCard()">-->
+ <!-- </div>-->
+ <!-- <div class="layui-col-xs4 kccz-data-btnbox">-->
+ <!-- <input type="button" value="璇绘櫤鎱у崱"-->
+ <!-- class="rkbk-search-btn layui-btn"-->
+ <!-- onclick="flushICCard()">-->
+ <!-- </div>-->
+ <!-- <div class="layui-col-xs4 kccz-data-btnbox">-->
+ <!-- <input type="button" value="鎵嬪姩鏌ヨ"-->
+ <!-- class="rkbk-search-btn layui-btn" onclick="flushData()">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <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>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">绌鸿溅绉伴噸</label>
- <div class="layui-input-block">
- <input type="text" name="emptyWeight" autocomplete="off" placeholder="涓嶅彲鏀�"
- class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
+ <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="emptyWeight" autocomplete="off" placeholder="涓嶅彲缂栬緫"
+ class="layui-input rkbk-search-input" disabled>
+ <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">婊¤溅绉伴噸</label>
- <div class="layui-input-block">
- <input type="text" name="fullWeight" autocomplete="off" placeholder="涓嶅彲鏀�"
- class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">瑁呭嵏浠撳簱</label>
- <div class="layui-input-block">
- <select name="depotId" id="depotId">
- <option value="">涓嶅彲鏀�</option>
- <option th:each="depot,depotSet:${listDepot}"
- th:value="${depot.id}" th:text="${depot.name}"></option>
- </select>
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">姣涢噸(婊¤溅)</label>
+ <div class="layui-input-block">
+ <input type="text" name="fullWeight" autocomplete="off" placeholder="涓嶅彲缂栬緫"
+ class="layui-input rkbk-search-input" disabled> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">瑁呭嵏浠撳簱</label>
+ <div class="layui-input-block">
+ <select name="depotId" id="depotId">
+ <option value="">涓嶅彲缂栬緫</option>
+ <option th:each="depot,depotSet:${listDepot}"
+ th:value="${depot.id}" th:text="${depot.name}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鍑� 閲�</label>
- <div class="layui-input-block">
- <input type="text" name="netWeight" autocomplete="off" placeholder="涓嶅彲鏀�"
- class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
+ <!-- <div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">鍑� 閲�</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input type="text" name="netWeight" autocomplete="off" placeholder="涓嶅彲缂栬緫"-->
+ <!-- class="layui-input rkbk-search-input" disabled> <em-->
+ <!-- class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
- <div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">鏉傝川鎵ｉ噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <input type="text" name="impurity" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">%</em>
- </div>
- <div class="layui-input-block">
- <div class="posi-r">
- <input type="text" name="deImpurity" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <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>
+ <!-- <div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item kccz-data-group-md">-->
+ <!-- <label class="layui-form-label">鏉傝川鎵ｉ噸</label>-->
+ <!-- <div class="posi-r kccz-data-bfb fr">-->
+ <!-- <input type="text" name="impurity" placeholder="涓嶅彲缂栬緫"-->
+ <!-- autocomplete="off" class="layui-input rkbk-search-input"-->
+ <!-- disabled> <em class="kccz-data-dw">%</em>-->
+ <!-- </div>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <div class="posi-r">-->
+ <!-- <input type="text" name="deImpurity" placeholder="涓嶅彲缂栬緫"-->
+ <!-- autocomplete="off" class="layui-input rkbk-search-input"-->
+ <!-- disabled> <em class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <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="customerName" placeholder="涓嶅彲缂栬緫"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled>
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">绮绛夌骇</label>
- <div class="layui-input-block">
- <select name="foodLevel" id="foodLevel">
- <option value="">涓嶅彲鏀�</option>
- <option th:each="dic,dicSet:${listFoodLevel}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
- </select>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">姘村垎澧為噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <input type="text" name="wet" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">%</em>
- </div>
- <div class="layui-input-block">
- <div class="posi-r">
- <input type="text" name="deWet" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">绮鍝佺</label>
- <div class="layui-input-block">
- <select name="foodVariety" id="foodVariety">
- <option value="">涓嶅彲鏀�</option>
- <option th:each="dic,dicSet:${listFoodVariety}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
- </select>
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">绮绛夌骇</label>
+ <div class="layui-input-block">
+ <select name="foodLevel" id="foodLevel" lay-filter="select_foodLevel">
+ <option value="">璇烽�夋嫨</option>
+ <option th:each="dic,dicSet:${listFoodLevel}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item kccz-data-group-md">-->
+ <!-- <label class="layui-form-label">姘村垎澧為噸</label>-->
+ <!-- <div class="posi-r kccz-data-bfb fr">-->
+ <!-- <input type="text" name="wet" placeholder="涓嶅彲缂栬緫"-->
+ <!-- autocomplete="off" class="layui-input rkbk-search-input"-->
+ <!-- disabled> <em class="kccz-data-dw">%</em>-->
+ <!-- </div>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <div class="posi-r">-->
+ <!-- <input type="text" name="deWet" placeholder="涓嶅彲缂栬緫"-->
+ <!-- autocomplete="off" class="layui-input rkbk-search-input"-->
+ <!-- disabled> <em class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">绮鍝佺</label>
+ <div class="layui-input-block">
+ <select name="foodVariety" id="foodVariety">
+ <option value="">璇烽�夋嫨</option>
+ <option th:each="dic,dicSet:${listFoodVariety}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鍏朵粬鎵ｉ噸</label>
- <div class="layui-input-block">
- <input type="text" name="deOther" autocomplete="off" placeholder="涓嶅彲鏀�"
- class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏朵粬鎵ｉ噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="deOther" autocomplete="off" placeholder="璇疯緭鍏�"
+ class="layui-input rkbk-search-input weight"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐜板満鎵ｉ噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="deHandle" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input weight"> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎬绘墸閲�</label>
+ <div class="layui-input-block">
+ <input type="text" name="deSum" placeholder="涓嶅彲缂栬緫"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">鍊间粨寮�濮�</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input type="text" name="handleStart" id="handleStart"-->
+ <!-- placeholder="骞�-鏈�-鏃� 鏃�:鍒�" autocomplete="off"-->
+ <!-- class="layui-input bg-date">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
+ <!-- <div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">缁撶畻閲嶉噺</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input type="text" name="settleWeight" placeholder="涓嶅彲缂栬緫"-->
+ <!-- autocomplete="off" class="layui-input rkbk-search-input"-->
+ <!-- disabled> <em class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
-
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鎬绘墸閲�</label>
- <div class="layui-input-block">
- <input type="text" name="deSum" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
-
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鍊间粨寮�濮�</label>
- <div class="layui-input-block">
- <input type="text" name="handleStart" id="handleStart"
- placeholder="骞�-鏈�-鏃� 鏃�:鍒�" autocomplete="off"
- class="layui-input bg-date">
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鐜板満鎵ｉ噸</label>
- <div class="layui-input-block">
- <input type="text" name="deHandle" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input"> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
-
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鎵ｉ噸鍚庡噣閲�</label>
- <div class="layui-input-block">
- <input type="text" name="settleWeight" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鍊间粨缁撴潫</label>
- <div class="layui-input-block">
- <input type="text" name="handleEnd" id="handleEnd"
- placeholder="骞�-鏈�-鏃� 鏃�:鍒�" autocomplete="off"
- class="layui-input bg-date">
- </div>
- </div>
- </div>
- <div class="layui-col-xs12">
- <div class="layui-form-item">
- <label class="layui-form-label">澶� 娉�</label>
- <div class="layui-input-block">
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">鍊间粨缁撴潫</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input type="text" name="handleEnd" id="handleEnd"-->
+ <!-- placeholder="骞�-鏈�-鏃� 鏃�:鍒�" autocomplete="off"-->
+ <!-- class="layui-input bg-date">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
+ <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">
+ <input type="text" name="deOtherInfo" placeholder="鍏朵粬鎵ｉ噸璇存槑"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
<textarea name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-textarea"></textarea>
- </div>
- </div>
- </div>
- </form>
- </div>
- </div>
- <!--kccz-left-box2 end-->
+ autocomplete="off" class="layui-textarea"></textarea>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ <!--kccz-left-box2 end-->
- </div>
- <!--kccz-left end-->
- <div class="kccz-right fr bg-ef">
- <div class="kccz-r-item radius-6">
- <div class="kccz-r-box">
- <div class="rkbk-tit">
- <i></i>
- <h3>鍊间粨璁板綍1</h3>
- </div>
- <div class="kccz-r-con">
- <div class="kccz-r-vedio"><img id="kccz-r-img1"></div>
- <div class="kccz-r-btnbox">
- <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn1"> <span
- class="kccz-r-img"></span>
- <p>涓婁紶鍥剧墖</p>
- </a>
- </div>
- </div>
+ </div>
+ <!--kccz-left end-->
+ <div class="kccz-right fr bg-ef">
+ <div class="kccz-r-item radius-6">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鍊间粨璁板綍1</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio"><img id="kccz-r-img1"></div>
+ <div class="kccz-r-btnbox">
+ <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn1"> <span
+ class="kccz-r-img"></span>
+ <p>涓婁紶鍥剧墖</p>
+ </a>
+ </div>
+ </div>
- </div>
+ </div>
- </div>
- <!--kccz-r-item end-->
+ </div>
+ <!--kccz-r-item end-->
- <div class="kccz-r-item radius-6 mt-10">
- <div class="kccz-r-box">
- <div class="rkbk-tit">
- <i></i>
- <h3>鍊间粨璁板綍2</h3>
- </div>
- <div class="kccz-r-con">
- <div class="kccz-r-vedio"><img id="kccz-r-img2"></div>
- <div class="kccz-r-btnbox">
- <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn2"> <span
- class="kccz-r-img"></span>
- <p>涓婁紶鍥剧墖</p>
- </a>
- </div>
- </div>
+ <div class="kccz-r-item radius-6 mt-10">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鍊间粨璁板綍2</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio"><img id="kccz-r-img2"></div>
+ <div class="kccz-r-btnbox">
+ <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn2"> <span
+ class="kccz-r-img"></span>
+ <p>涓婁紶鍥剧墖</p>
+ </a>
+ </div>
+ </div>
- </div>
+ </div>
- </div>
- <!--kccz-r-item end-->
+ </div>
+ <!--kccz-r-item end-->
- <div class="kccz-r-item radius-6 mt-10">
- <div class="kccz-r-box">
- <div class="rkbk-tit">
- <i></i>
- <h3>鍊间粨璁板綍3</h3>
- </div>
- <div class="kccz-r-con">
- <div class="kccz-r-vedio"><img id="kccz-r-img3"></div>
- <div class="kccz-r-btnbox">
- <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn3"> <span
- class="kccz-r-img"></span>
- <p>涓婁紶鍥剧墖</p>
- </a>
- </div>
- </div>
+ <div class="kccz-r-item radius-6 mt-10">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鍊间粨璁板綍3</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio"><img id="kccz-r-img3"></div>
+ <div class="kccz-r-btnbox">
+ <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn3"> <span
+ class="kccz-r-img"></span>
+ <p>涓婁紶鍥剧墖</p>
+ </a>
+ </div>
+ </div>
- </div>
+ </div>
- </div>
- <!--kccz-r-item end-->
+ </div>
+ <!--kccz-r-item end-->
- </div>
- </div>
- <!--kccz-con end-->
+ </div>
+ </div>
+ <!--kccz-con end-->
- </div>
- <!--rk-main end-->
+ </div>
+ <!--rk-main end-->
</div>
<!--l-container end-->
<script th:inline="javascript">
- //娴佺▼鐜妭
- var inoutProgress = [[${inoutProgress}]];
- var progress = [[${progress}]];
+ //娴佺▼鐜妭
+ var inoutProgress = [[${inoutProgress}]];
+ var progress = [[${progress}]];
- var listDepot = [[${listDepot}]];
- //涓氬姟姝ラ
- var bizType = [[${bizType}]];
- var deptId = [[${deptId}]];
- //userId
- var userId = [[${loginUser.username}]];
- //鍑哄叆搴撶被鍨�
- var type = [[${type}]];
- var companyId = [[${loginUser.companyId}]];
+ var listDepot = [[${listDepot}]];
+ //涓氬姟姝ラ
+ var bizType = [[${bizType}]];
+ var deptId = [[${deptId}]];
+ //userId
+ var userId = [[${loginUser.username}]];
+ //鍑哄叆搴撶被鍨�
+ var type = [[${type}]];
+ var companyId = [[${loginUser.companyId}]];
- //鍝佺
- var listFoodVariety = [[${listFoodVariety}]];
+ //鍝佺
+ var listFoodVariety = [[${listFoodVariety}]];
</script>
@@ -505,37 +576,39 @@
<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>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
<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-register.html b/igds-web/src/main/resources/templates/admin/inout/out-register.html
index 1edc54e..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
@@ -1,337 +1,349 @@
<!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}">
- <style>
- .display-none {
- display: none;
- }
+ <style>
+ .display-none {
+ display: none;
+ }
- .kccz-r-con2 {
- /* height: 230px; */
- padding-right: 120px;
- position: relative;
- margin-top: 10px;
- }
+ .kccz-r-con2 {
+ /* height: 230px; */
+ padding-right: 120px;
+ position: relative;
+ margin-top: 10px;
+ }
- .kccz-r-vedio {
- width: 100%;
- height: 280px;
- /* background: #dee6ec; */
- background: #000;
- color: #FFF;
- text-align: center;
- }
+ .kccz-r-vedio {
+ width: 100%;
+ height: 280px;
+ /* background: #dee6ec; */
+ background: #000;
+ color: #FFF;
+ text-align: center;
+ }
- .kccz-r-btnbox {
- width: 100px;
- position: absolute;
- right: 0px;
- top: 0px;
- z-index: 99;
- }
+ .kccz-r-btnbox {
+ width: 100px;
+ position: absolute;
+ right: 0px;
+ top: 0px;
+ z-index: 99;
+ }
- .layui-form-label {
- font-weight: bold;
- }
+ .layui-form-label {
+ font-weight: bold;
+ }
- .ckdj-radiobox .layui-form-item {
- margin-bottom: 0px;
- margin-top: 10px;
- }
+ .ckdj-radiobox .layui-form-item {
+ margin-bottom: 0px;
+ margin-top: 10px;
+ }
- .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 !important;
- }
- .color-red {
- color: red !important;
- }
- .layui-form-item .layui-input-inline {
- width: unset;
- }
- .rkbk-search-input{
- background: #FFF !important;
- }
- .rkbk-search-input.bg-date {
- background: #FFF !important;
- }
- </style>
+ .qyzj-btnbox .rkbk-quick {
+ margin-top: 15px !important;
+ }
+
+ .color-red {
+ color: red !important;
+ }
+
+ .layui-form-item .layui-input-inline {
+ width: unset;
+ }
+
+ .rkbk-search-input {
+ background: #FFF !important;
+ }
+
+ .rkbk-search-input.bg-date {
+ background: #FFF !important;
+ }
+ </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="rkbk-quick fl">
- <button class="rkbk-quick-btn layui-btn btn-red"
- onclick="resetForm()">
- <i><img th:src="@{../../static/images/icon-clear.png}"/></i> 娓呯┖鏁版嵁
- </button>
- <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="resetPlateNum()">
- <i><img th:src="@{../../static/images/icon-che.png}"/></i>閲嶇疆杞︾墝璇嗗埆
- </button>
- </div>
+ <div class="qyzj-btnbox layui-clear">
+ <!-- 鎿嶄綔鑿滃崟-->
+ <div class="rkbk-quick fl">
+ <button class="rkbk-quick-btn layui-btn btn-red"
+ onclick="resetForm()">
+ <i><img th:src="@{../../static/images/icon-clear.png}"/></i> 娓呯┖鏁版嵁
+ </button>
+ <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="resetPlateNum()">-->
+ <!-- <i><img th:src="@{../../static/images/icon-che.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">
+ <p>鍑哄簱鐧昏</p>
+ </li>
+ <li id="progress-emptyWeight">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-chengzhong.png}"/>
</span>
- <p>绌鸿溅绉伴噸</p>
- </li>
- <li id="progress-hand">
+ <p>绌鸿溅绉伴噸</p>
+ </li>
+ <li id="progress-hand">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-xiehuo.png}"/>
</span>
- <p>鍑哄簱鍊间粨</p>
- </li>
- <li id="progress-fullWeight">
+ <p>鍑哄簱鍊间粨</p>
+ </li>
+ <li id="progress-fullWeight">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-chengzhong.png}"/>
</span>
- <p>婊¤溅绉伴噸</p>
- </li>
- <li id="progress-cardBack">
+ <p>婊¤溅绉伴噸</p>
+ </li>
+ <li id="progress-cardBack">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-banli.png}"/>
</span>
- <p>绂诲簱纭</p>
- </li>
- </ul>
- </div>
- <!--娴佺▼寮曞缁撴潫-->
- </div>
+ <p>绂诲簱纭</p>
+ </li>
+ </ul>
+ </div>
+ <!--娴佺▼寮曞缁撴潫-->
+ </div>
- <form class="layui-form" action="" id="form-data"
- lay-filter="form-data">
+ <form class="layui-form" action="" id="form-data"
+ lay-filter="form-data">
- <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">
+ <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">
- <div class="rkbk-form-box1">
+ <div class="rkbk-form-box1">
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-绫诲瀷</label>
- <input type="text" name="type" th:value="${type}" >
- </div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-绫诲瀷</label>
+ <input type="text" name="type" th:value="${type}">
+ </div>
- <div class="rkbk-form-left">
- <div class="layui-form-item">
- <label class="layui-form-label color-red">濮� 鍚嶏細</label>
- <div class="layui-input-block">
- <input type="text" name="userName" id="userName" required
- lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label color-red">韬唤璇佸彿锛�</label>
- <div class="layui-input-block">
- <input type="text" name="userId" id="userId" required
- lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鑱旂郴鏂瑰紡锛�</label>
- <div class="layui-input-block">
- <input type="text" name="userContact" id="userContact"
- placeholder="璇疯緭鍏�" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍑虹敓鏃ユ湡锛�</label>
- <div class="layui-input-block">
- <input type="text" name="userBirthday" id="userBirthday"
- placeholder="yyyy-MM-dd" autocomplete="off"
- class="layui-input rkbk-search-input bg-date">
- </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" id="userSex" value="鐢�"
- title="鐢�" checked> <input type="radio"
- name="userSex" value="濂�" title="濂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">姘� 鏃忥細</label>
- <div class="layui-input-block">
- <input type="text" name="userNation" id="userNation"
- required lay-verify="required" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input rkbk-search-input">
- </div>
- </div>
- </div>
- <!--rk-form-left end-->
+ <div class="rkbk-form-left">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">濮� 鍚嶏細</label>
+ <div class="layui-input-block">
+ <input type="text" name="userName" id="userName" required
+ lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">韬唤璇佸彿锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userId" id="userId" required
+ lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鑱旂郴鏂瑰紡锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userContact" id="userContact"
+ placeholder="璇疯緭鍏�" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑虹敓鏃ユ湡锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userBirthday" id="userBirthday"
+ placeholder="yyyy-MM-dd" autocomplete="off"
+ class="layui-input rkbk-search-input bg-date">
+ </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" id="userSex" value="鐢�"
+ title="鐢�" checked> <input type="radio"
+ name="userSex" value="濂�" title="濂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">姘� 鏃忥細</label>
+ <div class="layui-input-block">
+ <input type="text" name="userNation" id="userNation"
+ required lay-verify="required" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ </div>
+ <!--rk-form-left end-->
- <div class="rkbk-photo">
- <a href="#"><img id="id_img_pers"
- th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
- </div>
+ <div class="rkbk-photo">
+ <a href="#"><img id="id_img_pers"
+ 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" id="userAddress"
- placeholder="璇疯緭鍏�" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- </div>
- <!--rkbk-form-box2 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" id="userAddress"
+ placeholder="璇疯緭鍏�" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ </div>
+ <!--rkbk-form-box2 end-->
- <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>
+ <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>
- </div>
- </div>
+ </div>
+ </div>
- </div>
- <!--rkbk-left end-->
+ </div>
+ <!--rkbk-left end-->
- <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
- <div class="rkbk-left">
- <div class="rkbk-tit">
- <i></i>
- <h3>杩愯緭淇℃伅</h3>
- </div>
+ <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
+ <div class="rkbk-left">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>杩愯緭淇℃伅</h3>
+ </div>
- <div class="rkbk-left-form rkbk-right-form">
- <div class="layui-form-item">
- <input type="button" value="璇诲崱" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()"/>
- <label class="layui-form-label color-red">鏅烘収鍗″彿锛�</label>
- <div class="layui-input-block">
- <input type="text" name="intelCard" id="intelCard" required
- lay-verify="required" placeholder="鍏堟斁鍗★紝鐒跺悗鐐瑰嚮璇诲崱"
- autocomplete="off" class="layui-input rkbk-search-input">
- </div>
- </div>
+ <div class="rkbk-left-form rkbk-right-form">
+ <div class="layui-form-item">
+ <input type="button" value="璇诲崱" class="rkbk-r-btn fr layui-btn"
+ onclick="flushICCard()"/>
+ <label class="layui-form-label color-red">鏅烘収鍗″彿锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="intelCard" id="intelCard" required
+ lay-verify="required" placeholder="鍏堟斁鍗★紝鐒跺悗鐐瑰嚮璇诲崱"
+ 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 layui-btn-normal"
- onclick="flushPlateNum()"/>
- <label class="layui-form-label color-red">杩愯緭杞︾墝锛�</label>
- <div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum" required placeholder="鏃犺溅鐗岃溅杈嗭紝濉啓 鏃犺溅鐗�"
- lay-verify="required" 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 layui-btn-normal"
+ onclick="flushPlateNum()"/>
+ <label class="layui-form-label color-red">杩愯緭杞︾墝锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="plateNum" id="plateNum" required placeholder="鏃犺溅鐗岃溅杈嗭紝濉啓 鏃犺溅鐗�"
+ lay-verify="required" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">杩愯緭鏂瑰紡锛�</label>
- <div class="layui-input-inline">
- <input type="radio" name="transType" value="1" title="姹借溅" checked>
- <input type="radio" name="transType" value="2" title="鐏溅">
- <input type="radio" name="transType" value="3" title="杞埞">
- <input type="radio" name="transType" value="9" title="鍏朵粬">
- </div>
- </div>
- </div>
- </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩愯緭鏂瑰紡锛�</label>
+ <div class="layui-input-inline">
+ <input type="radio" name="transType" value="1" title="姹借溅" checked>
+ <input type="radio" name="transType" value="2" title="鐏溅">
+ <input type="radio" name="transType" value="3" title="杞埞">
+ <input type="radio" name="transType" value="9" title="鍏朵粬">
+ </div>
+ </div>
+ </div>
+ </div>
- </div>
+ </div>
- <!-- 瑙嗛 -->
- <div class="rkbk-left">
- <div class="rkbk-tit">
- <i></i>
- <h3>鐧昏瑙嗛</h3>
- </div>
- <div class="kccz-r-con2">
- <div class="kccz-r-vedio" id="kccz-r-video1">
-
- </div>
- <div class="kccz-r-btnbox">
- <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">
- <span class="kccz-r-pz"></span>
- <p>杞︾墝璇嗗埆</p>
- </a>
- <a href="javascript:;" class="kccz-r-btn mt-10">
- <span id="pz-img" class="kccz-r-img"></span>
- <p id="pz-text">鑷姩鎶撴媿</p>
- </a>
- </div>
- </div>
- </div>
- </div>
- <!--rkbk-right end-->
- </div>
- <!--rkbk-con end-->
- </form>
- </div>
- <!--rk-main end-->
+ <!-- 瑙嗛 -->
+ <div class="rkbk-left">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鐧昏瑙嗛</h3>
+ </div>
+ <div class="kccz-r-con2">
+ <div class="kccz-r-vedio" id="kccz-r-video1"></div>
+ <div class="kccz-r-btnbox">
+ <div class="kccz-r-div" style="width: 110px">
+ <span id="plateNum2">鏈瘑鍒�</span>
+ <p>杞︾墝璇嗗埆</p>
+ </div>
+ <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10">
+ <span id="pz-img" class="kccz-r-pz"></span>
+ <p id="pz-text">鑷姩鎶撴媿</p>
+ </a>
+ <!-- <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">-->
+ <!-- <span class="kccz-r-pz"></span>-->
+ <!-- <span id="plateNum2">鏈瘑鍒�</span>-->
+ <!-- <p>杞︾墝璇嗗埆</p>-->
+ <!-- </a>-->
+ <!-- <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10">-->
+ <!-- <span id="pz-img" class="kccz-r-img"></span>-->
+ <!-- <p id="pz-text">鑷姩鎶撴媿</p>-->
+ <!-- </a>-->
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--rkbk-right end-->
+ </div>
+ <!--rkbk-con end-->
+ </form>
+ </div>
+ <!--rk-main end-->
</div>
<!--l-container end-->
<script th:inline="javascript">
- //娴佺▼鐜妭
- var inoutProgress = [[${inoutProgress}]];
- //褰撳墠鑺傜偣
- var progress = [[${progress}]];
- //涓氬姟姝ラ
- var bizType = [[${bizType}]];
- var deptId = [[${deptId}]];
- //鍑哄叆搴撶被鍨�
- var type = [[${type}]];
- var userId = [[${loginUser.username}]];
- var companyId = [[${loginUser.companyId}]];
- //杞︾墝璇嗗埆
- var lprDto = [[${lprDto}]];
- var ship = null; //鏄惁鑸硅繍椤甸潰鏍囪瘑
+ //娴佺▼鐜妭
+ var inoutProgress = [[${inoutProgress}]];
+ //褰撳墠鑺傜偣
+ var progress = [[${progress}]];
+ //涓氬姟姝ラ
+ var bizType = [[${bizType}]];
+ var deptId = [[${deptId}]];
+ //鍑哄叆搴撶被鍨�
+ var type = [[${type}]];
+ var userId = [[${loginUser.username}]];
+ var companyId = [[${loginUser.companyId}]];
+ //杞︾墝璇嗗埆
+ var lprDto = [[${lprDto}]];
+ var ship = null; //鏄惁鑸硅繍椤甸潰鏍囪瘑
</script>
<script th:src="@{../../static/plugins/layui/layui.js}"></script>
@@ -339,37 +351,38 @@
<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>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
<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-weight.html b/igds-web/src/main/resources/templates/admin/inout/out-weight.html
index 6ebe4ee..89ff31b 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-weight.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-weight.html
@@ -17,6 +17,14 @@
<script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
<style>
+ .kccz-r-btnbox {
+ width: 86px !important;
+ }
+
+ .kccz-r-btn {
+ width: 86px !important;
+ }
+
.display-none {
display: none;
}
@@ -33,7 +41,7 @@
}
.kccz-left-box2 {
- height: 500px;
+ height: 560px;
}
.color-red {
@@ -72,6 +80,12 @@
.border-no {
border: 0px;
+ }
+
+ #text-param {
+ font-size: 14px;
+ color: red;
+ padding-left: 10px;
}
.qyzj-btnbox {
@@ -124,21 +138,19 @@
<div class="rkbk-quick fl">
<button id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
onclick="weight()">
- <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>绉伴噸
+ <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>姝ラ涓�锛氱О閲嶇‘璁�
</button>
<button id="btn-submit"
- class="rkbk-quick-btn layui-btn btn-green layui-btn-disabled"
- disabled=true onclick="submit()">
- <i><img th:src="@{../../static/images/icon-ok.png}"/></i>瀹屾垚绉伴噸
+ class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i>姝ラ浜岋細瀹屾垚绉伴噸
</button>
<button id="btn-printBill"
- class="rkbk-quick-btn layui-btn btn-blue layui-btn-disabled"
- disabled=true onclick="printBill()">
- <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>鎵撳嵃杩囩鍗�
+ class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
+ <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>姝ラ涓夛細鎵撳嵃杩囩鍗�
</button>
<button class="rkbk-quick-btn layui-btn btn-violet"
onclick="flushPage()">
- <i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>閲嶆柊绉伴噸
+ <i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>鍒锋柊椤甸潰
</button>
</div>
@@ -229,7 +241,7 @@
<div class="rkbk-tit">
<i></i>
- <h3>涓氬姟鏁版嵁</h3>
+ <h3>涓氬姟鏁版嵁<span id="text-param"></span></h3>
<div>
<input type="button" value="璇绘櫤鎱у崱"
class="rkbk-search-btn layui-btn r-240"
@@ -276,37 +288,37 @@
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">鏅烘収鍗″彿</label>
+ <label class="layui-form-label color-red">鏅烘収鍗″彿</label>
<div class="layui-input-block">
<input type="text" name="intelCard" id="intelCard"
- placeholder="鏅烘収鍗″彿" autocomplete="off" class="layui-input">
+ placeholder="鍒峰崱/鎵嬪姩褰曞叆" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">杞︾墝鍙�</label>
+ <label class="layui-form-label color-red">杞︾墝鍙�</label>
<div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum" placeholder="杞︾墝鍙�"
+ <input type="text" name="plateNum" id="plateNum" placeholder="鑷姩褰曞叆/鎵嬪姩褰曞叆"
autocomplete="off" class="layui-input">
</div>
</div>
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">韬唤璇佸彿</label>
- <div class="layui-input-block">
- <input type="text" name="userId" id="userId"
- placeholder="鎵胯繍浜鸿韩浠借瘉鍙�" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">韬唤璇佸彿</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input type="text" name="userId" id="userId"-->
+ <!-- placeholder="鎵胯繍浜鸿韩浠借瘉鍙�" autocomplete="off" class="layui-input">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">鎵胯繍浜�</label>
+ <label class="layui-form-label color-red">鎵胯繍浜�</label>
<div class="layui-input-block">
<input type="text" name="userName" placeholder="涓嶅彲缂栬緫" class="layui-input"
disabled>
@@ -344,7 +356,7 @@
<div class="layui-input-block">
<input type="text" name="customerName" placeholder="璇烽�夋嫨锛屼笉鍙墜鍔ㄥ綍鍏�"
autocomplete="off" class="layui-input" disabled="disabled"> <em
- class="kccz-data-dw cursor" onclick="showNotice()">鈥�</em>
+ class="kccz-data-dw cursor" onclick="showNotice()">鈥︹��</em>
</div>
</div>
</div>
@@ -361,23 +373,23 @@
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">鏉傝川鎵ｉ噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <input id="impurity" type="text" name="impurity" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">%</em>
- </div>
- <div class="layui-input-block">
- <div class="posi-r">
- <input id="deImpurity" type="text" name="deImpurity" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- </div>
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item kccz-data-group-md">-->
+ <!-- <label class="layui-form-label">鏉傝川鎵ｉ噸</label>-->
+ <!-- <div class="posi-r kccz-data-bfb fr">-->
+ <!-- <input id="impurity" type="text" name="impurity" placeholder="璇疯緭鍏�"-->
+ <!-- autocomplete="off" class="layui-input weight"> <em-->
+ <!-- class="kccz-data-dw">%</em>-->
+ <!-- </div>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <div class="posi-r">-->
+ <!-- <input id="deImpurity" type="text" name="deImpurity" placeholder="璇疯緭鍏�"-->
+ <!-- autocomplete="off" class="layui-input weight"> <em-->
+ <!-- class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label" id="label4">瑁呭嵏浠撳簱</label>
@@ -390,7 +402,6 @@
</div>
</div>
</div>
-
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label">鐜板満鎵ｉ噸</label>
@@ -402,23 +413,23 @@
</div>
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">姘村垎澧為噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <input id="wet" type="text" name="wet" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">%</em>
- </div>
- <div class="layui-input-block">
- <div class="posi-r">
- <input id="deWet" type="text" name="deWet" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- </div>
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item kccz-data-group-md">-->
+ <!-- <label class="layui-form-label">姘村垎澧為噸</label>-->
+ <!-- <div class="posi-r kccz-data-bfb fr">-->
+ <!-- <input id="wet" type="text" name="wet" placeholder="璇疯緭鍏�"-->
+ <!-- autocomplete="off" class="layui-input weight"> <em-->
+ <!-- class="kccz-data-dw">%</em>-->
+ <!-- </div>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <div class="posi-r">-->
+ <!-- <input id="deWet" type="text" name="deWet" placeholder="璇疯緭鍏�"-->
+ <!-- autocomplete="off" class="layui-input weight"> <em-->
+ <!-- class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label">绮鍝佺</label>
@@ -442,6 +453,15 @@
</div>
</div>
</div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏朵粬璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="deOtherInfo" autocomplete="off"
+ placeholder="鍏朵粬鎵ｉ噸璇存槑" class="layui-input">
+ </div>
+ </div>
+ </div>
<div class="layui-col-xs4">
<div class="layui-form-item">
@@ -453,51 +473,29 @@
</div>
</div>
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">瑙� 鏍�</label>
- <div class="layui-input-block">
- <select name="specType" id="specType">
- <option value="鏁ｇ伯">鏁ｇ伯</option>
- <option value="25kg">25kg</option>
- <option value="50kg">50kg</option>
- </select>
- </div>
- </div>
- </div>
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">瑙� 鏍�</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <select name="specType" id="specType">-->
+ <!-- <option value="鏁ｇ伯">鏁ｇ伯</option>-->
+ <!-- <option value="25kg">25kg</option>-->
+ <!-- <option value="50kg">50kg</option>-->
+ <!-- </select>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
<div class="layui-col-xs4">
<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"> <em
- class="kccz-data-dw cursor" onclick="showFoodLocation()">鈥�</em>
+ class="kccz-data-dw cursor" onclick="showFoodLocation()">鈥︹��</em>
</div>
</div>
</div>
-
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曚环</label>
- <div class="layui-input-block">
- <input type="text" name="price" placeholder="璇疯緭鍏ュ崟浠�"
- class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>
- </div>
- </div>
- </div>
-
-
-
- <div class="layui-col-xs8">
- <div class="layui-form-item">
- <label class="layui-form-label">澶囨敞璇存槑</label>
- <div class="layui-input-block">
- <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-input">
- </div>
- </div>
- </div>
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label color-red">缁撶畻閲嶉噺</label>
@@ -508,17 +506,28 @@
</div>
</div>
</div>
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">鍗曚环</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input type="text" name="price" placeholder="璇疯緭鍏ュ崟浠�"-->
+ <!-- class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
+
+
<div class="layui-col-xs8">
- <span style="padding-left: 50px;color: blue;">
- 娉ㄦ剰锛�1銆佹按鍒嗗閲嶏紝姝ｆ暟=澧炲姞 <br>
- </span>
- <span style="padding-left: 93px;color: blue;">
- 2銆佸噣閲� = 姣涢噸 - 鐨噸 锛涙�绘墸閲� = 鎵ｆ按鏉傦紙澶т簬0锛� + 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸<br>
- </span>
- <span style="padding-left: 93px;color: blue;">
- 3銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� + 姘存潅澧為噸锛涘嚭搴撻噸閲� = 鍑�閲� - 鎬绘墸閲�
- </span>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
+
+
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label color-red">鍑哄簱閲嶉噺</label>
@@ -529,6 +538,80 @@
</div>
</div>
</div>
+ <div class="layui-col-xs8">
+ <span style="padding-left: 93px;color: blue;">
+ 璇存槑锛� 1銆佸噣閲� = 姣涢噸 - 鐨噸 锛涙�绘墸閲� = 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸<br>
+ </span>
+ <span style="padding-left: 93px;color: blue;">
+ 2銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� 锛涘嚭搴撻噸閲� = 鍑�閲� - 鎬绘墸閲�
+ </span>
+ </div>
+
+ <div class="layui-col-xs12">
+ <div class="line-container">
+ <div class="line"></div>
+ <div class="line-text">浠ヤ笅鏍规嵁搴撳尯绉伴噸浣滀笟瑕佹眰濉啓</div>
+ <div class="line"></div>
+ </div>
+ </div>
+
+ <!-- 琛ュ厖瀛楁榛樿闅愯棌 -->
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呰鐗�</label>
+ <div class="layui-input-block">
+ <input type="radio" name="bzw" value="1" title="楹昏">
+ <input type="radio" name="bzw"
+ value="2" title="缂栫粐琚�">
+ <input type="radio" name="bzw"
+ value="3" title="鏁ｈ" checked>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呰鎵ｉ噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="dePackage" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input weight"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曚环</label>
+ <div class="layui-input-block">
+ <input type="text" name="price" placeholder="璇疯緭鍏�"
+ class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏍囧噯鍖呴噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="dbz" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呬欢鎬绘暟</label>
+ <div class="layui-input-block">
+ <input type="text" name="bzbjs" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <em
+ class="kccz-data-dw">浠�</em>
+ </div>
+ </div>
+ </div>
+
</form>
</div>
</div>
@@ -662,6 +745,7 @@
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/inout-print.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/weight.js}"></script>
<script th:src="@{../../static/admin/inout/out-weight.js}"></script>
</body>
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
diff --git a/igds-web/src/main/resources/templates/test/qualityReport01.html b/igds-web/src/main/resources/templates/test/qualityReport01.html
index 3b0ba86..9f4f69e 100644
--- a/igds-web/src/main/resources/templates/test/qualityReport01.html
+++ b/igds-web/src/main/resources/templates/test/qualityReport01.html
@@ -36,7 +36,7 @@
</style>
</head>
<body><h1 class='tit'>璐ㄦ鎶ュ憡(foodVariety)</h1>
-<div class='div-tit'>鍗曞彿锛歴erId</div>
+<div class='div-tit'>缂栫爜锛歴erId</div>
<table cellspacing='0' cellpadding='0'>
<tr>
<td colspan='2' rowspan="5" `width`="15%">鏍峰搧淇℃伅</td>
--
Gitblit v1.9.3