From c8989bdabacdf96c457a6e14a7437c8c6740fa79 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 08 十月 2024 01:19:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
WebTM/views/公共页面/Kf_SourceBillEditDlg_PDA.html | 12 +++++++++++-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f350f29..b49cf09 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,9 +8,9 @@
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
index d72f20d..1af7cc6 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
@@ -46,6 +46,14 @@
<input type="text" name="HMater" id="HMater" lay-verify="HMater" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏宠仈椤�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HCustom" id="HCustom" lay-verify="HCustom" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
<button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
<button type="button" lay-submit="" lay-filter="cmdOK" class="layui-btn" id="cmdOK">杩斿洖</button>
@@ -93,6 +101,7 @@
var HMaker = sessionStorage["HUserName"]
var HSourceBillNo = "";
var HMater = "";
+ var HCustom = "";
var listOption = [];
var columns = "";
var HModName = "Kf_SourceBillEditDlg_PDA";
@@ -186,6 +195,7 @@
form.on('submit(cmdQuery)', function () {
HSourceBillNo = $("#HSourceBillNo").val();
HMater = $("#HMater").val();
+ HCustom = $("#HCustom").val();
//鏄剧ず鐗╂枡鍒楄〃淇℃伅
DisBillEntryList();
});
@@ -223,7 +233,7 @@
type: "GET",
url: GetWEBURL() + '/WEBSController/GetSourceBillList_Json',
async: true, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HBillType": HBillType, "HSourceBillType": HSourceBillType, "HStockOrgID": HStockOrgID, "HSourceBillNo": HSourceBillNo, "HMater": HMater },
+ data: { "HBillType": HBillType, "HSourceBillType": HSourceBillType, "HStockOrgID": HStockOrgID, "HSourceBillNo": HSourceBillNo, "HMater": HMater, "HCustom": HCustom },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = [];
--
Gitblit v1.9.1