MES-WEB-LayUI.git

parent: 050cdc4b | 补丁 | 提交 | ignore whitespace

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

yangle

2023-06-25 b28ec87ae7e456800eae3a4891bed886972085a8

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

1个文件已添加

7个文件已修改

	WebTM/Properties/PublishProfiles/JFTM.pubxml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	2773 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产管理/删托单/Sc_DeletePackUnionBill_PDA.html	329 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index_Mobile.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/user/login.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/Properties/PublishProfiles/JFTM.pubxml

@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\ç½ç«åå¸\æºäºMESWMS\LAYUI</PublishUrl>
    <PublishUrl>E:\ç½ç«åå¸\LAYUI</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -193,6 +193,7 @@
    <Content Include="views\video\1.wav" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\video\success.wav" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§ç®¡ç\å æå\Sc_DeletePackUnionBill_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§ç®¡ç\çäº§ç»æå\Sc_PackUnionBillList_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§ç®¡ç\çäº§ç»æå\Sc_PackUnionBill_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\è°æ¨æ¢æ\Kf_MoveStockBill_HuanTuo_PDA.html" />

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
ï»¿<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\GITä»åº\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,11 +3,11 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //åå¬å®¤æå¡å¨
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //chæ¬å°*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost/API/";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost/API/";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost/WEBAPI/";   //é¢å®¶å°å¼æºæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/lubao";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/API/";    //æè´ºæ¬å°éç½®
    var WEBURL = "http://localhost:8082/API/";    //æè´ºæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ä½ææ°æ¬å°éç½®
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW
    //var WEBURL = "http://47.96.97.237/API/";   //æºäºæå¡å¨

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²ú¹ÜÀí/É¾ÍÐµ¥/Sc_DeletePackUnionBill_PDA.html

