From 7fff423ea251afed364dc523fb5be4d0b23f39b1 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 05 七月 2023 09:13:12 +0800
Subject: [PATCH] 出库登记
---
igds-web/src/main/resources/static/admin/inout/out-card-back.js | 362 ++++++++++----------
igds-web/src/main/resources/templates/admin/inout/out-register.html | 622 +++++++++++++++++----------------
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 3
igds-web/src/main/resources/templates/test/qualityReport01.html | 2
igds-web/src/main/resources/static/admin/inout/in-sample.js | 35 +
igds-web/src/main/resources/static/admin/inout/out-register.js | 45 +
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 1
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js | 1
8 files changed, 566 insertions(+), 505 deletions(-)
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..3154877 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
*/
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..afb7878 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/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("鑾峰彇鎵撳嵃妯$増澶辫触锛岃鑱旂郴绠$悊鍛樻煡鐪嬪師鍥狅紒锛�");
+ }
+ });
}
// 鎵撳嵃鎶芥牱鍗�
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-register.js b/igds-web/src/main/resources/static/admin/inout/out-register.js
index f356f99..04d532d 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()
});
@@ -165,32 +165,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']
+ // });
+ // }
});
}
@@ -299,7 +312,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/templates/admin/inout/out-register.html b/igds-web/src/main/resources/templates/admin/inout/out-register.html
index 1edc54e..39f8f5e 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">
+ <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>
@@ -343,33 +355,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/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