From 5aaa7600fb56ab0bb041657cfd17290a5996a028 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 17 十一月 2022 16:07:10 +0800
Subject: [PATCH] 生产订单编辑功能 用户 完善 角色 编辑 删除

---
 WebTM/views/系统管理/用户管理/Xt_UserGroupListEdit.html |  345 ++++++++++
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillImport.html   |  354 +++++++++++
 WebTM/views/系统管理/用户管理/Xt_UserGroupList.html     |  148 ++++
 WebTM/views/系统管理/用户管理/Xt_UserListEdit.html      |  130 +++
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillimport.html |   23 
 WebTM/views/index.html                          |    1 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html     |   69 ++
 WebTM/WebTM.csproj                              |    3 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit.html     |  844 ++++++++++++++++++++++++++
 9 files changed, 1,882 insertions(+), 35 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8f71c60..4e468b0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -909,6 +909,8 @@
     <Content Include="views\鐢熶骇绠$悊\鏃ヨ鍒掓姤琛╘ReportWorkDemandPlanBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillEdit.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillImport.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList - 澶嶅埗.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鍋滃伐鍗昞Sc_MESStopWorkBillList.html" />
@@ -973,6 +975,7 @@
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserMater.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserStock.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Xt_UserGroupList.html" />
+    <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Xt_UserGroupListEdit.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Xt_UserList.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Xt_UserListEdit.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Xt_UserSuplies.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 0c119a6..ce373a3 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -308,6 +308,7 @@
                                     <a>鐢熶骇璁㈠崟</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">鐢熶骇璁㈠崟缁存姢</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillImport.html">鐢熶骇璁㈠崟瀵煎叆</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit.html"