New file
@@ -0,0 +1,329 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; 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, maximum-scale=1">
    <!--å¼ç¨layuiæ ·å¼æä»¶-->
    <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
    <!--å¼ç¨layui jsæä»¶-->
    <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>
    <style>
        .layui-col-xs4 {
            width: 12.333333%
        }

        .layui-col-xs8 {
            width: 55.666667%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0px">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>å æå</span>
                    </div>
                    <div class="layui-form-item" style="padding:10px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:50px;padding-left:0px;">ææ¡ç </label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" lay-verify="HBarCode_Pack" autocomplete="off" class="layui-input">
                            </div>
                            <div class="layui-col-xs2">
                                <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBarCode_Pack" id="cmdHBarCode_Pack">ç¡®å®</button>
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-Sc_DeletePackUnionBill_PDA">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1">æ¡ç ä¿¡æ¯</li>
                            <li lay-id="2">åæ®ä¿¡æ¯</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--æ¡ç ä¿¡æ¯-->
                            <div class="layui-tab-item">
                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                            </div>
                            <!--åæ®ä¿¡æ¯-->
                            <div class="layui-tab-item">
                                <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-xs8 layui-input-inline mobile">
                                        <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
                                    </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-xs8 layui-input-inline mobile">
                                        <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">åæ®ID</label>
                                    </div>
                                    <div class="layui-col-xs8 layui-input-inline mobile">
                                        <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>
                            <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdLoadData" id="cmdLoadData">æäº¤</button>
                                    </div>
                                    <div class="layui-col-xs3">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">éåº</button>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <div id="" style="display:none;">
                        <audio id="cs1" hidden controls>
                            <source src="../../../video/jingbao.wav" type="audio/ogg">
                        </audio>
                    </div>
                    <div id="" style="display:none;">
                        <audio id="cs2" hidden controls>
                            <source src="../../../video/success.wav" type="audio/ogg">
                        </audio>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index' //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {

            //#region å¬å±åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
            var HInterID = $('#HInterID').val()
            var HBillNo = $('#HBillNo').val()
            var HBillType = '3783'
            var HMaker = sessionStorage["HUserName"]
            var HStockOrgID = sessionStorage["OrganizationID"]
            var option = [];

            //#endregion

            //å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
            if (sessionStorage.login != "login") {
                layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
                    icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
                }, function () { window.location.href = "../../../user/login.html"; });
            }

            //#region åå§åçé¢

            set_ClearBill();

            function set_ClearBill() {
                $("#HMaker").val(HMaker);
                $("#HMaker").attr("readonly", "readonly");
                $("#HBillNo").attr("readonly", "readonly");
                $("#HInterID").attr("readonly", "readonly");
                element.tabChange('tab-Sc_DeletePackUnionBill_PDA', '1');
                var pFocus = $("#HBarCode_Pack");
                pFocus.focus();     //è·ååæ 
                pFocus.select();
                set_InitGrid();     //åå§åè¡¨æ ¼
            }

            //#region åå§åè¡¨æ ¼æ¹æ³
            function set_InitGrid() {
                option = {
                    elem: '#wl-table'
                    , height: 'full-50'
                    //, page: true
                    , cellMinWidth: 90
                    , limit: 50
                    //, limits: [50, 500, 5000, 20000]
                };
            }

            //#endregion

            //å¤±è´¥æç¤ºé³
            function playSound() {
                console.log("playSound");
                var audio = document.getElementById("cs1");
                audio.play();
            }
            //æåæç¤ºé³
            function playSound_OK() {
                console.log("playSound_OK");
                var audio = document.getElementById("cs2");
                audio.play();
            }

            //#endregion


            //#region æ«æææ¡ç 

            //æåè½¦é®è¿åä¿¡æ¯
            $('#HBarCode_Pack').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    GetMeesageByBarCode_Pack();
                }
            });

            //ç¹å»æé®è¿åä¿¡æ¯
            form.on('submit(cmdHBarCode_Pack)', function (data) {
                GetMeesageByBarCode_Pack();
            });

            //æ«æææ¡ç 
            function GetMeesageByBarCode_Pack(obj) {
                HBarCode_Pack = $('#HBarCode_Pack').val()

                if (HBarCode_Pack == '') {
                    playSound();
                    layer.msg("ææ¡ç ä¸è½ä¸ºç©ºï¼è¯·æ«æææ¡ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return false;
                }

                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/Get_PackBarCode_DeletePackUnionBill_Json",
                    data: { "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
                    success: function (result) {
                        var col = [];
                        if (result.count == 1) {
                            playSound_OK();
                            $("#HInterID").val(result.data[0].HInterID);
                            $("#HBillNo").val(result.data[0].HBillNo);
                            $("#HBarCode_Pack").val(result.data[0].HBarCode_Pack);
                            $("#HBarCode_Pack").attr("readonly", "readonly");
                            document.getElementById("cmdHBarCode_Pack").disabled = true;   //æé®åä¸ºä¸å¯ç¼è¾ç¶æ
                            //å¨å±åéèµå¼
                            HInterID = $('#HInterID').val()
                            HBillNo = $('#HBillNo').val()
                            element.tabChange('tab-Sc_DeletePackUnionBill_PDA', '1');
                            //æ¾ç¤ºè¡¨ä½æç»
                            var data = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in result.list) {
                                data.push({ "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
                            }
                            //å¤ææ¯å¦æ¯çº¯è±æ
                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
                            col.push({ type: 'radio' });
                            for (var i = 0; i < data.length; i++) {
                                if (!patrn.test(data[i].name)) {
                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //éèå
                                }
                                else {
                                    switch (data[i].Type) {
                                        case 'DateTime':
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
                                    }
                                }
                            }
                            option.cols = [col];
                            option.data = result.data;
                            table.render(option);
                            layer.load(3);
                        }
                        else {
                            playSound();
                            layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
                            $('#HBarCode_Pack').val("");
                            $("#HBarCode_Pack").select();
                            $("#HBarCode_Pack").focus();     //è·ååæ 
                        }
                        layer.closeAll("loading");
                    }
                });
            }

            //#endregion


            //#region åè½æ§ä»¶

            //#region æäº¤ä¸ä¼ åè½æ§ä»¶

            form.on('submit(cmdLoadData)', function (data) {
                document.getElementById("cmdLoadData").disabled = true;   //æé®åä¸ºä¸å¯ç¼è¾ç¶æ
                $.ajax(
                    {
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/GetDeletePackUnionBill_Json",
                        async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                        data: { "HInterID": HInterID, "HBillType": HBillType, "HMaker": HMaker },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                                layer.confirm(data.Message, {
                                    icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
                                    btn2: function () {
                                        parent.location.href = "../../../../views/index_Mobile.html"
                                    }//å³é
                                }, function () {
                                    window.location.reload();   //å·æ°å½åé¡µé¢
                                });//æ°å¢
                                layer.load(3);
                            }
                            else {
                                playSound();
                                layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
                                document.getElementById("cmdLoadData").disabled = false;  //æé®åä¸ºå¯ç¼è¾ç¶æ
                            }
                            layer.closeAll("loading");  //å³éå è½½å±
                        },
                        error: function (err) {
                            layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
                            document.getElementById("cmdLoadData").disabled = false;
                        }
                    });
            });

            //#endregion

            //#region éåºåè½æ§ä»¶

            form.on('submit(cmdCancel)', function () {
                layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
                    parent.location.href = "../../../../views/index_Mobile.html";
                });
            })

            //#endregion

            //#endregion

        });

    </script>

