From e50265de5ae4e5e4c8b8852e777216adab7c4ce4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:13:06 +0800
Subject: [PATCH] 合并分支
---
WebTM/views/设备管理/Sb_EqpMaintenanceBill_PDA.html | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
index dd24b0a..d63e542 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBill_PDA.html"
@@ -238,6 +238,7 @@
<th>璁惧鍚嶇О</th>
<td class="bz_td">
<input type="text" name="HBarName" class="layui-input LineHeight" id="HBarName" style="border-radius: 50px;background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HNumber" id="HNumber" value="" autocomplete="off" class="layui-input">
<input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
</td>
</tr>
@@ -454,7 +455,7 @@
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../views/index_Mobile.html";
+ parent.location.href = "../../views/index_Mobile.html";
});
})
@@ -534,7 +535,7 @@
//#region 閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../views/index_Mobile.html";
+ parent.location.href = "../../views/index_Mobile.html";
});
})
//#endregion
@@ -690,6 +691,7 @@
//琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
form.on('submit(XDHList)', function () {
+ var hnumber = $("HNumber").val()
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -697,7 +699,7 @@
title: '璁惧缁翠慨鐧昏鍗�',
shift: 2,
area: ['90%', '90%'],
- content: ['../璁惧绠＄悊/Sb_EqpConkBookBillList.html', 'yes'],
+ content: ['../璁惧绠＄悊/Sb_EqpConkBookBillList.html?type=2&HNumber='+hnumber, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -708,6 +710,10 @@
$("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
$("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
+
+ $("#HEquipID").val(checkStatus.data[0].hmainid);
+ $("#HNumber").val(checkStatus.data[0].璁惧浠ｇ爜);
+ $("#HBarName").val(checkStatus.data[0].璁惧鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -870,7 +876,7 @@
if ($("#HManagerID").val() == 0) {
layer.msg("璐熻矗浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
-
+ }
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("娌℃湁璁惧鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -910,6 +916,7 @@
if (result.count == 1) {
var data = result.data[0];
$("#HEquipID").val(data.HInterID);
+ $("#HNumber").val(data.HEquipFileNumber);
$("#HBarName").val(data.HName);
$("#HBarSpec").val(data.HModel);
$("#HBarModel").val(data.HModel2);
@@ -925,6 +932,7 @@
HProcExchBillNoFlag = true;
layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
else {
$("#HBarCode").val("");
--
Gitblit v1.9.1