KAISHANLAYUI.git

parent: e3455a51 | 补丁 | 提交 | show whitespace

zgq

2021-08-05 e4fc4be3a162854c2acbd521c72bd1c8c7d39d01

扫码详情

1个文件已添加

3个文件已修改

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/Baseset/基础资料/WMSBarCodeDetailsList.html	166 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html	90 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -300,6 +300,7 @@
    <Content Include="views\Baseset\åºç¡èµæ\Gy_StockPlaceList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_SupplierList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_WarehouseList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\WMSBarCodeDetailsList.html" />
    <Content Include="views\component\anim\index.html" />
    <Content Include="views\component\auxiliar\index.html" />
    <Content Include="views\component\badge\index.html" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -1,9 +1,10 @@
ï»¿function GetWEBURL() {
    var WEBURL = "http://61.130.49.162:9090/WMSAPI//";  //å¼å±±å¤ç½
    //var WEBURL = "http://61.130.49.162:9090/WMSAPI//";  //å¼å±±å¤ç½
    //var WEBURL = "http://192.168.16.80:8011/";          //åå¬å®¤æå¡å¨
    //var WEBURL = "http://192.168.235.1:8011/";          //éèª
    //var WEBURL = "http://192.168.3.7:8011/";            //å®¶éæ çº¿
    //var WEBURL = "http://localhost:8086/API";
    var WEBURL = "http://localhost:8085/API/";   //zgqæ¬å°
    //61.130.49.162:9090
    //WEBURL = "";
    return WEBURL

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/WMSBarCodeDetailsList.html

New file
@@ -0,0 +1,166 @@
ï»¿<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <style type="text/css">
        .layui-form-label {
            width: 85px;
        }
    </style>
</head>
<body>

    <div id="layout1" class="layui-fluid">
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <div class="layui-card-body" style="padding: 15px;">
                        <form class="layui-form" action="" lay-filter="component-form-group">
                            <div class="layui-form-item">
                                <div class="layui-inline">
                                    <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>-->
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Exit">éåº</button>
                                </div>
                            </div>
                        </form>
                    </div>
                </div>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
    <script type="text/html" id="barDemo">
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">ç¼è¾</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
    </script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>

        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index' //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;

            //è·ååæ°
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            var params = getUrlVars();
            var HInterID = params[params[0]];
            var HBillType = params[params[1]];
            form.on('submit(FH)', function () {
                var checkStatus = table.checkStatus('ck-table')
                    , data = checkStatus.data;
                parent.GetHKeeperValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            form.on('submit(Exit)', function () {
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery(HInterID, HBillType);
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
                //, toolbar: '#toolbarDemo'
                , data: []
                //, cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
                , height: 'full-1000'
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', width: 150, title: 'HInterID', hide: true }//, hide: true
                    , { field: 'HBillType', width: 150, title: 'åæ®ç±»å' }
                    , { field: 'HMaterID', width: 150, title: 'HMaterID', hide: true }
                    , { field: 'HMaterNumber', width: 150, title: 'äº§åç¼ç ' }
                    , { field: 'HMaterName', width: 150, title: 'äº§ååç§°' }
                    , { field: 'HMaterModel', width: 150, title: 'è§æ ¼åå·' }
                    , { field: 'HQty', width: 150, title: 'æ°é' }
                    , { field: 'HQtyMust', width: 150, title: 'åºæ¶æ°é' }
                    , { field: 'HBatchNo', width: 150, title: 'æ¹æ¬¡' }
                    , { field: 'HPieceQty', width: 150, title: 'ä»¶æ°' }
                    , { fixed: 'right', width: 70, title: 'æä½', toolbar: '#barDemo' }
                ]]
                //, page: true
            });
            ///å è½½æ¾ç¤ºæ°æ®
            function RoadQuery(HInterID, HBillType) {
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetWMSBarCodeDetailsList",
                    async: true,
                    data: { "HInterID": HInterID, "HBillType": HBillType },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-1000'
                            , loading: false
                            , done: function (index, res) {

                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
                    }
                });
            };

            //è¡åäºä»¶
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event === 'del') {
                    layer.confirm('ççå é¤è¡ä¹', function (index) {
                        $.ajax({
                            url: GetWEBURL() + '/Web/DelCacheList',
                            type: "GET",
                            data: { "sHitemID": data.HitemID },
                            success: function (data) {
                                if (data.count == 1) {
                                    layer.close(index);
                                    obj.del(); //å é¤å¯¹åºè¡ï¼trï¼çDOMç»æ
                                    layer.msg('å é¤æå');
                                } else {
                                    layer.alert(data.code + data.msg, { icon: 5 });
                                }
                            }, error: function () {
                                layer.msg("æ¥å£è¯·æ±å¤±è´¥!", {
                                    icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't',
                                    skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º"
                                });
                            }
                        });
                    });
                }
            });
            //ä»¥ä¸ä¸ºlayuiæ¨¡å
        });
    </script>