</body>
</html>

 WebTM/views/index_Mobile.html

@@ -446,6 +446,12 @@
                          </a>
                      </dd>
                      <dd>
                          <a href="WMSæ«ç æ¨¡å/çäº§ç®¡ç/å æå/Sc_DeletePackUnionBill_PDA.html" target="main_self_frame" style="color: aqua;">
                              <img src="../layuiadmin/myicon/åæ®å½å¶.svg" alt="åæ®å½å¶" style="width:25px;height:25px;margin-right: 5px;" />
                              å æå
                          </a>
                      </dd>
                      <dd>
                          <a href="WMSæ«ç æ¨¡å/çäº§è°æ¨/è°æ¨æ¢æ/Kf_MoveStockBill_HuanTuo_PDA.html" target="main_self_frame" style="color: aqua;">
                              <img src="../layuiadmin/myicon/åæ®å½å¶.svg" alt="åæ®å½å¶" style="width:25px;height:25px;margin-right: 5px;" />
                              æ¢æè°æ¨å

 WebTM/views/user/login.html

@@ -247,7 +247,7 @@
                            if (!judgeMorPCflag) {//ç§»å¨ç«¯
                                window.location.href = '../../views/index_Mobile.html'
                            } else {//PCç«¯
                                window.location.href = '../../views/index.html'
                                window.location.href = '../../views/indexMenu.html'
                            }
                            get_WriteConfigFile();
                        }

			@@ -10,7 +10,7 @@
			<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
			<LastUsedPlatform>Any CPU</LastUsedPlatform>
			<PublishProvider>FileSystem</PublishProvider>
			<PublishUrl>D:\ç½ç«åå¸\æºäºMESWMS\LAYUI</PublishUrl>
			<PublishUrl>E:\ç½ç«åå¸\LAYUI</PublishUrl>
			<WebPublishMethod>FileSystem</WebPublishMethod>
			<SiteUrlToLaunchAfterPublish />
			</PropertyGroup>

			@@ -193,6 +193,7 @@
			<Content Include="views\video\1.wav" />
			<Content Include="views\video\jingbao.wav" />
			<Content Include="views\video\success.wav" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§ç®¡ç\å æå\Sc_DeletePackUnionBill_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§ç®¡ç\çäº§ç»æå\Sc_PackUnionBillList_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§ç®¡ç\çäº§ç»æå\Sc_PackUnionBill_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\è°æ¨æ¢æ\Kf_MoveStockBill_HuanTuo_PDA.html" />

			@@ -1,7 +1,7 @@
			ï»¿<?xml version="1.0" encoding="utf-8"?>
			<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<NameOfLastUsedPublishProfile>D:\GITä»åº\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ProjectFiles</ProjectView>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>

			@@ -3,11 +3,11 @@
			//var WEBURL = "http://192.168.16.80:8011/"; //åå¬å®¤æå¡å¨
			//var WEBURL = "http://localhost:8081/SWEAPI/"; //chæ¬å°*/
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
			var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost/WEBAPI/"; //é¢å®¶å°å¼æºæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®
			var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°éç½®
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨

New file
			@@ -0,0 +1,329 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; 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, maximum-scale=1">
			<!--å¼ç¨layuiæ ·å¼æä»¶-->
			<link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
			<!--å¼ç¨layui jsæä»¶-->
			<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>
			<style>
			.layui-col-xs4 {
			width: 12.333333%
			}

			.layui-col-xs8 {
			width: 55.666667%;
			}
			</style>
			</head>
			<body>
			<div class="layui-fluid" style="padding: 0px">
			<div class="layui-card">
			<div class="layui-card-body" style="padding: 0px; height:800px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div style="background-color:#0085E8;">
			<span style="color: white;"><i class="layui-icon layui-icon-form"></i>å æå</span>
			</div>
			<div class="layui-form-item" style="padding:10px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:50px;padding-left:0px;">ææ¡ç </label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HBarCode_Pack" id="HBarCode_Pack" lay-verify="HBarCode_Pack" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBarCode_Pack" id="cmdHBarCode_Pack">ç¡®å®</button>
			</div>
			</div>
			</div>
			<div class="layui-tab" lay-filter="tab-Sc_DeletePackUnionBill_PDA">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1">æ¡ç ä¿¡æ¯</li>
			<li lay-id="2">åæ®ä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--æ¡ç ä¿¡æ¯-->
			<div class="layui-tab-item">
			<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
			</div>
			<!--åæ®ä¿¡æ¯-->
			<div class="layui-tab-item">
			<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-xs8 layui-input-inline mobile">
			<input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
			</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-xs8 layui-input-inline mobile">
			<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input">
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">åæ®ID</label>
			</div>
			<div class="layui-col-xs8 layui-input-inline mobile">
			<input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdLoadData" id="cmdLoadData">æäº¤</button>
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">éåº</button>
			</div>
			</div>
			</div>
			</div>
			</div>
			<div id="" style="display:none;">
			<audio id="cs1" hidden controls>
			<source src="../../../video/jingbao.wav" type="audio/ogg">
			</audio>
			</div>
			<div id="" style="display:none;">
			<audio id="cs2" hidden controls>
			<source src="../../../video/success.wav" type="audio/ogg">
			</audio>
			</div>
			</form>
			</div>
			</div>
			</div>
			<script>
			layui.config({
			base: '../../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {

			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element;
			var HInterID = $('#HInterID').val()
			var HBillNo = $('#HBillNo').val()
			var HBillType = '3783'
			var HMaker = sessionStorage["HUserName"]
			var HStockOrgID = sessionStorage["OrganizationID"]
			var option = [];

			//#endregion

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "../../../user/login.html"; });
			}

			//#region åå§åçé¢

			set_ClearBill();

			function set_ClearBill() {
			$("#HMaker").val(HMaker);
			$("#HMaker").attr("readonly", "readonly");
			$("#HBillNo").attr("readonly", "readonly");
			$("#HInterID").attr("readonly", "readonly");
			element.tabChange('tab-Sc_DeletePackUnionBill_PDA', '1');
			var pFocus = $("#HBarCode_Pack");
			pFocus.focus(); //è·ååæ
			pFocus.select();
			set_InitGrid(); //åå§åè¡¨æ ¼
			}

			//#region åå§åè¡¨æ ¼æ¹æ³
			function set_InitGrid() {
			option = {
			elem: '#wl-table'
			, height: 'full-50'
			//, page: true
			, cellMinWidth: 90
			, limit: 50
			//, limits: [50, 500, 5000, 20000]
			};
			}

			//#endregion

			//å¤±è´¥æç¤ºé³
			function playSound() {
			console.log("playSound");
			var audio = document.getElementById("cs1");
			audio.play();
			}
			//æåæç¤ºé³
			function playSound_OK() {
			console.log("playSound_OK");
			var audio = document.getElementById("cs2");
			audio.play();
			}

			//#endregion


			//#region æ«æææ¡ç

			//æåè½¦é®è¿åä¿¡æ¯
			$('#HBarCode_Pack').on('keydown', function (event) {
			if (event.keyCode == 13) {
			GetMeesageByBarCode_Pack();
			}
			});

			//ç¹å»æé®è¿åä¿¡æ¯
			form.on('submit(cmdHBarCode_Pack)', function (data) {
			GetMeesageByBarCode_Pack();
			});

			//æ«æææ¡ç
			function GetMeesageByBarCode_Pack(obj) {
			HBarCode_Pack = $('#HBarCode_Pack').val()

			if (HBarCode_Pack == '') {
			playSound();
			layer.msg("ææ¡ç ä¸è½ä¸ºç©ºï¼è¯·æ«æææ¡ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}

			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/WEBSController/Get_PackBarCode_DeletePackUnionBill_Json",
			data: { "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
			success: function (result) {
			var col = [];
			if (result.count == 1) {
			playSound_OK();
			$("#HInterID").val(result.data[0].HInterID);
			$("#HBillNo").val(result.data[0].HBillNo);
			$("#HBarCode_Pack").val(result.data[0].HBarCode_Pack);
			$("#HBarCode_Pack").attr("readonly", "readonly");
			document.getElementById("cmdHBarCode_Pack").disabled = true; //æé®åä¸ºä¸å¯ç¼è¾ç¶æ
			//å¨å±åéèµå¼
			HInterID = $('#HInterID').val()
			HBillNo = $('#HBillNo').val()
			element.tabChange('tab-Sc_DeletePackUnionBill_PDA', '1');
			//æ¾ç¤ºè¡¨ä½æç»
			var data = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in result.list) {
			data.push({ "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
			}
			//å¤ææ¯å¦æ¯çº¯è±æ
			var patrn = new RegExp("[\u4E00-\u9FA5]+");
			col.push({ type: 'radio' });
			for (var i = 0; i < data.length; i++) {
			if (!patrn.test(data[i].name)) {
			col.push({ field: data[i].name, title: data[i].name, hide: true }); //éèå
			}
			else {
			switch (data[i].Type) {
			case 'DateTime':
			col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
			}
			}
			}
			option.cols = [col];
			option.data = result.data;
			table.render(option);
			layer.load(3);
			}
			else {
			playSound();
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
			$('#HBarCode_Pack').val("");
			$("#HBarCode_Pack").select();
			$("#HBarCode_Pack").focus(); //è·ååæ
			}
			layer.closeAll("loading");
			}
			});
			}

			//#endregion


			//#region åè½æ§ä»¶

			//#region æäº¤ä¸ä¼ åè½æ§ä»¶

			form.on('submit(cmdLoadData)', function (data) {
			document.getElementById("cmdLoadData").disabled = true; //æé®åä¸ºä¸å¯ç¼è¾ç¶æ
			$.ajax(
			{
			type: "GET",
			url: GetWEBURL() + "/WEBSController/GetDeletePackUnionBill_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": HInterID, "HBillType": HBillType, "HMaker": HMaker },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.confirm(data.Message, {
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			btn2: function () {
			parent.location.href = "../../../../views/index_Mobile.html"
			}//å³é
			}, function () {
			window.location.reload(); //å·æ°å½åé¡µé¢
			});//æ°å¢
			layer.load(3);
			}
			else {
			playSound();
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
			document.getElementById("cmdLoadData").disabled = false; //æé®åä¸ºå¯ç¼è¾ç¶æ
			}
			layer.closeAll("loading"); //å³éå è½½å±
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
			document.getElementById("cmdLoadData").disabled = false;
			}
			});
			});

			//#endregion

			//#region éåºåè½æ§ä»¶

			form.on('submit(cmdCancel)', function () {
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../../views/index_Mobile.html";
			});
			})

			//#endregion

			//#endregion

			});

			</script>

			</body>
			</html>

			@@ -446,6 +446,12 @@
			</a>
			</dd>
			<dd>
			<a href="WMSæ«ç æ¨¡å/çäº§ç®¡ç/å æå/Sc_DeletePackUnionBill_PDA.html" target="main_self_frame" style="color: aqua;">
			<img src="../layuiadmin/myicon/åæ®å½å¶.svg" alt="åæ®å½å¶" style="width:25px;height:25px;margin-right: 5px;" />
			å æå
			</a>
			</dd>
			<dd>
			<a href="WMSæ«ç æ¨¡å/çäº§è°æ¨/è°æ¨æ¢æ/Kf_MoveStockBill_HuanTuo_PDA.html" target="main_self_frame" style="color: aqua;">
			<img src="../layuiadmin/myicon/åæ®å½å¶.svg" alt="åæ®å½å¶" style="width:25px;height:25px;margin-right: 5px;" />
			æ¢æè°æ¨å

			@@ -247,7 +247,7 @@
			if (!judgeMorPCflag) {//ç§»å¨ç«¯
			window.location.href = '../../views/index_Mobile.html'
			} else {//PCç«¯
			window.location.href = '../../views/index.html'
			window.location.href = '../../views/indexMenu.html'
			}
			get_WriteConfigFile();
			}