From 01c9dc24bf1d52351da921bf31d0c144481e3cd5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 14 十一月 2022 08:54:30 +0800
Subject: [PATCH] 作业指导书;工序流转卡维护列表改为动态加载。

---
 WebTM/views/基础资料/生产基础资料/Gy_SOPBillEdit.html            |  987 +++++++++++++++++++++++++
 WebTM/views/基础资料/生产基础资料/Gy_SOPBillList.html            |    2 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html |  788 ++++++++++++++++---
 WebTM/views/Gy_SOPBill.html                            |  505 ++++++++++++
 4 files changed, 2,145 insertions(+), 137 deletions(-)

diff --git a/WebTM/views/Gy_SOPBill.html b/WebTM/views/Gy_SOPBill.html
new file mode 100644
index 0000000..4992739
--- /dev/null
+++ b/WebTM/views/Gy_SOPBill.html
@@ -0,0 +1,505 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>浣滀笟鎸囧涔�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/modules/layer/default/layer.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
+    <style>
+       /*
+        tr:nth-child(even) {
+            background: #CDCDCD;
+        }
+        table{
+            margin-top:1px;
+        }
+        tr:nth-child(1) {
+            background: #f8ff00;
+        }*/
+        li {
+            /*鏃堕棿鏄剧ず瀛椾綋澶у皬*/
+            font-size: 16px;
+            font-weight: bolder;
+        }
+
+        .layui-table-cell{
+            height:20px;
+        }
+
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <!--<form class="layui-form" action="" lay-filter="component-form-group">-->
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">  <!--top-->
+                                <div class="layui-inline">
+                                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit" style="background-color:#959393">閫�鍑�</button>
+                                </div>
+                                <div class="layui-inline">
+                                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="IsAuto" style="background-color:#959393;margin-left:15px" id="auto">鑷姩鎾斁</button>
+                                </div>
+                                <div class="layui-inline">
+                                    <h1 style="text-align: center;margin-left:300px"><b>宸ヤ綅浣滀笟鎸囧涔�</b></h1>
+                                </div>
+                                <div class="layui-inline" style="margin-left:460px;">
+                                    <ul>
+                                        <li id="Date"></li>
+                                    </ul>
+                                </div>
+                                <div class="layui-inline">
+                                    <ul>
+                                        <li id="hours"> </li>
+                                    </ul>
+                                </div>
+                                <div class="layui-inline">
+                                    <ul>
+                                        <li id="point">:</li>
+                                    </ul>
+                                </div>
+                                <div class="layui-inline">
+                                    <ul>
+                                        <li id="min"> </li>
+                                    </ul>
+                                </div>
+                                <div class="layui-inline">
+                                    <ul>
+                                        <li id="point">:</li>
+                                    </ul>
+                                </div>
+                                <div class="layui-inline">
+                                    <ul>
+                                        <li id="sec"> </li>
+                                    </ul>
+                                </div>
+                            </div> <!--top-end-->
+                            <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
+                            <div style="margin-top:10px; width:100%;height:100%">
+                                <div style="width:77%;height:670px;float:left;line-height:500px">
+                                    <!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="" style="background-color:#959393;width:10px;height:80px;vertical-align:middle;float:left;margin:200px 0 0 1.5px;font-size:25px"><</button>-->
+
+                                    <div class="layui-carousel" id="test1">
+                                        <div carousel-item>
+                                            <div><img src="OIP-C.jpg" style="width:100%;height:100%"></div>
+                                            <div><img src="R-C.jpg" style="width:100%;height:100%"></div>
+                                            <div><img src="娴嬭瘯.jpeg" style="width:100%;height:100%"></div>
+                                            <div><embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>
+                                        </div>
+                                    </div>
+
+                                    <!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="" style="background-color:#959393;width:10px;height:80px;vertical-align:middle;float:left;margin-top:200px;font-size:25px">></button>-->
+                                </div>
+                                <div style="width:22%;height:670px;float:left;margin-left:1%">
+                                    <div style="width:100%;height:49%;margin-bottom:2%">
+                                        <div style="width:100px;height:23px; background: linear-gradient(-135deg, transparent 30px, #2baaca 0);"><span style="color:aliceblue;">宸ュ崟鍒楄〃</span></div>
+                                        <!--<table border="1" style="border-collapse: collapse;">
+                                            <thead>
+                                                <tr>
+                                                    <th style="min-width:40PX">璁″垝</th>
+                                                    <th style="min-width:40PX">鏃ユ湡</th>
+                                                    <th style="min-width:40PX">鐗╂枡浠g爜</th>
+                                                    <th style="min-width:40PX">鐗╂枡鍚嶇О</th>
+                                                    <th style="min-width:40PX">瑙勬牸鍨嬪彿</th>
+                                                    <th style="min-width:40PX">宸ュ簭</th>
+                                                </tr>
+                                                <tr>
+                                                    <td>S00001</td>
+                                                    <td>2022</td>
+                                                    <td>001</td>
+                                                    <td>S500</td>
+                                                    <td>S500</td>
+                                                    <td>151545</td>
+                                                </tr>
+                                                <tr>
+                                                    <td>S00001</td>
+                                                    <td>2022</td>
+                                                    <td>001</td>
+                                                    <td>S500</td>
+                                                    <td>S500</td>
+                                                    <td>151545</td>
+                                                </tr>
+                                                <tr>
+                                                    <td>S00001</td>
+                                                    <td>2022</td>
+                                                    <td>001</td>
+                                                    <td>S500</td>
+                                                    <td>S500</td>
+                                                    <td>151545</td>
+                                                </tr>
+                                            </thead>
+                                        </table>-->
+                                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                    </div>
+                                    <div style="width:100%;height:49%;">
+                                        <div style="width:100px;height:23px; background: linear-gradient(-135deg, transparent 30px, #2baaca 0);"><span style="color:aliceblue;">鏂囦欢鍒楄〃</span></div>
+                                        <!--<table border="1" style="border-collapse: collapse;">
+                                            <thead>
+                                                <tr>
+                                                    <th style="min-width:65PX">搴忓彿</th>
+                                                    <th style="min-width:87PX">宸ュ簭</th>
+                                                    <th style="min-width:88PX">鏂囦欢鍚嶇О</th>
+                                                </tr>
+                                                <tr>
+                                                    <td>S001</td>
+                                                    <td>2022-11-08</td>
+                                                    <td>001</td>
+                                                </tr>
+                                                <tr>
+                                                    <td>S001</td>
+                                                    <td>2022-11-08</td>
+                                                    <td>001</td>
+                                                </tr>
+                                                <tr>
+                                                    <td>S001</td>
+                                                    <td>2022-11-08</td>
+                                                    <td>001</td>
+                                                </tr>
+                                            </thead>
+                                        </table>-->
+                                        <table class="" id="mainTable2" lay-filter="mainTable2"></table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    <!--</form>-->
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <!--<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>-->
+    </script>
+    <script type="text/javascript">
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        // 鎶ュ伐骞冲彴;宸ュ簭娴佽浆鍗$淮鎶�;鐢熶骇璧勬簮鍒楄〃
+
+        //1.杩涘叆妯″潡锛屼粠鏈湴閰嶇疆鏂囦欢鑾峰彇鎵�灞炵敓浜ц祫婧愬拰宸ヤ綅锛屽垵濮嬪寲妯″潡銆傜晫闈㈡竻绌猴紝鍙宠竟涓婄綉鏍兼樉绀鸿鐢熶骇璧勬簮鐢熶骇鐘舵�佽〃閲岀殑褰撴棩璁″垝宸ュ崟锛岄粯璁や负褰撳墠寮�宸ョ殑宸ュ崟锛屼笅缃戞牸鏄剧ず杩欎釜宸ュ崟鍙婅宸ヤ綅鐨勬枃浠舵竻鍗�(鑾峰彇浣滀笟鎸囧涔︾殑鏁版嵁)銆�
+
+        //2.宸﹁竟鏄剧ず宸ヤ綅浣滀笟鎸囧涔︾殑绗竴寮犳枃浠�(鍥剧墖鎴朠DF) 銆�
+
+        //3.鐐瑰嚮涓婁竴寮狅紝涓嬩竴寮狅紝鍙互鍦ㄤ綔涓氭寚瀵间功鐨勬湰宸ヤ綅鐨勬枃浠跺垪琛ㄩ噷鍒囨崲PDF鏂囦欢鎴栧浘鐗�;
+
+        //4.宸ュ崟鍒楄〃閲岋紝鍙屽嚮鎴栬�呯偣鏌ョ湅鎸夐挳锛屽彲浠ュ垏鎹㈠伐鍗曪紝宸﹁竟 浣滀笟鎸囧涔︿篃鐩稿簲鏀瑰彉锛屼笅缃戞牸鐨勬枃浠跺垪琛ㄤ篃搴旀敼
+        //鍙�;
+
+        //5.鑷姩鎾斁鎸夐挳锛岀偣鍑昏嚜鍔ㄦ挱鏀炬寜閽紝杩涜鑷姩鎾斁妯″紡锛屾寜閽悕瀛楁敼涓衡�滄墜鍔ㄦ挱锛� 鐐瑰嚮 鎵嬪姩鎾斁 鎸夐挳锛屸�濊繘琛屾墜鍔ㄦ挱鏀炬ā寮�
+
+        //6.鎵嬪姩鎾斁妯″紡涓嬶紝涓嶆墜鍔ㄥ垏鎹紝褰撳墠宸ュ崟锛屼綔涓氭寚瀵间功鍧囦笉鍋氬彉鏇淬��
+
+        //7.鑷姩鎾斁妯″紡涓嬶紝姣�2鍒嗛挓鍋氫竴娆℃煡璇紝鑾峰彇褰撳墠寮�宸ョ殑宸ュ崟锛屽鏋滅洰鍓嶅紑宸ョ殑宸ュ崟鍜岀晫闈笂鏄剧ず鐨勫伐鍗曚笉绗﹀悎鏃讹紝鑷姩鍒囨崲鍒板紑宸ョ殑宸ュ崟锛屼綔涓氭寚瀵间功涔熺浉鍏虫洿鏂�
+
+        //8.閫�鍑烘寜閽�傞��鍑烘湰妯″潡銆�
+
+
+        //浜у搧鏍规嵁宸ュ崟鏉ワ紱鑷姩鎾斁锛氬綋鍓嶅伐搴忓畬鎴愬悗鑷姩鍒囨崲鎸囧涔︾瓑锛屾墜鍔ㄦ挱鏀撅細绾︾瓑浜庝粈涔堥兘涓嶅仛锛涘伐鍗曞垪琛ㄩ噷鏄剧ず褰撴棩闇�瑕佽繘琛屽緱浠诲姟锛涢〉闈㈣皟鏁翠负鍏ㄥ睆鏄剧ず锛�
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'carousel'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , carousel = layui.carousel
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var option2 = [];
+            var arr = [];
+            //#endregion
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            set_InitGrid2();
+            // 杞挱鍥�
+            var ins = carousel.render({
+                elem: '#test1'
+                , width: '100%' //璁剧疆瀹瑰櫒瀹藉害
+                , height: '100%' //璁剧疆瀹瑰櫒楂樺害
+                , arrow: 'always' //濮嬬粓鏄剧ず绠ご
+                , indicator: 'none' //鎸囩ず鍣ㄤ笉鏄剧ず
+                , autoplay: false //鎵嬪姩鎾斁
+                , interval: 2000 //鎾斁閫熷害
+            });
+            //#region  鑾峰彇鏃堕棿鏃ユ湡
+            $(document).ready(function () {
+                // 鍒涘缓涓や釜鍙橀噺锛屼竴涓暟缁勪腑鐨勬湀鍜屾棩鐨勫悕绉�
+                var monthNames = ["1 鏈�", "2 鏈�", "3 鏈�", "4 鏈�", "5 鏈�", "6 鏈�", "7 鏈�", "8 鏈�", "9 鏈�", "10 鏈�", "11 鏈�", "12 鏈�"];
+                setInterval(function () {
+                    var date1 = new Date;
+                    var year = date1.getFullYear();
+                    var month = date1.getMonth();
+                    var day = date1.getDate();
+                    var hh = date1.getHours();
+                    var mm = date1.getMinutes();
+                    var ss = date1.getSeconds();
+                    var dayNames = new Array("鏄熸湡鏃�", "鏄熸湡涓�", "鏄熸湡浜�", "鏄熸湡涓�", "鏄熸湡鍥�", "鏄熸湡浜�", "鏄熸湡鍏�");
+                    var Stamp = new Date();
+
+
+                    $('#Date').html(year + "&nbsp;骞�" + " " + monthNames[month] + ' ' + day + "&nbsp;鏃�&nbsp;&nbsp;" + ' ' + dayNames[Stamp.getDay()]);
+                    $("#hours").html((hh < 10 ? ("0" + hh) : hh));
+                    $("#min").html((mm < 10 ? ("0" + mm) : mm));
+                    $("#sec").html((ss < 10 ? ("0" + ss) : ss));
+
+                }, 1000);
+            });
+            //#endregion
+
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1 || OperationType == 2) {//鏃犳簮鏂板
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                set_AddFNew();
+                set_AddFNew2();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid(linterid);
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //#endregion
+
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //鏄惁鑷姩鎾斁
+            form.on('submit(IsAuto)', function (data) {
+                var num = 0;
+                if (ins.config.autoplay == false) {
+                    ins.reload({ autoplay: true }) //鎾斁鏂瑰紡鏀逛负鑷姩鎾斁
+                    document.getElementById("auto").innerHTML = "鎵嬪姩鎾斁";
+                    num = 1;
+                } else if (ins.config.autoplay == true && num == 0) {
+                    ins.reload({ autoplay: false }) //鎾斁鏂瑰紡鏀逛负鎵嬪姩鎾斁
+                    document.getElementById("auto").innerHTML = "鑷姩鎾斁";
+                }
+            });
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                option.data = [{
+                    "娴佹按鍙�": "", "宸ュ簭浠g爜": "", "宸ュ簭": "", "宸ヤ綅": "", "宸ヤ綅浠g爜": "", "宸ヤ綔涓績浠g爜": "", "宸ヤ綔涓績": "", "澶囨敞": ""
+                }];
+                table.render(option);
+            }
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;;
+                var AddRow = table.cache['mainTable'];
+                var NewRow = { "娴佹按鍙�": "", "宸ュ簭浠g爜": "", "宸ュ簭": "", "宸ヤ綅": "", "宸ヤ綅浠g爜": "", "宸ヤ綔涓績浠g爜": "", "宸ヤ綔涓績": "", "澶囨敞": "" };
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': btnCopyLine(data);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                }
+            });
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                //set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+            //鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            //table.on('edit(mainTable)', function (obj) {
+            //    var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+            //        , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+            //        , field = obj.field; //寰楀埌瀛楁
+            //    arr.push(data);
+            //});
+
+            //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
+            table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                console.log(obj);
+                //var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+                //HBillNo = datas["鍗曟嵁鍙�"].toString();
+                //var HMainID = datas.hmainid;
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/Filelist',
+                    type: "GET",
+                    //data: { "sWhere": HMainID },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option2.data = data1.data;
+                            table.render(option2);
+                            layer.close(wait);
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                            layer.close(wait);
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                    }
+                });
+                //DisPlay_HideColumn_Sec();
+                //set_ClearBillHMainID(HMainID);    //鍣ㄥ叿娓呭崟
+            });
+            //#endregion
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 90
+                    , totalRow: false
+                    , toolbar: false 
+                    , limit: 50
+                    , height: 300
+                    , cols: [[
+                        , { field: '璁″垝', title: '璁″垝', width: 100 }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                        , { field: '宸ュ簭', title: '宸ュ簭', width: 100 }
+                        //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 60 }
+                    ]]
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+            function set_InitGrid2() {
+                option2 = {
+                    id: 'mainTable2'
+                    , elem: '#mainTable2'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 20
+                    , totalRow: false
+                    , toolbar: false 
+                    , limit: 50
+                    , height: 300
+                    , cols: [[
+                        , { field: '搴忓彿', title: '搴忓彿', width: 110,}
+                        , { field: '宸ュ簭', title: '宸ュ簭', width: 110, }
+                        , { field: '鏂囦欢鍚嶇О', title: '鏂囦欢鍚嶇О', width: 110 }
+                    ]]
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                option.data = [{
+                    "璁″垝": "鏃�", "鏃ユ湡": "2022", "鐗╂枡浠g爜": "SM001", "鐗╂枡鍚嶇О": "SM001", "瑙勬牸鍨嬪彿": "SM001", "宸ュ簭": "6"
+                }];
+                table.render(option);
+            }
+            function set_AddFNew2() {
+                option2.data = [{
+                    "搴忓彿": "8", "宸ュ簭": "6", "鏂囦欢鍚嶇О": "Hello"
+                }];
+                table.render(option2);
+            }
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_ICMOBillStatus_Tmp/list',
+                    type: "GET",
+                    data: { "sWhere": sessionStorage["HSourceID"], "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            
+            // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            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();
+                            //layer.close(index);
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1);
+                            table.reload('mainTable', { data: oldData });
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
new file mode 100644
index 0000000..b8e3fd7
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
@@ -0,0 +1,987 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>浣滀笟鎸囧涔︾紪杈�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <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/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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
+    <style>
+        .layui-table-view {
+            width: 52%;
+            float: left;
+        }
+        /*layui-form layui-border-box layui-table-view*/
+        .right {
+            width: 47.5%;
+            height: 550px;
+            float: left;
+            margin-left: 0.5%;
+        }
+
+        .right-button {
+            float: right;
+            margin-top: 10px
+        }
+
+        .right-content {
+            width: 100%;
+            height: 490px;
+            background-color: white;
+            border: solid 1px #BEC0C4;
+        }
+
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Give_Up">鏀惧純</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Get_Use">浣跨敤</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">鍙栨秷</button>
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Copy">澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-collapse" style="margin-bottom:2px">
+                            <h1 style="text-align: center; padding: 10px 0;"><b>浣滀笟鎸囧涔�</b></h1>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" id="HBillNo" style="width:190px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" id="HDate" style="width:190px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鎸囧涔﹀悕绉�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" id="HName" style="width:190px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">浜у搧浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HMaterNumber" id="HMaterNumber" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchMater" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">浜у搧鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" id="HMaterName" style="width:190px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" id="HMaterModel" style="width:190px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">璁¢噺鍗曚綅</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HUnitName" id="HUnitName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0" autocomplete="off" class="layui-input">
+                                                <input type="hidden" name="HUnitNumber" id="HUnitNumber" lay-verify="HUnitNumber" value="0" autocomplete="off" class="layui-input">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchUnit" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" id="HRemark" style="width:514px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline">
+                                            <div class="layui-input-inline" style="margin-left: 80px;">
+                                                <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" title="鏄惁榛樿宸ヨ壓">
+                                                <input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <div class="layui-input-inline" style="margin-left: 110px;">
+                                                <input type="checkbox" name="checkboxHUse" id="checkboxHUse" lay-skin="primary" lay-filter="checkboxHUse" title="鏄惁鍚敤">
+                                                <input type="hidden" value="true" name="HUse" id="HUse" lay-verify="HUse">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <!--鍙充晶琛ㄦ牸-->
+                        <div class="right">
+                            <div class="right-content">
+                                <!--<table class="" id="mainTable2" lay-filter="mainTable2"></table>-->
+                                <table id="right_table" border="1" style="border-collapse: collapse;">
+                                    <thead>
+                                        <tr>
+                                            <!--<th>娆″簭鍙�</th>
+                                            <th>闄勪欢璺緞</th>
+                                            <th>闄勪欢鏂囦欢绫诲瀷</th>
+                                            <th>闄勪欢鍚�</th>
+                                            <th>涓婁紶鏃ユ湡</th>
+                                            <th>涓婁紶浜�</th>-->
+                                            <th style="min-width:100PX">鏂囦欢鍚�</th>
+                                            <th style="min-width:100PX">澶у皬</th>
+                                            <th style="min-width:100PX">鐘舵��</th>
+                                            <th style="min-width:100PX">鎿嶄綔</th>
+                                        </tr>
+                                        <!--<tr>
+                                            <td><input type="text" class="layui-input" id="test" style="max-width:50px" readonly></td>
+                                            <td>2</td>
+                                            <td>3</td>
+                                            <td>4</td>
+                                            <td>5</td>
+                                            <td>6</td>
+                                        </tr>-->
+                                    </thead>
+                                    <tbody id="ProImgByList">
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="right-button">
+                                <button type="button" class="layui-btn layui-btn-primary" id="ChoseFile" lay-submit="" lay-filter="Add_Row" style="color:#232389;background-color:#D4D2CF">閫夋嫨鏂囦欢</button>
+                                <!--<button type="button" class="layui-btn layui-btn-primary" id="delete" lay-submit="" lay-filter="Add_Row" style="color:#232389">鍒犻櫎</button>-->
+                            </div>
+                        </div>
+                        <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>
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                        <script type="text/html" id="switchTpl">
+                            <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+                            <input type="checkbox" name="checkbox" value="{{d.HGiveAwayFlag}}" lay-skin="primary" lay-filter="HGiveAwayFlag" {{ d.HGiveAwayFlag == 1 ? 'checked' : '' }}>
+                        </script>
+                        <script type="text/html" id="switchTp2">
+                            <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+                            <input type="checkbox" name="checkbox" lay-skin="primary" lay-filter="HGiveAwayFlag1">
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script type="text/javascript">
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var option2 = [];
+            var HModName = "Gy_SOPBillEdit";
+            var arr = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            set_InitGrid2();
+            document.getElementById("right_table").style.visibility = 'hidden';  // 闅愯棌鍒楄〃
+            $('#ChoseFile').addClass("layui-btn-disabled").attr("disabled", true); //绂佺敤鎸夐挳
+            $('#delete').addClass("layui-btn-disabled").attr("disabled", true);
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            //get_Display(sWhere);
+            //闅愯棌鍕鹃�夊瓧娈�
+            DisPlay_HideColumn();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1 || OperationType == 2) {//鏃犳簮鏂板
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鏃ユ湡
+                set_AddFNew();
+                set_AddFNew2();
+                PicUpload();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid(linterid);
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+           
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;;
+                var AddRow = table.cache['mainTable'];
+                var NewRow = { "娴佹按鍙�": "", "宸ュ簭浠g爜": "", "宸ュ簭": "", "宸ヤ綅": "", "宸ヤ綅浠g爜": "", "宸ヤ綔涓績浠g爜": "", "宸ヤ綔涓績": "", "澶囨敞": "" };
+                console.log(NewRow);
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': btnCopyLine(data);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                }
+            });
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+            //鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            table.on('edit(mainTable)', function (obj) {
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                arr.push(data);
+            });
+      
+            //鍒犻櫎鎸夐挳
+            form.on('submit(del)', function (data) {
+                console.log('aaa');
+            });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //#endregion
+
+            //澶嶅埗鎸夐挳
+            form.on('submit(Copy)', function (data) {
+                $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);
+            });
+
+            //琛ㄥご淇℃伅鍗曚綅寮圭獥
+            form.on('submit(btnSearchUnit)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                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, 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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HUnitName").val(checkStatus.data[0].HName);
+                        $("#HUnitID").val(checkStatus.data[0].HItemID);
+                        $("#HUnitNumber").val(checkStatus.data[0].HNumber)
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            form.on('submit(btnSearchMater)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐗╂枡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡);
+                        $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                var HMaterNumber = $('#HMaterNumber').val();
+                var HUnitName = $('#HUnitName').val();
+
+                var user = sessionStorage["HUserName"];
+                var oMain = JSON.stringify(data.field)
+                var sMainSub = oMain + ';' + linterid + ';' + user;
+
+                if (HMaterNumber == "") {
+                    layer.msg("浜у搧娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (HUnitName == "") {
+                    layer.msg("鍗曚綅娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (option.data[0].娴佹按鍙� == "" && option.data[0].宸ュ簭浠g爜 == "" && option.data[0].宸ュ簭 == "" && option.data[0].宸ヤ綅 == "" && option.data[0].宸ヤ綅浠g爜 == "" && option.data[0].宸ヤ綔涓績浠g爜 == "" && option.data[0].宸ヤ綔涓績 == "" && option.data[0].澶囨敞 == "") {
+                    layer.msg("娌℃湁鏄庣粏琛�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (option.data[0].宸ヤ綔涓績 == "") {
+                    layer.msg("宸ヤ綔涓績涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_SOPBill/ModifyByID',
+                    type: "POST",
+                    data: { "oMain": sMainSub },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = arr;
+                            table.render(option);
+                            //layer.close(wait);
+                            $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            $('#ChoseFile').removeClass("layui-btn-disabled").attr("disabled", false);
+                            $('#delete').removeClass("layui-btn-disabled").attr("disabled", false);         
+                            document.getElementById("ChoseFile").style.backgroundColor = 'white'
+                            layer.msg("鍗曟嵁瀛樼洏瀹屾瘯锛佸崟鎹彿锛�" + $("#HBillNo").val())
+                        } else {
+                            //layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        //layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            });
+            //鏀惧純
+            form.on('submit(Give_Up)', function (data) {//鏀惧純
+                layer.alert('鍗曟嵁灏氭湭淇濆瓨锛屾槸鍚︽斁寮冿紵', {
+                    icon: 3
+                    , title: '鎻愮ず'
+                    , btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , yes: function (index) {
+                        $('#HBillNo').val("");
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鏃ユ湡
+                        $('#HName').val("");
+                        $('#HMaterNumber').val("");
+                        $('#HMaterName').val("");
+                        $('#HMaterModel').val("");
+                        $('#HUnitName').val("");
+                        $('#HRemark').val("");
+
+                        option.data = [{
+                            "娴佹按鍙�": "", "宸ュ簭浠g爜": "", "宸ュ簭": "", "宸ヤ綅": "", "宸ヤ綅浠g爜": "", "宸ヤ綔涓績浠g爜": "", "宸ヤ綔涓績": "", "澶囨敞": ""
+                        }];
+                        table.render(option);
+
+                        layer.close(index);
+                    }
+                })
+            });
+            
+            //浣跨敤
+            form.on('submit(Get_Use)', function (data) {//浣跨敤
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_SOPBill/Use',
+                    type: "GET",
+                    //data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.alert(data1.Message)
+                        } else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            });
+            
+            //鍙栨秷
+            form.on('submit(Cancel)', function (data) {//鍙栨秷
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_SOPBill/Cancel',
+                    type: "GET",
+                    //data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.alert(data1.Message)
+                        } else {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            });
+
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , cellMinWidth: 120
+                    , totalRow: true
+                    , limit: 50
+                    , cellMinWidth: 1000
+                    , height: 'full-50'
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                        , { field: '娴佹按鍙�', title: '娴佹按鍙�', width: 200, edit: 'text' }
+                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜', width: 200, sort: true, edit: 'text', event: '宸ュ簭浠g爜' }
+                        , { field: '宸ュ簭', title: '宸ュ簭', width: 200 }
+                        , { field: '宸ヤ綅', title: '宸ヤ綅', width: 200, event: '宸ヤ綅', edit: 'text' }
+                        , { field: '宸ヤ綅浠g爜', title: '宸ヤ綅浠g爜', width: 200 }
+                        , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', width: 110, event: '宸ヤ綔涓績浠g爜', edit: 'text' }
+                        , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', width: 110 }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 110, edit: 'text' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width:80 }
+                    ]]
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+            function set_InitGrid2() {
+                option2 = {
+                    id: 'mainTable2'
+                    , elem: '#mainTable2'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , cellMinWidth: 120
+                    , totalRow: true
+                    , limit: 50
+                    , cellMinWidth: 1000
+                    , height: 'full-50'
+                    , width:300
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: '娆″簭鍙�', title: '娆″簭鍙�', width: 200, edit: 'text' }
+                        , { field: '闄勪欢璺緞', title: '闄勪欢璺緞', width: 200, sort: true, edit: 'text', event: '宸ュ簭浠g爜' }
+                        , { field: '闄勪欢鏂囦欢绫诲瀷', title: '闄勪欢鏂囦欢绫诲瀷', width: 200 }
+                        , { field: '闄勪欢鍚�', title: '闄勪欢鍚�', width: 200, event: '宸ヤ綅', edit: 'text' }
+                        , { field: '涓婁紶鏃ユ湡', title: '涓婁紶鏃ユ湡', width: 200 }
+                        , { field: '涓婁紶浜�', title: '涓婁紶浜�', width: 110 }
+                    ]]
+                    , limits: [50, 500, 5000, 20000]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                option.data = [{
+                    "娴佹按鍙�": "", "宸ュ簭浠g爜": "", "宸ュ簭": "", "宸ヤ綅": "", "宸ヤ綅浠g爜": "", "宸ヤ綔涓績浠g爜": "", "宸ヤ綔涓績": "", "澶囨敞": ""
+                }];
+                table.render(option);
+            }
+            function set_AddFNew2() {
+                option2.data = [{
+                    "娆″簭鍙�": "", "闄勪欢璺緞": "", "闄勪欢鏂囦欢绫诲瀷": "", "闄勪欢鍚�": "", "涓婁紶鏃ユ湡": "", "涓婁紶浜�": ""
+                }];
+                table.render(option2);
+            }
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_SOPBill/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            DataList = data1.data;
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //鏂囦欢涓婁紶
+            function PicUpload() {
+                layui.use('upload', function () {
+                    var upload = layui.upload;
+                    //澶氬浘鐗囦笂浼�
+                    //澶氭枃浠跺垪琛ㄧず渚�
+                    var ProImgByList = $('#ProImgByList')
+                    var uploadListIns = upload.render({
+                        elem: '#ChoseFile'
+                        , url: GetWEBURL() + "/Gy_SOPBill/UploadFile1"
+                        , accept: 'file'
+                        , multiple: true
+                        , auto: false
+                        //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+                        , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+                        , choose: function (obj) {
+                            var files = this.files = obj.pushFile(); //灏嗘瘡娆¢�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+                            document.getElementById("right_table").style.visibility = '';      //浣挎爣绛炬樉绀�
+                            //璇诲彇鏈湴鏂囦欢
+                            obj.preview(function (index, file, result) {
+                                var tr = $(['<tr id="upload-' + index + '">'
+                                    , '<td>' + file.name + '</td>'
+                                    , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+                                    , '<td>绛夊緟涓婁紶</td>'
+                                    , '<td>'
+                                    , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+                                    , '</td>'
+                                    , '</tr>'].join(''));
+
+                                //鍗曚釜閲嶄紶
+                                tr.find('.demo-reload').on('click', function () {
+                                    obj.upload(index, file);
+                                    return false;
+                                });
+
+                                //鍒犻櫎
+                                tr.find('.demo-delete').on('click', function () {
+                                    delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+                                    tr.remove();
+                                    uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+                                });
+
+                                ProImgByList.append(tr);
+                            });
+                        }
+                      
+                        , done: function (res, index, upload) {
+                            if (res.code == 1) { //涓婁紶鎴愬姛
+                                var tr = ProImgByList.find('tr#upload-' + index)
+                                    , tds = tr.children();
+                                tds.eq(2).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+                                tds.eq(3).html(''); //娓呯┖鎿嶄綔
+                                //tds.eq(3).find('.demo-reload').addClass('layui-hide'); //闅愯棌涓婁紶
+                                return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+                            }
+                            this.error(index, upload);
+                        }
+                        , error: function (index, upload) {
+                            var tr = ProImgByList.find('tr#upload-' + index)
+                                , tds = tr.children();
+                            tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+                            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+                        }
+                    });
+                });
+            }
+            // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            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();
+                            //layer.close(index);
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1);
+                            table.reload('mainTable', { data: oldData });
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //宸ュ簭淇℃伅  濡傛灉鍦ㄥ伐搴忎唬鐮佸垪 鎸塅7
+                        if (obj.event === '宸ュ簭浠g爜')  //宸ュ簭淇℃伅  濡傛灉鍦ㄥ伐搴忎唬鐮佸垪 鎸塅7
+                        {
+                            //椤甸潰灞�-鑷畾涔�  //F7閫夋嫨宸ュ簭
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '宸ュ簭鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        宸ュ簭浠g爜: checkStatus.data[0].宸ュ簭浠g爜,
+                                        宸ュ簭: checkStatus.data[0].宸ュ簭鍚嶇О,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        //宸ヤ綅
+                        if (obj.event === '宸ヤ綅')  //宸ヤ綅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '宸ヤ綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkStationList.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('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        宸ヤ綅: checkStatus.data[0].宸ヤ綅鍚嶇О,
+                                        宸ヤ綅浠g爜: checkStatus.data[0].宸ヤ綅浠g爜,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        //宸ヤ綔涓績
+                        if (obj.event === '宸ヤ綔涓績浠g爜')  //宸ヤ綔涓績
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '宸ヤ綔涓績鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                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('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        宸ヤ綔涓績浠g爜: checkStatus.data[0].宸ヤ綔涓績浠g爜,
+                                        宸ヤ綔涓績: checkStatus.data[0].宸ヤ綔涓績,
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+          
+            //澧炲姞涓�琛�
+            function btnAddLine(NewRow) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+                //rows++;
+                layer.msg('澧炲姞涓�琛屾寜閽紒')
+            }
+            //澶嶅埗涓�琛�
+            function btnCopyLine(data) {
+                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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                }
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = ["鍗曟嵁ID", "hmaterid", "hsubid", "HCenterID", "HWorkStationID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillList.html"
index 5d3c62a..d89ba28 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillList.html"
@@ -290,7 +290,7 @@
                     shift: 2,
                     area: ['100%', '100%'],
                     maxmin: true,
-                    content: '../鐢熶骇鍩虹璧勬枡/Gy_SOPBill.html?OperationType=1&linterid=&HSouceBillType=',
+                    content: '../鐢熶骇鍩虹璧勬枡/Gy_SOPBillEdit.html?OperationType=1&linterid=&HSouceBillType=',
                     end: function () {
                         //鍒锋柊椤甸潰,
                         location.reload();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 88f0b38..b640f82 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -95,7 +95,7 @@
                             </div>
                         </div>
                         <!--<div class="layui-tab-item layui-show">-->
-                            <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                         <!--</div>-->
                         <!--<table class="" id="mainTable" lay-filter="mainTable"></table>
     <table class="" id="mainTable2" lay-filter="mainTable2"></table>-->
@@ -107,10 +107,16 @@
                             </ul>
                             <div class="layui-tab-content">
                                 <div class="layui-tab-item layui-show">
+                                    <!--宸ヨ壓娴佺▼-->
                                     <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                 </div>
                                 <div class="layui-tab-item">
+                                    <!--鍣ㄥ叿娓呭崟-->
                                     <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <!--宸ヨ壓鍙傛暟娓呭崟-->
+                                    <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
                                 </div>
                             </div>
                         </div>
@@ -126,7 +132,30 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn1"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo2">
+                            <div class="layui-btn-container">
+                                <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_ShowBill"><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_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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>鏄庣粏鍒楄缃�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo3">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn3"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo4">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn4"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
                             </div>
                         </script>
                     </form>
@@ -160,14 +189,25 @@
             var sWhere = "";
             var option = "";
             var option2 = "";
+            var option3 = "";
+            var option4 = "";
             var HBillNo = "";
             var wybj = false;
+            var Organization = sessionStorage["Organization"]
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //
             var HModName = "Sc_ProcessExchangeBillList";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜富琛級
+            var titleData = ["HItemID", "HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID"];
+             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹烘祦绋嬶級
+            var titleData2 = ["HEntryID", "HProcID", "HCenterID", "HDeptID", "hmainid", "hicmointerid", "HWorkShopID", "HMaterID", "HUnitID", "hsubid", "HSupID"];
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝櫒鍏锋竻鍗曪級
+            var titleData3 = ["HEntryID", "HMouldID", "HMaterID", "HUnitID", "hmainid","hicmointerid"];
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹哄弬鏁版竻鍗曪級
+            var titleData4 = ["HItemID"];
             //鍒濆鍖栫晫闈�
             set_ClearBill();
 
@@ -209,7 +249,66 @@
                     //鏄庣粏鍒楄缃�
                     case 'get_HideColumn2': get_HideColumn2();
                         break;
+                    //鏄庣粏鍒楄缃�
+                    case 'get_HideColumn3': get_HideColumn3();
+                        break;
+                    //鏄庣粏鍒楄缃�
+                    case 'get_HideColumn4': get_HideColumn4();
+                        break;
 
+                };
+            });
+
+            table.on('toolbar(mainTable1)', function (obj) {
+                switch (obj.event) {
+                    //鏄庣粏鍒楄缃�
+                    case 'get_HideColumn3': get_HideColumn3();
+                        break;
+
+                };
+            });
+            table.on('toolbar(mainTable2)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //棰勮
+                    case 'btn_view': get_view();
+                        break;
+                    //鎵撳嵃
+                    case 'btn_print': get_print();
+                        break;
+                    //宸ュ簭鍑虹珯姹囨姤鍗�
+                    case 'set_StationOut': set_StationOut();
+                        break;
+                    //宸ュ簭杩涚珯鎺ユ敹鍗�
+                    case 'get_StationIn': get_StationIn();
+                        break;
+                    //鍒楄缃�
+                    case 'get_HideColumn1': get_HideColumn1();
+                        break;
+                    //鏄庣粏鍒楄缃�
+                    case 'get_HideColumn2': get_HideColumn2();
+                        break
+                };
+            });
+            table.on('toolbar(mainTable3)', function (obj) {
+                switch (obj.event) {
+                    //鏄庣粏鍒楄缃�
+                    case 'get_HideColumn4': get_HideColumn4();
+                        break;
                 };
             });
 
