MES-WEB-LayUI.git

parent: 5ddedc16 | 补丁 | 提交 | show whitespace

增加生产组织字段并改为动态列（进站单，出站单，委外接收，委外发出）；出站汇报单模块在流水号旁边加一个放大镜框

yusijie

2022-10-13 134442a32d1a7581d713300dda5e9ff82c1d6b70

增加生产组织字段并改为动态列（进站单，出站单，委外接收，委外发出）；出站汇报单模块在流水号旁边加一个放大镜框

1个文件已添加

9个文件已修改

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/Baseset/基础资料/Gy_GetProcNoList.html	120 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBillList.html	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillList.html	147 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html	55 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html	79 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html	69 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -100,6 +100,7 @@
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_ClassTimePrjGroupEdit.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_ClassTimePrjList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_GetProcNoList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_LineCenter.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_MaterList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_MouldList.html" />

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

New file
@@ -0,0 +1,120 @@
ï»¿<!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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <!--<div class="layui-card-header"></div>-->
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">è¿æ»¤å</label>
                            <div class="layui-input-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥æµæ°´å·" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;

            form.on('submit(HQuery)', function () {//éæ©ä»åº
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            form.on('submit(FH)', function () {//éæ©ä»åº
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
                 , data = checkStatus.data;
                parent.GetProcNoValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
              , cols: [[
                  { type: 'radio' }
                , { field: 'HItemID', width: 150, title: 'æµç¨ID', hide: true }
                  , { field: 'æµæ°´å·', width: 150, title: 'æµæ°´å·' }
                  , { field: 'å·¥åºåç§°', width: 150, title: 'å·¥åºåç§°', sort: true }
              ]]
              , page: true
            });

            // è·åé¡µé¢ä¼ è¿æ¥ç HInterID å¼
            function getUrlParam(HInterID) {

                // æé ä¸ä¸ªå«æç®æ åæ°çæ£åè¡¨è¾¾å¼å¯¹è±¡
                var reg = new RegExp("(^|&)" + HInterID + "=([^&]*)(&|$)");

                // å¹éç®æ åæ°
                r = window.location.search.substr(1).match(reg);

                // è¿ååæ°å¼
                if(r!= null)
                return decodeURI(r[2]);

                // å¦æä¸åå¨ï¼è¿ånull 
                return null;
            }

            ///å è½½æ¾ç¤ºæ°æ®
            function RoadQuery(HInterID, sWhere) {

                var sWhere = $("#Value").val();
                
                var HInterID = getUrlParam('HInterID')

                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetProcNoList",
                    async: true,
                    data: { "HInterID": HInterID, "sWhere": sWhere },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {

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

</body>
</html>

 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò·¢³öµ¥/Cj_StationEntrustInBill.html

@@ -81,6 +81,13 @@
                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">çäº§ç»ç»</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -590,7 +597,8 @@
                                "HGroupID": data.HGroupID,
                                "HGroup": data.çç»,
                                "HDeptID": sessionStorage["HDeptID"],
                                "HDept": sessionStorage["HDept"]
                                "HDept": sessionStorage["HDept"],
                                "HPRDOrg": data.ç»ç»
                            });
                            $("#HBarCode").attr("readonly", "readonly");//æ¡å½¢ç åªè¯»
                            $("#HBarCode").css("background-color", "#efefef4d");

 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò·¢³öµ¥/Cj_StationEntrustInBillList.html

@@ -117,6 +117,7 @@
            var sWhere = "";
            var option = [];
            var HModName = "Cj_StationEntrustInBillList";
            var titleData = ["HInterID","hsubid","hmainid", "HSupID", "HMaterID", "HProcID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            //åå§åè¡¨æ ¼
            set_InitGrid();
            DisPlay_HideColumn();
@@ -256,26 +257,69 @@
            //å è½½ç½æ ¼
            function get_Display(sWhere) {
                //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
                var ajaxLoad = layer.load();    
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationEntrustInBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 0) {
                            option.data = [];
                            layer.alert(data1.Message, { icon: 5 });
                        } else {
                            option.data = data1.data;
                        if (data1.count == 1) {
                            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);
                        btnIs();
                        layer.close(wait);

                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                layer.close(wait);

            }


@@ -526,7 +570,7 @@


                            var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
                            var titleData = ["hmainid", "HSupID", "HMaterID", "HProcID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
                            /*var titleData = ["hmainid", "HSupID", "HMaterID", "HProcID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±*/

                            dataCol = data1.data[0].HGridString.split(',');


 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò½ÓÊÕµ¥/Cj_StationEntrustOutBill.html

@@ -81,6 +81,13 @@
                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">çäº§ç»ç»</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -679,7 +686,8 @@
                                "HGroupID": data.HGroupID,
                                "HGroup": data.çç»,
                                "HDeptID": sessionStorage["HDeptID"],
                                "HDept": sessionStorage["HDept"]
                                "HDept": sessionStorage["HDept"],
                                "HPRDOrg": data.ç»ç»
                            });
                            if ($("#eventType").val() === "Add") {
                                form.val("formData", {

 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò½ÓÊÕµ¥/Cj_StationEntrustOutBillList.html

@@ -118,9 +118,10 @@
            var sWhere = "";
            var option = [];
            var HModName = "Cj_StationEntrustOutBillList";
            var titleData = ["HInterID","hmainid", "HSupID", "HMaterID", "HProcID", "HDeptID", "Hsubid","HProcExchInterID","HProcExchEntryID","HSourceID","HICMOEntryID","HICMOInterID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            //åå§åè¡¨æ ¼
            set_InitGrid();
            DisPlay_HideColumn();
            //DisPlay_HideColumn();
            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
@@ -165,46 +166,46 @@
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: 'æ¥æ', title: 'æ¥æ' }
                        , { field: 'è®¢åè·è¸ªå·', title: 'è®¢åè·è¸ªå·' }
                        , { field: 'éè´§åå·', title: 'éè´§åå·' }
                        , { field: 'åæ®å·', title: 'åæ®å·' }
                        , { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·' }
                        , { field: 'æµè½¬å¡å·', title: 'æµè½¬å¡å·' }
                        , { field: 'HSupID', title: 'HSupID', hide: true }
                        , { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ' }
                        , { field: 'ä¾åºå', title: 'ä¾åºå' }
                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
                        , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
                        , { field: 'äº§ååç§°', title: 'äº§ååç§°' }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
                        , { field: 'ä¸è¯æ°é', title: 'ä¸è¯æ°é' }
                        , { field: 'æ¥åºæ°é', title: 'æ¥åºæ°é' }
                        , { field: 'è®¡éåä½', title: 'è®¡éåä½' }
                        , { field: 'æµæ°´å·', title: 'æµæ°´å·', sort: true }
                        , { field: 'HProcID', title: 'HProcID', hide: true }
                        , { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ' }
                        , { field: 'å·¥åº', title: 'å·¥åº', sort: 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: 'HDeptID', title: 'HDeptID', hide: true }
                        , { field: 'é¨é¨', title: 'é¨é¨' }
                        , { field: 'Hsubid', title: 'Hsubid', hide: true }
                        , { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
                    ]]
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                    //    , { field: 'æ¥æ', title: 'æ¥æ' }
                    //    , { field: 'è®¢åè·è¸ªå·', title: 'è®¢åè·è¸ªå·' }
                    //    , { field: 'éè´§åå·', title: 'éè´§åå·' }
                    //    , { field: 'åæ®å·', title: 'åæ®å·' }
                    //    , { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·' }
                    //    , { field: 'æµè½¬å¡å·', title: 'æµè½¬å¡å·' }
                    //    , { field: 'HSupID', title: 'HSupID', hide: true }
                    //    , { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ' }
                    //    , { field: 'ä¾åºå', title: 'ä¾åºå' }
                    //    , { field: 'HMaterID', title: 'HMaterID', hide: true }
                    //    , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
                    //    , { field: 'äº§ååç§°', title: 'äº§ååç§°' }
                    //    , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
                    //    , { field: 'ä¸è¯æ°é', title: 'ä¸è¯æ°é' }
                    //    , { field: 'æ¥åºæ°é', title: 'æ¥åºæ°é' }
                    //    , { field: 'è®¡éåä½', title: 'è®¡éåä½' }
                    //    , { field: 'æµæ°´å·', title: 'æµæ°´å·', sort: true }
                    //    , { field: 'HProcID', title: 'HProcID', hide: true }
                    //    , { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ' }
                    //    , { field: 'å·¥åº', title: 'å·¥åº', sort: 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: 'HDeptID', title: 'HDeptID', hide: true }
                    //    , { field: 'é¨é¨', title: 'é¨é¨' }
                    //    , { field: 'Hsubid', title: 'Hsubid', hide: true }
                    //    , { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
                    //]]
                    , text: {
                        none: 'æ æ°æ®ï¼'
                    }
@@ -262,26 +263,69 @@
            //å è½½ç½æ ¼
            function get_Display(sWhere) {
                //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
                var ajaxLoad = layer.load();    
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 0) {
                            option.data = [];
                            layer.alert(data1.Message, { icon: 5 });
                        } else {
                            option.data = data1.data;
                        if (data1.count == 1) {
                            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);
                        btnIs();
                        layer.close(wait);

                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }

                });
                layer.close(wait);
            }

            //åè½æé®æ¯å¦ç¦ç¨æ¹æ³ï¼æ¯æ¬¡å è½½è¡¨æ ¼é½è¦è°ç¨
@@ -548,12 +592,14 @@


                            var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
                            var titleData = ["hmainid", "HSupID", "HMaterID", "HProcID", "HDeptID", "Hsubid"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
                            /*var titleData = ["hmainid", "HSupID", "HMaterID", "HProcID", "HDeptID", "Hsubid"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±*/

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                var dataCols = dataCol[i].split('|');
                                }
                                //éèå
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
@@ -619,7 +665,6 @@
                    }
                })
            }

            //ä»¥ä¸æ¯layuiæ¨¡å
        });


 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html

