From 5f48e04bf4bc594121d2ef3f768407393f643fe7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 08 七月 2023 15:14:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/static/admin/inout/in-check.js | 670 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 390 insertions(+), 280 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/in-check.js b/igds-web/src/main/resources/static/admin/inout/in-check.js
index 0a780a4..594983d 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-check.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-check.js
@@ -1,7 +1,9 @@
//褰撳墠鑺傜偣 鍏ュ簱璐ㄦ
var layer;
+var laydate;
var form;
var table;
+var scanCodeTag = false;
var page = 1;
var limit = 10;
var curCheckData = null;// 褰撳墠缂栬緫鏁版嵁
@@ -12,7 +14,7 @@
layer = layui.layer;
form = layui.form;
table = layui.table;
- var laydate = layui.laydate;
+ laydate = layui.laydate;
laydate.render({
elem: '#start',
@@ -27,9 +29,10 @@
});
laydate.render({
- elem: '#foodYear',
+ elem: '#checkTime',
theme: '#7b8e9f',
- type: 'year',
+ format: 'yyyy-MM-dd HH:mm:ss',
+ type: 'datetime'
});
// 鍒濆鍖栬〃鍗曟暟鎹�
@@ -39,15 +42,20 @@
table.on('tool(tableData)', function (obj) {
if (obj.event === 'edit') {
//鏇存柊浠撳簱涓嬫媺鍒楄〃
- updateSelect(obj);
+ updateSelect();
//灞曠ず鏁版嵁
- showDetail(obj);
+ showDetail(obj.data);
}
});
- //鐩戝惉绮鍝佺
+ //鐩戝惉绮鍝佺锛岃幏鍙栧寲楠岄」
layui.form.on('select(select_foodVariety)', function (data) {
updateFoodVariety(data.value);
+ });
+
+ //鐩戝惉绮绛夌骇锛岃幏鍙栫伯椋熷畾浠�
+ layui.form.on('select(select_foodLevel)', function (data) {
+ getPriceByFoodLevel(data.value);
});
//鐩戝惉鍖栭獙缁撴灉鍗曞～鍐欐暟鎹�,骞剁粰鍑烘彁绀虹粨鏋�
@@ -58,17 +66,32 @@
//鏄剧ず鍏ュ簱娴佺▼
showProgress();
-
- // 鍒濆鍖朩ebSocket
- //initInoutWS(deptId, bizType, progress, userId);
});
+window.onbeforeunload = function () {
+ console.log('椤甸潰鍒锋柊涔嬪墠瑙﹀彂');
+}
+window.onunload = function () {
+ console.log('椤甸潰鍒锋柊瀹屾垚瑙﹀彂');
+}
+window.onload = function () {
+
+ //鎵弿鏋嚜鍔ㄥ洖杞︿簨浠�
+ $('#checkId').bind('keyup', function (event) {
+ if (event.keyCode == "13") {
+ // //鍘绘帀鐒︾偣锛岄槻姝㈠埛鏂伴〉闈�
+ // $('#checkId').blur();
+ console.log("in-check", "鎵爜鏋�");
+ getDataByCheckId();
+ }
+ });
+};
// socket淇℃伅杩斿洖铏曠悊
function socketOnMessage(packet) {
layer.alert(packet.data);
window.parent.sysNotify(packet.data);
-};
+}
//鎺у埗娴佺▼鐜妭鏄剧ず
function showProgress() {
@@ -108,23 +131,23 @@
if (symbol && limit) {
if (">=" == symbol) {
if (newValue < limit) {
- data.remarks = "涓嶅悎鏍�";
+ data.result = "0";
} else {
- data.remarks = "鍚堟牸";
+ data.result = "1";
}
}
if ("<=" == symbol) {
if (newValue > limit) {
- data.remarks = "涓嶅悎鏍�";
+ data.result = "0";
} else {
- data.remarks = "鍚堟牸";
+ data.result = "1";
}
}
if ("==" == symbol) {
if (newValue != limit) {
- data.remarks = "涓嶅悎鏍�";
+ data.result = "0";
} else {
- data.remarks = "鍚堟牸";
+ data.result = "1";
}
}
}
@@ -134,9 +157,8 @@
}
//鍔ㄦ�佹洿鎹粨搴撲笅鎷夊垪琛�
-function updateSelect(obj) {
+function updateSelect() {
$('#depotId option').remove();
- var dat = obj.data;
for (var i = 0; i < listDepot.length; i++) {
$('#depotId').append('<option value="' + listDepot[i].id + '">' + listDepot[i].name + '</option>');
}
@@ -144,7 +166,7 @@
form.render('select');
}
-//鏍规嵁閫夋嫨浠撳簱鏄剧ず绮鍝佺
+//鏍规嵁鍝佺鑾峰彇鍖栭獙椤�
function updateFoodVariety(foodVariety) {
if (null == foodVariety || "" == foodVariety) return;
form.val("form-detail", {
@@ -153,6 +175,37 @@
form.render();
flushCheckItem(foodVariety);
+}
+
+//鏍规嵁閫夋嫨浠撳簱鏄剧ず绮鍝佺
+function getPriceByFoodLevel(foodLevel) {
+ if (null == foodLevel || "" == foodLevel) return;
+ form.val("form-detail", {
+ foodLevel: foodLevel
+ });
+ form.render();
+ var data = form.val("form-detail");
+ console.log("getPriceByFoodLevel")
+
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/get-price",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(data),
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.msg(result.msg);
+ console.log("getPriceByFoodLevel", "!=0000")
+ } else {
+ console.log("getPriceByFoodLevel", "==0000")
+ $("#check-result-tip2").text("绮瀹氫环锛�" + result.data.price + "鍏�/鍏枻");
+ }
+ },
+ error: function () {
+ layer.msg("鍚庡彴寮傚父锛岃閲嶈瘯鎴栬�呰仈绯荤鐞嗗憳锛侊紒");
+ }
+ });
}
// 鏌ヨ
@@ -178,81 +231,6 @@
// window.parent.openTab(url, "鍖栭獙缁撴灉瀵煎嚭", "checkDataExport");
};
-// 鏍规嵁妯″紡鍚姩寮�濮嬫墻鏍�
-function checkExe(type) {
- checkDto.type = type;
- var param = JSON.stringify(checkDto);
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: "../../api/check/check-exe",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: param,
- success: function (result) {
- layer.close(index);
- if (result.code != "0000") {
- layer.alert(result.msg);
- } else {
- layer.msg("鎿嶄綔鍛戒护鍙戦�佹垚鍔燂紒");
- }
- },
- error: function () {
- layer.close(index);
- layer.alert("鍚庡彴寮傚父锛屾搷浣滃懡浠ゅ彂閫佸け璐ワ紒");
- }
- });
-};
-
-// 鍏抽棴鎵︽牱鏈哄櫒
-function checkStop() {
- var param = JSON.stringify(checkDto);
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: "../../api/check/stop",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: param,
- success: function (result) {
- layer.close(index);
- if (result.code != "0000") {
- layer.alert(result.msg);
- } else {
- layer.msg("鎿嶄綔鍛戒护鍙戦�佹垚鍔燂紒");
- }
- },
- error: function () {
- layer.close(index);
- layer.alert("鍚庡彴寮傚父锛屾搷浣滃懡浠ゅ彂閫佸け璐ワ紒");
- }
- });
-};
-
-// 鎵︽牱鏈哄浣�
-function checkReset() {
- var param = JSON.stringify(checkDto);
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: "../../api/check/reset",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: param,
- success: function (result) {
- layer.close(index);
- if (result.code != "0000") {
- layer.alert(result.msg);
- } else {
- layer.msg("鎿嶄綔鍛戒护鍙戦�佹垚鍔燂紒");
- }
- },
- error: function () {
- layer.close(index);
- layer.alert("鍚庡彴寮傚父锛屾搷浣滃懡浠ゅ彂閫佸け璐ワ紒");
- }
- });
-};
// 鎵︽牱鏈鸿В闄ゆ�ュ仠
function checkResetStop() {
var param = JSON.stringify(checkDto);
@@ -277,97 +255,6 @@
}
});
};
-//闅愯棌淇℃伅--鏇挎崲涓�*
-function replaceStr(str) {
- if (!str) {
- return "";
- }
- var split = str.split("");
-
- if (split.length == 1) {
- return "*";
- }
- if (split.length == 2 || split.length == 3) {
- return str.slice(0, 1) + "**"
- }
- return str.slice(0, 1) + "***" + str.slice(split.length - 1);
-}
-
-function showDetail(obj) {
- curCheckData = obj.data;
- // console.log(curCheckData);
-
- curCheckData.foodYear = dateFtt("yyyy", new Date());
- curCheckData.checkUser = checkUser;
- if (curCheckData.checkStatus == "NONE") {
- //闅愯棌杞︾墝閮ㄥ垎淇℃伅
- curCheckData.plateNum = replaceStr(curCheckData.plateNum);
- }
-
- // 璧嬪��
- form.val("form-detail", curCheckData);
- form.render();
-
- layer.open({
- type: 1,
- title: "鍖栭獙鍗曟槑缁�",
- area: ['1400px', '650px'],
- shade: 0,
- content: $('#checkDetail'),
- btnAlign: 'c',
- btn: ['淇濆瓨鎻愪氦', '鍏抽棴鍙栨秷'],
- yes: function () {
- // 鏇存柊鍒伴〉闈�
- var data = form.val("form-detail");
- obj.update(data);
- // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
- Object.assign(curCheckData, data);
-
- submit();
- }, btn2: function () {
- layer.closeAll();
- },
- closeBtn: 0
- });
-
- // 鑾峰彇鍖栭獙椤逛俊鎭�
- flushCheckItem(null);
-};
-
-
-/**
- * 鍒锋柊鍖栭獙缁撴灉椤�
- */
-function flushCheckItem(foodVariety) {
- curCheckItems = null;
- $("#check-result-tip").text("妫�楠岀粨鏋滐細#");
- curCheckData.foodVariety = foodVariety;
-
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: "../../basic/inout/get-check-item",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: JSON.stringify(curCheckData),
- success: function (result) {
- if (result.code != "0000") {
- layer.msg(result.msg);
- } else {
- curCheckItems = result.data;
- // 鏍规嵁鍖栭獙缁撴灉鎻愰啋鏄惁鍚堟牸
- updateCheckResultTip();
- // 椤甸潰娓叉煋妫�娴嬮」
- renderTableCheckItem();
- layer.close(index);
- }
- },
- error: function () {
- layer.close(index);
- layer.msg("鍚庡彴寮傚父锛岃閲嶈瘯鎴栬�呰仈绯荤鐞嗗憳锛侊紒");
- }
- });
-};
// 鏇存柊鍖栭獙缁撴灉鎻愰啋锛屽彧鍋氭彁閱掞紝涓嶅仛鑷姩鍒ゆ柇
function updateCheckResultTip() {
@@ -379,28 +266,29 @@
}
var msg;
$.each(curCheckItems, function (index, data) {
- if (!data.remarks) {
+ if (!data.result) {
return true;
}
- if (data.remarks == "涓嶅悎鏍�") {
+ if (data.result == "0") {
msg = "涓嶅悎鏍�";
return false;
}
- if (data.remarks == "鍚堟牸") {
+ if (data.result == "1") {
msg = "鍚堟牸";
}
});
if (msg) {
- $("#check-result-tip").text("妫�楠岀粨鏋滐細" + msg);
+ $("#check-result-tip").text("璐ㄦ缁撴灉锛�" + msg);
} else {
- $("#check-result-tip").text("妫�楠岀粨鏋滐細鍚堟牸");
+ $("#check-result-tip").text("璐ㄦ缁撴灉锛�#");
}
-};
+}
/**
* 娓叉煋琛ㄦ牸
*/
function renderTableCheckItem() {
+ console.log("renderTableCheckItem")
// 娓呯┖鏁版嵁
$("#tableCheckItem").empty();
table.render({
@@ -411,28 +299,68 @@
even: true,
cols: [[{
field: 'standardName',
- title: '鍖栭獙椤圭洰',
+ title: '妫�楠岄」鐩�',
align: 'center',
- width: '20%'
+ width: '10%'
}, {
field: 'value',
- title: '鍖栭獙缁撴灉',
+ title: '妫�楠屽��',
align: 'center',
- width: '20%',
+ width: '10%',
edit: 'text'
+ }, {
+ field: 'operaSymbolValue',
+ title: '鏍囧噯鍊�',
+ align: 'center',
+ width: '10%'
}, {
field: 'unit',
title: '鍗曚綅',
align: 'center',
width: '10%'
}, {
- field: 'standardValue',
- title: '鍖栭獙鏍囧噯',
+ field: 'deNum',
+ title: '鎵ｉ噸',
align: 'center',
- width: '15%'
+ width: '10%',
+ edit: 'text'
+ }, {
+ field: 'addNum',
+ title: '澧為噸',
+ align: 'center',
+ width: '10%',
+ edit: 'text'
+ }, {
+ field: 'dePrice',
+ title: '鎵ｄ环',
+ align: 'center',
+ width: '10%',
+ edit: 'text'
+ }, {
+ field: 'addPrice',
+ title: '澧炰环',
+ align: 'center',
+ width: '10%',
+ edit: 'text'
+ }, {
+ field: 'result',
+ title: '妫�楠岀粨鏋�',
+ align: 'center',
+ width: '10%',
+ templet: function (item) {
+ if (item.result == null) {
+ return "";
+ }
+ if (item.result == '0') {
+ return "涓嶅悎鏍�";
+ }
+ if (item.result == '1') {
+ return "鍚堟牸";
+ }
+ }
}, {
field: 'remarks',
- title: '璇� 鏄�',
+ title: '澶囨敞璇存槑',
align: 'center',
edit: 'text'
}]]
@@ -442,25 +370,144 @@
"border-bottom": "2px solid #53adce",
"background": "#eff4f6"
});
+}
+
+function showDetail(data) {
+ curCheckData = data;
+ if (!curCheckData.checkTime) {
+ curCheckData.checkTime = dateFtt("yyyy-MM-dd hh:mm:ss", new Date());
+ }
+ curCheckData.checkUser = checkUser;
+
+ // 璧嬪��
+ form.val("form-detail", curCheckData);
+ form.render();
+ console.log("showDetail");
+
+ layer.open({
+ type: 1,
+ title: "鍖栭獙鍗曟槑缁�",
+ area: ['1400px', '700px'],
+ shade: 0,
+ content: $('#checkDetail'),
+ btnAlign: 'c',
+ btn: ['浠呬繚瀛�', '淇濆瓨鎻愪氦', '鍏抽棴鍙栨秷'],
+ yes: function () {
+ console.log("showDetail", "btn1")
+ // 鏇存柊鍒伴〉闈�
+ var data = form.val("form-detail");
+ // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
+ Object.assign(curCheckData, data);
+ saveCheckData();
+ if (scanCodeTag) {
+ console.log("showScanCode")
+ showScanCode();
+ }
+ }, btn2: function () {
+ console.log("showDetail", "btn2")
+ // 鏇存柊鍒伴〉闈�
+ var data = form.val("form-detail");
+ // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
+ Object.assign(curCheckData, data);
+ submit();
+ if (scanCodeTag) {
+ showScanCode();
+ }
+ }, btn3: function () {
+ parent.layer.closeAll();
+ console.log("showDetail", "btn3")
+ if (scanCodeTag) {
+ showScanCode();
+ }
+ },
+ closeBtn: 0
+ });
+ console.log("showDetail", "end");
+ // 鑾峰彇鍖栭獙椤逛俊鎭�
+ flushCheckItem(curCheckData.foodVariety);
+ getPriceByFoodLevel(curCheckData.foodLevel);
+}
+
+/**
+ * 鍒锋柊鍖栭獙缁撴灉椤�
+ */
+function flushCheckItem(foodVariety) {
+ curCheckItems = null;
+ $("#check-result-tip").text("妫�楠岀粨鏋滐細#");
+ $("#price-result-tip2").text("绮瀹氫环锛�#鍏�/鍏枻");
+ curCheckData.foodVariety = foodVariety;
+ var index = layer.load();
+ console.log("flushCheckItem")
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/get-check-item",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(curCheckData),
+ success: function (result) {
+ if (result.code != "0000") {
+ console.log("flushCheckItem", "!==0000")
+ layer.msg(result.msg);
+ } else {
+ curCheckItems = result.data;
+ console.log("flushCheckItem", "==0000")
+ // 鏍规嵁鍖栭獙缁撴灉鎻愰啋鏄惁鍚堟牸
+ updateCheckResultTip();
+ // 椤甸潰娓叉煋妫�娴嬮」
+ renderTableCheckItem();
+ layer.close(index);
+ }
+ },
+ error: function () {
+ console.log("flushCheckItem", "error")
+ layer.close(index);
+ layer.msg("鍚庡彴寮傚父锛岃閲嶈瘯鎴栬�呰仈绯荤鐞嗗憳锛侊紒");
+ }
+ });
+ console.log("flushCheckItem", "end")
};
+//浠呬繚瀛�
+function saveCheckData() {
+ if (!curCheckData.foodVariety) {
+ layer.alert("璇风‘璁ょ伯椋熷搧绉嶏紒锛�");
+ return;
+ }
+ curCheckData.checkItems = curCheckItems;
+ var index1 = layer.load();
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/submit-checkItem",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ async: false,
+ data: JSON.stringify(curCheckData),
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.close(index1);
+ notify(result.msg, result.data);
+ } else {
+ layer.closeAll();
+ curCheckData = null;
+ notify("鏁版嵁淇濆瓨鎴愬姛", result.data);
+ flushData();
+ }
+ },
+ error: function () {
+ layer.close(index1);
+ layer.alert("淇濆瓨澶辫触锛岃閲嶆柊灏濊瘯锛�");
+ }
+ });
+}
-// 褰撳墠瀹屾垚
+//淇濆瓨鎻愪氦
function submit() {
if (curCheckData.checkStatus == "NONE" || curCheckData.checkStatus == "NONE2") {
layer.alert("璇风‘璁ゅ寲楠岀粨鏋滐紒锛�");
return;
}
- if (!curCheckData.depotId) {
- layer.alert("璇烽�夋嫨瑁呭嵏浠撳簱锛侊紒");
- return;
- }
if (!curCheckData.foodVariety) {
layer.alert("璇风‘璁ょ伯椋熷搧绉嶏紒锛�");
- return;
- }
- if (!curCheckData.foodYear) {
- layer.alert("璇风‘璁ょ伯椋熷勾浠斤紒锛�");
return;
}
if (!curCheckData.foodLevel) {
@@ -471,25 +518,23 @@
layer.alert("璇风‘璁ょ伯椋熷畾浠凤紝濡備笉鑰冭檻瀹氫环锛岃濉啓0.0");
return;
}
-
curCheckData.checkItems = curCheckItems;
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout/update-check",
+ url: "../../basic/inout/submit-check",
dataType: "json",
contentType: "application/json;charset=UTF-8",
+ async: false,
data: JSON.stringify(curCheckData),
success: function (result) {
if (result.code != "0000") {
layer.close(index);
- //layer.alert(result.msg);
notify(result.msg, result.data);
} else {
- layer.closeAll();
+ parent.layer.closeAll();
curCheckData = null;
- //layer.alert("鏁版嵁鎻愪氦鎴愬姛!");
notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
flushData();
}
@@ -499,7 +544,71 @@
layer.alert("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯锛�");
}
});
-};
+}
+
+//鎵爜寮圭獥
+function showScanCode() {
+ //娓呯┖琛ㄥ崟
+ $("#form-sacnCodeDetail")[0].reset();
+ form.render();
+
+ //鎵爜寮圭獥-璧嬪�紅rue
+ scanCodeTag = true;
+ layer.open({
+ type: 1,
+ title: "鎵爜淇℃伅",
+ area: ['700px', '320px'],
+ shade: 0,
+ content: $('#scanCodeDetail'),
+ success: function () {
+ document.getElementById('checkId').focus();
+ },
+ btnAlign: 'c',
+ btn: ['鏌ヨ', '鍏抽棴鍙栨秷'],
+ yes: function () {
+ getDataByCheckId();
+ }, btn2: function () {
+ scanCodeTag = false;
+ layer.closeAll();
+ },
+ closeBtn: 0
+ });
+}
+
+//鏍规嵁璐ㄦ鍗曞彿鑾峰彇淇℃伅
+function getDataByCheckId() {
+ var param = form.val("form-sacnCodeDetail");
+ if (!param.checkId) {
+ layer.alert("璐ㄦ鍗曞彿涓虹┖锛岃鎵爜鎴栬緭鍏ヨ川妫�鍗曞彿");
+ }
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/inout-check-scan-code",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(param),
+ success: function (result) {
+ if (result.code != "0000") {
+ console.log("success", "!=0000")
+ layer.close(index);
+ $("#form-sacnCodeDetail")[0].reset();
+ form.render();
+ notify(result.msg, result.data);
+ } else {
+ console.log("success", "==0000")
+ updateSelect();
+ showDetail(result.data);
+ }
+ },
+ error: function () {
+ layer.close(index);
+ $("#form-sacnCodeDetail")[0].reset();
+ form.render();
+ alertError("淇濆瓨澶辫触锛岃閲嶆柊灏濊瘯锛�")
+ }
+ });
+}
// 娓叉煋琛ㄥ崟鏁版嵁
function renderTable() {
@@ -516,37 +625,43 @@
contentType: "application/json;charset=UTF-8",
cols: [[{
field: 'checkId',
- title: '妫�楠屽崟鍙�',
- width: '13%',
+ title: '璐ㄦ鍗曞彿',
+ width: '10%',
style: 'color: #f67d06;font-weight: bold'
}, {
- field: 'plateNum',
- title: '杞﹁埞鍙�',
- width: '11%',
- style: 'font-weight: bold',
+ field: 'registerTime',
+ title: '鐧昏鏃堕棿',
+ width: '15%',
+ style: 'font-weight: bold'
+ }, {
+ field: 'sampleStatus',
+ title: '鏄惁鎵︽牱',
+ width: '10%',
templet: function (item) {
- if (item.checkStatus != "NONE") {
- return item.plateNum;
- } else {
- var result = replaceStr(item.plateNum);
- return result == null ? "" : result;
+ if (item.sampleStatus == null) {
+ return "鏈墻鏍�";
+ }
+ if (item.sampleStatus == 'NONE') {
+ return "鏈墻鏍�";
+ }
+ if (item.sampleStatus == 'SAMPLE') {
+ return "宸叉墻鏍�";
}
}
}, {
- field: 'customerName',
- title: '寰�鏉ュ崟浣�',
- templet: function (item) {
- if (item.checkStatus != "NONE") {
- return item.customerName;
- } else {
- var result = replaceStr(item.customerName);
- return result == null ? "" : result;
- }
- }
+ field: 'sampleUser',
+ title: '鎵︽牱浜�',
+ width: '10%',
+ style: 'font-weight: bold'
+ }, {
+ field: 'sampleTime',
+ title: '鎵︽牱鏃堕棿',
+ width: '15%',
+ style: 'font-weight: bold'
}, {
field: 'foodVariety',
title: '绮鍝佺',
- width: '10%',
+ width: '11%',
templet: function (item) {
var result = item.foodVariety;
$.each(listFoodVariety, function (index, data) {
@@ -560,7 +675,7 @@
}, {
field: 'depotId',
title: '瑁呭嵏浠撳簱',
- width: '10%',
+ width: '11%',
templet: function (item) {
var result = item.depotId;
$.each(listDepot, function (index, data) {
@@ -574,7 +689,6 @@
}, {
field: 'checkStatus',
title: '妫�楠岀粨鏋�',
- width: '10%',
style: 'font-weight: bold',
templet: function (item) {
if (item.checkStatus == 'NONE') {
@@ -589,13 +703,9 @@
return item.checkStatus == null ? "" : item.checkStatus;
}
}, {
- field: 'registerTime',
- title: '鐧昏鏃堕棿',
- width: '14%'
- }, {
field: '',
title: '鎿嶄綔',
- width: '9%',
+ width: '8%',
toolbar: "#barControl"
}]],
where: param,
@@ -619,48 +729,13 @@
"border-bottom": "2px solid #53adce",
"background": "#eff4f6"
});
-};
+}
// 琛ㄥ崟娓呯┖
function resetForm() {
$("#form-param")[0].reset();
form.render();
-};
-
-/**
- * 寮瑰嚭鎻愰啋妗�
- * @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']});
- }
-};
+}
// ---------------------------绮浜у湴 -寮�濮� -------------------//
// 寮瑰嚭绮浜у湴涓嬫媺妗�
@@ -755,4 +830,39 @@
});
};
+/**
+ * 寮瑰嚭鎻愰啋妗�
+ * @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
--
Gitblit v1.9.3