@@ -236,6 +335,10 @@
                 set_InitGrid();
                 //鍒濆鍖栦粠琛ㄥ垪琛�
                 set_InitGrid2();
+                //鍒濆鍖栦粠琛ㄥ垪琛�
+                set_InitGrid3();
+                //鍒濆鍖栦粠琛ㄥ垪琛�
+                set_InitGrid4();
                 table.render(option2);
                 //鏌ヨ
                 get_FastQuery();
@@ -325,18 +428,72 @@
                     url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
                     type: "GET",
                     data: { "sWhere": HMainID },
+                    //success: function (data1) {
+                    //    if (data1.count == 1) {
+                    //        option2.data = data1.data;
+                    //        table.render(option2);
+                    //        layer.close(wait);
+                    //    } else {
+                    //        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    //        layer.close(wait);
+                    //    }
+                    //}, error: function () {
+                    //    layer.close(wait);
+                    //    layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                    //}
                     success: function (data1) {
                         if (data1.count == 1) {
-                            option2.data = data1.data;
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData2) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option2 = {
+                                elem: '#mainTable2'
+                                , toolbar: '#toolbarDemo2'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            }
                             table.render(option2);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
                             layer.close(wait);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
                             layer.close(wait);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(wait);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
                 DisPlay_HideColumn_Sec();
@@ -350,10 +507,11 @@
                 resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
                 //鍒濆鏌ヨ
                 get_DisplayHMainID(HMainID);
+                get_Display4(HMainID);
             }
             //#endregion
 