new file mode 100644
index 0000000..b183e65
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit.html"
@@ -0,0 +1,844 @@
+锘�<!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">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></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 src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閿�鍞鍗曞彿</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HSeOrderInterID" id="HSeOrderInterID" lay-verify="HSeOrderInterID" value="0">
+                                                <input type="hidden" name="HSeOrderEntryID" id="HSeOrderEntryID" lay-verify="HSeOrderEntryID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSeOrder" id="btnHSeOrder" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓氬姟鍛�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <!--<div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>-->
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HCenterName" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenter" id="btnHCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璁″垝鐢熶骇鏁伴噺</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty">
+                                            </div>
+                                        </div>
+                                    </div>                            
+                                    <div class="layui-row">
+                                        <div class="layui-inline" style="width: 56%;">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+
+    <!--琛屼笅鎷夐�夋嫨(涓氬姟鐘舵��)-->
+    <script type="text/html" id="HSTATUS">
+        <select name="HSTATUS" lay-filter="HSTATUS" id="HSTATUS{{d.LAY_TABLE_INDEX+1}}">
+            <option value="1">璁″垝</option>
+            <option value="2">璁″垝纭</option>
+            <option value="3">涓嬭揪</option>
+            <option value="4">寮�宸�</option>
+            <option value="5">瀹屽伐</option>
+            <option value="6">缁撴</option>
+            <option value="7">缁撶畻</option>
+        </select>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'laydate'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laydate = layui.laydate
+            var option = [];
+
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            var rowdata = [{
+                "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HModel": "", "HSourceID": 0
+                , "HSourceName": "", "HDeptID": 0, "HDeptName": "", "HUnitID": 0, "HUnitName": ""
+                , "HQty": "", "HSTATUS": "1", "HPlanBeginDate": "", "HPlanEndDate": ""
+            }];
+            //鍒濆鍖�
+            set_ClearBill();
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+            if (linterid == null || linterid == 0) {
+                OperationType = 1;
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3710' },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰
+                //绂佺敤缁勭粐閫夐」
+                $("#HPRDORGID").attr("disabled", true);
+                $("#HDate").attr("disabled", true);
+                RoadBillMain(linterid);
+            }
+
+
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HModel": "", "HSourceID": 0
+                    , "HSourceName": "", "HDeptID": 0, "HDeptName": "", "HUnitID": 0, "HUnitName": ""
+                    , "HQty": "", "HSTATUS": "1", "HPlanBeginDate": "", "HPlanEndDate": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+                        //鍒锋柊澶嶉�夋
+                        checkRefresh();
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                        break;
+                    ////鍒楄缃�
+                    //case 'set_HideColumn':
+                    //    get_HideColumn();
+                    //    break;
+                }
+            });
+
+            //閫夋嫨閿�鍞鍗曞彿鎸夐挳
+            form.on('submit(btnHSeOrder)', function () {
+                get_btnHSeOrder();
+            });
+
+            //閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(btnHEmp)', function () {
+                get_btnHEmp();
+            });
+
+            //閫夋嫨瀹㈡埛鎸夐挳
+            form.on('submit(btnHCus)', function () {
+                get_btnHCus();
+            });
+
+            //閫夋嫨宸ヤ綔涓績鎸夐挳
+            form.on('submit(btnHCenter)', function () {
+                get_btnHCenter();
+            });
+
+
+            //琛岄�夋嫨澶勭悊锛堝伐搴忕被鍨嬶級
+            form.on('select(HSTATUS)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HSTATUS = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                if (OperationType == 1 && linterid != "") {
+                    Pub_Close(2);
+                } else {
+                    Pub_Close(1);
+                }
+            });
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                set_AddNew(data);
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+                //#region 淇敼琛� 鏃堕棿
+
+                var data = obj.data;
+                //璁″垝寮�濮嬫棩鏈�
+                if (obj.event == 'HPlanBeginDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //璁″垝瀹屽伐鏃ユ湡
+                if (obj.event == 'HPlanEndDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            checkRefresh();
+                        }
+                    });
+                }
+
+                //#endregion
+
+            });
+
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖� 缁勭粐
+                Organ();
+
+                set_InitGrid();
+            }
+
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HPRDORGID").append(Organization);
+                            $("#HPRDORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , cols: [[ //琛ㄥご
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', edit: 'text', event: "HMaterID" }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О' }
+                        , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
+                        , { field: 'HSourceID', title: 'HSourceID', hide: true }
+                        , { field: 'HSourceName', title: '鐢熶骇璧勬簮', edit: 'text', event: "HSourceID" }//f7
+                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                        , { field: 'HDeptName', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HDeptID" }//f7
+                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                        , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', event: "HUnitID" }//f7
+                        , { field: 'HQty', title: '鏁伴噺', edit: 'text' }
+                        , { field: 'HSTATUS', title: '涓氬姟鐘舵��', templet: "#HSTATUS" }
+                        , { field: 'HPlanBeginDate', title: '璁″垝寮�宸ユ棩鏈�', event: 'HPlanBeginDate' }
+                        , { field: 'HPlanEndDate', title: '璁″垝瀹屽伐鏃ユ湡', event: 'HPlanEndDate' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                }
+
+                option.data = rowdata;
+                table.render(option);
+            }
+
+            //閿�鍞鍗�
+            function get_btnHSeOrder() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閿�鍞鍗�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HSeOrderInterID").val(checkStatus.data[0].hmainid);
+                        $("#HSeOrderBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HSeOrderEntryID").val(checkStatus.data[0].hsubid);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //涓氬姟鍛�
+            function get_btnHEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓氬姟鍛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //瀹㈡埛
+            function get_btnHCus() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹㈡埛'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HCusID").val(checkStatus.data[0].HItemID);
+                        $("#HCusName").val(checkStatus.data[0].HName);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //宸ヤ綔涓績
+            function get_btnHCenter() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ヤ綔涓績'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HCenterID").val(checkStatus.data[0].HItemID);
+                        $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //琛屽唴鍒犻櫎蹇嵎閿�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HMaterID": checkStatus.data[0].HItemID
+                                        , "HMaterNumber": checkStatus.data[0].HNumber
+                                        , "HMaterName": checkStatus.data[0].HName
+                                        , "HModel": checkStatus.data[0].HModel
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //鐢熶骇璧勬簮
+                        if (obj.event == "HSourceID") {
+                            //鎵撳紑浜哄憳琛�  灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐢熶骇璧勬簮鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HSourceID": checkStatus.data[0].HItemID
+                                        , "HSourceName": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //鐢熶骇杞﹂棿
+                        if (obj.event == "HDeptID") {
+                            //鎵撳紑浜哄憳琛�  灏忕獥浣�
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐢熶骇杞﹂棿鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HDeptID": checkStatus.data[0].HItemID
+                                        , "HDeptName": checkStatus.data[0].HName
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //璁¢噺鍗曚綅
+                        if (obj.event == "HUnitID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HUnitName": checkStatus.data[0].HName
+                                        , "HUnitID": checkStatus.data[0].HItemID
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+
+            //澶氶��  鍒锋柊琛ㄦ牸
+            function checkRefresh() {
+                for (var i = 1; i <= option.data.length; i++) {
+                    //鏄惁鎵嬪伐鍏抽棴
+                    if (option.data[i - 1].HSTATUS) {
+                        $('#HSTATUS' + i + '').attr("checked", true);
+                    }
+                }
+                form.render('select');
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_ICMOBill/ICMOBillEdit",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + "  and hmainid='" + linterid + "'";
+                $.ajax({
+                    url: GetWEBURL() + "/LEMS/MES_IF_ICMOBillList_Json",
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (d) {
+
+                        //$("#HPRDORGID").val(d.data[0].HPRDORGID);
+                        //涓昏〃
+                        form.val("formData", { 
+                            "HBillNo": d.data[0].鍗曟嵁鍙�
+                            , "HInterID":d.data[0].hmainid
+                            , "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
+                            , "HSeOrderBillNo": d.data[0].婧愬崟鍗曞彿
+                            , "HSeOrderInterID": d.data[0].婧愬崟涓诲唴鐮�
+                            , "HSeOrderEntryID": d.data[0].婧愬崟瀛愬唴鐮�
+                            , "HEmpID": d.data[0].HEmpID
+                            , "HEmpName": d.data[0].涓氬姟鍛�
+                            , "HCenterID": d.data[0].HCenterID
+                            , "HCenterName": d.data[0].宸ヤ綔涓績
+                            , "HRemark": d.data[0].琛ㄥご澶囨敞
+                            , "HPlanQty": d.data[0].璁″垝鐢熶骇鏁伴噺
+                            , "HPRDORGID": d.data[0].HPRDORGID
+                        });
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [];
+                        for (var i = 0; i < d.data.length; i++) {
+                            var HSTATUS = "";
+                            switch (d.data[i].鐘舵��) {
+                                case "璁″垝":
+                                    HSTATUS = "1";
+                                    break;
+                                case "璁″垝纭":
+                                    HSTATUS = "2";
+                                    break;
+                                case "涓嬭揪":
+                                    HSTATUS = "3";
+                                    break;
+                                case "寮�宸�":
+                                    HSTATUS = "4";
+                                    break;
+                                case "瀹屽伐":
+                                    HSTATUS = "5";
+                                    break;
+                                case "缁撴":
+                                    HSTATUS = "6";
+                                    break;
+                            }
+                            rowdata.push(
+                                {
+                                    "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].浜у搧浠g爜, "HMaterName": d.data[i].浜у搧鍚嶇О
+                                    , "HModel": d.data[i].瑙勬牸鍨嬪彿, "HSourceID": d.data[i].HSourceID, "HSourceName": d.data[i].鐢熶骇璧勬簮
+                                    , "HDeptID": d.data[i].HDeptID, "HDeptName": d.data[i].鐢熶骇杞﹂棿, "HUnitID": d.data[i].HUnitID
+                                    , "HUnitName": d.data[i].璁¢噺鍗曚綅, "HQty": d.data[i].鐢熶骇浠诲姟鍗曟暟閲�, "HSTATUS": HSTATUS
+                                    , "HPlanBeginDate": Format(new Date(d.data[i].璁″垝寮�宸ユ棩鏈�), "yyyy-MM-dd"), "HPlanEndDate": Format(new Date(d.data[i].璁″垝瀹屽伐鏃ユ湡), "yyyy-MM-dd")
+                                }
+                            )
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    }
+                })
+            }
+
+            //鑾峰彇鍙傛暟
+            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;
+            }
+
+            //#endregion
+
+        });
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillImport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillImport.html"
new file mode 100644
index 0000000..e25fec9
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillImport.html"
@@ -0,0 +1,354 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鐢熶骇璁㈠崟瀵煎叆</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></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 src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">鍗曟嵁鏃ユ湡</label>
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <div class="layui-inline">
+                                                <div class="layui-input-block" style="margin-left: 120px;">
+                                                    <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+
+        //#region 鍏叡鍙橀噺
+
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , laydate = layui.laydate
+            , excel = layui.excel
+            , upload = layui.upload
+            , element = layui.element;
+
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        var params = getUrlVars();
+        var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+            set_GridCellCheck(obj);//琛屽唴蹇嵎閿瓫閫�
+        });
+
+        //鏂囦欢涓婁紶
+        upload.render({
+            elem: '#UpLoad',
+            url: GetWEBURL() + '/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_DR',
+            contentType: 'application/json',
+            exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+            before: function (data) {
+                loadIndex = layer.load(2);
+            },
+            done: function (data1) {
+                if (data1.count == 1) {
+                    option.data = data1.data;
+                    table.render(option);
+                    layer.close(loadIndex);
+                } else {
+                    layer.close(loadIndex);
+                    layer.alert(data1.code + data1.Message, { icon: 5 });
+                }
+            },
+            error: function (err) {
+                debugger
+                layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+            }
+        });
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function () {
+            if (OperationType == 1) {
+                Pub_Close(1);
+            }
+            else {
+                Pub_Close(2);
+            }
+        })
+
+        //瀵煎叆  淇濆瓨鏁版嵁
+        form.on('submit(btnSave)', function (data) {
+            if (table.cache["mainTable"] != null) {
+                set_AddNew(data);
+            }
+            else {
+                layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+            }
+        })
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栨椂闂�
+            $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+        }
+
+        //#endregion
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            var columns = [];
+
+            columns.push({ type: 'checkbox', fixed: 'left' });
+            columns.push({ field: 'hmainid', title: 'hmainid', width: 200, hide: true });
+            columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 });
+            columns.push({ field: '鐢熶骇璁㈠崟鍙�*', title: '鐢熶骇璁㈠崟鍙�' });
+            columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿*', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 200 });
+            columns.push({ field: '缁勭粐缂栫爜*', title: '缁勭粐缂栫爜' });
+            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
+            columns.push({ field: '鐢熶骇杞﹂棿缂栫爜*', title: '鐢熶骇杞﹂棿' });
+            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
+            columns.push({ field: '鐢熶骇璧勬簮缂栫爜*', title: '鐢熶骇璧勬簮', edit: 'text', event: "HSourceID" });
+            columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�' });
+            columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
+            columns.push({ field: '鍛樺伐', title: '鍛樺伐' });
+            columns.push({ field: '鍛樺伐缂栫爜', title: '鍛樺伐缂栫爜' });
+            columns.push({ field: 'HMaterID', title: '鐗╂枡ID', hide: true });
+            columns.push({ field: '鐗╂枡缂栫爜*', title: '鐗╂枡缂栫爜' });
+            columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 });
+            columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' });
+            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
+            columns.push({ field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' });
+            columns.push({ field: '鎵规鍙�', title: '鎵规' });
+            columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 200 });
+            columns.push({ field: '鐢熶骇璁㈠崟鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 200 });
+            columns.push({ field: '鎬婚綈濂楁暟閲�', title: '鎬婚綈濂楁暟閲�', width: 200 });
+            columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true });
+            columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
+            columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
+
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-190'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , loading: false
+                , cols: [columns]
+            };
+
+            //娓叉煋椤甸潰
+            table.render(option);
+        }
+
+        //瀵煎叆(淇濆瓨)
+        function set_AddNew(data) {
+
+            var num = [];
+            for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                if (table.cache["mainTable"][i] != "") {
+                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                    num.push(table.cache["mainTable"][i])
+                }
+            }
+            data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
+            var sMainStr = JSON.stringify(data.field);
+            var sSubStr = JSON.stringify(num);
+            var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+            var index = layer.load();
+
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave",
+                async: true,
+                data: { "sMainSub": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        layer.close(index);
+                        layer.msg("鎻愪氦鎴愬姛");
+                    }
+                    else {
+                        layer.close(index);
+                        layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                },
+                error: function (err) {
+                    layer.close(index);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //琛屽唴鍒犻櫎
+        function set_GridDelete(obj) {
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    obj.del();
+                    option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    table.reload(option);
+                    layer.close(index);
+                });
+            }
+        }
+
+        //琛屽唴鍒犻櫎蹇嵎閿�
+        function set_GridCellCheck(obj) {
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    //鐢熶骇璧勬簮
+                    if (obj.event == "HSourceID") {
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "鐢熶骇璧勬簮鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                if (checkStatus.data.length != 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "HSourceID": checkStatus.data[0].HItemID
+                                    , "鐢熶骇璧勬簮缂栫爜*": checkStatus.data[0].鐢熶骇璧勬簮浠g爜
+                                })
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    }
+                    obj.event = "";
+                    return false;
+                }
+
+            })
+        }
+
+        //鑾峰彇鍙傛暟
+        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;
+        }
+
+        //#endregion
+
+    });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 5dc5e45..940fab1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -154,7 +154,10 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel瀵煎叆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
@@ -235,8 +238,17 @@
                     //涓嬫帹
                     case 'set_ShowBill': set_ShowBill();
                         break;
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_Edit': set_Edit();
+                        break;
                     //鍒犻櫎
                     case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //瀵煎叆