@@ -83,6 +83,13 @@
                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">çäº§ç»ç»</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -158,7 +165,11 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label"><span style="color:red;">*</span>æµæ°´å·</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HProcNo" placeholder="è¯·é®å¥ååè½¦" id="HProcNo">
                                                <input type="text" class="layui-input" name="HProcNo" placeholder="è¯·é®å¥ååè½¦" id="HProcNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" value="0" name="HSourceID" id="HSourceID">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
@@ -802,12 +813,12 @@
                                "HProcExchBillNo": data.åæ®å·,
                                "HProcExchHinteID": data.hmainid,
                                "HICMOQty": data.ä»»å¡åæ°é,
                                "HOrderProcNO": data.è®¢åè·è¸ªå·
                                "HOrderProcNO": data.è®¢åè·è¸ªå·,
                                "HPRDOrg": data.ç»ç»
                            });
                            $("#HBarCode").attr("readonly", "readonly");//æ¡å½¢ç åªè¯»
                            $("#HBarCode").css("background-color", "#efefef4d");
                            HProcExchBillNoFlag = true;


                            var HProcExchHinteID = $('#HProcExchHinteID').val();
                            //$.ajax({
@@ -1152,6 +1163,40 @@
                location.replace('Cj_StationOutBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
            }
            //#endregion

            //éæ©æµæ°´å·å¼¹çª
            form.on('submit(SerialNum-BT)', function () {//çäº§èµæº
                var value = $("#HProcExchHinteID").val();
                // å¤ææ¯å¦å·²ç»è¾å¥æµæ°´å·ï¼æ¯åå¼¹åºæ¨¡ææ¡ï¼å¦åç»åºæç¤º
                if (value) {
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: 'æµæ°´å·'
                        , shade: 0.6 //é®ç½©éæåº¦
                        //, maxmin: true //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: [`../../Baseset/åºç¡èµæ/Gy_GetProcNoList.html?HInterID=${value}`, 'yes']
                        , resize: false
                        , cancel: function (index, layero) {
                        }
                        //, btn: ['ç¡®å®', 'åæ¶']
                        //, btn1: function (index, layero) {
                        //    //æé®ãæé®ä¸ãçåè°
                        //    var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                        //    if (checkStatus.data.length === 0) {
                        //        return layer.msg('è¯·éæ©æ°æ®');
                        //    }
                        //    $("#HProcNo").val(checkStatus.data[0].æµæ°´å·);
                        //    layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                        //}
                    })
                } else {
                    layer.alert('è¯·æ¨ç¡®è®¤è¾å¥æµè½¬å¡å·åéè¯^_^',{ icon: 7 });
                    //alert('è¯·åè¾å¥æµè½¬å¡å·!')
                }
            });

            //éæ©çäº§çç»å¼¹çª
            form.on('submit(ProductionTeam-BT)', function () {//éæ©çäº§çç»
@@ -1665,6 +1710,10 @@
            window.open(url)
        }

        //è¿åæµæ°´å·
        function GetProcNoValue(obj) {
            $("#HProcNo").val(obj[0].æµæ°´å·);
        }
        //è¿åçäº§çç»
        function GetProductionTeamValue(obj) {
            $("#HGroupName").val(obj[0].çç»);

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -162,6 +162,7 @@
            var option = [];

            var HModName = "JIT_LiftMaterPlaBillnList";
            var titleData = ["HMaterID", "HUnitID", "HSourceID","hmainid","HProcExchInterID","HProcID","HunitID","HEmpID","HGroupID","HProcExchEntryID","HSubID","HICMOInterID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            //åå§åè¡¨æ ¼
            set_InitGrid();

@@ -356,7 +357,7 @@


                            var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
                            var titleData = ["HMaterID", "HUnitID", "HSourceID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
                            /*var titleData = ["HMaterID", "HUnitID", "HSourceID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±*/

                            dataCol = data1.data[0].HGridString.split(',');

@@ -667,29 +668,85 @@
            //å è½½ç½æ ¼
            function get_Display(sWhere) {
                //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
                var ajaxLoad = layer.load();    
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    //success: function (data1) {
                    //    if (data1.count == 0) {
                    //        option.data = [];
                    //        layer.alert(data1.Message, { icon: 5 });
                    //    } else {
                    //        option.data = data1.data;
                    //    }
                    //    table.render(option);
                    //    btnIs();
                    //    if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                    //        ColFilter();
                    //    }
                    //    layer.close(wait);
                    //}, error: function () {
                    //    layer.close(wait);
                    //    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    //}
                    success: function (data1) {
                        if (data1.count == 0) {
                            option.data = [];
                            layer.alert(data1.Message, { icon: 5 });
                        } else {
                            option.data = data1.data;
                        if (data1.count == 1) {
                            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);
                        btnIs();
                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();

                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                layer.close(wait);
            }

            //å é¤åæ®

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html

@@ -80,6 +80,13 @@
                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">çäº§ç»ç»</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -842,7 +849,8 @@
                                "HProcExchHinteID": data.hmainid,
                                "HICMOQty": data.ä»»å¡åæ°é,
                                "lngBillKey": data.hmainid,
                                "HOrderProcNO": data.è®¢åè·è¸ªå·
                                "HOrderProcNO": data.è®¢åè·è¸ªå·,
                                "HPRDOrg": data.ç»ç»
                            });
                            $("#HBarCode").attr("readonly", "readonly");//æ¡å½¢ç åªè¯»
                            $("#HBarCode").css("background-color", "#efefef4d");

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBillList.html

@@ -156,9 +156,10 @@
            var sWhere = "";
            var option = [];
            var HModName = "Cj_StationInBillList";
            var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID","HInterID","HProcExchInterID","HProcExchEntryID","HICMOInterID","HICMOEntryID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            //åå§åè¡¨æ ¼
            set_InitGrid();
            DisPlay_HideColumn();
            //DisPlay_HideColumn();

            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
@@ -364,29 +365,68 @@
            //å è½½ç½æ ¼
            function get_Display(sWhere) {
                //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
                var ajaxLoad = layer.load();    
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationInBill/get_Display',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (result) {
                        if (result.count == 0) {
                            option.data = [];
                            layer.alert(result.Message, { icon: 5 });
                        } else {
                            option.data = result.data;
                    success: function (data1) {
                        if (data1.count == 1) {
                            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);
                        btnIs();
                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();

                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
                layer.close(wait);
            }

            //å¿«éè¿æ»¤
@@ -469,6 +509,7 @@
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
                sWhere = "";
            }

            //ç¼è¾åæ®
@@ -689,12 +730,14 @@


                            var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
                            var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
                            /*var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±*/

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                var dataCols = dataCol[i].split('|');
                                }
                                //éèå
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;

			@@ -100,6 +100,7 @@
			<Content Include="views\Baseset\HBarPlanPrint.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_ClassTimePrjGroupEdit.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_ClassTimePrjList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_GetProcNoList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_LineCenter.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_MaterList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_MouldList.html" />

New file
			@@ -0,0 +1,120 @@
			ï»¿<!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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-card">
			<!--<div class="layui-card-header"></div>-->
			<div class="layui-card-body" style="padding: 15px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤å</label>
			<div class="layui-input-inline">
			<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥æµæ°´å·" class="layui-input">
			</div>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">å¿«éæ¥è¯¢</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">è¿å</button>
			</div>
			</div>
			</form>
			</div>
			</div>
			</div>
			<table class="layui-hide" id="mainTable"></table>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script>
			layui.use(['table', 'form', 'layer'], function () {
			var table = layui.table
			, form = layui.form
			, layer = layui.layer;

			form.on('submit(HQuery)', function () {//éæ©ä»åº
			//var sMainStr = JSON.stringify(table.cache['mainTable']);
			RoadQuery($('#Value').val());
			});
			form.on('submit(FH)', function () {//éæ©ä»åº
			//var sMainStr = JSON.stringify(table.cache['mainTable']);
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			parent.GetProcNoValue(data);
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			});
			RoadQuery($('#Value').val());
			table.render({
			elem: '#mainTable'
			// , url: '/demo/table/user/'
			, data: []
			, cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
			, cols: [[
			{ type: 'radio' }
			, { field: 'HItemID', width: 150, title: 'æµç¨ID', hide: true }
			, { field: 'æµæ°´å·', width: 150, title: 'æµæ°´å·' }
			, { field: 'å·¥åºåç§°', width: 150, title: 'å·¥åºåç§°', sort: true }
			]]
			, page: true
			});

			// è·åé¡µé¢ä¼ è¿æ¥ç HInterID å¼
			function getUrlParam(HInterID) {

			// æé ä¸ä¸ªå«æç®æ åæ°çæ£åè¡¨è¾¾å¼å¯¹è±¡
			var reg = new RegExp("(^\|&)" + HInterID + "=([^&]*)(&\|$)");

			// å¹éç®æ åæ°
			r = window.location.search.substr(1).match(reg);

			// è¿ååæ°å¼
			if(r!= null)
			return decodeURI(r[2]);

			// å¦æä¸åå¨ï¼è¿ånull
			return null;
			}

			///å è½½æ¾ç¤ºæ°æ®
			function RoadQuery(HInterID, sWhere) {

			var sWhere = $("#Value").val();

			var HInterID = getUrlParam('HInterID')

			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetProcNoList",
			async: true,
			data: { "HInterID": HInterID, "sWhere": sWhere },
			success: function (result) {
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-10'
			, loading: false
			, done: function (index, res) {

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

			</body>
			</html>

			@@ -81,6 +81,13 @@
			<input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">çäº§ç»ç»</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			@@ -590,7 +597,8 @@
			"HGroupID": data.HGroupID,
			"HGroup": data.çç»,
			"HDeptID": sessionStorage["HDeptID"],
			"HDept": sessionStorage["HDept"]
			"HDept": sessionStorage["HDept"],
			"HPRDOrg": data.ç»ç»
			});
			$("#HBarCode").attr("readonly", "readonly");//æ¡å½¢ç åªè¯»
			$("#HBarCode").css("background-color", "#efefef4d");

			@@ -117,6 +117,7 @@
			var sWhere = "";
			var option = [];
			var HModName = "Cj_StationEntrustInBillList";
			var titleData = ["HInterID","hsubid","hmainid", "HSupID", "HMaterID", "HProcID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//åå§åè¡¨æ ¼
			set_InitGrid();
			DisPlay_HideColumn();
			@@ -256,26 +257,69 @@
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			var ajaxLoad = layer.load();
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Cj_StationEntrustInBill/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			success: function (data1) {
			if (data1.count == 0) {
			option.data = [];
			layer.alert(data1.Message, { icon: 5 });
			} else {
			option.data = data1.data;
			if (data1.count == 1) {
			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);
			btnIs();
			layer.close(wait);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(wait);
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			layer.close(wait);

			}


			@@ -526,7 +570,7 @@


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "HSupID", "HMaterID", "HProcID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			/var titleData = ["hmainid", "HSupID", "HMaterID", "HProcID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±/

			dataCol = data1.data[0].HGridString.split(',');

			@@ -118,9 +118,10 @@
			var sWhere = "";
			var option = [];
			var HModName = "Cj_StationEntrustOutBillList";
			var titleData = ["HInterID","hmainid", "HSupID", "HMaterID", "HProcID", "HDeptID", "Hsubid","HProcExchInterID","HProcExchEntryID","HSourceID","HICMOEntryID","HICMOInterID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//åå§åè¡¨æ ¼
			set_InitGrid();
			DisPlay_HideColumn();
			//DisPlay_HideColumn();
			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			@@ -165,46 +166,46 @@
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ' }
			, { field: 'è®¢åè·è¸ªå·', title: 'è®¢åè·è¸ªå·' }
			, { field: 'éè´§åå·', title: 'éè´§åå·' }
			, { field: 'åæ®å·', title: 'åæ®å·' }
			, { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·' }
			, { field: 'æµè½¬å¡å·', title: 'æµè½¬å¡å·' }
			, { field: 'HSupID', title: 'HSupID', hide: true }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ' }
			, { field: 'ä¾åºå', title: 'ä¾åºå' }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			, { field: 'ä¸è¯æ°é', title: 'ä¸è¯æ°é' }
			, { field: 'æ¥åºæ°é', title: 'æ¥åºæ°é' }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½' }
			, { field: 'æµæ°´å·', title: 'æµæ°´å·', sort: true }
			, { field: 'HProcID', title: 'HProcID', hide: true }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ' }
			, { field: 'å·¥åº', title: 'å·¥åº', sort: 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: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'é¨é¨', title: 'é¨é¨' }
			, { field: 'Hsubid', title: 'Hsubid', hide: true }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			]]
			//, cols: [[
			// { type: 'checkbox', fixed: 'left' }
			// , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			// , { field: 'æ¥æ', title: 'æ¥æ' }
			// , { field: 'è®¢åè·è¸ªå·', title: 'è®¢åè·è¸ªå·' }
			// , { field: 'éè´§åå·', title: 'éè´§åå·' }
			// , { field: 'åæ®å·', title: 'åæ®å·' }
			// , { field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·' }
			// , { field: 'æµè½¬å¡å·', title: 'æµè½¬å¡å·' }
			// , { field: 'HSupID', title: 'HSupID', hide: true }
			// , { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ' }
			// , { field: 'ä¾åºå', title: 'ä¾åºå' }
			// , { field: 'HMaterID', title: 'HMaterID', hide: true }
			// , { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
			// , { field: 'äº§ååç§°', title: 'äº§ååç§°' }
			// , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			// , { field: 'ä¸è¯æ°é', title: 'ä¸è¯æ°é' }
			// , { field: 'æ¥åºæ°é', title: 'æ¥åºæ°é' }
			// , { field: 'è®¡éåä½', title: 'è®¡éåä½' }
			// , { field: 'æµæ°´å·', title: 'æµæ°´å·', sort: true }
			// , { field: 'HProcID', title: 'HProcID', hide: true }
			// , { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ' }
			// , { field: 'å·¥åº', title: 'å·¥åº', sort: 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: 'HDeptID', title: 'HDeptID', hide: true }
			// , { field: 'é¨é¨', title: 'é¨é¨' }
			// , { field: 'Hsubid', title: 'Hsubid', hide: true }
			// , { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			//]]
			, text: {
			none: 'æ æ°æ®ï¼'
			}
			@@ -262,26 +263,69 @@
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			var ajaxLoad = layer.load();
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			success: function (data1) {
			if (data1.count == 0) {
			option.data = [];
			layer.alert(data1.Message, { icon: 5 });
			} else {
			option.data = data1.data;
			if (data1.count == 1) {
			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);
			btnIs();
			layer.close(wait);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(wait);
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}

			});
			layer.close(wait);
			}

			//åè½æé®æ¯å¦ç¦ç¨æ¹æ³ï¼æ¯æ¬¡å è½½è¡¨æ ¼é½è¦è°ç¨
			@@ -548,12 +592,14 @@


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "HSupID", "HMaterID", "HProcID", "HDeptID", "Hsubid"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			/var titleData = ["hmainid", "HSupID", "HMaterID", "HProcID", "HDeptID", "Hsubid"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±/

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			@@ -619,7 +665,6 @@
			}
			})
			}

			//ä»¥ä¸æ¯layuiæ¨¡å
			});

			@@ -83,6 +83,13 @@
			<input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">çäº§ç»ç»</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			@@ -158,7 +165,11 @@
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label"><span style="color:red;">*</span>æµæ°´å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HProcNo" placeholder="è¯·é®å¥ååè½¦" id="HProcNo">
			<input type="text" class="layui-input" name="HProcNo" placeholder="è¯·é®å¥ååè½¦" id="HProcNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<input type="hidden" value="0" name="HSourceID" id="HSourceID">
			</div>
			</div>
			<!--<div class="layui-col-xs4 layui-inline">
			@@ -802,12 +813,12 @@
			"HProcExchBillNo": data.åæ®å·,
			"HProcExchHinteID": data.hmainid,
			"HICMOQty": data.ä»»å¡åæ°é,
			"HOrderProcNO": data.è®¢åè·è¸ªå·
			"HOrderProcNO": data.è®¢åè·è¸ªå·,
			"HPRDOrg": data.ç»ç»
			});
			$("#HBarCode").attr("readonly", "readonly");//æ¡å½¢ç åªè¯»
			$("#HBarCode").css("background-color", "#efefef4d");
			HProcExchBillNoFlag = true;


			var HProcExchHinteID = $('#HProcExchHinteID').val();
			//$.ajax({
			@@ -1152,6 +1163,40 @@
			location.replace('Cj_StationOutBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
			}
			//#endregion

			//éæ©æµæ°´å·å¼¹çª
			form.on('submit(SerialNum-BT)', function () {//çäº§èµæº
			var value = $("#HProcExchHinteID").val();
			// å¤ææ¯å¦å·²ç»è¾å¥æµæ°´å·ï¼æ¯åå¼¹åºæ¨¡ææ¡ï¼å¦åç»åºæç¤º
			if (value) {
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'æµæ°´å·'
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: [`../../Baseset/åºç¡èµæ/Gy_GetProcNoList.html?HInterID=${value}`, 'yes']
			, resize: false
			, cancel: function (index, layero) {
			}
			//, btn: ['ç¡®å®', 'åæ¶']
			//, btn1: function (index, layero) {
			// //æé®ãæé®ä¸ãçåè°
			// var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			// var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			// if (checkStatus.data.length === 0) {
			// return layer.msg('è¯·éæ©æ°æ®');
			// }
			// $("#HProcNo").val(checkStatus.data[0].æµæ°´å·);
			// layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			//}
			})
			} else {
			layer.alert('è¯·æ¨ç¡®è®¤è¾å¥æµè½¬å¡å·åéè¯^_^',{ icon: 7 });
			//alert('è¯·åè¾å¥æµè½¬å¡å·!')
			}
			});

			//éæ©çäº§çç»å¼¹çª
			form.on('submit(ProductionTeam-BT)', function () {//éæ©çäº§çç»
			@@ -1665,6 +1710,10 @@
			window.open(url)
			}

			//è¿åæµæ°´å·
			function GetProcNoValue(obj) {
			$("#HProcNo").val(obj[0].æµæ°´å·);
			}
			//è¿åçäº§çç»
			function GetProductionTeamValue(obj) {
			$("#HGroupName").val(obj[0].çç»);

			@@ -162,6 +162,7 @@
			var option = [];

			var HModName = "JIT_LiftMaterPlaBillnList";
			var titleData = ["HMaterID", "HUnitID", "HSourceID","hmainid","HProcExchInterID","HProcID","HunitID","HEmpID","HGroupID","HProcExchEntryID","HSubID","HICMOInterID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//åå§åè¡¨æ ¼
			set_InitGrid();

			@@ -356,7 +357,7 @@


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["HMaterID", "HUnitID", "HSourceID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			/var titleData = ["HMaterID", "HUnitID", "HSourceID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±/

			dataCol = data1.data[0].HGridString.split(',');

			@@ -667,29 +668,85 @@
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			var ajaxLoad = layer.load();
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			//success: function (data1) {
			// if (data1.count == 0) {
			// option.data = [];
			// layer.alert(data1.Message, { icon: 5 });
			// } else {
			// option.data = data1.data;
			// }
			// table.render(option);
			// btnIs();
			// if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			// ColFilter();
			// }
			// layer.close(wait);
			//}, error: function () {
			// layer.close(wait);
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			//}
			success: function (data1) {
			if (data1.count == 0) {
			option.data = [];
			layer.alert(data1.Message, { icon: 5 });
			} else {
			option.data = data1.data;
			if (data1.count == 1) {
			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);
			btnIs();
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			layer.close(wait);
			}

			//å é¤åæ®

			@@ -80,6 +80,13 @@
			<input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">çäº§ç»ç»</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			@@ -842,7 +849,8 @@
			"HProcExchHinteID": data.hmainid,
			"HICMOQty": data.ä»»å¡åæ°é,
			"lngBillKey": data.hmainid,
			"HOrderProcNO": data.è®¢åè·è¸ªå·
			"HOrderProcNO": data.è®¢åè·è¸ªå·,
			"HPRDOrg": data.ç»ç»
			});
			$("#HBarCode").attr("readonly", "readonly");//æ¡å½¢ç åªè¯»
			$("#HBarCode").css("background-color", "#efefef4d");

			@@ -156,9 +156,10 @@
			var sWhere = "";
			var option = [];
			var HModName = "Cj_StationInBillList";
			var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID","HInterID","HProcExchInterID","HProcExchEntryID","HICMOInterID","HICMOEntryID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//åå§åè¡¨æ ¼
			set_InitGrid();
			DisPlay_HideColumn();
			//DisPlay_HideColumn();

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			@@ -364,29 +365,68 @@
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			var ajaxLoad = layer.load();
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Cj_StationInBill/get_Display',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			success: function (result) {
			if (result.count == 0) {
			option.data = [];
			layer.alert(result.Message, { icon: 5 });
			} else {
			option.data = result.data;
			success: function (data1) {
			if (data1.count == 1) {
			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);
			btnIs();
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			layer.close(wait);
			}

			//å¿«éè¿æ»¤
			@@ -469,6 +509,7 @@
			$("#ColName").val("0");
			$("#Comparator").val("0");
			form.render('select');
			sWhere = "";
			}

			//ç¼è¾åæ®
			@@ -689,12 +730,14 @@


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			/var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±/

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;