-            //#region 鏌ヨ
+            //#region 鏌ヨ (鍣ㄥ叿娓呭崟)
             function get_DisplayHMainID(HMainID) {
                 var ajaxLoad = layer.load();
                 $.ajax({
@@ -369,7 +527,8 @@
                             }
                             var col = [];
                             for (var i = 0; i < data.length; i++) {
-                                if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData3) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                                 }
                                 else {
@@ -387,6 +546,7 @@
                             //鍔ㄦ�佹樉绀哄垪鍚�
                             table.render({
                                 elem: '#mainTable1'
+                                , toolbar: '#toolbarDemo3'
                                 , cols: [col]
                                 , data: data1.data
                                 , height: 550
@@ -408,10 +568,67 @@
                     }
                 });
             }
+            //#endregion
 
+            //#region 鏌ヨ 宸ヨ壓鍙傛暟
+            function get_Display4(sWhere) {
+                sWhere = " ";
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_TechnologyParameter/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            var col = [];
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData4) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
 
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            table.render({
+                                elem: '#mainTable3'
+                                , toolbar: '#toolbarDemo4'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            });
 
-
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
 
 
             //鍒濆鍖栦富琛ㄥ垪琛�
@@ -425,68 +642,68 @@
                     , limit: 50
                     , limits: [50, 500, 5000, 20000]
                     , cols: [[
-                        { type: 'checkbox', fixed: 'left' }
-                        , { field: 'hmainid', title: 'hmainid', width: 90, hide: true }
-                        , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
-                        , { field: '绫诲瀷', title: '绫诲瀷' }
-                        , {
-                            field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"
-                        }
-                        , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
-                        , { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true }
-                        , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 140 }
-                        , { field: '鍞竴ID', title: '鍞竴ID', width: 140 }
-                        , { field: '鏃ヨ鍒掑伐鍗曟棩鏈�', title: '鏃ヨ鍒掑伐鍗曟棩鏈�', width: 140 }
-                        , { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true }
-                        , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
-                        , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
-                        , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
-                        , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
-                        , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true }
-                        , { field: '瀛愪欢浠g爜', title: '瀛愪欢浠g爜' }
-                        , { field: '瀛愪欢鍚嶇О', title: '瀛愪欢鍚嶇О' }
-                        , { field: '瀛愪欢瑙勬牸', title: '瀛愪欢瑙勬牸' }
-                        , { field: '鎵瑰彿', title: '鎵瑰彿' }
-                        , { field: '鍘熸枡鎵规鍙�', title: '鍘熸枡鎵规鍙�' }
-                        , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
-                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                        , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
-                        , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
-                        , { field: '鍗曚綅', title: '鍗曚綅' }
-                        , { field: '璁惧妯″叿浠g爜', title: '璁惧妯″叿浠g爜' }
-                        , { field: '璁惧妯″叿', title: '璁惧妯″叿' }
-                        , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
-                        , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
-                        , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
-                        , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
-                        , { field: '鎽樿', title: '鎽樿' }
-                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
-                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
-                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
-                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
-                        , { field: '淇敼浜�', title: '淇敼浜�' }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
-                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
-                        , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
-                        , { field: 'HBillType', title: 'HBillType', width: 80, hide: true }
-                        , { field: 'hsubid', title: 'hsubid', width: 80, hide: true }
-                        , { field: '鎷嗗垎鏁伴噺', title: '鎷嗗垎鏁伴噺' }
-                        , { field: '婧愬崟瀹㈡埛缂栫爜', title: '婧愬崟瀹㈡埛缂栫爜', width: 80 }
-                        , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 80 }
-                        , { field: '鍖呰鏍囪瘑缂栫爜', title: '鍖呰鏍囪瘑缂栫爜', width: 80 }
+                    //    { type: 'checkbox', fixed: 'left' }
+                    //    , { field: 'hmainid', title: 'hmainid', width: 90, hide: true }
+                    //    , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
+                    //    , { field: '绫诲瀷', title: '绫诲瀷' }
+                    //    , {
+                    //        field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"
+                    //    }
+                    //    , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
+                    //    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
+                    //    , { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true }
+                    //    , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 140 }
+                    //    , { field: '鍞竴ID', title: '鍞竴ID', width: 140 }
+                    //    , { field: '鏃ヨ鍒掑伐鍗曟棩鏈�', title: '鏃ヨ鍒掑伐鍗曟棩鏈�', width: 140 }
+                    //    , { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true }
+                    //    , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
+                    //    , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
+                    //    , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+                    //    , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
+                    //    , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true }
+                    //    , { field: '瀛愪欢浠g爜', title: '瀛愪欢浠g爜' }
+                    //    , { field: '瀛愪欢鍚嶇О', title: '瀛愪欢鍚嶇О' }
+                    //    , { field: '瀛愪欢瑙勬牸', title: '瀛愪欢瑙勬牸' }
+                    //    , { field: '鎵瑰彿', title: '鎵瑰彿' }
+                    //    , { field: '鍘熸枡鎵规鍙�', title: '鍘熸枡鎵规鍙�' }
+                    //    , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
+                    //    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                    //    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+                    //    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                    //    , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
+                    //    , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
+                    //    , { field: '鍗曚綅', title: '鍗曚綅' }
+                    //    , { field: '璁惧妯″叿浠g爜', title: '璁惧妯″叿浠g爜' }
+                    //    , { field: '璁惧妯″叿', title: '璁惧妯″叿' }
+                    //    , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
+                    //    , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+                    //    , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+                    //    , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+                    //    , { field: '鎽樿', title: '鎽樿' }
+                    //    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
+                    //    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+                    //    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                    //    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+                    //    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                    //    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+                    //    , { field: '淇敼浜�', title: '淇敼浜�' }
+                    //    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+                    //    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                    //    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+                    //    , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+                    //    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+                    //    , { field: 'HBillType', title: 'HBillType', width: 80, hide: true }
+                    //    , { field: 'hsubid', title: 'hsubid', width: 80, hide: true }
+                    //    , { field: '鎷嗗垎鏁伴噺', title: '鎷嗗垎鏁伴噺' }
+                    //    , { field: '婧愬崟瀹㈡埛缂栫爜', title: '婧愬崟瀹㈡埛缂栫爜', width: 80 }
+                    //    , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 80 }
+                    //    , { field: '鍖呰鏍囪瘑缂栫爜', title: '鍖呰鏍囪瘑缂栫爜', width: 80 }
                     ]]
                 };