+                    case 'set_Excel': set_Excel();
                         break;
                     case 'get-view': get_ViewReport();
                         break;
@@ -617,7 +629,7 @@
             //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
             //    }
             //});
-            //缂栬緫鍗曟嵁
+            //涓嬫帹鍗曟嵁
             function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -633,6 +645,45 @@
                     })
                 } else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+                }
+            }
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鐢熶骇璁㈠崟鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit.html?OperationType=1&linterid='
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            }
+
+            // 缂栬緫
+            function set_Edit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid;
+
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鐢熶骇璁㈠崟缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit.html?OperationType=3&linterid=' + linterid +''
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
             }
 
@@ -677,6 +728,22 @@
             }
             //#endregion
 
+            //瀵煎叆
+            function set_Excel() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鐢熶骇璁㈠崟瀵煎叆'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鐢熶骇浠诲姟鍗�/Sc_ICMOBillImport.html?OperationType=1'
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            }
+
             //閲嶆柊鍚屾鎸夐挳
             function set_ResCnz() {
                 var HBillno2 = $('#HBillno2').val();
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_UserGroupList.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_UserGroupList.html"
index 7966c12..63a0a2c 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_UserGroupList.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_UserGroupList.html"
@@ -1,7 +1,7 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <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">
@@ -9,7 +9,8 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+
 </head>
 <body>
     <div class="layui-fluid">
@@ -46,17 +47,11 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Power"><i class="layui-icon">&#xe641;</i>鏉冮檺</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
 
                             </div>
                         </script>
@@ -95,6 +90,26 @@
             //#endregion
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_Edit': set_Edit();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鏉冮檺
+                    case 'btn-Power': set_PowerBill();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'set_Exit': Pub_Close(2);
+                };
+            });
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
@@ -144,7 +159,6 @@
                 var index = layer.load(0, { shade: false });
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Xt_UserGroup/list',
                     type: "GET",
                     data: { "sWhere": sWhere },