</body>
</html>

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁÏ³ö¿â/Kf_MateOutBill_Fast.html

@@ -8,6 +8,18 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <style>
        /*.layui-table-body{
            height:auto;
        }*/
        .layui-table-fixed .layui-table-body {
            height: auto !important;
        }

        .layui-table-fixed.layui-hide {
            display: block !important;
        }
    </style>
</head>
<!--<style>
    @media screen and (max-width: 450px) {
@@ -32,6 +44,7 @@
        }
    }
</style>-->

<body>
    <div class="layui-fluid">
        <div class="layui-card" style="padding: 1px">
@@ -244,6 +257,9 @@
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script type="text/html" id="barDemo">
        <a class="layui-btn layui-btn-xs" lay-event="edit">ç¼è¾</a>
    </script>
    <script>
    layui.config({
        base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
@@ -334,6 +350,7 @@
                , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
                , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
                , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
                        , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                ]]
                // , data: [linterid]
                // , page: true
@@ -516,7 +533,7 @@
                               elem: '#wl-table' 
                               , url: GetWEBURL1() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
                               //, cellMinWidth: 80
                               , toolbar: '#toolbarDemo'
                                    //, toolbar: '#toolbarDemo'
                               , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
                               , cols: [[
                                  { type: 'radio' }
@@ -611,8 +628,7 @@
            if (sQty == "") {
                sQty = 0;
            }
            if (sHBillType == '-1')
            {
                if (sHBillType == '-1') {
                sSourceBillNo=''
            }
            if (event.keyCode == 13) {
@@ -702,7 +718,7 @@
                            table.render({
                                elem: '#wl-table' 
                          , url: GetWEBURL1() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
                          , toolbar: '#toolbarDemo'
                                    //, toolbar: '#toolbarDemo'
                          , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
                          , cols: [[
                              { type: 'radio' }
@@ -716,6 +732,7 @@
                            , { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
                            , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
                            , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
                                        , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                          ]]
                                // , data: [linterid]
                                // , page: true
@@ -754,7 +771,7 @@
                                elem: '#wl-table' 
                                , url: GetWEBURL1() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
                                //, cellMinWidth: 80
                              , toolbar: '#toolbarDemo'
                                    //, toolbar: '#toolbarDemo'
                              , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
                              , cols: [[
                                  { type: 'radio' }
@@ -768,6 +785,7 @@
                                , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
                                , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
                                , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
                                        , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                              ]]
                                // , data: [linterid]
                                // , page: true
@@ -802,6 +820,56 @@
         , done: function () {
         }
        });


            //æµè¯æ°æ®begin
            var rowdata = [{
                "HSNO": "1", "HQty": "2", "HQtyMust": "3", "HMaterName": "4", "HMaterNumber": "5"
                , "HMaterModel": "6"
                , "HSourceInterID": "367", "HSourceEntryID": "7", "HSourceBillNo": "8", "HBatchNo": "9"
            }];
            var option = {
                elem: '#wl-table'
                , height: 'full-1000'
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HSNO', title: 'åºå·', width: 60 }
                    , { field: 'HQty', title: 'æ°é', width: 80 }
                    , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
                    , { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
                    , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
                    , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
                    , { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
                    , { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
                    , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
                ]]
                //, page: true
            };
            option.data = rowdata;
            table.render(option);
            //æµè¯æ°æ®end

            //è¡åäºä»¶
            table.on('tool(wl-table)', function (obj) {
                var data = obj.data;
                console.log(data.æºåä¸»åç );
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'edit') {
                    var _obj = obj;
                    layer.open({
                        type: 2
                        , area: ['90%', '90%']
                        , title: 'æ«ç è¯¦æåè¡¨'
                        , content: ['../../../views/Baseset/åºç¡èµæ/WMSBarCodeDetailsList.html?HInterID=' + data.HSourceInterID + '&HBillType=3789', 'yes']
                        , end: function () {

                        }
                    })
                }
            });

    });
    function GetHWHValue(obj)  //è¿åä»åº
    {
@@ -863,8 +931,7 @@
            layer.msg("éè¯¯çåç !", { icon: 5 });
            return false;
        }
        if(sSubStr=='')
        {
            if (sSubStr == '') {
            layer.msg("æ²¡æç©ææç»è®°å½!", { icon: 5 });
            return false;
        }
@@ -872,8 +939,7 @@
        if (sSubStr != '') {
            for (var i = 0; i <= sSubStr.length - 1; i++) {  //å¤ææ«ç æ°éä¸è½å¤§äºåºæ¶æ°é
                if (parseFloat(sSubStr[i].HQtyMust) > 0) {
                    if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
                    {
                        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
                        layer.msg("æ°éä¸è½å¤§äºåºåæ°éï¼", { icon: 5 });
                        return false;
                    }
@@ -884,14 +950,12 @@
                    s = 1;
                }
            }
            if (s == 0)
            {
                if (s == 0) {
                layer.msg("çäº§é¢æåºåºè®°å½æªæ«ç ï¼", { icon: 5 });
                return false;
            }
        }
        else
        {
            else {
            return true;
        }
    }

			@@ -300,6 +300,7 @@
			<Content Include="views\Baseset\åºç¡èµæ\Gy_StockPlaceList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_SupplierList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_WarehouseList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\WMSBarCodeDetailsList.html" />
			<Content Include="views\component\anim\index.html" />
			<Content Include="views\component\auxiliar\index.html" />
			<Content Include="views\component\badge\index.html" />

			@@ -1,9 +1,10 @@
			ï»¿function GetWEBURL() {
			var WEBURL = "http://61.130.49.162:9090/WMSAPI//"; //å¼å±±å¤ç½
			//var WEBURL = "http://61.130.49.162:9090/WMSAPI//"; //å¼å±±å¤ç½
			//var WEBURL = "http://192.168.16.80:8011/"; //åå¬å®¤æå¡å¨
			//var WEBURL = "http://192.168.235.1:8011/"; //éèª
			//var WEBURL = "http://192.168.3.7:8011/"; //å®¶éæ çº¿
			//var WEBURL = "http://localhost:8086/API";
			var WEBURL = "http://localhost:8085/API/"; //zgqæ¬å°
			//61.130.49.162:9090
			//WEBURL = "";
			return WEBURL

New file
			@@ -0,0 +1,166 @@
			ï»¿<!DOCTYPE html>
			<html>
			<head>
			<meta charset="utf-8" />
			<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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<style type="text/css">
			.layui-form-label {
			width: 85px;
			}
			</style>
			</head>
			<body>

			<div id="layout1" class="layui-fluid">
			<div class="layui-row layui-col-space15">
			<div class="layui-col-md12">
			<div class="layui-card">
			<div class="layui-card-body" style="padding: 15px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-form-item">
			<div class="layui-inline">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>-->
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Exit">éåº</button>
			</div>
			</div>
			</form>
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="barDemo">
			<!--<a class="layui-btn layui-btn-xs" lay-event="edit">ç¼è¾</a>-->
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</script>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script>

			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, laydate = layui.laydate
			, element = layui.element;

			//è·ååæ°
			function getUrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			for (var i = 0; i < hashes.length; i++) {
			hash = hashes[i].split('=');
			vars.push(hash[0]);
			vars[hash[0]] = hash[1];
			}
			return vars;
			}
			var params = getUrlVars();
			var HInterID = params[params[0]];
			var HBillType = params[params[1]];
			form.on('submit(FH)', function () {
			var checkStatus = table.checkStatus('ck-table')
			, data = checkStatus.data;
			parent.GetHKeeperValue(data);
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			});
			form.on('submit(Exit)', function () {
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			});
			RoadQuery(HInterID, HBillType);
			table.render({
			elem: '#mainTable'
			// , url: '/demo/table/user/'
			//, toolbar: '#toolbarDemo'
			, data: []
			//, cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
			, height: 'full-1000'
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', width: 150, title: 'HInterID', hide: true }//, hide: true
			, { field: 'HBillType', width: 150, title: 'åæ®ç±»å' }
			, { field: 'HMaterID', width: 150, title: 'HMaterID', hide: true }
			, { field: 'HMaterNumber', width: 150, title: 'äº§åç¼ç ' }
			, { field: 'HMaterName', width: 150, title: 'äº§ååç§°' }
			, { field: 'HMaterModel', width: 150, title: 'è§æ ¼åå·' }
			, { field: 'HQty', width: 150, title: 'æ°é' }
			, { field: 'HQtyMust', width: 150, title: 'åºæ¶æ°é' }
			, { field: 'HBatchNo', width: 150, title: 'æ¹æ¬¡' }
			, { field: 'HPieceQty', width: 150, title: 'ä»¶æ°' }
			, { fixed: 'right', width: 70, title: 'æä½', toolbar: '#barDemo' }
			]]
			//, page: true
			});
			///å è½½æ¾ç¤ºæ°æ®
			function RoadQuery(HInterID, HBillType) {
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetWMSBarCodeDetailsList",
			async: true,
			data: { "HInterID": HInterID, "HBillType": HBillType },
			success: function (result) {
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-1000'
			, loading: false
			, done: function (index, res) {

			}
			});
			},
			error: function (result) {
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}
			});
			};

			//è¡åäºä»¶
			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡ä¹', function (index) {
			$.ajax({
			url: GetWEBURL() + '/Web/DelCacheList',
			type: "GET",
			data: { "sHitemID": data.HitemID },
			success: function (data) {
			if (data.count == 1) {
			layer.close(index);
			obj.del(); //å é¤å¯¹åºè¡ï¼trï¼çDOMç»æ
			layer.msg('å é¤æå');
			} else {
			layer.alert(data.code + data.msg, { icon: 5 });
			}
			}, error: function () {
			layer.msg("æ¥å£è¯·æ±å¤±è´¥!", {
			icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't',
			skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º"
			});
			}
			});
			});
			}
			});
			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});
			</script>
			</body>
			</html>

			@@ -8,6 +8,18 @@
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<style>
			/*.layui-table-body{
			height:auto;
			}*/
			.layui-table-fixed .layui-table-body {
			height: auto !important;
			}

			.layui-table-fixed.layui-hide {
			display: block !important;
			}
			</style>
			</head>
			<!--<style>
			@media screen and (max-width: 450px) {
			@@ -32,6 +44,7 @@
			}
			}
			</style>-->

			<body>
			<div class="layui-fluid">
			<div class="layui-card" style="padding: 1px">
			@@ -244,6 +257,9 @@
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script type="text/html" id="barDemo">
			<a class="layui-btn layui-btn-xs" lay-event="edit">ç¼è¾</a>
			</script>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -334,6 +350,7 @@
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			// , data: [linterid]
			// , page: true
			@@ -516,7 +533,7 @@
			elem: '#wl-table'
			, url: GetWEBURL1() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
			//, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			//, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			@@ -611,8 +628,7 @@
			if (sQty == "") {
			sQty = 0;
			}
			if (sHBillType == '-1')
			{
			if (sHBillType == '-1') {
			sSourceBillNo=''
			}
			if (event.keyCode == 13) {
			@@ -702,7 +718,7 @@
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL1() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
			, toolbar: '#toolbarDemo'
			//, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			@@ -716,6 +732,7 @@
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			// , data: [linterid]
			// , page: true
			@@ -754,7 +771,7 @@
			elem: '#wl-table'
			, url: GetWEBURL1() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
			//, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			//, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			@@ -768,6 +785,7 @@
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			// , data: [linterid]
			// , page: true
			@@ -802,6 +820,56 @@
			, done: function () {
			}
			});


			//æµè¯æ°æ®begin
			var rowdata = [{
			"HSNO": "1", "HQty": "2", "HQtyMust": "3", "HMaterName": "4", "HMaterNumber": "5"
			, "HMaterModel": "6"
			, "HSourceInterID": "367", "HSourceEntryID": "7", "HSourceBillNo": "8", "HBatchNo": "9"
			}];
			var option = {
			elem: '#wl-table'
			, height: 'full-1000'
			, cols: [[
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 90 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 90 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 90 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 90 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 90 }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			//, page: true
			};
			option.data = rowdata;
			table.render(option);
			//æµè¯æ°æ®end

			//è¡åäºä»¶
			table.on('tool(wl-table)', function (obj) {
			var data = obj.data;
			console.log(data.æºåä¸»åç );
			var rowIndex = $(obj.tr).attr("data-index");
			if (obj.event === 'edit') {
			var _obj = obj;
			layer.open({
			type: 2
			, area: ['90%', '90%']
			, title: 'æ«ç è¯¦æåè¡¨'
			, content: ['../../../views/Baseset/åºç¡èµæ/WMSBarCodeDetailsList.html?HInterID=' + data.HSourceInterID + '&HBillType=3789', 'yes']
			, end: function () {

			}
			})
			}
			});

			});
			function GetHWHValue(obj) //è¿åä»åº
			{
			@@ -863,8 +931,7 @@
			layer.msg("éè¯¯çåç !", { icon: 5 });
			return false;
			}
			if(sSubStr=='')
			{
			if (sSubStr == '') {
			layer.msg("æ²¡æç©ææç»è®°å½!", { icon: 5 });
			return false;
			}
			@@ -872,8 +939,7 @@
			if (sSubStr != '') {
			for (var i = 0; i <= sSubStr.length - 1; i++) { //å¤ææ«ç æ°éä¸è½å¤§äºåºæ¶æ°é
			if (parseFloat(sSubStr[i].HQtyMust) > 0) {
			if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
			{
			if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
			layer.msg("æ°éä¸è½å¤§äºåºåæ°éï¼", { icon: 5 });
			return false;
			}
			@@ -884,14 +950,12 @@
			s = 1;
			}
			}
			if (s == 0)
			{
			if (s == 0) {
			layer.msg("çäº§é¢æåºåºè®°å½æªæ«ç ï¼", { icon: 5 });
			return false;
			}
			}
			else
			{
			else {
			return true;
			}
			}