-                table.render(option);
+                //table.render(option);
             }
 
-            //鍒濆鍖栦粠琛ㄥ垪琛�
+            //鍒濆鍖栦粠琛ㄥ垪琛�  宸ヨ壓娴佺▼
             function set_InitGrid2() {
                 option2 = {
                     elem: '#mainTable2'
@@ -496,66 +713,92 @@
                     , cellMinWidth: 90
                     , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
                     , cols: [[
-                        { type: 'checkbox', fixed: 'left' }
-                        , { field: 'hsubid', title: 'hsubid', hide: true }
-                        , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
-                        , { field: 'HProcID', title: 'HProcID', hide: true }
-                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
-                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                        , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
-                        , { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺', width: 120 }
-                        , { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺', width: 120 }
-                        , { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', width: 150 }
-                        , { field: '杩斿伐鏍囪', title: '杩斿伐鏍囪' }
-                        , { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
-                        , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', width: 115 }
-                        , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
-                        , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
-                        , { field: 'hmainid', title: 'hmainid', hide: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
-                        , { field: 'hicmointerid', title: 'hicmointerid', hide: true }
-                        , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 100 }
-                        , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
-                        , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
-                        , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
-                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
-                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                        , { field: '鎵瑰彿', title: '鎵瑰彿' }
-                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
-                        , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
-                        , { field: '鍗曚綅', title: '鍗曚綅' }
-                        , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
-                        , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
-                        , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
-                        , { field: '鎽樿', title: '鎽樿' }
-                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
-                        , { field: 'HSupID', title: 'HSupID', hide: true }
-                        , { field: '濮斿鍔犲伐鍗曚綅浠g爜', title: '濮斿鍔犲伐鍗曚綅浠g爜' }
-                        , { field: '濮斿鍔犲伐鍗曚綅', title: '濮斿鍔犲伐鍗曚綅' }
-                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
-                        , { field: 'HBillType', title: 'HBillType', hide: true }
-                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
-                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
-                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
-                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
-                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
-                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
-                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
-                        , { field: '姹囨姤鏁伴噺', title: '姹囨姤鏁伴噺' }
-                        , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
-                        , { field: '鍑虹珯娴佽浆宸ュ簭', title: '鍑虹珯娴佽浆宸ュ簭' }
-                        , { field: '棣栭亾宸ュ簭', title: '棣栭亾宸ュ簭' }
-                        , { field: '鏈亾宸ュ簭', title: '鏈亾宸ュ簭' }
-                        , { field: '涓嬮亾宸ュ簭鍙�', title: '涓嬮亾宸ュ簭鍙�' }
-                        , { field: '涓嶈壇鍝佸叧鑱旀暟閲�', title: '涓嶈壇鍝佸叧鑱旀暟閲�' }
+                        //{ type: 'checkbox', fixed: 'left' }
+                        //, { field: 'hsubid', title: 'hsubid', hide: true }
+                        //, { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+                        //, { field: 'HProcID', title: 'HProcID', hide: true }
+                        //, { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
+                        //, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                        //, { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
+                        //, { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺', width: 120 }
+                        //, { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺', width: 120 }
+                        //, { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', width: 150 }
+                        //, { field: '杩斿伐鏍囪', title: '杩斿伐鏍囪' }
+                        //, { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
+                        //, { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', width: 115 }
+                        //, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+                        //, { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+                        //, { field: 'hmainid', title: 'hmainid', hide: true }
+                        //, { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
+                        //, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+                        //, { field: 'hicmointerid', title: 'hicmointerid', hide: true }
+                        //, { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 100 }
+                        //, { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
+                        //, { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
+                        //, { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+                        //, { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        //, { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                        //, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+                        //, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        //, { field: '鎵瑰彿', title: '鎵瑰彿' }
+                        //, { field: 'HUnitID', title: 'HUnitID', hide: true }
+                        //, { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
+                        //, { field: '鍗曚綅', title: '鍗曚綅' }
+                        //, { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
+                        //, { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+                        //, { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+                        //, { field: '鎽樿', title: '鎽樿' }
+                        //, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
+                        //, { field: 'HSupID', title: 'HSupID', hide: true }
+                        //, { field: '濮斿鍔犲伐鍗曚綅浠g爜', title: '濮斿鍔犲伐鍗曚綅浠g爜' }
+                        //, { field: '濮斿鍔犲伐鍗曚綅', title: '濮斿鍔犲伐鍗曚綅' }
+                        //, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+                        //, { field: 'HBillType', title: 'HBillType', hide: true }
+                        //, { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
+                        //, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
+                        //, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+                        //, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
+                        //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+                        //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+                        //, { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
+                        //, { field: '姹囨姤鏁伴噺', title: '姹囨姤鏁伴噺' }
+                        //, { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
+                        //, { field: '鍑虹珯娴佽浆宸ュ簭', title: '鍑虹珯娴佽浆宸ュ簭' }
+                        //, { field: '棣栭亾宸ュ簭', title: '棣栭亾宸ュ簭' }
+                        //, { field: '鏈亾宸ュ簭', title: '鏈亾宸ュ簭' }
+                        //, { field: '涓嬮亾宸ュ簭鍙�', title: '涓嬮亾宸ュ簭鍙�' }
+                        //, { field: '涓嶈壇鍝佸叧鑱旀暟閲�', title: '涓嶈壇鍝佸叧鑱旀暟閲�' }
                     ]]
                 };
              
             }
-            //#region 鏌ヨ
+             //鍒濆鍖栦粠琛ㄥ垪琛�  鍣ㄥ叿娓呭崟
+            function set_InitGrid3() {
+                option3 = {
+                    elem: '#mainTable1'
+                    //, toolbar: '#toolbarDemo'
+                    , page: false
+                    , height: 500
+                    , cellMinWidth: 90
+                    , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                    , cols: [[]]
+                };
+             
+            }
+            //鍒濆鍖栦粠琛ㄥ垪琛�   宸ヨ壓鍙傛暟娓呭崟
+            function set_InitGrid4() {
+                option4 = {
+                    elem: '#mainTable3'
+                    //, toolbar: '#toolbarDemo'
+                    , page: false
+                    , height: 500
+                    , cellMinWidth: 90
+                    , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                    , cols: [[]]
+                };
+
+            }
+            //#region 鏌ヨ (涓昏〃)
             function get_Display(sWhere) {
                 sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
                 var ajaxLoad = layer.load();
@@ -565,13 +808,53 @@
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
-                            option.data = data1.data;
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            }
                             table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
                             layer.close(ajaxLoad);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(ajaxLoad);
-                            layer.alert(data1.Message, { icon: 5 });
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(ajaxLoad);
@@ -580,9 +863,9 @@
                 });
                 DisPlay_HideColumn();
             }
+            //#endregion
 
-
-            //闅愯棌鍒楄缃�
+            //#region 闅愯棌鍒楄缃� (涓诲垪琛�)
             function get_HideColumn1() {
                 var colName = "";
                 for (var i = 1; i < option.cols[0].length - 1; i++) {
@@ -608,8 +891,9 @@
                     }
                 })
             }
