From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-web/src/main/resources/static/admin/inout/in-sample.js | 161 +++++------------------------------------------------
1 files changed, 17 insertions(+), 144 deletions(-)
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 525ebf8..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
@@ -6,7 +6,6 @@
var page = 1;
var limit = 10;
var curSampleData = null;// 褰撳墠缂栬緫鏁版嵁
-var curCheckItems = null;// 褰撳墠鏁版嵁鐨勬鏌ラ」淇℃伅
$(function () {
layui.use(['layer', 'laydate', 'form', 'table'], function () {
@@ -14,7 +13,6 @@
form = layui.form;
table = layui.table;
laydate = layui.laydate;
-
laydate.render({
elem: '#start',
theme: '#7b8e9f',
@@ -44,31 +42,11 @@
showDetail(obj);
}
});
-
- //鐩戝惉绮鍝佺
- layui.form.on('select(select_foodVariety)', function (data) {
- updateFoodVariety(data.value);
- });
-
- //鐩戝惉鍖栭獙缁撴灉鍗曞～鍐欐暟鎹�,骞剁粰鍑烘彁绀虹粨鏋�
- table.on('edit(tableCheckItem)', function (obj) {
- getResult(obj);
- });
});
//鏄剧ず鍏ュ簱娴佺▼
showProgress();
-
- // 鍒濆鍖朩ebSocket
- initInoutWS(deptId, bizType, progress, userId);
});
-
-
-// socket淇℃伅杩斿洖铏曠悊
-function socketOnMessage(packet) {
- layer.alert(packet.data);
- window.parent.sysNotify(packet.data);
-}
/**
* 鏉′欢鏌ヨ
@@ -193,55 +171,6 @@
form.render();
};
-//鏍规嵁濉啓鍖栭獙鏁版嵁,缁欏嚭鎻愰啋鏄惁鍚堟牸
-function getResult(obj) {
- var data = obj.data;
- //濉啓鐨勬暟鎹��
- var newValue = data.value;
- //鏍囧噯鍊�
- var limit = data.upperLimit;
- //杩愮畻绗�
- var symbol = data.operaSymbol;
-
- if (symbol && limit) {
- if (">=" == symbol) {
- if (newValue < limit) {
- data.remarks = "涓嶅悎鏍�";
- } else {
- data.remarks = "鍚堟牸";
- }
- }
- if ("<=" == symbol) {
- if (newValue > limit) {
- data.remarks = "涓嶅悎鏍�";
- } else {
- data.remarks = "鍚堟牸";
- }
- }
- if ("==" == symbol) {
- if (newValue != limit) {
- data.remarks = "涓嶅悎鏍�";
- } else {
- data.remarks = "鍚堟牸";
- }
- }
- }
- obj.update(data);
- //鏍规嵁鍖栭獙缁撴灉鎻愰啋鏄惁鍚堟牸
- updateCheckResultTip();
-}
-
-//鏍规嵁閫夋嫨浠撳簱鏄剧ず绮鍝佺
-function updateFoodVariety(foodVariety) {
- if (null == foodVariety || "" == foodVariety) return;
- form.val("form-detail", {
- foodVariety: foodVariety
- });
- form.render();
-
- flushCheckItem(foodVariety);
-}
-
// 鏍规嵁妯″紡鍚姩寮�濮嬫墻鏍�
function checkExe(type) {
@@ -257,14 +186,14 @@
success: function (result) {
layer.close(index);
if (result.code != "0000") {
- layer.alert(result.msg);
+ alertError(result.msg);
} else {
- layer.msg("鎿嶄綔鍛戒护鍙戦�佹垚鍔燂紒");
+ alertSuccess("鎿嶄綔鍛戒护鍙戦�佹垚鍔�!");
}
},
error: function () {
layer.close(index);
- layer.alert("鍚庡彴寮傚父锛屾搷浣滃懡浠ゅ彂閫佸け璐ワ紒");
+ alertError("鍚庡彴寮傚父锛屾搷浣滃懡浠ゅ彂閫佸け璐ワ紒");
}
});
};
@@ -348,51 +277,23 @@
* 鏃堕棿绛�
*/
function getTime() {
-
- var now = new Date();
- var time = now.toLocaleString('chinese', {
- hour12: false
- });
- return time;
-}
-
-function formatDateTime(date, format) {
- const o = {
- 'M+': date.getMonth() + 1, // 鏈堜唤
- 'd+': date.getDate(), // 鏃�
- 'h+': date.getHours() % 12 === 0 ? 12 : date.getHours() % 12, // 灏忔椂
- 'H+': date.getHours(), // 灏忔椂
- 'm+': date.getMinutes(), // 鍒�
- 's+': date.getSeconds(), // 绉�
- 'q+': Math.floor((date.getMonth() + 3) / 3), // 瀛ｅ害
- S: date.getMilliseconds(), // 姣
- a: date.getHours() < 12 ? '涓婂崍' : '涓嬪崍', // 涓婂崍/涓嬪崍
- A: date.getHours() < 12 ? 'AM' : 'PM', // AM/PM
- };
- if (/(y+)/.test(format)) {
- format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
- }
- for (let k in o) {
- if (new RegExp('(' + k + ')').test(format)) {
- format = format.replace(
- RegExp.$1,
- RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
- );
- }
- }
- return format;
+ var now = new Date();
+ var time = now.toLocaleString('chinese', {
+ hour12: false
+ });
+ return time;
}
function showDetail(obj) {
curSampleData = null;
- var nowTime = formatDateTime(new Date(), "yyyy-MM-dd HH:mm:ss");
+ var nowTime = dateFtt("yyyy-MM-dd hh:mm:ss", new Date());
$("#printTime").html(nowTime);
curSampleData = obj.data;
- if(!curSampleData.sampleTime){
+ if (!curSampleData.sampleTime) {
curSampleData.sampleTime = nowTime;
}
- if(!curSampleData.sampleUser){
+ if (!curSampleData.sampleUser) {
curSampleData.sampleUser = sampleUser;
}
// 璧嬪��
@@ -406,18 +307,17 @@
shade: 0,
content: $('#checkDetail'),
btnAlign: 'c',
- btn: ['淇濆瓨骞舵墦鍗�', '淇濆瓨鎻愪氦','鍏抽棴鍙栨秷'],
+ btn: ['鎵撳嵃骞朵繚瀛�', '浠呬繚瀛�', '鍏抽棴鍙栨秷'],
yes: function () {
- layer.alert("鏉″舰鐮佸緟纭畾锛�");
+ printBar(curSampleData);
+ submit();
}, btn2: function () {
// 鏇存柊鍒伴〉闈�
var data = form.val("form-detail");
obj.update(data);
// 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
Object.assign(curSampleData, data);
-
submit();
-
}, btn3: function () {
layer.closeAll();
},
@@ -427,7 +327,6 @@
// 褰撳墠瀹屾垚
function submit() {
-
if (!curSampleData.sampleUser) {
layer.alert("璇疯緭鍏ユ墻鏍蜂汉锛侊紒");
return;
@@ -436,18 +335,17 @@
layer.alert("璇疯緭鍏ユ墻鏍锋椂闂达紒锛�");
return;
}
-
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout/update-sample",
+ url: "../../basic/inout/submit-sample",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(curSampleData),
success: function (result) {
if (result.code != "0000") {
layer.close(index);
- notify(result.msg, result.data);
+ alertError(result.msg);
} else {
layer.closeAll();
curSampleData = null;
@@ -457,34 +355,9 @@
},
error: function () {
layer.close(index);
- layer.alert("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯锛�");
+ alertError("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯");
}
});
-}
-
-//鎺у埗娴佺▼鐜妭鏄剧ず
-function showProgress() {
- if (!inoutProgress) {
- return;
- }
- if (inoutProgress.indexOf("REGISTER") == -1) {
- $("#progress-register").css("display", "none");
- }
- if (inoutProgress.indexOf("CHECK") == -1) {
- $("#progress-check").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");
- }
}
/**
--
Gitblit v1.9.3