From d9d78499cf3aaa6165bb1bc9fe3d8a9537e4d26a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 30 十月 2025 17:03:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/设备状态/Sb_EquipStatusChangeBill.html | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBill.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBill.html"
index ed9dc0e..154e64f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBill.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBill.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -57,6 +58,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>璁惧鐘舵�佸彉鏇村崟</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
@@ -251,6 +253,13 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "3916";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
var rowdata = [{
"HEquipID": 0, "璁惧": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQty": 0, "HStatusID_Old": 0, "鍘熺姸鎬�": "", "HRemark": "",
@@ -449,6 +458,7 @@
, limit: 500
, height: 500
, loading: false
+ , totalRow: true
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
@@ -456,7 +466,7 @@
, { field: '璁惧', title: '璁惧', edit: 'text', event: "HEquipID" }//f7
, { field: 'HUnitID', title: 'HUnitID ', width: 100, hide: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', edit: 'text', event: "HUnitID" }//f7
- , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text', totalRow: true}
, { field: 'HStatusID_Old', title: 'HStatusID_Old ', width: 100, hide: true }
, { field: '鍘熺姸鎬�', title: '鍘熺姸鎬�', edit: 'text', hide: true }//f7
, { field: 'HStatusID_New', title: 'HStatusID_New ', width: 100, hide: true }
@@ -478,7 +488,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -488,11 +498,24 @@
}
//鑾峰彇鏁版嵁
$("#HDeptID").val(checkStatus.data[0].HItemID);
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- , btn2: function (index, layero) { }
+ //, btn: ['纭畾', '鍙栨秷']
+ //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ // if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+ // //鑾峰彇鏁版嵁
+ // $("#HDeptID").val(checkStatus.data[0].HItemID);
+ // $("#HDeptName").val(checkStatus.data[0].HName);
+
+ // layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //}
+ //, btn2: function (index, layero) { }
})
}
@@ -536,7 +559,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_EquipFileBillMainList.html', 'yes']
+ , content: ['../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -548,8 +571,8 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "璁惧": checkStatus.data[0].HName
- , "HEquipID": checkStatus.data[0].HInterID
+ "璁惧": checkStatus.data[0].璁惧鍚嶇О
+ , "HEquipID": checkStatus.data[0].hmainid
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -566,7 +589,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -578,7 +601,7 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "璁￠噺鍗曚綅": checkStatus.data[0].HName
+ "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
, "HUnitID": checkStatus.data[0].HItemID
})
layer.close(index);//鍏抽棴寮圭獥
@@ -755,7 +778,12 @@
//#endregion
});
-
+ // 鍩虹璧勬枡杩斿洖鏁版嵁
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
</script>
</body>
--
Gitblit v1.9.1