+            //#endregion
 
-            //闅愯棌鍒楄缃�
+            //#region 闅愯棌鍒楄缃� (宸ヨ壓娴佺▼)
             function get_HideColumn2() {
                 var colName = "";
                 for (var i = 1; i < option2.cols[0].length - 1; i++) {
@@ -635,9 +919,9 @@
                     }
                 })
             }
+            //#endregion
 
-
-            //鏄剧ず鍒楁暟鎹�
+            //#region 鏄剧ず鍒楁暟鎹� (涓诲垪琛�)
             function DisPlay_HideColumn() {
                 $.ajax({
                     url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
@@ -648,12 +932,14 @@
 
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["hmainid", "hicmointerid", "HWorkShopID", "HDeptID", "HMaterID", "HMaterID2", "HUnitID", "HBillType", "hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            /*var titleData = ["hmainid", "hicmointerid", "HWorkShopID", "HDeptID", "HMaterID", "HMaterID2", "HUnitID", "HBillType", "hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
 
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                var dataCols = dataCol[i].split('|');
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
@@ -719,9 +1005,9 @@
                     }
                 })
             }
+            //#endregion
 
-
-            //鏄剧ず鍒楁暟鎹�
+            //#region 鏄剧ず鍒楁暟鎹� (宸ヨ壓娴佺▼)
             function DisPlay_HideColumn_Sec() {
                 $.ajax({
                     url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
@@ -732,12 +1018,14 @@
 
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            //var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option2.cols[0].length - 2; i++) {
-                                var dataCols = dataCol[i].split('|');
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option2.cols[0][i + 1]["hide"] = true;
@@ -759,7 +1047,7 @@
                                 //    option2.cols[0][i + 1]["width"] = "";
                                 //}
                                 //鏄剧ず鍒�
-                                if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
+                                if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData2) == -1) {
                                     option2.cols[0][i + 1]["hide"] = false;
                                 }
                                 //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
@@ -788,7 +1076,7 @@
                             //鍐荤粨鍒�
                             if (data1.data[0].HFixCols != 0) {
                                 for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                                    if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
+                                    if ($.inArray(option2.cols[0][i + 1]["title"], titleData2) != -1) {
                                         data1.data[0].HFixCols += 1;
                                     }
                                     option2.cols[0][i + 1]["fixed"] = "left";
@@ -805,6 +1093,234 @@
             }
             //#endregion
 
+            //#region 闅愯棌鍒�  鏄剧ず鍒楁暟鎹�  锛堝櫒鍏锋竻鍗曪級
+            //闅愯棌
+            function get_HideColumn3() {
+                var colName = "";
+                for (var i = 1; i < option3.cols[0].length - 1; i++) {
+                    colName += option3.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn3();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず
+            function DisPlay_HideColumn3() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            /*var titleData = ["hmainid", "hicmointerid", "HWorkShopID", "HDeptID", "HMaterID", "HMaterID2", "HUnitID", "HBillType", "hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option3.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option3.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option3.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option3.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option3.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option3.cols[0][i + 1]["title"], titleData3) == -1) {
+                                    option3.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option3.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option3.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option3.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option3.cols[0].length - 1; i++) {
+                                if (option3.cols[0][i]["fixed"] != null) {
+                                    option3.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option3.cols[0][i + 1]["title"], titleData3) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option3.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option3);
+                        } else {
+                            table.render(option3);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒�  鏄剧ず鍒楁暟鎹�  锛堝伐鑹哄弬鏁版竻鍗曪級
+            //闅愯棌
+            function get_HideColumn4() {
+                var colName = "";
+                for (var i = 1; i < option4.cols[0].length - 1; i++) {
+                    colName += option4.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn4();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず
+            function DisPlay_HideColumn4() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            /*var titleData = ["hmainid", "hicmointerid", "HWorkShopID", "HDeptID", "HMaterID", "HMaterID2", "HUnitID", "HBillType", "hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option4.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option4.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option4.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option4.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option4.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option4.cols[0][i + 1]["title"], titleData4) == -1) {
+                                    option4.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option4.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option4.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option4.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option4.cols[0].length - 1; i++) {
+                                if (option4.cols[0][i]["fixed"] != null) {
+                                    option4.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option4.cols[0][i + 1]["title"], titleData4) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option4.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option4);
+                        } else {
+                            table.render(option4);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
             //#region 鏂板
             function set_AddNew() {
                 layer.open({

--
Gitblit v1.9.1