From 7b7a08e33a029cb0df2bf48d7c4d524c18d051f0 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 03 十二月 2025 19:04:59 +0800
Subject: [PATCH] 登记、化验、称重页面调整，及登记化验数据提交
---
fzzy-igdss-web/src/main/resources/static/inout/inout-weight.js | 265 +++++-----------------------------------------------
1 files changed, 28 insertions(+), 237 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/static/inout/inout-weight.js b/fzzy-igdss-web/src/main/resources/static/inout/inout-weight.js
index b91f605..5faa9fd 100644
--- a/fzzy-igdss-web/src/main/resources/static/inout/inout-weight.js
+++ b/fzzy-igdss-web/src/main/resources/static/inout/inout-weight.js
@@ -12,37 +12,12 @@
$(function () {
layui.use(['layer', 'laydate', 'form', 'table', 'util'], function () {
- var util = layui.util;
layer = layui.layer;
form = layui.form;
table = layui.table;
layui.laydate.render({
elem: '#test1',
theme: '#7b8e9f'
- });
- // 鍙充笅瑙掓坊鍔犲浐瀹氫俊鎭�
- util.fixbar({
- bar1: true,
- css: {
- right: 10,
- bottom: 20
- },
- bgcolor: '#53adce',
- click: function (type) {
- if (type === 'bar1') {
- layer.closeAll();
- layer.open({
- type: 2,
- title: false,
- shadeClose: true,
- shade: 0.3,
- closeBtn: 2,
- offset: ['50px', '120px'],
- area: ['1000px', '640px'],
- content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
- });
- }
- }
});
//鐩戝惉閫夋嫨鏁版嵁浜嬩欢
@@ -164,80 +139,6 @@
}
}
-//璇绘櫤鎱у崱
-function flushICCard() {
- if (!cardDto.protocol) {
- flushICCard1();
- } else {
- flushICCard2();
- }
-}
-
-/**
- * 鍗忚璇诲彇鏅烘収鍗�
- */
-function flushICCard2() {
- var index = layer.load();
- var param = JSON.stringify(cardDto);
- $.ajax({
- type: "POST",
- url: "../../inout/api/get-icCard",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: param,
- success: function (result) {
- layer.close(index);
- if (result.code != "0000") {
- alertError(result.msg);
- } else {
- resultData = result.data;
- paramIntelCard = resultData.icCardNo;
- $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
- flushData(paramIntelCard, null);
- }
- },
- error: function () {
- layer.close(index);
- alertError("IC鍗¤鍙栧け璐�");
- }
- });
-}
-
-/**
- * 鏈湴璇诲彇鏅烘収鍗�
- */
-function flushICCard1() {
- var index = layer.load();
- $("#text-param").val(null);
- $("#form-data")[0].reset();
- form.render();
- recordData = null;
- $.ajax({
- type: "GET",
- async: true,
- url: "http://127.0.0.1:9111/ICCARD",
- data: {},
- dataType: "json",
- // jsonp: "callback",
- // jsonpCallback: "jsonpCallback",
- success: function (json) {
- var data = json;
- layer.close(index);
- if (data.code === "200" || data.code == 200) {
- paramIntelCard = data.no;
- $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
- flushData(paramIntelCard, null);
- } else {
- alertError("璇烽噸鏂拌鍗★紒");
- }
- },
- error: function () {
- layer.close(index);
- alertError("IC鍗¤鍙栧嚭閿欙紒");
- }
- });
-}
-
// 浣跨敤鎻掍欢鑾峰彇韬唤璇�
function flushIdCard() {
var index = layer.load();
@@ -285,7 +186,7 @@
};
$.ajax({
type: "POST",
- url: "../../basic/inout/list-only-progress",
+ url: "/basic/inout/list-weight-data",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(param),
@@ -568,57 +469,6 @@
});
}
-//鏄剧ず璐ㄦ淇℃伅
-function showCheck() {
- if (!recordData) {
- alertError("娌℃湁涓氬姟鏁版嵁淇℃伅锛屾墽琛岃鎷掔粷");
- return;
- }
- // 鑾峰彇鍖栭獙椤逛俊鎭�
- flushCheckItem();
- layer.open({
- type: 1,
- title: "璐ㄦ璇︾粏",
- offset: ['120px', '100px'],
- area: ['1000px', '520px'],
- shade: 0,
- content: $('#checkDetail'),
- btnAlign: 'c',
- btn: ['鍙栨秷'],
- yes: function () {
- layer.closeAll();
- },
- closeBtn: 0
- });
-}
-
-/**
- * 鍒锋柊鍖栭獙缁撴灉椤�
- */
-function flushCheckItem() {
- curCheckItems = null;
- $.ajax({
- type: "POST",
- url: "../../basic/inout/get-check-item",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: JSON.stringify(recordData),
- success: function (result) {
- if (result.code != "0000") {
- layer.msg(result.msg);
- } else {
- curCheckItems = result.data;
-
- // 椤甸潰娓叉煋妫�娴嬮」
- renderTableCheckItem();
- }
- },
- error: function () {
- layer.msg("鍚庡彴寮傚父锛岃閲嶈瘯鎴栬�呰仈绯荤鐞嗗憳锛侊紒");
- }
- });
-}
-
/**
* 寮瑰嚭鎻愰啋妗�
* @param msg 鎻愰啋淇℃伅
@@ -654,105 +504,32 @@
}
}
-/**
- * 娓叉煋琛ㄦ牸
- */
-function renderTableCheckItem() {
- // 娓呯┖鏁版嵁
- $("#tableCheckItem").empty();
- table.render({
- elem: '#tableCheckItem',
- data: curCheckItems,
- page: false,
- even: true,
- cols: [[{
- field: 'standardName',
- title: '妫�楠岄」鐩�',
- align: 'center',
- width: '13%'
- }, {
- field: 'value',
- title: '妫�楠屽��',
- align: 'center',
- width: '9%'
- }, {
- field: 'operaSymbolValue',
- title: '鏍囧噯鍊�',
- align: 'center',
- width: '10%'
- }, {
- field: 'unit',
- title: '鍗曚綅',
- align: 'center',
- width: '10%'
- }, {
- field: 'deNum',
- title: '鎵ｉ噸',
- align: 'center',
- width: '9%'
- }, {
- field: 'addNum',
- title: '澧為噸',
- align: 'center',
- width: '9%'
- }, {
- field: 'dePrice',
- title: '鎵ｄ环',
- align: 'center',
- width: '9%'
- }, {
- field: 'addPrice',
- title: '澧炰环',
- align: 'center',
- width: '9%'
- }, {
- 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: '澶囨敞璇存槑',
- align: 'center'
- }]]
- });
-
- $("thead tr").css({
- "border-bottom": "2px solid #53adce",
- "background": "#eff4f6"
- });
-}
-
function renderTableProgressData(list) {
// 娓呯┖鏁版嵁
$("#tableListProgressData").empty();
layer.open({
type: 1,
- title: "閫夋嫨娴佺▼涓溅杈�",
- offset: ['120px', '100px'],
- area: ['1000px', '520px'],
+ title: "閫夋嫨绉伴噸涓溅杈�",
+ offset: ['240px', '100px'],
+ area: ['1000px', '560px'],
+ cancel: function (index, layero) {
+ $("#listProgressData").css("display", "none");
+ },
shade: 0,
+ scrollbar: 0,
content: $('#listProgressData'),
closeBtn: 1
});
table.render({
elem: '#tableListProgressData',
data: list,
- page: true,
+ page: false,
even: true,
cols: [[
- {type: 'numbers'}, {
+ {
+ type: 'numbers',
+ title: '搴忓彿'
+ }, {
field: 'id',
title: '鍗曟嵁鍙�',
align: 'center'
@@ -764,7 +541,21 @@
field: 'plateNum',
title: '杞︾墝鍙�',
align: 'center'
- }, {fixed: 'right', title: '閫夋嫨鎿嶄綔', align: 'center', toolbar: '#barSelectProgress'}]]
+ }, {
+ field: 'progress',
+ title: '娴佺▼杩涘害',
+ align: 'center',
+ style: 'font-weight: bold',
+ templet: function (item) {
+ return INOUT_PROGRESS_MSG(item.progress);
+ }
+ }, {
+ fixed: 'right',
+ title: '閫夋嫨鎿嶄綔',
+ align: 'center',
+ toolbar: '#barSelectProgress'
+ }
+ ]]
});
$("thead tr").css({
"border-bottom": "2px solid #53adce",
--
Gitblit v1.9.3