From a54118da6fd23eb5b8b433ce748290cda562f5ca Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 21 一月 2023 12:12:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html | 35 +++++++++++------
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 8 ++--
WebTM/views/车间管理/工序出站汇报单/Sc_StationOutBill_Mul_RYQ.html | 28 +++++++++++++
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 7 ++-
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 2
5 files changed, 60 insertions(+), 20 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index e7090f0..fe593e6 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -324,8 +324,11 @@
option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
table.render(option);
table.render(option1);
- $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
- $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
+ if (BYData.length != 0) {
+ $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
+ $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
+ }
+
if (BYData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
buttonArr = [];//娓呯┖鏁扮粍
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index caecd22..e3cf196 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -927,7 +927,7 @@
$("#HLogo").val(d.data[0].鍝佺墝);
$("#HSourceID").val(d.data[0].HSourceID);
$("#HSourceName").val(d.data[0].HSourceName);
-
+ form.render("select");
}
});
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index b5ff7bc..a5c0b44 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -495,6 +495,7 @@
"HMoney": data.HMoney,
"HWasterQty": data.HWasterQty,
"HInnerBillNo": data.HInnerBillNo,
+ "HSendBillNo": data.HInnerBillNo,
"HWWWorkOrderBillNo": data.HWWWorkOrderBillNo,
"HRemark": data.HRemark,
"HPieceQty": data.HPieceQty,
@@ -665,6 +666,7 @@
$.ajax({
url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
type: "GET",
+ async: false,
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) {
@@ -973,20 +975,29 @@
//閫夋嫨渚涘簲鍟�
form.on('submit(HSupID-BT)', function () {
- var HStockInOrgID = sessionStorage["OrganizationID"];
layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '渚涘簲鍟嗗垪琛�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html?HOrgID=' + HStockInOrgID + '', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '渚涘簲鍟嗗垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../../views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ $("#HSupID").val(checkStatus.data[0].HItemID);
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+ layer.close(layer.index);
}
- })
+ });
});
//閫夋嫨鎿嶄綔鍛�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_RYQ.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_RYQ.html"
index fd70d62..b6d126d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_RYQ.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Sc_StationOutBill_Mul_RYQ.html"
@@ -854,37 +854,55 @@
var HEmpName7 = $("#HEmpName7").val();
var HEmpName8 = $("#HEmpName8").val();
+ var HEmpNumber1 = $("#HEmpNumber1").val();
+ var HEmpNumber2 = $("#HEmpNumber2").val();
+ var HEmpNumber3 = $("#HEmpNumber3").val();
+ var HEmpNumber4 = $("#HEmpNumber4").val();
+ var HEmpNumber5 = $("#HEmpNumber5").val();
+ var HEmpNumber6 = $("#HEmpNumber6").val();
+ var HEmpNumber7 = $("#HEmpNumber7").val();
+ var HEmpNumber8 = $("#HEmpNumber8").val();
+
var HMaker = "";
+ var HEmpNum = "";
if (HEmpName1 != "")
{
HMaker = HMaker + "," + HEmpName1;
+ HEmpNum = HEmpNum + "," + HEmpNumber1;
}
if (HEmpName2 != "") {
HMaker = HMaker + "," + HEmpName2;
+ HEmpNum = HEmpNum + "," + HEmpNumber2;
}
if (HEmpName3 != "") {
HMaker = HMaker + "," + HEmpName3;
+ HEmpNum = HEmpNum + "," + HEmpNumber3;
}
if (HEmpName4 != "") {
HMaker = HMaker + "," + HEmpName4;
+ HEmpNum = HEmpNum + "," + HEmpNumber4;
}
if (HEmpName5 != "") {
HMaker = HMaker + "," + HEmpName5;
+ HEmpNum = HEmpNum + "," + HEmpNumber5;
}
if (HEmpName6 != "") {
HMaker = HMaker + "," + HEmpName6;
+ HEmpNum = HEmpNum + "," + HEmpNumber6;
}
if (HEmpName7 != "") {
HMaker = HMaker + "," + HEmpName7;
+ HEmpNum = HEmpNum + "," + HEmpNumber7;
}
if (HEmpName8 != "") {
HMaker = HMaker + "," + HEmpName8;
+ HEmpNum = HEmpNum + "," + HEmpNumber8;
}
var HBillNo = $("#HMainBillNo").val();
//sSubStr = table.cache["mainTable1"];
var sSubStr = JSON.stringify(num);
- var sSubStr = sSubStr + ';' + HBillNo + ';' + HMaker;
+ var sSubStr = sSubStr + ';' + HBillNo + ';' + HMaker + ';' + HEmpNum;
$.ajax({
type: "POST",
url: GetWEBURL() + "/Cj_StationOutBill/AddBill_Mul",
@@ -1238,34 +1256,42 @@
function GetHWorkerValue(obj) {
$("#HEmpName1").val(obj[0].HName);
$("#HEmpID1").val(obj[0].HItemID);
+ $("#HEmpNumber1").val(obj[0].HNumber);
}
function GetHWorkerValue2(obj) {
$("#HEmpName2").val(obj[0].HName);
$("#HEmpID2").val(obj[0].HItemID);
+ $("#HEmpNumber2").val(obj[0].HNumber);
}
function GetHWorkerValue3(obj) {
$("#HEmpName3").val(obj[0].HName);
$("#HEmpID3").val(obj[0].HItemID);
+ $("#HEmpNumber3").val(obj[0].HNumber);
}
function GetHWorkerValue4(obj) {
$("#HEmpName4").val(obj[0].HName);
$("#HEmpID4").val(obj[0].HItemID);
+ $("#HEmpNumber4").val(obj[0].HNumber);
}
function GetHWorkerValue5(obj) {
$("#HEmpName5").val(obj[0].HName);
$("#HEmpID5").val(obj[0].HItemID);
+ $("#HEmpNumber5").val(obj[0].HNumber);
}
function GetHWorkerValue6(obj) {
$("#HEmpName6").val(obj[0].HName);
$("#HEmpID6").val(obj[0].HItemID);
+ $("#HEmpNumber6").val(obj[0].HNumber);
}
function GetHWorkerValue7(obj) {
$("#HEmpName7").val(obj[0].HName);
$("#HEmpID7").val(obj[0].HItemID);
+ $("#HEmpNumber7").val(obj[0].HNumber);
}
function GetHWorkerValue8(obj) {
$("#HEmpName8").val(obj[0].HName);
$("#HEmpID8").val(obj[0].HItemID);
+ $("#HEmpNumber8").val(obj[0].HNumber);
}
</script>
</body>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 66158e5..2621a6f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -1054,7 +1054,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes'],
+ content: ['../../../../views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1064,9 +1064,9 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
obj.update({
- HSupName: checkStatus.data[0].HName
+ HSupName: checkStatus.data[0].渚涘簲鍟嗗悕绉�
, HSupID: checkStatus.data[0].HItemID
- , HSupNumber: checkStatus.data[0].HNumber
+ , HSupNumber: checkStatus.data[0].渚涘簲鍟嗕唬鐮�
});
layer.close(layer.index);
}
@@ -1081,7 +1081,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '渚涘簲鍟嗗垪琛�',
+ title: '閮ㄩ棬鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['90%', '90%'],
--
Gitblit v1.9.1