From 3f4ff859a1ee8eee43b1b8e554e686679fbaad61 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 16 二月 2022 11:11:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 37 ++++++--
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 174 ++++++++++++++++++++++++++++++++++++------
2 files changed, 173 insertions(+), 38 deletions(-)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
index 03e2e7b..77f93af 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>濮斿鍑哄簱</title>
+ <title>濮斿(棰嗘枡)鍑哄簱</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -33,7 +33,7 @@
<li lay-id="1" style="padding:1px;" class="layui-this">婧愬崟淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
<li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
- <!--<li lay-id="4" style="padding:1px;">鏄庣粏娓呭崟</li>-->
+ <li lay-id="4" style="padding:1px;">鏄庣粏娓呭崟</li>
<li lay-id="5" style="padding:1px;">鏃ュ織</li>
</ul>
<div class="layui-tab-content">
@@ -60,6 +60,7 @@
</div>
</div>
</div>
+
<!--鍗曟嵁淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item" style="padding:0px;margin:0px">
@@ -158,6 +159,7 @@
</div>
</div>
</div>
+
<!--鐗╂枡娓呭崟-->
<div class="layui-tab-item">
<div class="layui-form-item" style="padding:0px;margin:0px">
@@ -172,10 +174,102 @@
</div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
+
<!--鏄庣粏娓呭崟-->
- <!--<div class="layui-tab-item">
- <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
- </div>-->
+ <div class="layui-tab-item">
+ <!-- <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>-->
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode_B" id="HBarCode_B" lay-verify="HBarCode_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鐗╂枡</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HMaterName_B" id="HMaterName_B" lay-verify="HMaterName_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">瑙勬牸</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HMaterModel_B" id="HMaterModel_B" lay-verify="HMaterModel_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鎵规</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBatchNo_B" id="HBatchNo_B" lay-verify="HBatchNo_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鍗曚綅</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HUnitName_B" id="HUnitName_B" lay-verify="HUnitName_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty_B" id="HQty_B" lay-verify="HQty_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">瀹归噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HTMQty_B" id="HTMQty_B" lay-verify="HTMQty_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">浠撳簱</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HWHName_B" id="HWHName_B" lay-verify="HWHName_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HSPName_B" id="HSPName_B" lay-verify="HSPName_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ </div>
+
<!--鏃ュ織-->
<div class="layui-tab-item">
<textarea id="rizhi" style="height: 200px;width: 100%;margin-left: 1%;"></textarea>
@@ -669,28 +763,54 @@
$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮侊紝鎴愬姛\n");
element.tabChange('tab-EntrustOutBill', '3'); //璺宠浆椤电
layer.load(3)
- table.render({
- elem: '#wl-table'
- , url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
- , toolbar: '#toolbarDemo'
- , where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
+ table.render({
+ elem: '#wl-table'
+ , url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
+ , toolbar: '#toolbarDemo'
+ , where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ });
+
+ //鏄庣粏娓呭崟
+ $.ajax({
+ url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillType: '1211', sWhere: '' },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ $("#HBarCode_B").val(result.data.list1[0].HBarCode);
+ $("#HMaterName_B").val(result.data.list1[0].HMaterName);
+ $("#HMaterModel_B").val(result.data.list1[0].HMaterModel);
+ $("#HBatchNo_B").val(result.data.list1[0].HBatchNo);
+ $("#HUnitName_B").val(result.data.list1[0].HUnitName);
+ $("#HQty_B").val(result.data.list1[0].HQty);
+ $("#HTMQty_B").val(result.data.list1[0].HTMQty);
+ $("#HWHName_B").val(result.data.list1[0].HWHName);
+ $("#HSPName_B").val(result.data.list1[0].HSPName);
+ }
+ else {
+ layer.msg(result.Message);
+ }
+ layer.closeAll("loading");
+ }
});
}
else {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 2558ed6..3330d1d 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -38,6 +38,7 @@
<li lay-id="6" style="padding:1px;min-width: 35px;">鍚堣</li>
</ul>
<div class="layui-tab-content">
+ <!--婧愬崟淇℃伅-->
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-row">
@@ -101,6 +102,8 @@
</div>
</div>
</div>
+
+ <!--鍗曟嵁淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
@@ -198,6 +201,8 @@
</div>
</div>
</div>
+
+ <!--鐗╂枡娓呭崟-->
<div class="layui-tab-item">
<!--<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
@@ -221,6 +226,8 @@
</div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
+
+ <!--鏄庣粏娓呭崟-->
<div class="layui-tab-item">
<!-- <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>-->
<div class="layui-form-item" style="padding: 0px; margin: 0px">
@@ -314,9 +321,12 @@
</div>
</div>
</div>
+
+ <!--搴撳瓨-->
<div class="layui-tab-item">
<table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
</div>
+
</div>
<!--<div class="layui-form-item" style="margin-bottom: 20px;">
<div class="layui-row">
@@ -494,7 +504,8 @@
RoadBillSub(linterid);
}
- form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
+ //閫夋嫨浠撳簱
+ form.on('submit(HWHID-BT)', function () {
layer.open({
type: 2
, area: ['100%', '100%']
@@ -509,7 +520,8 @@
}
})
});
- form.on('submit(HFIFOWHID-BT)', function () {//閫夋嫨浠撳簱
+ //閫夋嫨浠撳簱
+ form.on('submit(HFIFOWHID-BT)', function () {
layer.open({
type: 2
, area: ['100%', '100%']
@@ -524,7 +536,8 @@
}
})
});
- form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
+ //閫夋嫨浠撲綅
+ form.on('submit(HSpID-BT)', function () {
layer.open({
type: 2
, area: ['100%', '100%']
@@ -539,7 +552,8 @@
}
})
});
- form.on('submit(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
+ //閫夋嫨渚涘簲鍟�
+ form.on('submit(HSupID-BT)', function () {
layer.open({
type: 2
, area: ['100%', '100%']
@@ -554,7 +568,6 @@
}
})
});
-
//form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
// layer.open({
@@ -588,7 +601,8 @@
// })
//});
- form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+ //閫夋嫨淇濈
+ form.on('submit(HKeeperID-BT)', function () {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -610,7 +624,8 @@
, btn2: function (index, layero) { }
})
});
- form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨鍙戣揣
+ //閫夋嫨鍙戣揣
+ form.on('submit(HSecManagerID-BT)', function (data) {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -633,9 +648,8 @@
})
});
-
-
- form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
+ //閫夋嫨閮ㄩ棬
+ form.on('submit(HDeptID-BT)', function () {
layer.open({
type: 2
, area: ['100%', '100%']
@@ -883,7 +897,7 @@
data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
- playSound1();
+
if (result.data.HBarType == '浠撳簱鏉＄爜') {
$("#HWHNAME").val(result.data.HWhName);
$("#HWHID").val(result.data.HWhID);
@@ -946,6 +960,7 @@
element.tabChange('tab-Kf_MateOutBill', '3');
}
}
+
//$("#HSupID").val(result.data.HSupID);
//$("#HSupName").val(result.data.HSupName);
//$("#HDeptID").val(result.data.HDeptID);
--
Gitblit v1.9.1