From 78fbcff2eabefedc9602424c77d96b97a5aa4cc6 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 17 十一月 2025 11:39:36 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/系统管理/用户管理/Xt_UserListEdit.html              |    2 
 WebTM/views/WMS扫码模块/库存查询/KF_ICInventory_Clear_PDA .html |  527 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebTM/WebTM.csproj                                      |    1 
 3 files changed, 530 insertions(+), 0 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 40669f2..5554df2 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -336,6 +336,7 @@
     <Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉$爜鎵弿\Gy_getCusBarCodeBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉$爜鎵弿\Gy_getCusBarCodeBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\灏忚溅閿佸畾\Kf_TrolleyPositionBill_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_Clear_PDA .html" />
     <Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_WorkShopByXJ_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_WorkShopByCLD_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByWorkShop_PDA.html" />
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA .html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA .html"
new file mode 100644
index 0000000..6d7b618
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA .html"
@@ -0,0 +1,527 @@
+锘�<!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>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card" style="padding: 1px">
+            <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="margin: 1% 2%;text-align: right;">
+                        <button type="button" lay-submit="" lay-filter="cmdSearch" class="layui-btn layui-btn-radius" id="cmdSearch">鏌ヨ</button>
+                        <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn layui-btn-radius layui-btn-danger" id="cmdCancel">閫�鍑�</button>
+                    </div>
+                    <div class="layui-collapse">
+                        <div class="layui-colla-item">
+                            <div class="layui-colla-title layui-inline">
+                                <div class="layui-inline">
+                                    <span>鏇村</span>
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <div class="layui-col-xs2">
+                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">鏉$爜</label>
+                                </div>
+                                <div class="layui-col-xs10">
+                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                </div>
+                            </div>
+                            <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
+                                <div class="layui-row" style="margin-top:5px">
+                                    <div class="layui-col-xs2">
+                                        <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+                                    </div>
+                                    <div class="layui-col-xs10">
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                            <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:5px">
+                                    <div class="layui-col-xs2">
+                                        <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                    </div>
+                                    <div class="layui-col-xs10">
+                                        <div class="layui-col-xs10">
+                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab layui-col-xs12" lay-filter="tab-KF_ICInventoryByCLD_PDA">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;">杞﹂棿鍙婃椂搴撳瓨淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--杞﹂棿鍙婃椂搴撳瓨淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-row">
+                                    <div class="layui-col-xs12">
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var listOption = [];
+            var columns = "";
+            var HModName = "KF_ICInventory_WorkShopByCLD_PDA";
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var params = get_UrlVars();
+            var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //1涓虹洿鎺ユā鍧楁墦寮�  2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑
+            var HMaterNumber = params[params[1]];      //鐗╂枡浠g爜
+
+            //#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() {
+                set_InitGrid();     //鍒濆鍖栬〃鏍�
+
+                var data = [];
+                listOption.cols = [[
+                    { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                    , { field: '浠撳簱', title: '浠撳簱', width: 100 }
+                    , { field: '浠撲綅', title: '浠撲綅', width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                    , { field: '鎵规', title: '鎵规', width: 100 }
+                    , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+                    , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 100 }
+                    , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 100 }
+                    , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                ]];
+                listOption.data = data;
+                table.render(listOption);
+
+                if (OperationType == 2) {
+                    //杩斿洖鐗╂枡浠g爜
+                    $("#HBarCode").val(HMaterNumber);
+                    //鏄剧ず琛ㄤ綋鏄庣粏
+                    DisBillEntryList();
+                }
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //鏉$爜淇℃伅
+                listOption = {
+                    elem: '#wl-table'
+                    //, toolbar: '#toolbarDemo'
+                    //, totalRow: true
+                    , height: 'full-60'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                };
+            }
+
+            //#endregion
+
+
+            //#region 鍩虹璧勬枡閫夋嫨
+
+            //#region 浠撳簱
+            //鎵弿浠撳簱鏉$爜
+            $('#HWHName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HWHName = $('#HWHName').val()
+                    if (HWHName == '') {
+                        playSound();
+                        $("#HWHID").val("0");
+                        $("#HWHName").val("");
+                        $("#HStockPlaceID").val("0");
+                        $("#HStockPlaceName").val("");
+                        $("#HStockPlaceName").removeAttr("disabled");
+                        $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                        layer.msg("浠撳簱鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HWHName").select();
+                            $("#HWHName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HWHName, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HWHID").val(result.data[0].HItemID);
+                                $("#HWHName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                if (result.data[0].HSPFlag == 0) {
+                                    $("#HStockPlaceName").attr("disabled", "disabled");
+                                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                }
+                                else {
+                                    $("#HStockPlaceName").removeAttr("disabled");
+                                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                }
+                                element.tabChange('tab-Kf_POStockInBill_PDA', '2');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HWHID").val("0");
+                                $("#HWHName").val("");
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                $("#HStockPlaceName").removeAttr("disabled");
+                                $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HWHName").select();
+                                    $("#HWHName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //浠撳簱鎸夐挳
+            form.on('submit(HWHID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 浠撲綅
+            //鎵弿浠撲綅鏉$爜
+            $('#HStockPlaceName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                    if ($("#HWHName").val() == '') {
+                        $("#HWHID").val("0");
+                    }
+                    var sHWHID = $("#HWHID").val()
+                    var HStockPlaceName = $('#HStockPlaceName').val()
+                    if (HStockPlaceName == '') {
+                        playSound();
+                        $("#HWHID").val("0");
+                        $("#HWHName").val("");
+                        $("#HStockPlaceID").val("0");
+                        $("#HStockPlaceName").val("");
+                        layer.msg("浠撲綅鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HStockPlaceName").select();
+                            $("#HStockPlaceName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHName").val(result.data[0].HWhName);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                element.tabChange('tab-Kf_POStockInBill_PDA', '2');
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HWHID").val("0");
+                                $("#HWHName").val("");
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HStockPlaceName").select();
+                                    $("#HStockPlaceName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //浠撲綅鎸夐挳
+            form.on('submit(HSpID-BT)', function () {
+                //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                }
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鎵弿鐗╂枡鏉$爜
+
+            //鎵弿鏉$爜
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    DisBillEntryList();
+                    layer.closeAll("loading");
+                }
+            });
+
+            //#endregion
+
+
+            //#region 鍔熻兘鎺т欢
+
+            //#region 鏌ヨ
+            form.on('submit(cmdSearch)', function (data) {
+                DisBillEntryList();
+                layer.closeAll("loading");
+            });
+
+            function DisBillEntryList() {
+                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                }
+                if ($("#HStockPlaceName").val() == '') {
+                    $("#HStockPlaceID").val("0");
+                }
+                var sHBarCode = $('#HBarCode').val()
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/KF_ICInventory_WorkShopByMaterID/GetWorkShopICInventory',
+                    async: true,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HBarCode": sHBarCode, "sHWHID": sHWHID, "sHSPID": sHSPID, "HOWNERID": HStockOrgID, "sWhere": '' },
+                    success: function (result) {
+                        var data = [];
+                        var col = [];
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in result.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(result.list[key].ColmCols)) {
+                                    titleData[key] = result.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'radio' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, 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:
+
+                                            if (data[i].name == '浠撳簱' || data[i].name == '鎵瑰彿') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120 });
+                                            } else if (data[i].name == '鐗╂枡浠g爜' || data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿' || data[i].name == '缁勭粐' || data[i].name == '浠撲綅浠g爜' ) {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 180 });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center' });
+                                            }
+                                    }
+                                }
+                            }
+                            columns = col;
+                            listOption.cols = [columns];
+                            listOption.data = result.data;
+                            //listOption.totalRow = true;
+                            table.cache['wl-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+                            table.render(listOption);
+                        }
+                        else {
+                            listOption.cols = [[
+                                { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                                , { field: '浠撳簱', title: '浠撳簱', width: 100 }
+                                , { field: '浠撲綅', title: '浠撲綅', width: 100 }
+                                , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                                , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                                , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                , { field: '鎵规', title: '鎵规', width: 100 }
+                                , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+                                , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 100 }
+                                , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 100 }
+                                , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                            ]];
+                            listOption.data = data;
+                            //listOption.totalRow = true;
+                            table.render(listOption);
+                            //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+            }
+
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(cmdCancel)', function () {
+                //layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    if (OperationType == 2) {
+                        var index = parent.layer.getFrameIndex(window.name);    //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                        //parent.location.reload();                               //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+                        parent.layer.close(index);                              //鍐嶆墽琛屽叧闂�
+                    }
+                    else {
+                        parent.location.href = "../../../views/index_Mobile.html";
+                    }
+                //});
+            })
+
+            //#endregion
+
+            //#endregion
+
+        });
+
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖浠撳簱淇℃伅
+        function GetHWHValue(obj) {
+            if (obj.length > 0) {
+                $("#HWHName").val(obj[0].HName);
+                $("#HWHID").val(obj[0].HItemID);
+                $("#HStockPlaceName").val("");
+                $("#HStockPlaceID").val("0");
+                if (obj[0].HSPFlag == 0) {
+                    $("#HStockPlaceName").attr("disabled", "disabled");
+                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                }
+                else {
+                    $("#HStockPlaceName").removeAttr("disabled");
+                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                }
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖浠撲綅淇℃伅
+        function GetHSpValue(obj) {
+            if (obj.length > 0) {
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
+                $("#HWHName").val(obj[0].HWhName);
+                $("#HWHID").val(obj[0].HWHID);
+            }
+        }
+
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index b555e1f..f73d19b 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -733,6 +733,8 @@
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
+                        $("#HEmpName").val("");
+                        $("#HEmpID").val(0);
                         //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
                         //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
                     },

--
Gitblit v1.9.1