From 53fab3f56e8335fbf39fc07c4e10f6abdb0505bb Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 03 十二月 2025 18:48:11 +0800
Subject: [PATCH] 登记、化验、称重页面调整，及登记化验数据提交
---
fzzy-igdss-web/src/main/resources/static/inout/weight.js | 281 --------------------------------------------------------
1 files changed, 0 insertions(+), 281 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/static/inout/weight.js b/fzzy-igdss-web/src/main/resources/static/inout/weight.js
index e01add9..a0e4a2a 100644
--- a/fzzy-igdss-web/src/main/resources/static/inout/weight.js
+++ b/fzzy-igdss-web/src/main/resources/static/inout/weight.js
@@ -73,103 +73,6 @@
form.render();
}
-// function deAutoByOut(name) {
-// var curData = form.val("form-data");
-//
-// if (curData.fullWeight == 0 || curData.emptyWeight == 0) {
-// return;
-// }
-// //姹囨�荤粨鏋�
-// var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
-// // 鍑�閲�
-// var netWeight = curData.fullWeight - curData.emptyWeight;
-// //鎵ｆ按鏉�
-// var deWet = curData.deWet, deImpurity = curData.deImpurity;
-//
-// if (netWeight <= 0) {
-// layer.alert("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
-// return;
-// }
-//
-// var deBase = 0, multiple = 0;
-// //姘村垎鏉傝川锛屾洿鏀规瘮渚嬪苟涓旀按鍒嗘墸閲嶈繕娌¤绠楁儏鍐典笅
-// if ("fullWeight" == name || null == deWet) {
-// var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
-// if (checkItem) {
-// deBase = Number(curData.wet) - Number(checkItem.upperLimit);
-// if (deBase == 0) return;
-// multiple = parseInt(deBase / checkItem.ruleNum);//鍊嶆暟
-// deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
-// }
-// }
-// //鏉傝川
-// if ("fullWeight" == name || null == deImpurity) {
-// checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
-// if (checkItem) {
-// deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
-// if (deBase == 0) return;
-// multiple = parseInt(deBase / checkItem.ruleNum);
-// deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
-// }
-// }
-//
-// /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
-// deSum = Number(curData.deOther) + Number(curData.deHandle);
-//
-//
-// if (Number(deWet) > 0) {//澧為噸
-// addSum = addSum + Number(deWet);
-// } else {
-// deSum = deSum + Number(deWet);
-// }
-//
-// if (Number(deImpurity) > 0) {//鎵ｉ噸
-// deSum = deSum + Number(deImpurity);
-// } else {
-// addSum = addSum + Number(deImpurity);
-// }
-//
-// deSum = deSum.toFixed(0);
-// /** 澧為噸杞鏁帮紝渚夸簬璁＄畻 */
-// addSum = Math.abs(addSum).toFixed(0);
-// /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
-// recordWeight = Number(netWeight) - Number(deSum);
-// /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
-// settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
-//
-// form.val("form-data", {
-// netWeight: netWeight,
-// deImpurity: deImpurity,
-// deWet: deWet,
-// deSum: deSum,
-// settleWeight: settleWeight,
-// recordWeight: recordWeight
-// });
-// form.render();
-// }
-
-/**
- * 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
- * @param checkItems
- * @param code1 绯荤粺鍙傛暟ID
- * @param code2 鍥芥爣鍙傛暟ID
- * @returns {undefined}
- */
-function getCheckItem(checkItems, code1, code2) {
- var checkData = null;
- if (!checkItems) return checkData;
- $.each(checkItems, function (index, checkItem) {
- if (checkItem.standardId == code1 || checkItem.standardId == code2) {
- if (checkItem.ruleNum && checkItem.upperLimit > 0.0) {
- checkData = checkItem;
- return true;
- }
- }
- });
- return checkData;
-}
-
-
/**
* 鏇存柊鐢ㄦ埛閫夋嫨鍦扮
*/
@@ -190,190 +93,6 @@
},
error: function () {
notify("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯", null);
- }
- });
-}
-
-// ---------------------------閫氱煡鍗�-寮�濮� -------------------//
-// 寮瑰嚭寰�鏉ュ崟浣嶄笅鎷夋
-function showNotice() {
- var titleCustomer = "閫佽揣鍗曚綅";
- var url = "../../basic/inout/list-notice-in";
- if ("OUT" == type) {
- titleCustomer = "鏀惰揣鍗曚綅";
- url = "../../basic/inout/list-notice-out"
- }
- var index = layer.load();
- var param = {
- type: type
- };
-
- console.log(url);
-
- table.render({
- elem: '#tableNotice',
- url: url,
- page: false,
- even: true,
- method: 'POST',
- contentType: "application/json;charset=UTF-8",
- cols: [[{
- field: 'name',
- title: '閫氱煡鍗曞悕绉�',
- width: '15%'
- }, {
- field: 'customerName',
- title: titleCustomer
- }, {
- field: 'foodVarietyName',
- title: '绮鍝佺',
- width: '10%'
- }, {
- field: 'year',
- title: '骞翠唤',
- width: '8%'
- }, {
- field: 'depotName',
- title: "鎵�娑変粨搴�"
- }, {
- field: 'contractName',
- title: '鎵�灞炲悎鍚�'
- }]],
- where: param,
- parseData: function (res) {
- if ("0000" == res.code) {
- return {
- "code": "0",
- "msg": res.msg,
- "data": res.data
- }
- } else {
- return {
- "code": "1",
- "msg": res.msg
- }
- }
- },
- done: function (res) {
- layer.close(index);
- }
- });
- //鍙屽嚮鏄剧ず閫変腑鏁版嵁
- table.on('rowDouble(tableNotice)', function (obj) {
- var data = obj.data;
- console.log(data)
- form.val("form-data", {
- customerName: data.customerName,
- noticeId: data.id,
- foodYear: data.year,
- depotId: data.depotId,
- foodVariety: data.foodVariety
- });
- layer.closeAll();
- });
- // 寮瑰嚭瀵硅瘽妗�
- layer.open({
- type: 1,
- offset: ['100px', '250px'],
- title: "閫氱煡鍗曞垪琛紙鍙屽嚮閫変腑锛�",
- area: ['900px', '600px'],
- shade: 0,
- content: $('#listNotice'),
- btn: 0,
- btn: ['鍙栨秷'],
- yes: function () {
- layer.closeAll();
- },
- closeBtn: 0
- });
-}
-
-// ---------------------------绮浜у湴-寮�濮� -------------------//
-function showFoodLocation() {
- var index = layer.load();
- table.render({
- elem: '#tableFoodLoaction',
- url: '../../basic/inout/page-dicArea',
- page: false,
- toolbar: '#toolbarFoodLocaton',
- even: true,
- method: 'POST',
- contentType: "application/json;charset=UTF-8",
- cols: [[{
- field: 'code',
- title: '缂栫爜',
- }, {
- field: 'simple',
- title: '绠�鎷�',
- }, {
- field: 'name',
- title: '鍚嶇О',
- width: '60%'
- }]],
- where: {
- "page": 1,
- "limit": 100
- },
- parseData: function (res) {
- if ("0000" == res.code) {
- return {
- "code": "0",
- "msg": res.msg,
- "count": res.data.total,
- "data": res.data.records
- }
- } else {
- return {
- "code": "1",
- "msg": res.msg
- }
- }
- },
- done: function (res) {
- layer.close(index);
- }
- });
-
- //鍙屽嚮鏄剧ず閫変腑鏁版嵁
- table.on('rowDouble(tableFoodLoaction)', function (obj) {
- var data = obj.data;
- // 璧嬪��
- form.val("form-data", {
- foodLocation: data.name,
- foodLocationId: data.code
- });
- // 鍏抽棴
- layer.closeAll();
- });
-
- // 寮瑰嚭瀵硅瘽妗�
- layer.open({
- type: 1,
- title: "閫夋嫨绮骇鍦�",
- area: ['600px', '600px'],
- shade: 0,
- content: $('#listFoodLocation'),
- btn: 0,
- btn: ['鍙栨秷'],
- yes: function () {
- layer.closeAll();
- },
- closeBtn: 0
- });
-}
-
-// 鍒锋柊
-function flushFoodLocation() {
- var key = $("#key2").val();
- table.reload('tableFoodLoaction', {
- url: "../../basic/inout/page-dicArea",
- where: {
- key: key
- },
- done: function (res) {
- if (key) {
- $("#key2").val(key);
- }
}
});
}
--
Gitblit v1.9.3