From bfb2037536523e61cc1cf4ae050181d89daffcae Mon Sep 17 00:00:00 2001
From: lch <luluchen515@163.com>
Date: 星期一, 26 八月 2024 10:34:30 +0800
Subject: [PATCH] 盘点优化
---
.vs/GS_MES2/FileContentIndex/read.lock | 0
.vs/GS_MES2/v17/workspaceFileList.bin | 0
pages/CangKuManage/GS_CKPDD.html | 25 +------
unpackage/release/H546D0BA6.wgt | 0
.vs/slnx.sqlite | 0
manifest.json | 2
.vs/GS_MES2/v17/.wsuo | 0
.vs/VSWorkspaceState.json | 4 +
js/CangKuManage_js/GS_CKPDD.js | 92 ++++++++++++++++++++++++++----
9 files changed, 89 insertions(+), 34 deletions(-)
diff --git a/.vs/GS_MES2/FileContentIndex/read.lock b/.vs/GS_MES2/FileContentIndex/read.lock
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.vs/GS_MES2/FileContentIndex/read.lock
diff --git a/.vs/GS_MES2/v17/.wsuo b/.vs/GS_MES2/v17/.wsuo
new file mode 100644
index 0000000..c42443a
--- /dev/null
+++ b/.vs/GS_MES2/v17/.wsuo
Binary files differ
diff --git a/.vs/GS_MES2/v17/workspaceFileList.bin b/.vs/GS_MES2/v17/workspaceFileList.bin
new file mode 100644
index 0000000..8ed3b17
--- /dev/null
+++ b/.vs/GS_MES2/v17/workspaceFileList.bin
Binary files differ
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..c3a6e11
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,4 @@
+{
+ "ExpandedNodes": [],
+ "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index bb41242..60cc419 100644
--- a/.vs/slnx.sqlite
+++ b/.vs/slnx.sqlite
Binary files differ
diff --git a/js/CangKuManage_js/GS_CKPDD.js b/js/CangKuManage_js/GS_CKPDD.js
index 5483ddd..8c6ab6d 100644
--- a/js/CangKuManage_js/GS_CKPDD.js
+++ b/js/CangKuManage_js/GS_CKPDD.js
@@ -26,12 +26,12 @@
app.init();
fetchData();
- mui("#txtGD")[0].focus();
+
console.log("杩炴帴娴嬭瘯锛�");
- initBluetooth();
+ // initBluetooth();
//SetBillNo();
$('#info').height($(window).height() - $("#row001").height() - $("#div001").height() - $("#div002")
- .height() - 70);
+ .height() - 70);
});
// $(function(){
// billNo= GetMaxBillNO("1201",GetSysDateTime());//璋冩嫧鍗曞彿锛屽彧瑕佷笉绂诲紑鐣岄潰锛屽崟鍙蜂笉鍙�
@@ -275,6 +275,55 @@
});
});
+function refreshpdno() {
+ $.ajax({
+ url: app.API_URL_HEADER + "/WARBABChag/GetBarInfoTAC",
+
+ data: {
+ TAA001: $("#order").val(),
+ },
+ DataType: "json",
+ type: "post",
+ async: false,
+ //timeout: 15000,
+ success: function(data) {
+ //console.log(JSON.stringify(data));
+ if (data.status != 0) {
+ playerAudio("NG");
+ mui.alert(data.message, "", "", function() {
+ mui("#input")[0].focus();
+ });
+ return;
+ } else {
+ populateTable(data.data);
+ var selectElement = document.getElementById("spici");
+ console.log(pici);
+ // 娓呯┖ <select> 鍏冪礌鐨勭幇鏈夐�夐」
+ selectElement.innerHTML = "";
+
+ // 浠�1寮�濮嬪埌 pici 涓烘鐨勬暟锛屾坊鍔犲埌 <select> 鍏冪礌涓�
+ for (var i = 1; i <= parseInt(pici); i++) {
+ // 鍒涘缓涓�涓柊鐨� <option> 鍏冪礌
+ var option = document.createElement("option");
+
+ // 璁剧疆 <option> 鍏冪礌鐨� value 鍜� text 灞炴��
+ option.value = i;
+ option.text = i;
+
+ // 灏� <option> 鍏冪礌娣诲姞鍒� <select> 鍏冪礌涓�
+ selectElement.appendChild(option);
+ }
+ selectElement.value = pici;
+ GetInfopici();
+ mui("#MBA001")[0].focus();
+
+ }
+ },
+ error: function(xhr, type, errorThrown) {
+ alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown));
+ }
+ });
+}
//鍒ゆ柇搴撲綅
function GetStoreTAA() {
if (event.keyCode == 13) {
@@ -472,8 +521,11 @@
});
return;
} else {
-GetInfopici();
- mui.toast("姹囨�绘垚鍔�!");
+ refreshpdno();
+ var selectElement = document.getElementById("spici");
+ selectElement.value = parseInt(pici) - 1;
+ GetInfopici();
+ mui.toast("姹囨�绘垚鍔�!");
}
@@ -489,27 +541,41 @@
}
-function showdetail() {
+document.getElementById("huizongbt").addEventListener("click", function() {
console.log('133');
var element = document.getElementById("divdetail");
var element1 = document.getElementById("info");
- var element2 = document.getElementById("myTable2");
+
if (element.style.display === "none") {
- element.style.display = "block";
+ element.style.display = "";
} else {
element.style.display = "none";
}
if (element1.style.display === "none") {
- element1.style.display = "block";
+ element1.style.display = "";
} else {
element1.style.display = "none";
}
- if (element2.style.display === "none") {
- element2.style.display = "block";
+});
+
+function showdetail() {
+ console.log('133');
+ var element = document.getElementById("divdetail");
+ var element1 = document.getElementById("info");
+
+
+ if (element.style.display === "none") {
+ element.style.display = "";
} else {
- element2.style.display = "none";
+ element.style.display = "none";
}
+ if (element1.style.display === "none") {
+ element1.style.display = "";
+ } else {
+ element1.style.display = "none";
+ }
+
}
@@ -612,7 +678,7 @@
alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown));
}
});
- GetInfopici();
+ GetInfopici();
};
diff --git a/manifest.json b/manifest.json
index a8cf436..1a61191 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
"id" : "H546D0BA6", /*搴旂敤鐨勬爣璇�*/
"name" : "YKD_MES", /*搴旂敤鍚嶇О锛岀▼搴忔闈㈠浘鏍囧悕绉�*/
"version" : {
- "name" : "3.61", /*搴旂敤鐗堟湰鍚嶇О*/
+ "name" : "3.63", /*搴旂敤鐗堟湰鍚嶇О*/
"code" : "100"
},
"description" : "", /*搴旂敤鎻忚堪淇℃伅*/
diff --git a/pages/CangKuManage/GS_CKPDD.html b/pages/CangKuManage/GS_CKPDD.html
index 96c0b73..ab0367f 100644
--- a/pages/CangKuManage/GS_CKPDD.html
+++ b/pages/CangKuManage/GS_CKPDD.html
@@ -92,23 +92,7 @@
</tr>
</div>
- <div class="mui-content" id="contentId">
- <div class="mui-input-group">
- </div>
- <div class="mui-input-row">
- <ul class="mui-table-view">
- <li class="mui-table-view-cell mui-collapse mui-active">
- <a class="mui-navigate-right font" href="#" style="font-size: 20px; text-align: center;"
- onclick="showdetail()">姹囨�绘槑缁�</a>
-
- <div class="mui-collapse-content" id="collapseId">
-
- </div>
- </li>
-
- </ul>
- </div>
- </div>
+ <button style="width: 100%; margin: 0 auto; font-size: 18px;" onclick="showdetail()">灞曞紑/鏀惰捣姹囨�绘槑缁�</button>
<div class="mui-input-row" id="divdetail" style="display:none">
<div style="width:20%;float: left;">
<label style="width: 100%;float: left;">鎵规</label>
@@ -118,7 +102,7 @@
</select>
<button style="width: 60%;float: right;" class="confirm-button" onclick="huizong()">姹囨��</button>
</div>
-<textarea readonly="readonly" id='info' style="height:200px;display:none"></textarea>
+ <textarea readonly="readonly" id='info' style="display:none"></textarea>
<div id="txtInfo"><!--<div class="mui-input-row" style="height: 350px; margin-top: 10px;">-->
<div class="link-area" id="div001">
@@ -137,10 +121,11 @@
<table class="data-table" id="myTable" style="height:100% width: 100%;;">
<thead>
<tr>
- <th>鏉＄爜缂栧彿</th>
+ <th>鏉＄爜搴忓彿</th>
+ <th>鏉＄爜缂栫爜</th>
<!-- <th>鐗╂枡浠ｇ爜</th> -->
<th>鏉＄爜鏁伴噺</th>
- <th>浠撲綅</th>
+ <th>鐗╂枡缂栫爜</th>
<th>瀹炵洏鏁伴噺</th>
<th>瀹炵洏搴撲綅</th>
</tr>
diff --git a/unpackage/release/H546D0BA6.wgt b/unpackage/release/H546D0BA6.wgt
index 1de65d9..7e8a8f3 100644
--- a/unpackage/release/H546D0BA6.wgt
+++ b/unpackage/release/H546D0BA6.wgt
Binary files differ
--
Gitblit v1.9.3