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-web/src/main/resources/static/admin/inout/out-handle.js | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 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..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);
}
});
}
--
Gitblit v1.9.3