@@ -164,6 +178,112 @@
                 });
             }
 
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '瑙掕壊鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鐢ㄦ埛绠$悊/Xt_UserGroupListEdit.html?OperationType=1&linterid='
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            }
+
+            // 缂栬緫
+            function set_Edit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HGroupID;
+
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '瑙掕壊缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鐢ㄦ埛绠$悊/Xt_UserGroupListEdit.html?OperationType=3&linterid=' + linterid + ''
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            // 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hmainid = data[0].HGroupID;
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + '/Xt_UserGroup/DelXt_UserGroupList',
+                            type: "GET",
+                            data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    get_FastQuery();
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+
+            //鏉冮檺
+            function set_PowerBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HGroupID;
+
+                    //layer.open({
+                    //    type: 2
+                    //    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    //    , area: ['100%', '100%']
+                    //    , title: '瑙掕壊鏉冮檺鍏宠仈'
+                    //    , closeBtn: 1
+                    //    , shade: 0.6 //閬僵閫忔槑搴�
+                    //    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    //    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    //    , content: '../../PublicPage/PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    //    , resize: false,
+                    //    end: function () {
+                    //        //鍒锋柊椤甸潰,
+                    //        location.reload();
+                    //    }
+                    //})
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
             // 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $("#HNumber").val("");
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_UserGroupListEdit.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_UserGroupListEdit.html"
new file mode 100644
index 0000000..3ed32f5
--- /dev/null
+++ "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_UserGroupListEdit.html"
@@ -0,0 +1,345 @@
+锘�<!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">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></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 src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .main-btn { /*澶撮儴涓绘寜閽�*/
+            padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+            height: 30px;
+            line-height: 30px;
+        }
+
+        .btn-title {
+            font-size: 16px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瑙掕壊鍚�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="GroupName" lay-verify="GroupName" id="GroupName" value="">
+                                                <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">绾у埆</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HLev" id="HLev" lay-verify="HLev">
+                                                    <option value="1鎬荤粡鐞嗙骇">1鎬荤粡鐞嗙骇</option>
+                                                    <option value="2鍓�荤骇">2鍓�荤骇</option>
+                                                    <option value="3閮ㄩ暱绾�">3閮ㄩ暱绾�</option>
+                                                    <option value="4涓荤绾�">4涓荤绾�</option>
+                                                    <option value="5鍛樼骇">5鍛樼骇</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline" style="width: 56%;">
+                                            <label class="layui-form-label" style="width: 85px;">璇存槑</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="Explain" id="Explain" lay-verify="Explain" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'laydate'], function () {
+
+            //#region 鍏叡鍙橀噺
+
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laydate = layui.laydate
+            var option = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖�
+            set_ClearBill();
+
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+            if (linterid == null || linterid == 0) {
+                OperationType = 1;
+                linterid = 0;
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰
+                RoadBillMain(linterid);
+            }
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+
+            //閫夋嫨閿�鍞鍗曞彿鎸夐挳
+
+            //閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                if (OperationType == 1 && linterid != "") {
+                    Pub_Close(2);
+                } else {
+                    Pub_Close(1);
+                }
+            });
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if (AllowLoadData(data)) {
+                    set_AddNew(data);
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                set_InitGrid();
+                get_Display();
+            }
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , height: 600
+                    , cellMinWidth: 90
+                    , limit: 500
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鐢ㄦ埛缂栫爜', title: '鐢ㄦ埛缂栫爜' }
+                        , { field: '鐢ㄦ埛鍚嶇О', title: '鐢ㄦ埛鍚嶇О' }
+                        , { field: '瀵瑰簲鑱屽憳', title: '瀵瑰簲鑱屽憳' }
+                        , { field: '瀵瑰簲淇濈', title: '瀵瑰簲淇濈' }
+                        , { field: '瀵瑰簲楠屾敹', title: '瀵瑰簲楠屾敹' }
+                        , { field: '瀵瑰簲涓氬姟鍛�', title: '瀵瑰簲涓氬姟鍛�' }
+                        , { field: '瀵瑰簲閮ㄩ棬', title: '瀵瑰簲閮ㄩ棬' }
+                        , { field: '瀵瑰簲浠撳簱', title: '瀵瑰簲浠撳簱' }
+                        , { field: '瀵瑰簲璋冨叆浠撳簱', title: '瀵瑰簲璋冨叆浠撳簱' }
+                        , { field: '瀵瑰簲渚涘簲鍟�', title: '瀵瑰簲渚涘簲鍟�' }
+                        , { field: '瀵瑰簲CLOUD璐﹀彿', title: '瀵瑰簲CLOUD璐﹀彿' }
+                        , { field: '瀵瑰簲CLOUD缁勭粐', title: '瀵瑰簲CLOUD缁勭粐' }
+                    ]]
+                }
+            }
+
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            function get_Display() {
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_User/list',
+                    type: "GET",
+                    data: { "sWhere": "" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(wait);
+                            get_DisplayUserGroupInfoList();
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鍔犺浇缁戝畾瑙掕壊鏁版嵁
+            function get_DisplayUserGroupInfoList() {
+                var sWhere = "and GroupId=" + linterid;
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_UserGroup/UserGroupInfoList',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        layer.close(wait);
+                        if (data1.count == 1) {
+                            if (data1.data.length > 0) {
+                                for (var i = 0; i < data1.data.length; i++) {
+                                    for (var j = 0; j < option.data.length; j++) {
+                                        if (data1.data[i].UserId == option.data[j]["鐢ㄦ埛缂栫爜"]) {
+                                            option.data[j]["LAY_CHECKED"] = true;
+                                            break;
+                                        }
+                                    }
+                                }
+                                table.render(option);
+                            }
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨HMaker
+            function set_AddNew(data) {
+
+                var num = [];
+                for (var i = 0; i < table.checkStatus('mainTable').data.length; i++) {
+                    num.push(table.checkStatus('mainTable').data[i]["鐢ㄦ埛缂栫爜"]);
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = num.toString() == "" ? "-1" : num.toString();
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Xt_UserGroup/UserGroupInfoEdit",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                var sWhere = " and HGroupID=" + linterid ;
+                $.ajax({
+                    url: GetWEBURL() + "/Xt_UserGroup/list",
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere},
+                    success: function (d) {
+                        //涓昏〃
+                        form.val("formData", {
+                            "HGroupID": linterid
+                            , "GroupName": d.data[0].瑙掕壊
+                            , "HLev": d.data[0].绾у埆
+                            , "Explain": d.data[0].璇存槑
+                        });
+                        form.render('select');
+                    }
+                })
+            }
+
+            //闈炵┖楠岃瘉
+            function AllowLoadData(data) {
+
+                if ($("#GroupName").val() == "") {
+                    layer.msg("瑙掕壊鍚嶄笉鑳戒负绌�!");
+                    return false;
+                }
+
+                return true;
+            }
+
+            //鑾峰彇鍙傛暟
+            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;
+            }
+
+            //#endregion
+
+        });
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
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 fd5e346..5f003a1 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"
@@ -68,13 +68,13 @@
                                                         <div class="layui-inline">
                                                             <label class="layui-form-label">瀵嗙爜</label>
                                                             <div class="layui-input-inline">
-                                                                <input type="password" class="layui-input" name="Czmm" id="Czmm" value="" >
+                                                                <input type="password" class="layui-input" name="Czmm" id="Czmm" value="">
                                                             </div>
                                                         </div>
                                                         <div class="layui-inline">
                                                             <label class="layui-form-label">纭瀵嗙爜</label>
                                                             <div class="layui-input-inline">
-                                                                <input type="password" name="Czyyz" id="Czyyz"  class="layui-input" value="" style="float:left;width:150px;">
+                                                                <input type="password" name="Czyyz" id="Czyyz" class="layui-input" value="" style="float:left;width:150px;">
                                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="CzyyzList" style="width:40px;">
                                                                     <i class="layui-icon layui-icon-edit layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                 </button>
@@ -88,11 +88,11 @@
                                                                 <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="Explain" id="Explain"></textarea>
                                                             </div>
                                                         </div>
-                                                        <div class="layui-inline" >
+                                                        <div class="layui-inline">
                                                             <label class="layui-form-label">瀵瑰簲鑱屽憳</label>
                                                             <div class="layui-input-inline">
-                                                                <input type="text" name="HEmpName" id="HEmpName" readonly  class="layui-input" value="" style="float:left;width:150px;">
-                                                                <input type="hidden" name="HEmpID" id="HEmpID"  class="layui-input" value="0" style="float:left;width:150px;">
+                                                                <input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                 </button>
@@ -108,7 +108,7 @@
                                                             <div class="layui-inline">
                                                                 <label class="layui-form-label">瀵瑰簲缁勭粐</label>
                                                                 <div class="layui-input-inline">
-                                                                    <select name="HOrgID" id="HOrgID" >
+                                                                    <select name="HOrgID" id="HOrgID">
                                                                     </select>
                                                                 </div>
                                                             </div>
@@ -117,7 +117,7 @@
                                                                 <div class="layui-input-inline">
                                                                     <div class="layui-input-inline">
                                                                         <input type="text" name="HK3UserName" id="HK3UserName" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                                        <input type="text" name="HK3UserID" id="HK3UserID"  value="0" hidden>
+                                                                        <input type="text" name="HK3UserID" id="HK3UserID" value="0" hidden>
                                                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="HK3UserList" style="width:40px;">
                                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                         </button>
@@ -131,7 +131,7 @@
                                                                 <div class="layui-input-inline">
                                                                     <div class="layui-input-inline">
                                                                         <input type="text" name="HKeeper" id="HKeeper" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                                        <input type="text" name="HKeeperID" id="HKeeperID"  value="0" hidden >
+                                                                        <input type="text" name="HKeeperID" id="HKeeperID" value="0" hidden>
                                                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
                                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                         </button>
@@ -143,7 +143,7 @@
                                                                 <div class="layui-input-inline">
                                                                     <div class="layui-input-inline">
                                                                         <input type="text" name="HSecManager" id="HSecManager" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                                        <input type="text" name="HSecManagerID" id="HSecManagerID"  value="0" hidden >
+                                                                        <input type="text" name="HSecManagerID" id="HSecManagerID" value="0" hidden>
                                                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
                                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                         </button>
@@ -157,7 +157,7 @@
                                                                 <div class="layui-input-inline">
                                                                     <div class="layui-input-inline">
                                                                         <input type="text" name="HSellMan" id="HSellMan" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                                        <input type="text" name="HSellManID" id="HSellManID"  value="0" hidden >
+                                                                        <input type="text" name="HSellManID" id="HSellManID" value="0" hidden>
                                                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="HSellManList" style="width:40px;">
                                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                         </button>
@@ -169,7 +169,7 @@
                                                                 <div class="layui-input-inline">
                                                                     <div class="layui-input-inline">
                                                                         <input type="text" name="HDept" id="HDept" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                                        <input type="text" name="HDeptID" id="HDeptID"  value="0" hidden >
+                                                                        <input type="text" name="HDeptID" id="HDeptID" value="0" hidden>
                                                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
                                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                         </button>
@@ -183,7 +183,7 @@
                                                                 <div class="layui-input-inline">
                                                                     <div class="layui-input-inline">
                                                                         <input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                                        <input type="text" name="HWhID" id="HWhID"  value="0" hidden>
+                                                                        <input type="text" name="HWhID" id="HWhID" value="0" hidden>
                                                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" style="width:40px;">
                                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                         </button>
@@ -195,7 +195,7 @@
                                                                 <div class="layui-input-inline">
                                                                     <div class="layui-input-inline">
                                                                         <input type="text" name="HSCWHName" id="HSCWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                                        <input type="text" name="HSCWHID" id="HSCWHID"  value="0" hidden>
+                                                                        <input type="text" name="HSCWHID" id="HSCWHID" value="0" hidden>
                                                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="HSCWHList" style="width:40px;">
                                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                         </button>
@@ -209,7 +209,7 @@
                                                                 <div class="layui-input-inline">
                                                                     <div class="layui-input-inline">
                                                                         <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                                        <input type="text" name="HSupID" id="HSupID" value="0" hidden >
+                                                                        <input type="text" name="HSupID" id="HSupID" value="0" hidden>
                                                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                         </button>
@@ -224,7 +224,7 @@
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label" style="width:110px;">瀵瑰簲CLOUD璐﹀彿</label>
                                                     <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HCloudUserName" lay-verify="" id="HCloudUserName" >
+                                                        <input class="layui-input" name="HCloudUserName" lay-verify="" id="HCloudUserName">
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
@@ -236,12 +236,14 @@
                                             </div>
                                         </div>
                                         <div class="layui-tab-item layui-show">
-                                           
+
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
+
+                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                     </form>
                 </div>
             </div>
@@ -250,15 +252,17 @@
     <script>
         var Sav = ""; //鎻愪氦绫诲瀷
         var Psv = ""; //鏄惁淇敼瀵嗙爜
+        var linterid;
         //鑾峰彇鍙傛暟
         var params = get_UrlVars();
         if (typeof (params[params[0]]) == "undefined") {
+            linterid = 0
             var OperationType = 1;//鎿嶄綔绫诲瀷
             var closeType = 2;  //鍏抽棴绫诲瀷
         } else {
             debugger;
             var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
-            var linterid = params[params[1]];//婧愬崟id
+            linterid = params[params[1]];//婧愬崟id
             var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
             var closeType = params[params[3]];  //鍏抽棴绫诲瀷
         }
@@ -279,11 +283,12 @@
                 , laydate = layui.laydate
                 , element = layui.element
                 , formSelects = layui.formSelects
-           
+            var option = [];
             //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             Organ();//鍔犺浇缁勭粐
+            set_ClearBill();
 
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板       
@@ -364,11 +369,19 @@
 
             //淇濆瓨
             form.on('submit(Saver)', function (data) {
-                var sMainStr = JSON.stringify(data.field) + ';' + Sav;
+                var num = [];
+                for (var i = 0; i < table.checkStatus('mainTable').data.length; i++) {
+                    num.push(table.checkStatus('mainTable').data[i]["HGroupID"]);
+                }
+
+                var sSubStr = num.toString() == "" ? "-1" : num.toString();
+
+                var sMainStr = JSON.stringify(data.field) + ';' + Sav + ';' + sSubStr;
                 if (!AllowLoadData())//鏁版嵁楠岃瘉
                 {
                     return false;
                 }
+                
                 $.ajax(
                     {
                         type: "POST",
@@ -411,6 +424,85 @@
 
             //#endregion
 
+            //鍒濆鍖栬〃鏍�
+            function set_ClearBill() {
+                set_InitGrid();
+                get_Display();
+            }
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , height: 340
+                    , cellMinWidth: 90
+                    , limit: 500
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HGroupID', title: 'HGroupID', sort: true, hide: true }
+                        , { field: '瑙掕壊', title: '瑙掕壊' }
+                        , { field: '绾у埆', title: '绾у埆' }
+                        , { field: '璇存槑', title: '璇存槑' }
+                    ]]
+                }
+            }
+
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            function get_Display() {
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_UserGroup/list',
+                    type: "GET",
+                    data: { "sWhere": "" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(wait);
+                            get_DisplayUserGroupInfoList();
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鍔犺浇缁戝畾瑙掕壊鏁版嵁
+            function get_DisplayUserGroupInfoList() {
+                var sWhere = "and UserId='" + linterid+"'";
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_UserGroup/UserGroupInfoList',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        layer.close(wait);
+                        if (data1.count == 1) {
+                            if (data1.data.length > 0) {
+                                for (var i = 0; i < data1.data.length; i++) {
+                                    for (var j = 0; j < option.data.length; j++) {
+                                        if (data1.data[i].GroupId == option.data[j]["HGroupID"]) {
+                                            option.data[j]["LAY_CHECKED"] = true;
+                                            break;
+                                        }
+                                    }
+                                }
+                                table.render(option);
+                            }
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
             //鑾峰彇缁勭粐
             function Organ() {
                 //鑾峰彇鐧诲綍椤电粍缁囧垪
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillimport.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillimport.html"
index b552835..d8931a4 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillimport.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillimport.html"
@@ -83,6 +83,9 @@
     </div>
 </body>
 </html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
 <script>
     var treeCkData = { id: 0 };
     var TagId = "";
@@ -91,7 +94,7 @@
         base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
     }).extend({
         index: 'lib/index', //涓诲叆鍙fā鍧�
-    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','upload'], function () {
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
         //#region 鍏敤鍙橀噺
         var $ = layui.$
             , admin = layui.admin
@@ -125,6 +128,11 @@
         });
 
         //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+        });
 
         //鏂囦欢涓婁紶
         upload.render({
@@ -271,6 +279,7 @@
                     , { field: '鐗堟湰', title: '鐗堟湰', width: 120 }
                     , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿', width: 120 }
                     , { field: '绋嬪簭鍙�', title: '绋嬪簭鍙�', width: 120 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ]]
             };
 
@@ -279,6 +288,18 @@
             DisPlay_HideColumn();
         }
 
+        //琛屽唴鍒犻櫎
+        function set_GridDelete(obj) {
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    obj.del();
+                    option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    table.reload(option);
+                    layer.close(index);
+                });
+            }
+        }
+
         //瀵煎叆(淇濆瓨)
         function set_AddNew(data) {
             //var num = [];

--
Gitblit v1.9.1