From 24053f10929f66813281398bb92a3a76b6ea90c7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 05 七月 2023 18:23:07 +0800
Subject: [PATCH] 出库值仓
---
igds-web/src/main/resources/templates/admin/inout/out-register.html | 10
igds-web/src/main/resources/templates/admin/inout/out-handle.html | 952 ++++++++++++++++++---------------
igds-web/src/main/resources/static/admin/inout/out-register.js | 16
igds-web/src/main/resources/templates/admin/inout/in-register.html | 623 +++++++++++-----------
igds-web/src/main/resources/static/admin/inout/out-handle.js | 54 +
5 files changed, 864 insertions(+), 791 deletions(-)
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..af23fc1 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锛�
@@ -101,31 +101,31 @@
showProgress();
//璋冩暣瀛楁涓嶇紪杈�
- $("#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 +191,13 @@
});
}
+function flushPage() {
+ layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
+ resetForm();
+ layer.close(index);
+ });
+}
+
// 琛ㄥ崟娓呯┖
function resetForm() {
$("#form-data")[0].reset();
@@ -200,6 +207,7 @@
$('#kccz-r-img3').removeAttr('src');
form.render();
recordData = null;
+ $("#text-param").val(null);
}
// 鏇存柊鏁版嵁淇℃伅
@@ -210,8 +218,8 @@
var param = {
type: type,
progress: progress,
- userId:userId2,
- intelCard:intelCard,
+ userId: userId2,
+ intelCard: intelCard,
plateNum: plateNum
};
var index = layer.load();
@@ -223,7 +231,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 +249,7 @@
// 褰撳墠瀹屾垚
function submit() {
- if (null == recordData) {
+ if (!recordData) {
layer.alert("娌℃湁鏁版嵁鍙互鎻愪氦锛侊紒锛�");
return;
}
@@ -262,15 +270,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 +286,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 04d532d..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
@@ -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;
}
// 涓存椂璧嬪��
@@ -252,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;
}
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-handle.html b/igds-web/src/main/resources/templates/admin/inout/out-handle.html
index cde472f..4928eb2 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,563 @@
<!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">
+ <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" 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="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="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">
+ <input type="text" name="deOtherInfo" placeholder="鍏朵粬鎵ｉ噸璇存槑"
+ 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-->
+ 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>
@@ -509,33 +569,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-register.html b/igds-web/src/main/resources/templates/admin/inout/out-register.html
index 39f8f5e..ec8add8 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
@@ -94,10 +94,10 @@
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>
+ <!-- <button class="rkbk-quick-btn layui-btn btn-violet"-->
+ <!-- onclick="resetPlateNum()">-->
+ <!-- <i><img th:src="@{../../static/images/icon-che.png}"/></i>閲嶇疆杞︾墝璇嗗埆-->
+ <!-- </button>-->
</div>
<!--娴佺▼寮曞-->
@@ -298,7 +298,7 @@
<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">
+ <div class="kccz-r-div" style="width: 110px">
<span id="plateNum2">鏈瘑鍒�</span>
<p>杞︾墝璇嗗埆</p>
</div>
--
Gitblit v1.9.3