Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-10-08 c8989bdabacdf96c457a6e14a7437c8c6740fa79

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 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/";  //奥邦

 WebTM/views/¹«¹²Ò³Ãæ/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用于控制（false）同步和（true）异步，默认的是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 = [];