From a535bb743aef828314fcd74f8bee534dcddde1bb Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 07 七月 2023 09:04:17 +0800
Subject: [PATCH] 出库称重
---
igds-web/src/main/resources/static/admin/inout/weight.js | 153 ++++++---
igds-web/src/main/resources/templates/admin/inout/out-handle.html | 75 ++--
igds-web/src/main/resources/static/admin/inout/out-weight.js | 355 ++++++++++++-----------
igds-web/src/main/resources/static/admin/inout/out-handle.js | 7
igds-web/src/main/resources/templates/admin/inout/out-weight.html | 292 ++++++++++++------
5 files changed, 513 insertions(+), 369 deletions(-)
diff --git a/igds-web/src/main/resources/static/admin/inout/out-handle.js b/igds-web/src/main/resources/static/admin/inout/out-handle.js
index af23fc1..0985304 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-handle.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-handle.js
@@ -99,11 +99,14 @@
});
showProgress();
-
+ // 鐩戝惉閲嶉噺鍙樺寲
+ $(".weight").blur(function () {
+ deAutoByHandle(this.name)
+ });
//璋冩暣瀛楁涓嶇紪杈�
$("#depotId").attr("disabled", true);
$("#foodVariety").attr("disabled", true);
- $("#foodLevel").attr("disabled", true);
+ // $("#foodLevel").attr("disabled", true);
});
diff --git a/igds-web/src/main/resources/static/admin/inout/out-weight.js b/igds-web/src/main/resources/static/admin/inout/out-weight.js
index 33fc9cc..ac45a64 100644
--- a/igds-web/src/main/resources/static/admin/inout/out-weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/out-weight.js
@@ -34,7 +34,7 @@
shadeClose: true,
shade: 0.3,
closeBtn: 2,
- offset: ['50px','120px'],
+ offset: ['50px', '120px'],
area: ['1000px', '640px'],
content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
});
@@ -48,9 +48,8 @@
// 鐩戝惉閲嶉噺鍙樺寲
$(".weight").blur(function () {
- var name = this.name;
// deAutoByWeight(name);
- deAutoByOut(name);
+ deAutoByOut(this.name)
});
// 鍒濆鍖朩ebSocket
@@ -85,42 +84,42 @@
//鏆傛棤
}
-// 鏍规嵁褰撳墠鎿嶄綔鐨勬寜閽甀D鏇存柊鍏朵粬鎸夐挳鐘舵��
-function flushBtn(btnId) {
- if ("btn-weight" == btnId) {// 绉伴噸鍚庡彲浠ョ偣鍑诲畬鎴愮О閲�
- $("#btn-submit").removeClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", false);
- }
-
- if ("btn-submit" == btnId) {
- $("#btn-submit").addClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", true);
-
- if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {// 鍑哄簱锛屽鏋滄槸绌鸿溅绉伴噸锛屽畬鎴愭敹鐩存帴鍒锋柊椤甸潰
- resetForm();
- } else {
- // 瀹屾垚绉伴噸鍚庢帶鍒舵寜閽�
- $("#btn-weight").addClass("layui-btn-disabled");
- $("#btn-weight").attr("disabled", true);
-
- $("#btn-printBill").removeClass("layui-btn-disabled");
- $("#btn-printBill").attr("disabled", false);
- addDisabled();
- }
- }
- if ("btn-printBill" == btnId) {// 鎵撳嵃杩囩鍗曪紝璇存槑涓氬姟瀹屾垚
- $("#btn-weight").removeClass("layui-btn-disabled");
- $("#btn-weight").attr("disabled", false);
-
- $("#btn-submit").addClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", true);
-
- $("#btn-printBill").addClass("layui-btn-disabled");
- $("#btn-printBill").attr("disabled", true);
- delDisabled();
- resetForm();
- }
-}
+// // 鏍规嵁褰撳墠鎿嶄綔鐨勬寜閽甀D鏇存柊鍏朵粬鎸夐挳鐘舵��
+// function flushBtn(btnId) {
+// if ("btn-weight" == btnId) {// 绉伴噸鍚庡彲浠ョ偣鍑诲畬鎴愮О閲�
+// $("#btn-submit").removeClass("layui-btn-disabled");
+// $("#btn-submit").attr("disabled", false);
+// }
+//
+// if ("btn-submit" == btnId) {
+// $("#btn-submit").addClass("layui-btn-disabled");
+// $("#btn-submit").attr("disabled", true);
+//
+// if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {// 鍑哄簱锛屽鏋滄槸绌鸿溅绉伴噸锛屽畬鎴愭敹鐩存帴鍒锋柊椤甸潰
+// resetForm();
+// } else {
+// // 瀹屾垚绉伴噸鍚庢帶鍒舵寜閽�
+// $("#btn-weight").addClass("layui-btn-disabled");
+// $("#btn-weight").attr("disabled", true);
+//
+// $("#btn-printBill").removeClass("layui-btn-disabled");
+// $("#btn-printBill").attr("disabled", false);
+// addDisabled();
+// }
+// }
+// if ("btn-printBill" == btnId) {// 鎵撳嵃杩囩鍗曪紝璇存槑涓氬姟瀹屾垚
+// $("#btn-weight").removeClass("layui-btn-disabled");
+// $("#btn-weight").attr("disabled", false);
+//
+// $("#btn-submit").addClass("layui-btn-disabled");
+// $("#btn-submit").attr("disabled", true);
+//
+// $("#btn-printBill").addClass("layui-btn-disabled");
+// $("#btn-printBill").attr("disabled", true);
+// delDisabled();
+// resetForm();
+// }
+// }
//鎺у埗娴佺▼鐜妭鏄剧ず
function showProgress() {
@@ -195,17 +194,19 @@
form.render();
// 鐐瑰嚮绉伴噸鏃跺�欒嚜鍔ㄦ姄鎷嶆暟鎹�
- layer.msg("绯荤粺鑷姩鎶撴媿淇濈暀璁板綍鈥︹��");
+ // layer.msg("绯荤粺鑷姩鎶撴媿淇濈暀璁板綍鈥︹��");
snapData = {
companyId: companyId,
deptId: deptId,
progress: recordData.progress,
bizType: bizType,
plateNum: recordData.plateNum,
-
- id1: (null != snapDto1) ? snapDto1.id : null,
- id2: (null != snapDto2) ? snapDto2.id : null,
- id3: (null != snapDto3) ? snapDto3.id : null,
+ id1: snapDto1.id,
+ id2: snapDto2.id,
+ id3: snapDto3.id,
+ // id1: (null != snapDto1) ? snapDto1.id : null,
+ // id2: (null != snapDto2) ? snapDto2.id : null,
+ // id3: (null != snapDto3) ? snapDto3.id : null,
sort: $("#scaleName").val(),
weight: weightDto.weight
@@ -223,7 +224,8 @@
success: function (result) {
layer.close(index);
if (result.code != "0000") {
- layer.alert(result.msg);
+ alertError(result.msg);
+ // layer.alert(result.msg);
} else {
snapData = result.data;
}
@@ -240,14 +242,15 @@
}
// 鍒锋柊鐘舵��
- flushBtn("btn-weight");
+ // flushBtn("btn-weight");
}
+
//鏂扮殑璇诲崱鏂瑰紡
function flushICCard() {
- if(cardDto && cardDto.protocol != "TCP_DEFAULT"){
+ if (cardDto && cardDto.protocol != "TCP_DEFAULT") {
//鍗忚鑾峰彇
flushICCard2();
- }else {
+ } else {
//鏈湴璇诲彇
flushICCard1();
}
@@ -276,7 +279,9 @@
offset: ['300px', '300px']
});
} else {
- $("#intelCard").val(result.data.icCardNo);
+ paramIntelCard = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
+ flushData(paramIntelCard, null);
}
}
layer.close(index);
@@ -294,7 +299,7 @@
* 鏈湴璇诲彇鏅烘収鍗�
*/
function flushICCard1() {
- $("#intelCard").val(null);
+ $("#text-param").val(null);
$("#form-data")[0].reset();
form.render();
recordData = null;
@@ -313,8 +318,9 @@
if (data === "not found") {
layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
} else {
- $("#intelCard").val(data);
- flushData();
+ paramIntelCard = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
+ flushData(paramIntelCard, null);
}
},
error: function () {
@@ -323,7 +329,7 @@
});
}
-// 浣跨敤鎻掍欢鑾峰彇鐪佷唤璇�
+// 浣跨敤鎻掍欢鑾峰彇韬唤璇佸彿
function flushIdCard() {
var index = layer.load();
$.ajax({
@@ -343,8 +349,10 @@
});
return;
}
- $("#userId").val(data.idNum);
- flushData();
+ // $("#userId").val(data.idNum);
+ $("#text-param").text("璇嗗埆韬唤璇侊細" + paramIdCard);
+
+ flushData(null, paramIdCard);
},
error: function () {
layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
@@ -415,7 +423,7 @@
printWeight(result.data);
}
// 鍒锋柊鎸夐挳
- flushBtn("btn-printBill");
+ // flushBtn("btn-printBill");
}
layer.close(index);
},
@@ -440,26 +448,27 @@
$("#btn-weight").removeClass("layui-btn-disabled");
$("#btn-weight").attr("disabled", false);
- //绌鸿溅鍜屾弧杞﹁閲嶇疆
- updateEditAndProgress();
+ $("#text-param").val('');
- //鎵ｉ噸淇℃伅妗嗘仮澶嶄负鍙紪杈�
- delDisabled();
+ // //绌鸿溅鍜屾弧杞﹁閲嶇疆
+ // updateEditAndProgress();
+ //
+ // //鎵ｉ噸淇℃伅妗嗘仮澶嶄负鍙紪杈�
+ // delDisabled();
}
function flushPage() {
layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
resetForm();
- layer.msg("椤甸潰閲嶇疆瀹屾垚锛岃閲嶆柊鎿嶄綔鈥︹��");
layer.close(index);
});
}
-function flushData() {
+function flushData(intelCard, userIdCard) {
var index = layer.load();
- var userId2 = $("#userId").val();
- var intelCard = $("#intelCard").val();
+ var userId2 = userIdCard;
+ var intelCard = intelCard;
var plateNum = $("#plateNum").val();
var param = {
type: type,
@@ -477,7 +486,7 @@
data: JSON.stringify(param),
success: function (result) {
if (result.code != "0000") {
- notify(result.msg, result.data);
+ notifyProgress(result.msg, result.data);
} else {
recordData = result.data;
// 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
@@ -490,7 +499,8 @@
},
error: function () {
layer.close(index);
- layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ alertError("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯");
+ // layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
}
});
}
@@ -542,37 +552,37 @@
}
// 褰撳墠瀹屾垚
-function submit(data) {
+function submit() {
if (null == recordData) {
- notify("娌℃湁鏁版嵁鍙互鎻愪氦", null);
+ notifyProgress("娌℃湁鏁版嵁鍙互鎻愪氦", null);
return;
}
var data = form.val("form-data");
// 鏍￠獙-鍑哄簱绌鸿溅
if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
if (data.emptyWeight <= 0.0) {
- notify("绌鸿溅绉伴噸淇℃伅蹇呭～锛侊紒", null);
+ notifyProgress("绌鸿溅绉伴噸淇℃伅蹇呭～锛侊紒", null);
return;
}
if (!data.depotId) {
- notify("瑁呭嵏浠撳簱蹇呴』濉啓锛侊紒", null);
+ notifyProgress("瑁呭嵏浠撳簱蹇呴』濉啓锛侊紒", null);
return;
}
if (!data.noticeId) {
- notify("閫氱煡鍗曞繀椤诲～鍐欙紒锛�", null);
+ notifyProgress("閫氱煡鍗曞繀椤诲～鍐欙紒锛�", null);
return;
}
} else {
if (data.fullWeight <= 0.0) {
- notify("婊¤溅绉伴噸淇℃伅蹇呭～锛侊紒", null);
+ notifyProgress("婊¤溅绉伴噸淇℃伅蹇呭～锛侊紒", null);
return;
}
if (!data.foodVariety) {
- notify("绮鍝佺蹇呭～锛侊紒", null);
+ notifyProgress("绮鍝佺蹇呭～锛侊紒", null);
return;
}
if (!data.settleWeight || data.settleWeight <= 0.0) {
- notify("缁撶畻閲嶉噺鍚堣锛岃鏍稿锛侊紒", null);
+ notifyProgress("缁撶畻閲嶉噺鍚堣锛岃鏍稿锛侊紒", null);
return;
}
}
@@ -589,27 +599,27 @@
fileName: snapData.fileName3
}];
recordData.files = files;
-
+ console.log("out-weight,submit")
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout/inout-next-step",
+ url: "../../basic/inout/submit-weight",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(recordData),
success: function (result) {
if (result.code != "0000") {
- notify(result.msg, result.data);
+ notifyProgress(result.msg, result.data);
} else {
- notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
+ notifyProgress("鏁版嵁鎻愪氦鎴愬姛", result.data);
// 鏇存柊鎸夐挳鏄剧ず
- flushBtn("btn-submit");
+ // flushBtn("btn-submit");
}
layer.close(index);
},
error: function () {
layer.close(index);
- notify("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯", null);
+ notifyProgress("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯", null);
}
});
@@ -635,95 +645,96 @@
// });
}
-
-// ---------------------------閫氱煡鍗�-寮�濮� -------------------//
-// 寮瑰嚭寰�鏉ュ崟浣嶄笅鎷夋
-function showNotice() {
- var index = layer.load();
- var param = {
- type: type
- };
- // 娓叉煋寰�鏉ュ崟浣嶅垪琛�
- table.render({
- elem: '#tableNotice',
- url: '../../basic/inout/list-notice鈥攐ut',
- page: false,
- // skin : "nob",
- // size : 'sm',
- even: true,
- method: 'POST',
- contentType: "application/json;charset=UTF-8",
- cols: [[{
- field: 'name',
- title: '閫氱煡鍗曞悕绉�',
- width: '15%'
- }, {
- field: 'customerName',
- title: '鏀惰揣鍗曚綅'
- }, {
- field: 'depotName',
- title: '浠撳簱鍚嶇О',
- width: '15%'
- }, {
- field: 'foodVarietyName',
- title: '绮鍝佺',
- width: '10%'
- }, {
- field: 'year',
- title: '骞翠唤',
- width: '8%'
- }, {
- 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;
- form.val("form-data", {
- customerId: data.customerId,
- customerName: data.customerName,
- noticeId: data.id,
- foodType: data.foodType,
- foodLevel: data.foodLevel
- });
- // 鍏抽棴
- 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
- });
-}
-// ---------------------------閫氱煡鍗� -缁撴潫 -------------------//
\ No newline at end of file
+//-----------------------杞Щ鑷硍eight.js涓�----------------------//
+// // ---------------------------閫氱煡鍗�-寮�濮� -------------------//
+// // 寮瑰嚭寰�鏉ュ崟浣嶄笅鎷夋
+// function showNotice() {
+// var index = layer.load();
+// var param = {
+// type: type
+// };
+// // 娓叉煋寰�鏉ュ崟浣嶅垪琛�
+// table.render({
+// elem: '#tableNotice',
+// url: '../../basic/inout/list-notice-out',
+// page: false,
+// // skin : "nob",
+// // size : 'sm',
+// even: true,
+// method: 'POST',
+// contentType: "application/json;charset=UTF-8",
+// cols: [[{
+// field: 'name',
+// title: '閫氱煡鍗曞悕绉�',
+// width: '15%'
+// }, {
+// field: 'customerName',
+// title: '鏀惰揣鍗曚綅'
+// }, {
+// field: 'depotName',
+// title: '浠撳簱鍚嶇О',
+// width: '15%'
+// }, {
+// field: 'foodVarietyName',
+// title: '绮鍝佺',
+// width: '10%'
+// }, {
+// field: 'year',
+// title: '骞翠唤',
+// width: '8%'
+// }, {
+// 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;
+// form.val("form-data", {
+// customerId: data.customerId,
+// customerName: data.customerName,
+// noticeId: data.id,
+// foodType: data.foodType,
+// foodLevel: data.foodLevel
+// });
+// // 鍏抽棴
+// 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
+// });
+// }
+//
+// // ---------------------------閫氱煡鍗� -缁撴潫 -------------------//
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/weight.js b/igds-web/src/main/resources/static/admin/inout/weight.js
index fb9d060..a4c137f 100644
--- a/igds-web/src/main/resources/static/admin/inout/weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/weight.js
@@ -42,79 +42,122 @@
*/
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锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
+ alertError("鍑�閲�<=0锛屽綋鍓嶇幆鑺傚瓨鍦ㄩ�昏緫閿欒锛岃鏍稿");
return;
}
+ //鍏朵粬淇℃伅
+ var deHandle = curData.deHandle, dePackage = curData.dePackage, deOther = curData.deOther, settleWeight = 0,
+ recordWeight = 0, deSum = 0;
+ recordWeight = Number(netWeight) - Number(deHandle) - Number(dePackage) - Number(deOther);
+ settleWeight = Number(recordWeight);
+ deSum = Number(deOther) + Number(deHandle)
- 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);
- }
-
+ netWeight = netWeight.toFixed(0);
+ recordWeight = recordWeight.toFixed(0);
+ settleWeight = settleWeight.toFixed(0);
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
+ recordWeight: recordWeight,
+ deSum: deSum
});
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();
+// }
+function deAutoByHandle(name) {
+ var curData = form.val("form-data");
+ var deOther = curData.deOther, deHandle = curData.deHandle;
+ deSum = Number(deOther) + Number(deHandle);
+ deSum = deSum.toFixed(0);
+ form.val("form-data", {
+ deSum: deSum,
+ });
+ form.render();
+
+}
+
/**
* 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
* @param checkItems
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-handle.html b/igds-web/src/main/resources/templates/admin/inout/out-handle.html
index 4928eb2..71e3c86 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-handle.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-handle.html
@@ -297,16 +297,16 @@
</div>
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鍑�姣涢噸</label>
- <div class="layui-input-block">
- <input type="text" name="netWeight" autocomplete="off" placeholder="涓嶅彲缂栬緫"
- class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
+ <!-- <div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">鍑� 閲�</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input type="text" name="netWeight" autocomplete="off" placeholder="涓嶅彲缂栬緫"-->
+ <!-- class="layui-input rkbk-search-input" disabled> <em-->
+ <!-- class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
<!-- <div class="layui-col-xs4">-->
@@ -341,8 +341,8 @@
<div class="layui-form-item">
<label class="layui-form-label">绮绛夌骇</label>
<div class="layui-input-block">
- <select name="foodLevel" id="foodLevel">
- <option value="">涓嶅彲缂栬緫</option>
+ <select name="foodLevel" id="foodLevel" lay-filter="select_foodLevel">
+ <option value="">璇烽�夋嫨</option>
<option th:each="dic,dicSet:${listFoodLevel}"
th:value="${dic.code}" th:text="${dic.name}"></option>
</select>
@@ -371,7 +371,7 @@
<label class="layui-form-label">绮鍝佺</label>
<div class="layui-input-block">
<select name="foodVariety" id="foodVariety">
- <option value="">涓嶅彲缂栬緫</option>
+ <option value="">璇烽�夋嫨</option>
<option th:each="dic,dicSet:${listFoodVariety}"
th:value="${dic.code}" th:text="${dic.name}"></option>
</select>
@@ -383,13 +383,22 @@
<div class="layui-form-item">
<label class="layui-form-label">鍏朵粬鎵ｉ噸</label>
<div class="layui-input-block">
- <input type="text" name="deOther" autocomplete="off" placeholder="涓嶅彲缂栬緫"
- class="layui-input rkbk-search-input" disabled> <em
+ <input type="text" name="deOther" autocomplete="off" placeholder="璇疯緭鍏�"
+ class="layui-input rkbk-search-input weight"> <em
class="kccz-data-dw">KG</em>
</div>
</div>
</div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐜板満鎵ｉ噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="deHandle" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input weight"> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
<div class="layui-col-xs4">
<div class="layui-form-item">
@@ -412,26 +421,19 @@
<!-- </div>-->
<!-- </div>-->
<!--</div>-->
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鐜板満鎵ｉ噸</label>
- <div class="layui-input-block">
- <input type="text" name="deHandle" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input"> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鎵ｉ噸鍚庡噣閲�</label>
- <div class="layui-input-block">
- <input type="text" name="settleWeight" placeholder="涓嶅彲缂栬緫"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
+
+ <!-- <div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">缁撶畻閲嶉噺</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input type="text" name="settleWeight" placeholder="涓嶅彲缂栬緫"-->
+ <!-- autocomplete="off" class="layui-input rkbk-search-input"-->
+ <!-- disabled> <em class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+
<!--<div class="layui-col-xs4">-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">鍊间粨缁撴潫</label>-->
@@ -447,7 +449,7 @@
<label class="layui-form-label">鍏朵粬璇存槑</label>
<div class="layui-input-block">
<input type="text" name="deOtherInfo" placeholder="鍏朵粬鎵ｉ噸璇存槑"
- class="layui-input">
+ autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -456,7 +458,7 @@
<label class="layui-form-label">澶囨敞璇存槑</label>
<div class="layui-input-block">
<textarea name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-textarea"></textarea>
+ autocomplete="off" class="layui-textarea"></textarea>
</div>
</div>
</div>
@@ -565,6 +567,7 @@
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
+<script th:src="@{../../static/admin/inout/weight.js}"></script>
<script th:src="@{../../static/admin/inout/out-handle.js}"></script>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
diff --git a/igds-web/src/main/resources/templates/admin/inout/out-weight.html b/igds-web/src/main/resources/templates/admin/inout/out-weight.html
index 6ebe4ee..89ff31b 100644
--- a/igds-web/src/main/resources/templates/admin/inout/out-weight.html
+++ b/igds-web/src/main/resources/templates/admin/inout/out-weight.html
@@ -17,6 +17,14 @@
<script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
<style>
+ .kccz-r-btnbox {
+ width: 86px !important;
+ }
+
+ .kccz-r-btn {
+ width: 86px !important;
+ }
+
.display-none {
display: none;
}
@@ -33,7 +41,7 @@
}
.kccz-left-box2 {
- height: 500px;
+ height: 560px;
}
.color-red {
@@ -72,6 +80,12 @@
.border-no {
border: 0px;
+ }
+
+ #text-param {
+ font-size: 14px;
+ color: red;
+ padding-left: 10px;
}
.qyzj-btnbox {
@@ -124,21 +138,19 @@
<div class="rkbk-quick fl">
<button id="btn-weight" class="rkbk-quick-btn layui-btn btn-blue"
onclick="weight()">
- <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>绉伴噸
+ <i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>姝ラ涓�锛氱О閲嶇‘璁�
</button>
<button id="btn-submit"
- class="rkbk-quick-btn layui-btn btn-green layui-btn-disabled"
- disabled=true onclick="submit()">
- <i><img th:src="@{../../static/images/icon-ok.png}"/></i>瀹屾垚绉伴噸
+ class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i>姝ラ浜岋細瀹屾垚绉伴噸
</button>
<button id="btn-printBill"
- class="rkbk-quick-btn layui-btn btn-blue layui-btn-disabled"
- disabled=true onclick="printBill()">
- <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>鎵撳嵃杩囩鍗�
+ class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
+ <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>姝ラ涓夛細鎵撳嵃杩囩鍗�
</button>
<button class="rkbk-quick-btn layui-btn btn-violet"
onclick="flushPage()">
- <i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>閲嶆柊绉伴噸
+ <i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>鍒锋柊椤甸潰
</button>
</div>
@@ -229,7 +241,7 @@
<div class="rkbk-tit">
<i></i>
- <h3>涓氬姟鏁版嵁</h3>
+ <h3>涓氬姟鏁版嵁<span id="text-param"></span></h3>
<div>
<input type="button" value="璇绘櫤鎱у崱"
class="rkbk-search-btn layui-btn r-240"
@@ -276,37 +288,37 @@
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">鏅烘収鍗″彿</label>
+ <label class="layui-form-label color-red">鏅烘収鍗″彿</label>
<div class="layui-input-block">
<input type="text" name="intelCard" id="intelCard"
- placeholder="鏅烘収鍗″彿" autocomplete="off" class="layui-input">
+ placeholder="鍒峰崱/鎵嬪姩褰曞叆" autocomplete="off" class="layui-input">
</div>
</div>
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">杞︾墝鍙�</label>
+ <label class="layui-form-label color-red">杞︾墝鍙�</label>
<div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum" placeholder="杞︾墝鍙�"
+ <input type="text" name="plateNum" id="plateNum" placeholder="鑷姩褰曞叆/鎵嬪姩褰曞叆"
autocomplete="off" class="layui-input">
</div>
</div>
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">韬唤璇佸彿</label>
- <div class="layui-input-block">
- <input type="text" name="userId" id="userId"
- placeholder="鎵胯繍浜鸿韩浠借瘉鍙�" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">韬唤璇佸彿</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input type="text" name="userId" id="userId"-->
+ <!-- placeholder="鎵胯繍浜鸿韩浠借瘉鍙�" autocomplete="off" class="layui-input">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">鎵胯繍浜�</label>
+ <label class="layui-form-label color-red">鎵胯繍浜�</label>
<div class="layui-input-block">
<input type="text" name="userName" placeholder="涓嶅彲缂栬緫" class="layui-input"
disabled>
@@ -344,7 +356,7 @@
<div class="layui-input-block">
<input type="text" name="customerName" placeholder="璇烽�夋嫨锛屼笉鍙墜鍔ㄥ綍鍏�"
autocomplete="off" class="layui-input" disabled="disabled"> <em
- class="kccz-data-dw cursor" onclick="showNotice()">鈥�</em>
+ class="kccz-data-dw cursor" onclick="showNotice()">鈥︹��</em>
</div>
</div>
</div>
@@ -361,23 +373,23 @@
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">鏉傝川鎵ｉ噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <input id="impurity" type="text" name="impurity" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">%</em>
- </div>
- <div class="layui-input-block">
- <div class="posi-r">
- <input id="deImpurity" type="text" name="deImpurity" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- </div>
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item kccz-data-group-md">-->
+ <!-- <label class="layui-form-label">鏉傝川鎵ｉ噸</label>-->
+ <!-- <div class="posi-r kccz-data-bfb fr">-->
+ <!-- <input id="impurity" type="text" name="impurity" placeholder="璇疯緭鍏�"-->
+ <!-- autocomplete="off" class="layui-input weight"> <em-->
+ <!-- class="kccz-data-dw">%</em>-->
+ <!-- </div>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <div class="posi-r">-->
+ <!-- <input id="deImpurity" type="text" name="deImpurity" placeholder="璇疯緭鍏�"-->
+ <!-- autocomplete="off" class="layui-input weight"> <em-->
+ <!-- class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label" id="label4">瑁呭嵏浠撳簱</label>
@@ -390,7 +402,6 @@
</div>
</div>
</div>
-
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label">鐜板満鎵ｉ噸</label>
@@ -402,23 +413,23 @@
</div>
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">姘村垎澧為噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <input id="wet" type="text" name="wet" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">%</em>
- </div>
- <div class="layui-input-block">
- <div class="posi-r">
- <input id="deWet" type="text" name="deWet" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input weight"> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- </div>
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item kccz-data-group-md">-->
+ <!-- <label class="layui-form-label">姘村垎澧為噸</label>-->
+ <!-- <div class="posi-r kccz-data-bfb fr">-->
+ <!-- <input id="wet" type="text" name="wet" placeholder="璇疯緭鍏�"-->
+ <!-- autocomplete="off" class="layui-input weight"> <em-->
+ <!-- class="kccz-data-dw">%</em>-->
+ <!-- </div>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <div class="posi-r">-->
+ <!-- <input id="deWet" type="text" name="deWet" placeholder="璇疯緭鍏�"-->
+ <!-- autocomplete="off" class="layui-input weight"> <em-->
+ <!-- class="kccz-data-dw">KG</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label">绮鍝佺</label>
@@ -442,6 +453,15 @@
</div>
</div>
</div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏朵粬璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="deOtherInfo" autocomplete="off"
+ placeholder="鍏朵粬鎵ｉ噸璇存槑" class="layui-input">
+ </div>
+ </div>
+ </div>
<div class="layui-col-xs4">
<div class="layui-form-item">
@@ -453,51 +473,29 @@
</div>
</div>
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">瑙� 鏍�</label>
- <div class="layui-input-block">
- <select name="specType" id="specType">
- <option value="鏁ｇ伯">鏁ｇ伯</option>
- <option value="25kg">25kg</option>
- <option value="50kg">50kg</option>
- </select>
- </div>
- </div>
- </div>
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">瑙� 鏍�</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <select name="specType" id="specType">-->
+ <!-- <option value="鏁ｇ伯">鏁ｇ伯</option>-->
+ <!-- <option value="25kg">25kg</option>-->
+ <!-- <option value="50kg">50kg</option>-->
+ <!-- </select>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label">绮浜у湴</label>
<div class="layui-input-block">
<input type="text" name="foodLocation" placeholder="璇烽�夋嫨"
autocomplete="off" class="layui-input"> <em
- class="kccz-data-dw cursor" onclick="showFoodLocation()">鈥�</em>
+ class="kccz-data-dw cursor" onclick="showFoodLocation()">鈥︹��</em>
</div>
</div>
</div>
-
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曚环</label>
- <div class="layui-input-block">
- <input type="text" name="price" placeholder="璇疯緭鍏ュ崟浠�"
- class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>
- </div>
- </div>
- </div>
-
-
-
- <div class="layui-col-xs8">
- <div class="layui-form-item">
- <label class="layui-form-label">澶囨敞璇存槑</label>
- <div class="layui-input-block">
- <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-input">
- </div>
- </div>
- </div>
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label color-red">缁撶畻閲嶉噺</label>
@@ -508,17 +506,28 @@
</div>
</div>
</div>
+ <!--<div class="layui-col-xs4">-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">鍗曚环</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input type="text" name="price" placeholder="璇疯緭鍏ュ崟浠�"-->
+ <!-- class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--</div>-->
+
+
<div class="layui-col-xs8">
- <span style="padding-left: 50px;color: blue;">
- 娉ㄦ剰锛�1銆佹按鍒嗗閲嶏紝姝ｆ暟=澧炲姞 <br>
- </span>
- <span style="padding-left: 93px;color: blue;">
- 2銆佸噣閲� = 姣涢噸 - 鐨噸 锛涙�绘墸閲� = 鎵ｆ按鏉傦紙澶т簬0锛� + 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸<br>
- </span>
- <span style="padding-left: 93px;color: blue;">
- 3銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� + 姘存潅澧為噸锛涘嚭搴撻噸閲� = 鍑�閲� - 鎬绘墸閲�
- </span>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
+
+
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label color-red">鍑哄簱閲嶉噺</label>
@@ -529,6 +538,80 @@
</div>
</div>
</div>
+ <div class="layui-col-xs8">
+ <span style="padding-left: 93px;color: blue;">
+ 璇存槑锛� 1銆佸噣閲� = 姣涢噸 - 鐨噸 锛涙�绘墸閲� = 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸<br>
+ </span>
+ <span style="padding-left: 93px;color: blue;">
+ 2銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� 锛涘嚭搴撻噸閲� = 鍑�閲� - 鎬绘墸閲�
+ </span>
+ </div>
+
+ <div class="layui-col-xs12">
+ <div class="line-container">
+ <div class="line"></div>
+ <div class="line-text">浠ヤ笅鏍规嵁搴撳尯绉伴噸浣滀笟瑕佹眰濉啓</div>
+ <div class="line"></div>
+ </div>
+ </div>
+
+ <!-- 琛ュ厖瀛楁榛樿闅愯棌 -->
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呰鐗�</label>
+ <div class="layui-input-block">
+ <input type="radio" name="bzw" value="1" title="楹昏">
+ <input type="radio" name="bzw"
+ value="2" title="缂栫粐琚�">
+ <input type="radio" name="bzw"
+ value="3" title="鏁ｈ" checked>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呰鎵ｉ噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="dePackage" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input weight"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曚环</label>
+ <div class="layui-input-block">
+ <input type="text" name="price" placeholder="璇疯緭鍏�"
+ class="layui-input"> <em class="kccz-data-dw">鍏�/鍏枻</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏍囧噯鍖呴噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="dbz" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呬欢鎬绘暟</label>
+ <div class="layui-input-block">
+ <input type="text" name="bzbjs" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <em
+ class="kccz-data-dw">浠�</em>
+ </div>
+ </div>
+ </div>
+
</form>
</div>
</div>
@@ -662,6 +745,7 @@
<script th:src="@{../../static/js/igds-common.js}"></script>
<script th:src="@{../../static/admin/inout/inout-print.js}"></script>
<script th:src="@{../../static/admin/inout/video-play.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/weight.js}"></script>
<script th:src="@{../../static/admin/inout/out-weight.js}"></script>
</body>
--
Gitblit v1.9.3