From 3d8dfc3dd31f73dd7ba33d020193f9ab0764fa56 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 04 十一月 2023 00:54:54 +0800
Subject: [PATCH] 入库--粮食性质
---
igds-web/src/main/resources/static/admin/inout/in-check.js | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 da2f1d2..47d1a88 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
@@ -491,6 +491,11 @@
//淇濆瓨鎻愪氦
function submit() {
+ console.log(curCheckData)
+ if (!curCheckData.sampleUser) {
+ layer.alert("璇峰厛鎵︽牱锛侊紒");
+ return;
+ }
if (curCheckData.checkStatus == "NONE" || curCheckData.checkStatus == "NONE2") {
layer.alert("璇风‘璁ゅ寲楠岀粨鏋滐紒锛�");
return;
@@ -501,6 +506,10 @@
}
if (!curCheckData.foodLevel) {
layer.alert("璇风‘璁ょ伯椋熺瓑绾э紒锛�");
+ return;
+ }
+ if (!curCheckData.foodType) {
+ layer.alert("璇风‘璁ょ伯椋熸�ц川锛侊紒");
return;
}
if (!curCheckData.price) {
@@ -618,7 +627,7 @@
}, {
field: 'registerTime',
title: '鐧昏鏃堕棿',
- width: '15%',
+ width: '13%',
style: 'font-weight: bold'
}, {
field: 'sampleStatus',
@@ -643,12 +652,26 @@
}, {
field: 'sampleTime',
title: '鎵︽牱鏃堕棿',
- width: '15%',
+ width: '13%',
style: 'font-weight: bold'
+ }, {
+ field: 'foodType',
+ title: '绮鎬ц川',
+ width: '9%',
+ templet: function (item) {
+ var result = item.foodType;
+ $.each(listFoodType, function (index, data) {
+ if (item.foodType == data.code) {
+ result = data.name;
+ return true;
+ }
+ });
+ return result == null ? "" : result;
+ }
}, {
field: 'foodVariety',
title: '绮鍝佺',
- width: '11%',
+ width: '9%',
templet: function (item) {
var result = item.foodVariety;
$.each(listFoodVariety, function (index, data) {
@@ -662,7 +685,7 @@
}, {
field: 'depotId',
title: '瑁呭嵏浠撳簱',
- width: '11%',
+ width: '10%',
templet: function (item) {
var result = item.depotId;
$.each(listDepot, function (index, data) {
--
Gitblit v1.9.3