From 1dbb47d9132f36ab3c427c4e7eb0376521d52df9 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期二, 12 三月 2024 16:58:42 +0800
Subject: [PATCH] Merge branch 'csc'
---
Pda/View/SoSetting/SampleOut.html | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/Pda/View/SoSetting/SampleOut.html b/Pda/View/SoSetting/SampleOut.html
index 75d9bf8..4fc9be3 100644
--- a/Pda/View/SoSetting/SampleOut.html
+++ b/Pda/View/SoSetting/SampleOut.html
@@ -613,18 +613,6 @@
checkPalletState()
})
- form.on('switch(IsZhengTuo)', function (obj) {
- if (obj.elem.checked) {
- $('#BoxDIv').attr("style", "display:none")
- isContinue="1";
- } else {
- $('#BoxDIv').attr("style", "display:block")
- isContinue="0";
- }
- $('#boxNo').val("");
- $('#boxNo3').val("");
- });
-
//绠辩爜鏂囨湰妗嗗洖杞︿簨浠�
$("#boxNo").blur(function () {
GetBoxInfo();
@@ -645,7 +633,7 @@
synData(IP + "/PdaSo/IsEnableOkPalletNo", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
- synData(IP + "/PdaSo/IsEnableOkPalletNo", param, 'post', function (res) {
+ synData(IP + "/PdaSo/GetSampleType", param, 'get', function (res) {
if (res.code == 0){
if (res.data == "0") {//搴撳唴鍙栨牱
$('#kuneilabel').show();
@@ -680,7 +668,39 @@
}
});
}
- //涓嬫媺鍗曟嵁閫変腑鍚庝簨浠�
+
+ //鍒濆鍖栨覆鏌� 鍏ュ簱鍗�
+ function updateAsnBillList() {
+
+ $("#bar").empty()
+ $("#bar").append('<option value =>' + '</option>');
+ form.render('select');
+
+ var param = {
+ PalletNo: $("#palletNo").val(),
+ };
+ synData(IP + "/PdaSo/GetRunSoNoticeList", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ console.log(res.data);
+ for (var i = 0; i < res.data.length; i++) {
+ if (i == 0) {
+ $("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
+ } else {
+ $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
+ }
+ }
+ form.render('select');
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+ });
+ }
+
+ //涓嬫媺鍗曟嵁閫変腑鍚庝簨浠�
form.on('select(getbar)', function (data) {
if ($('#palletNo').val() == "") {
layer.msg("璇疯緭鍏ユ墭鐩樻潯鐮�", {
--
Gitblit v1.8.0