From f0ca3d5128f801d1b3b18bf6a678da5868543cc0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 21 十一月 2024 11:05:47 +0800
Subject: [PATCH] 分步式调入单:增加 项目编码和项目名称; 字段 参考 直接调拨单; 分步式调出单:增加 项目编码和项目名称; 字段 参考 直接调拨单
---
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillEdit.html | 63 +++++++++++++++++++++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 4
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html | 64 +++++++++++++++++++++
3 files changed, 128 insertions(+), 3 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 314b311..297e68c 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -2275,7 +2275,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillEdit.html">
- <publishTime>11/21/2024 10:28:33</publishTime>
+ <publishTime>11/21/2024 11:04:52</publishTime>
</File>
<File Include="views/浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">
<publishTime>07/31/2024 13:38:19</publishTime>
@@ -7240,7 +7240,7 @@
<publishTime>09/14/2023 13:59:10</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillEdit.html">
- <publishTime>11/21/2024 10:30:46</publishTime>
+ <publishTime>11/21/2024 11:05:03</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">
<publishTime>09/13/2024 15:42:13</publishTime>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
index 5eb166e..e51d687 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
@@ -180,6 +180,22 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">椤圭洰浠g爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" value="" style="background-color: #efefef4d;float: left; width: 150px;" readonly>
+ <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjectID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">椤圭洰鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
@@ -469,7 +485,11 @@
form.on('submit(HKeeperList)', function () {
get_checkKeeper();
});
-
+ //#region 閫夋嫨椤圭洰浠g爜鎸夐挳
+ form.on('submit(btnSearchHProNumber)', function () {
+ get_checkSearchHProNumber();
+ });
+ //#endregion
//淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
@@ -908,6 +928,9 @@
, "HLinkMan": data[0].鑱旂郴浜�
, "HLinkPhone": data[0].鑱旂郴鐢佃瘽
, "HInnerBillNo": data[0].杈呭姪瀛楁
+ , "HProjectID": data[0]["HProjectID"]
+ , "HProNumber": data[0]["椤圭洰缂栫爜"]
+ , "HProName": data[0]["椤圭洰鍚嶇О"]
, "HRemark": data[0].琛ㄥご澶囨敞
, "HMaker": data[0].鍒跺崟浜�
, "HMakeDate": data[0].鍒跺崟鏃ユ湡
@@ -1768,6 +1791,45 @@
})
}
+ //#region 椤圭洰浠g爜閫夋嫨椤甸潰
+ function get_checkSearchHProNumber() {
+ var HOrgID = $("#HOrgID").val();
+ //鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ョ▼椤圭洰鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鍒ゆ柇椤圭洰鏄惁鍏抽棴
+ if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+ $("#HProjectID").val(checkStatus.data[0].HInterID);
+ $("#HProNumber").val(checkStatus.data[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
+ $("#HProName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
+ } else {
+ layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+ }
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
location.replace('Fb_StepFoldinBillEdit.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
index 1a10f09..3328538 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
@@ -171,6 +171,22 @@
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">椤圭洰浠g爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" value="" style="background-color: #efefef4d;float: left; width: 150px;" readonly>
+ <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjectID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">椤圭洰鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" readonly>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -472,6 +488,11 @@
form.on('submit(HKeeperList)', function () {
get_checkKeeper();
});
+ //#region 閫夋嫨椤圭洰浠g爜鎸夐挳
+ form.on('submit(btnSearchHProNumber)', function () {
+ get_checkSearchHProNumber();
+ });
+ //#endregion
//淇濆瓨鎸夐挳
@@ -906,6 +927,9 @@
, "HLinkMan": data[0].鑱旂郴浜�
, "HLinkPhone": data[0].鑱旂郴鐢佃瘽
, "HInnerBillNo": data[0].杈呭姪瀛楁
+ , "HProjectID": data[0]["HProjectID"]
+ , "HProNumber": data[0]["椤圭洰缂栫爜"]
+ , "HProName": data[0]["椤圭洰鍚嶇О"]
, "HRemark": data[0].琛ㄥご澶囨敞
, "HMaker": data[0].鍒跺崟浜�
, "HMakeDate": data[0].鍒跺崟鏃ユ湡
@@ -1600,6 +1624,45 @@
})
}
+ //#region 椤圭洰浠g爜閫夋嫨椤甸潰
+ function get_checkSearchHProNumber() {
+ var HOrgID = $("#HOrgID").val();
+ //鎵撳紑宸ョ▼椤圭洰灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ョ▼椤圭洰鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?openType=2&HOrgID=" + HOrgID, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鍒ゆ柇椤圭洰鏄惁鍏抽棴
+ if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+ $("#HProjectID").val(checkStatus.data[0].HInterID);
+ $("#HProNumber").val(checkStatus.data[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
+ $("#HProName").val(checkStatus.data[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
+ } else {
+ layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+ }
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
location.replace('Fb_StepFoldOutBillEdit.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
--
Gitblit v1.9.1