MES-WEB-LayUI.git

parent: aab454e5 | 补丁 | 提交 | ignore whitespace

沈泽

2021-09-16 2dccd23b4e7ca353c59d6d31874a506a9b6242ff

7个文件已修改

1个文件已添加

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html	53 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html	645 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html	161 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillList.html	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBill.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -560,6 +560,7 @@
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·ç»´ä¿®è®°å½å\Sc_MouldRepairWorkBill_PDA.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·å¶ä»åºåºå\Sc_MouldOtherOutBill_PDA.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·å¶ä»å¥åºå\Sc_MouldOtherInBill_PDA.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡æ²»å·ä»åºç®¡ç\Sc_MouldMoveStockStepInBillList.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡æ²»å·ä»åºç®¡ç\Sc_MouldProdMoveBillList.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡æ²»å·ä»åºç®¡ç\Sc_MouldMoveStockStepOutBillList.html" />
    <Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡æ²»å·ä»åºç®¡ç\Sc_Add_MouldMoveStockStepOutBill.html" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -2,15 +2,15 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //åå¬å®¤æå¡å¨
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //chæ¬å°
    //var WEBURL = "http://localhost:8085/API/";   //zgqæ¬å°
    var WEBURL = "http://localhost:8085/API/";   //zgqæ¬å°
    //var WEBURL = "http://localhost:8080/API/";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/lubao";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨é²æ¬å°éç½®
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW
    //var WEBURL = "http://47.96.97.237/API/";   //æºäºæå¡å¨
    //var WEBURL = "http://183.129.128.86:9090/API/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨
    var WEBURL = "http://localhost/API/";
    //var WEBURL = "http://localhost/API/";
    return WEBURL
}


 WebTM/views/index.html

@@ -487,7 +487,7 @@
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldMoveStockStepOutBillList.html">å¨å·åå¸å¼è°åºåæ®ç»´æ¤</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Sc_MouldOtherInBill.html">å¶ä»å¥åºå</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Sc_MouldOtherInBillList.html">å¶ä»å¥åºåç»´æ¤</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldOtherOutBill.html">å¶ä»åºåºå</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldOtherOutBillEdit.html">å¶ä»åºåºå</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldOtherOutBillList.html">å¶ä»åºåºåç»´æ¤</a></dd>
                                    </dl>
                                </dd>

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_Add_MouldProdBackBillList.html

@@ -61,11 +61,21 @@
                                                    <input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
                                                </div>
                                            </div>
                                            <!--<div class="layui-inline">
                                                <label class="layui-form-label">ä»åº</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" 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" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="hwhid" id="hwhid" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -234,7 +244,7 @@
                    , { field: 'HQty', title: 'å®æ¶æ°é', edit: 'text', width: 100}
                    , { field: 'HPrice', title: 'åä»·', edit: 'text', width: 100}
                    , { field: 'HMoney', title: 'éé¢', edit: 'text', width: 100}
                    , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true}
                    , { field: 'hwhid', title: 'hwhid', edit: 'text', width: 100, hide: true}
                    , { field: 'HWHCode', title: 'æ¶æä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 100 }
                    , { field: 'HWHName', title: 'æ¶æä»åºåç§°', edit: 'text', width: 100 }
                    , { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true}
@@ -253,7 +263,7 @@
            //å¤ææ¯å¦æ°å¢
            if (hID == null || hID == 0) {
                //åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "","HBackFlag":"", "HRemark": "" }];
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "hwhid": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "","HBackFlag":"", "HRemark": "" }];
                table.render(option);
            }
            else {
@@ -289,7 +299,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "", "HBackFlag": "", "HRemark": "" };
                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "hwhid": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "", "HBackFlag": "", "HRemark": "" };
                switch (obj.event) {
                    case 'btn-AddLine':
                        //table.cache["mainTable"].push(AddRow[rows]);
@@ -491,7 +501,7 @@

                                    //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                                    obj.update({
                                        HWHID: checkStatus.data[0].HItemID,
                                        hwhid: checkStatus.data[0].HItemID,
                                        HWHCode: checkStatus.data[0].HNumber,
                                        HWHName: checkStatus.data[0].HName,
                                    });
@@ -621,7 +631,7 @@
            });



                
            function RoadBillMain(hID)//å è½½è¡¨å¤´
            {
                //alert(hID);
@@ -635,13 +645,13 @@
                    success: function (result) {

                        if (result.code == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data.h_v_Sc_MouldProdBackBillList_Edit[0];
                            var data = result.data.h_v_Sc_MouldProdBackBillList[0];
                            console.info(data);
                            form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
                                "HBillNo": data.åæ®å·
                                , "HDate": formatDate(data.æ¥æ)
                                , "HInnerBillNo": data.åé¨åæ®å·
                                , "HWHID": data.HWHID                    //ä»åºID
                                , "hwhid": data.hwhid                    //ä»åºID
                                , "HWHName": data.ä»åºåç§°               //ä»åºåç§°
                                , "HSecManagerID": data.hsecmanagerid    //éªæ¶åID
                                , "HSecManagerName": data.éªæ¶å         //éªæ¶ååç§°
@@ -692,7 +702,22 @@
                RoadBillMain(hID);
                /* RoadBillSub(linterid);*/
            }

            ////é»è®¤ä»åºHWhList
            //form.on('submit(HWhList)', function () {//éæ©å·¥ç§
            //    layer.open({
            //        type: 2
            //        , area: ['666px', '666px']
            //        , title: 'ä»åºåè¡¨'
            //        , shade: 0.6 //é®ç½©éæåº¦
            //        , maxmin: true //åè®¸å¨å±æå°å
            //        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
            //        , content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
            //        , resize: false
            //        , cancel: function () {
            //            //$(".layui-btn").removeClass("layui-btn-disabled");
            //        }
            //    })
            //});
            //è¡¨å¤´ä¿¡æ¯ä»åºå¼¹çª
            form.on('submit(WareHouse)', function () {
                //é¡µé¢å±-èªå®ä¹
@@ -704,18 +729,18 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/WareHouseInformation.html', 'yes'],
                    content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {

                        //æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//è·åtableçelem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HWHName").val(checkStatus.data[0].HName);
                        $("#HWHID").val(checkStatus.data[0].HItemID);
                        $("#hwhid").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) {
@@ -738,7 +763,7 @@
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                    title: 'ä»åºåè¡¨',
                    title: 'éªæ¶ååè¡¨',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
@@ -776,7 +801,7 @@
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                    title: 'ä»åºåè¡¨',
                    title: 'ä¿ç®¡ååè¡¨',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldMoveStockStepInBillList.html

New file
@@ -0,0 +1,645 @@
ï»¿<!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/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style >
        .layui-form-select .layui-input {
            padding-right: 15px;
            cursor: pointer;
        }
    </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">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>æ´å¤</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç¶æ</label>
                                    <div class="layui-input-block">
                                        <select name="HStatus" lay-filter="HStatus" style="width:190px;">
                                            <option value="-1" selected="selected">å¨é¨</option>
                                            <option value="0">æªå®¡æ ¸</option>
                                            <option value="1">å·²å®¡æ ¸</option>
                                            <option value="2">å·²å³é</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">å¼å§æ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç»ææ¥æ</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>å¶ä»æ¡ä»¶></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">åæ®å·</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">é¦æ£</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>é¢è§</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>ä¿ååå®½</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>é»è®¤åå®½</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">éåº</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
   
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            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 = "";


            //#region è¿å¥é¡µé¢å³å è½½

            //åå§åçé¢
            set_ClearBill();

            //#endregion

            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

            //#region å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //æ°å¢æé®
                    case 'btn-Add': set_AddNew();
                        break;
                    //ç¼è¾æé®
                    case 'btn-Edit': set_ShowBill();
                        break;
                    //å é¤æé®
                    case 'btn-Delete': set_DeleteBill();
                        break;
                    //å®¡æ ¸æé®
                    case 'btn-Audit': set_CheckBill();
                        break;
                    //åå®¡æ ¸æé®
                    case 'btn-DeAudit': set_AbandonCheck();
                        break;
                    //é¢è§æé®
                    case 'btn-Print': get_PrintReport();
                        break;


                    //å·æ°
                    case 'get_Refresh': get_Refresh();
                        break;
                    //éåºæé®
                    case 'get_Exit': Pub_Close(2);
                        break;
                };
            });
            //#endregion

            //#region æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery(table, option);
            });
            //#endregion

            //#region éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                //æ¸ç©ºè¿æ»¤æ¡ä»¶
                set_ClearQuery();
            });
            //#endregion
            function set_ClearBill() {
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //æ¥è¯¢
                get_Display(sWhere);
            }
            //#endregion

            //#region å·æ°
            function get_Refresh() {
                sWhere = "";
                get_Display(sWhere);
            }
             //#endregion

            function set_InitGrid() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 columns = [
                     { type: 'checkbox', fixed: 'left' }
                    , { field: 'hmainid', title: 'åæ®ID', hide: true }
                    , { field: 'æ¥æ', title: 'æ¥æ', width: 180 }
                     , { field: 'åæ®å·', title: 'åæ®å·', width: 190 }
                     , { field: 'HDeptID', title: 'HDeptID', width: 160, hide: false }
                    , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 200 }
                    , { field: 'é¨é¨', title: 'é¨é¨', width: 200 }
                     , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
                    , { field: 'éªæ¶åä»£ç ', title: 'éªæ¶åä»£ç ', width: 200 }
                    , { field: 'éªæ¶å', title: 'éªæ¶å', width: 200 }
                     , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true }
                    , { field: 'ä¿ç®¡åä»£ç ', title: 'ä¿ç®¡åä»£ç ', width: 200 }
                    , { field: 'ä¿ç®¡å', title: 'ä¿ç®¡å', width: 200 }
                     , { field: 'hwhid', title: 'hwhid', width: 200, hide: true }
                    , { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 200 }
                    , { field: 'ä»åº', title: 'ä»åº', width: 200 }
                    , { field: 'æè¦', title: 'æè¦', width: 115, hide: true }
                    , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 200 }
                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                     , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true }
                    , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 115 }
                    , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 200 }
                    , { field: 'æ¡ç ç¼å·', title: 'æ¡ç ç¼å·', width: 200 }
                    //, { field: 'æ¨¡å·åç±»', title: 'æ¨¡å·åç±»', width: 200 }
                    //, { field: 'æ¶æä»åºä»£ç ', title: 'æ¶æä»åºä»£ç ', width: 200 }
                    //, { field: 'æ¶æä»åº', title: 'æ¶æä»åº', width: 200 }
                     , { field: 'HSPID', title: 'ä»ä½ä»£ç ', width: 200, hide: false }
                    //, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ', width: 200 }
                    //, { field: 'ä»ä½', title: 'ä»ä½', width: 200 }
                    , { field: 'è®¾è®¡å¯¿å½', title: 'è®¾è®¡å¯¿å½', width: 200 }
                    , { field: 'ç´¯è®¡ä½¿ç¨å¯¿å½', title: 'ç´¯è®¡ä½¿ç¨å¯¿å½', width: 200 }
                    , { field: 'æ¬æ¬¡ä½¿ç¨å¯¿å½', title: 'æ¬æ¬¡ä½¿ç¨å¯¿å½', width: 200 }
                    , { field: 'å©ä½å¯¿å½', title: 'å©ä½å¯¿å½', width: 200 }
                    //, { field: 'æåçäº§äº§å', title: 'æåçäº§äº§å', width: 200 }
                    //, { field: 'éåºç±»å', title: 'éåºç±»å', width: 200 }
                    , { field: 'æ¨¡å·æ°è§æ ¼', title: 'æ¨¡å·æ°è§æ ¼', width: 200 }
                    , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 200 }
                    , { field: 'å³èæ°é', title: 'å³èæ°é', width: 200 }
                    , { field: 'HBillType', title: 'HBillType', width: 200, hide: true }
                    , { field: 'çº¢èåæ è®°', title: 'çº¢èåæ è®°', width: 200 }
                    , { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
                     , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 180, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>"  }
                    , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 200 }
                     , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ? '':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                    , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 200 }
                     , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 180, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                    , { field: 'å³éäºº', title: 'å³éäºº', width: 200 }
                     , { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                    , { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 200 }
                     , { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                    , { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 200, hide: true }
                    , { field: 'æºåååç ', title: 'æºåååç ', width: 200, hide: true }
                    , { field: 'æºååå·', title: 'æºååå·', width: 200 }
                    , { field: 'æºåç±»å', title: 'æºåç±»å', width: 200 }
                ];
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    //, cellMinWidth: 120
                    , totalRow: true
                    , limit: 10
                    , height: 'full-50'
                    , cols: [columns]
                    , limits: [50, 500, 1000, 5000]
                    , done: function (res, curr, count) {

                    }
                };
                ////è®¾ç½®åå®½
                //var colWidth = getColumnsWidth();
                //if (colWidth == "" || colWidth == []) {

                //}
                //else {
                //    $.each(columns, function (x, m) {
                //        m["width"] = colWidth[x];
                //    });
                //}
            }

            ////#region è·ååå®½
            //function getColumnsWidth() {
            //    var result = [];
            //    var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
            //    //è·ååå®½
            //    $.ajax({
            //        url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
            //        async: false,
            //        type: "Get",
            //        dataType: "json",
            //        data: { "colNum": colNum, "Name": Name },
            //        success: function (data1) {
            //            if (data1.code == 1) {
            //                result = data1.data;
            //            }
            //            else if (data1.code == -1) {

            //            }
            //            else {
            //                layer.alert(data1.Message, { icon: 5 });
            //            }
            //        }, error: function (e) {
            //            layer.alert(e.Message, { icon: 5 });
            //        }
            //    });

            //    return result;
            //}
            ////#endregion

            //#region å è½½ç½æ ¼
            function get_Display(sWhere) {
                //å è½½ç½æ ¼
                var index = layer.load(0);//é®ç½©
            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            $.ajax({
                url: GetWEBURL() + '/Sc_MouldMoveStockStepInBillList/GetMouldMoveStockStepInBillList',
                type: "GET",
                data: { "sWhere": sWhere},
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }
            });
            }
            //#endregion


            //#region å¿«éè¿æ»¤
            function get_FastQuery(table, option) {
                var Status = $("select[name='Status']").val();//ç¶æ
                var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
                var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
                var HBillNo = $("#HBillNo").val(); //åæ®å·
                if (Status) {
                    switch (Status) {
                        case '-1':   //å¨é¨
                            sWhere += "";
                            break;
                        case '0':    //æªå®¡æ ¸
                            sWhere += " and å®¡æ ¸äºº=''";
                            break;
                        case '1':    //å·²å®¡æ ¸
                            sWhere += " and å®¡æ ¸äºº<>''";
                            break;
                        case '2':    //å·²å³é
                            sWhere += " and å³éäºº<>''";
                        default:

                    }
                }
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
                }
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
                var index = layer.load(0);
                get_Display(sWhere);
                //è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
                sWhere = "";
            }
            //#endregion


            //#region éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $('#Status').find("option[value='-1']").attr("selected", true);
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");
            }
            //#endregion

            //#region æ°å¢
            function set_AddNew() {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                    area: ['100%', '100%'],
                    title: 'å¨å·åå¸å¼è°åºåæ®åè¡¨-æ°å¢',
                    shift: 0,
                    content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldMoveStockStepOutBill.html',
                    end: function () {
                        //å·æ°é¡µé¢,
                        location.reload();
                    }
                });
            }
            //#endregion


            //ä¿®æ¹æé®
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hID = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: 'å¨å·åå¸å¼è°åºåæ®åè¡¨'
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: false //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: ['Sc_Add_MouldMoveStockStepOutBill.html?HInterID=' + data[0].hinterid + '&HType=Modify', 'yes']
                        , resize: false,
                        end: function () {
                            //å·æ°é¡µé¢
                            location.reload();
                        }
                        , cancel: function () {

                        }
                    })
                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
                }
            }


            //å é¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var ModRightNameDelete = 'Sc_MouldOtherInBill_Delete'

                var data = obj.data //è·å¾å½åè¡æ°æ®
                    , layEvent = obj.event; //è·å¾ lay-event å¯¹åºçå¼
                layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "Sc_ICMOReportBill/DeltetICMOReportBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾å°frameç´¢å¼
                                    var index = layer.getFrameIndex(window.name);
                                    //å³éå½åframe
                                    layer.close(index);
                                    //ä¿®æ¹ä¸ºååå·æ°çé¢
                                    window.location.reload();
                                });
                            }
                            else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                        }
                    });
                })
            }
            //#endregion


            //#region å®¡æ ¸
            function set_CheckBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //é»è¾å®¡æ ¸æ¹æ³
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Sc_ICMOReportBill/AuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾å°frameç´¢å¼
                                    var index = layer.getFrameIndex(window.name);
                                    //å³éå½åframe
                                    layer.close(index);
                                    //ä¿®æ¹ä¸ºååå·æ°çé¢
                                    $("#btnSearch").trigger('click');
                                });

                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
                }
            }
            //#endregion


            //#region åå®¡æ ¸
            function set_AbandonCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //é»è¾å®¡æ ¸æ¹æ³
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Sc_ICMOReportBill/AuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾å°frameç´¢å¼
                                    var index = layer.getFrameIndex(window.name);
                                    //å³éå½åframe
                                    layer.close(index);
                                    //ä¿®æ¹ä¸ºååå·æ°çé¢
                                    $("#btnSearch").trigger('click');
                                });

                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                        }
                    });

                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®åå®¡æ ¸ï¼');
                }

            }
            //#endregion

            //#region é¢è§
            function get_PrintReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    layer.alert("ææ¯æå°æé®ï¼åæ®ä¸»IDæ¯ï¼" + InterID);
                    //window.open("../çäº§å·¥åºç®¡ç/å·¥åºæ±æ¥å/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
                    window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼');
                }
            }
            //#endregion


            //#region ä¿ååå®½
            function set_SaveGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
                    if (colName != "" && colName != null) {
                        arr.push(colWidth == -1 ? 200 : colWidth);
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    type: "POST",
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": Name },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.alert(data1.Message, { icon: 1 });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                location.reload();
            }
            //#endregion

            //#region é»è®¤åå®½
            function set_DefaultGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    if (colName != "" && colName != null) {
                        arr.push(200);   //é»è®¤å®½åº¦200
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    type: "POST",
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": Name },
                    success: function (data1) {
                        if (data1.count == 1) {

                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                //get_FastQuery(table, option);
                location.reload();
            }
            //#endregion
            //ä»¥ä¸æ¯layuiæ¨¡å
        });
    </script>
</body>
</html>

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldOtherOutBillEdit.html

@@ -76,8 +76,8 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">éªæ¶å</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSecManagerList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -248,36 +248,67 @@
                , limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
            };
            //å¤ææ¯å¦æ°å¢
            //if (hID == null || hID == 0) {
            //    //åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
            //    option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "","HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
            //    table.render(option);
            //}
            //else {
            //    $("#HInterID").val(hID);//ä¿®æ¹æ¶ä¸»è¡¨ID
            //    //ç¼è¾å è½½æ°æ®
            //    var ajaxLoad = layer.load();
            //    $.ajax({
            //        url: GetWEBURL() + 'Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListCheckDetai',
            //        type: "GET",
            //        data: { "HID":  hID },
            //        success: function (result) {
            //            //console.log(result);
            //            //console.log('gouba' + result);
            //            if (result.code == 1) {
            //                option.data = result.data;
            //                layer.close(ajaxLoad);

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

            //}

            var date = new Date();
            var day = date.getDate();
            var month = date.getMonth() + 1;
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;

            //å¤ææ¯å¦æ°å¢
            if (hID == null || hID == 0) {
                //åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "","HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
                table.render(option);
            }
            else {
                $("#HInterID").val(hID);//ä¿®æ¹æ¶ä¸»è¡¨ID
                //ç¼è¾å è½½æ°æ®
                //è·åæå¤§åæ®å· new
                $("#HInterID").val("0");
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + 'Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListProjectDetai',
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "sqlWhere": "and hmainid=" + hID },
                    success: function (result) {
                        //console.log(result);
                        //console.log('gouba' + result);
                        if (result.count == 1) {
                            option.data = result.data;
                            table.render(option);

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index0);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    data: { "HBillType": '3828' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(shijian);
                        $("#HInterID").val(0);
                    }
                });

            }

            else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
                RoadBillMain(hID);
                /* RoadBillSub(linterid);*/
            }

            //å¤´å·¥å·æ äºä»¶
            var rowid = 0;
@@ -2282,7 +2313,7 @@

            function RoadBillMain(hID)//å è½½è¡¨å¤´
            {
                alert(hID);
                //alert(hID);
                //æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
                $.ajax({
                    url: GetWEBURL() + "Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListCheckDetai",
@@ -2290,29 +2321,44 @@
                    data: {
                        "HID": hID
                    },
                    
                    success: function (result) {
                        
                        option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
                        table.render(option);
                        if (result.code == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data.h_v_Sc_MouldOtherOutBillList[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
                                "HBillNo": data.åæ®å·
                                , "HDate": formatDate(data.æ¥æ)
                                , "HInnerBillNo": data.åé¨åæ®å·
                                , "HWHID": data.HWHID                    //ä»åºID
                                , "HWHName": data.ä»åºåç§°               //ä»åºåç§°
                                , "HSecManagerID": data.HSecManagerID    //éªæ¶åID
                                , "HSecManagerName": data.éªæ¶äºº     //éªæ¶ååç§°
                                , "HKeeperID": data.HKeeperID            //ä¿ç®¡åID
                                , "HKeeperName": data.ä¿ç®¡å        //ä¿ç®¡ååç§°
                                , "HManagerName": data.è´è´£äººåç§°        //è´è´£äººåç§°
                                , "HDeptID": data.HDeptID                 //é¨é¨ID
                                , "HDeptName": data.é¨é¨             //é¨é¨åç§°
                                , "HSourceBillType":""                   //æºåç±»å
                                , "XDH": ""                               //éåå·
                                , "HExplanation": data.æè¦              //æè¦
                                , "HRemark": data.è¡¨å¤´å¤æ³¨                    //å¤æ³¨
                            });
                            //form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
                            //    "HBillNo": data.åæ®å·
                            //    , "HDate": formatDate(data.æ¥æ)
                            //    , "HInnerBillNo": data.åé¨åæ®å·
                            //    , "HWHID": data.HWHID                    //ä»åºID
                            //    , "HWHName": data.ä»åºåç§°               //ä»åºåç§°
                            //    , "HSecManagerID": data.HSecManagerID    //éªæ¶åID
                            //    , "HSecManagerName": data.éªæ¶äºº     //éªæ¶ååç§°
                            //    , "HKeeperID": data.HKeeperID            //ä¿ç®¡åID
                            //    , "HKeeperName": data.ä¿ç®¡å        //ä¿ç®¡ååç§°
                            //    , "HManagerName": data.è´è´£äººåç§°        //è´è´£äººåç§°
                            //    , "HDeptID": data.HDeptID                 //é¨é¨ID
                            //    , "HDeptName": data.é¨é¨             //é¨é¨åç§°
                            //    , "HSourceBillType":""                   //æºåç±»å
                            //    , "XDH": ""                               //éåå·
                            //    , "HExplanation": data.æè¦              //æè¦
                            //    , "HRemark": data.è¡¨å¤´å¤æ³¨                    //å¤æ³¨
                            //});

                            $("#HBillNo").val(data.åæ®å·);
                            $("#HDate").val(formatDate(data.æ¥æ));
                            $("#HInnerBillNo").val(data.åé¨åæ®å·);
                            $("#HWHID").val(data.HWHID);
                            $("#HWHName").val(data.ä»åº);
                            $("#HManagerID").val(data.HSecManagerID);
                            $("#HManagerName").val(data.éªæ¶äºº); 
                            $("#HKeeperID").val(data.HKeeperID);
                            $("#HKeeperName").val(data.ä¿ç®¡å);
                            $("#HDeptID").val(data.HDeptID);
                            $("#HDeptName").val(data.é¨é¨);
                            $("#HExplanation").val(data.æè¦);
                            $("#HRemark").val(data.è¡¨å¤´å¤æ³¨);
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
                        }
@@ -2323,33 +2369,6 @@
            }


            var date = new Date();
            var day = date.getDate();
            var month = date.getMonth() + 1;
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;

            //å¤ææ¯å¦æ°å¢
            if (hID == null || hID == 0) {
                //è·åæå¤§åæ®å· new
                $("#HInterID").val("0");
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3828' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(shijian);
                        $("#HInterID").val(0);
                    }
                });
            }
            else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
                RoadBillMain(hID);
                /* RoadBillSub(linterid);*/
            }

            //è¡¨å¤´ä¿¡æ¯ä»åºå¼¹çª
            form.on('submit(WareHouse)', function () {

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldOtherOutBillList.html

@@ -140,23 +140,23 @@
                        , { field: 'hmainid', title: 'hmainid', hide: true }
                        , { field: 'æ¥æ', title: 'æ¥æ', width: 160 }
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
                        , { field: 'HWHID', title: 'HWHID', width: 160 }
                        , { field: 'HWHID', title: 'HWHID', width: 160, hide: true}
                        , { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 160, hide: true }
                        , { field: 'ä»åº', title: 'ä»åº', width: 200 }
                        , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
                        , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
                        , { field: 'éªæ¶äººä»£ç ', title: 'éªæ¶äººä»£ç ', width: 200 }
                        , { field: 'éªæ¶äºº', title: 'éªæ¶äºº', width: 200 }
                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200 }
                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
                        , { field: 'ä¿ç®¡åä»£ç ', title: 'ä¿ç®¡åä»£ç ', width: 200 }
                        , { field: 'HDeptID', title: 'HDeptID', width: 200 }
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true}
                        , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 200 }
                        , { field: 'é¨é¨', title: 'é¨é¨', width: 115 }
                        , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
                        , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 200 }
                        //, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
                        //, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 200 }
                        , { field: 'æ¡ç ç¼å·', title: 'æ¡ç ç¼å·', width: 200 }
                        , { field: 'æ¨¡å·åç±»', title: 'æ¨¡å·åç±»', width: 200 }
                        , { field: 'æ¨¡å·ä»åº', title: 'æ¨¡å·ä»åº', width: 200 }
                        , { field: 'HSPID', title: 'HSPID', width: 200 }
                        //, { field: 'æ¨¡å·åç±»', title: 'æ¨¡å·åç±»', width: 200 }
                        //, { field: 'æ¨¡å·ä»åº', title: 'æ¨¡å·ä»åº', width: 200 }
                        , { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
                        , { field: 'ä»ä½', title: 'ä»ä½', width: 200 }
                        , { field: 'è®¾è®¡å¯¿å½', title: 'è®¾è®¡å¯¿å½', width: 200 }
                        , { field: 'ç´¯ç§¯ä½¿ç¨å¯¿å½', title: 'ç´¯ç§¯ä½¿ç¨å¯¿å½', width: 200 }
@@ -166,7 +166,7 @@
                        , { field: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 115, hide: true }
                        , { field: 'å³éç±»å', title: 'å³éç±»å', width: 200 }
                        , { field: 'å³èæ°é', title: 'å³èæ°é', width: 200 }
                        , { field: 'hsupid', title: 'hsupid', width: 200 }
                        , { field: 'hsupid', title: 'hsupid', width: 200, hide: true}
                        , { field: 'æ¨¡å·ä¾åºåä»£ç ', title: 'æ¨¡å·ä¾åºåä»£ç ', width: 200 }
                        , { field: 'æ¨¡å·ä¾åºå', title: 'æ¨¡å·ä¾åºå', width: 200 }
                        , { field: 'æè¦', title: 'æè¦', width: 200 }
@@ -186,7 +186,7 @@
                        , { field: 'æºåååç ', title: 'æºåååç ', width: 200, hide: true }
                        , { field: 'æºååå·', title: 'æºååå·', width: 200 }
                        , { field: 'æºåç±»å', title: 'æºåç±»å', width: 200 }
                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
                        //, { field: 'hbilltype', title: 'hbilltype', width: 200 }
                    ]]
                };
            }
@@ -195,7 +195,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldOtherOutBill/GetMouldOtherOutBillList',
                    url: GetWEBURL() + '/Sc_MouldProdMoveBillList/GetMouldOtherOutBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß¹ÜÀí/Sc_MouldOtherInBill.html

@@ -307,7 +307,7 @@
            }
            else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
                RoadBillMain(linterid);
                RoadBillSub(linterid);
                //RoadBillSub(linterid);
            }
            //åå§è¡¨æ ¼æ°æ®
            var rowdata = [{

			@@ -560,6 +560,7 @@
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·ç»´ä¿®è®°å½å\Sc_MouldRepairWorkBill_PDA.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·å¶ä»åºåºå\Sc_MouldOtherOutBill_PDA.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡å·å¶ä»å¥åºå\Sc_MouldOtherInBill_PDA.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡æ²»å·ä»åºç®¡ç\Sc_MouldMoveStockStepInBillList.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡æ²»å·ä»åºç®¡ç\Sc_MouldProdMoveBillList.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡æ²»å·ä»åºç®¡ç\Sc_MouldMoveStockStepOutBillList.html" />
			<Content Include="views\æ¨¡æ²»å·ç®¡ç\æ¨¡æ²»å·ä»åºç®¡ç\Sc_Add_MouldMoveStockStepOutBill.html" />

			@@ -2,15 +2,15 @@
			function GetWEBURL() {
			//var WEBURL = "http://192.168.16.80:8011/"; //åå¬å®¤æå¡å¨
			//var WEBURL = "http://localhost:8081/SWEAPI/"; //chæ¬å°
			//var WEBURL = "http://localhost:8085/API/"; //zgqæ¬å°
			var WEBURL = "http://localhost:8085/API/"; //zgqæ¬å°
			//var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			//var WEBURL = "http://183.129.128.86:9090/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨
			var WEBURL = "http://localhost/API/";
			//var WEBURL = "http://localhost/API/";
			return WEBURL
			}

			@@ -487,7 +487,7 @@
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldMoveStockStepOutBillList.html">å¨å·åå¸å¼è°åºåæ®ç»´æ¤</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Sc_MouldOtherInBill.html">å¶ä»å¥åºå</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Sc_MouldOtherInBillList.html">å¶ä»å¥åºåç»´æ¤</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldOtherOutBill.html">å¶ä»åºåºå</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldOtherOutBillEdit.html">å¶ä»åºåºå</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldOtherOutBillList.html">å¶ä»åºåºåç»´æ¤</a></dd>
			</dl>
			</dd>

			@@ -61,11 +61,21 @@
			<input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">ä»åº</label>
			<div class="layui-input-inline">
			<input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" 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" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="hwhid" id="hwhid" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -234,7 +244,7 @@
			, { field: 'HQty', title: 'å®æ¶æ°é', edit: 'text', width: 100}
			, { field: 'HPrice', title: 'åä»·', edit: 'text', width: 100}
			, { field: 'HMoney', title: 'éé¢', edit: 'text', width: 100}
			, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true}
			, { field: 'hwhid', title: 'hwhid', edit: 'text', width: 100, hide: true}
			, { field: 'HWHCode', title: 'æ¶æä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 100 }
			, { field: 'HWHName', title: 'æ¶æä»åºåç§°', edit: 'text', width: 100 }
			, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true}
			@@ -253,7 +263,7 @@
			//å¤ææ¯å¦æ°å¢
			if (hID == null \|\| hID == 0) {
			//åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "","HBackFlag":"", "HRemark": "" }];
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "hwhid": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "","HBackFlag":"", "HRemark": "" }];
			table.render(option);
			}
			else {
			@@ -289,7 +299,7 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;;
			var AddRow = table.cache['mainTable'];
			var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "", "HBackFlag": "", "HRemark": "" };
			var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "hwhid": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "", "HBackFlag": "", "HRemark": "" };
			switch (obj.event) {
			case 'btn-AddLine':
			//table.cache["mainTable"].push(AddRow[rows]);
			@@ -491,7 +501,7 @@

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HWHID: checkStatus.data[0].HItemID,
			hwhid: checkStatus.data[0].HItemID,
			HWHCode: checkStatus.data[0].HNumber,
			HWHName: checkStatus.data[0].HName,
			});
			@@ -621,7 +631,7 @@
			});




			function RoadBillMain(hID)//å è½½è¡¨å¤´
			{
			//alert(hID);
			@@ -635,13 +645,13 @@
			success: function (result) {

			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data.h_v_Sc_MouldProdBackBillList_Edit[0];
			var data = result.data.h_v_Sc_MouldProdBackBillList[0];
			console.info(data);
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HInnerBillNo": data.åé¨åæ®å·
			, "HWHID": data.HWHID //ä»åºID
			, "hwhid": data.hwhid //ä»åºID
			, "HWHName": data.ä»åºåç§° //ä»åºåç§°
			, "HSecManagerID": data.hsecmanagerid //éªæ¶åID
			, "HSecManagerName": data.éªæ¶å //éªæ¶ååç§°
			@@ -692,7 +702,22 @@
			RoadBillMain(hID);
			/* RoadBillSub(linterid);*/
			}

			////é»è®¤ä»åºHWhList
			//form.on('submit(HWhList)', function () {//éæ©å·¥ç§
			// layer.open({
			// type: 2
			// , area: ['666px', '666px']
			// , title: 'ä»åºåè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});
			//è¡¨å¤´ä¿¡æ¯ä»åºå¼¹çª
			form.on('submit(WareHouse)', function () {
			//é¡µé¢å±-èªå®ä¹
			@@ -704,18 +729,18 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/WareHouseInformation.html', 'yes'],
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HWHName").val(checkStatus.data[0].HName);
			$("#HWHID").val(checkStatus.data[0].HItemID);
			$("#hwhid").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -738,7 +763,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ä»åºåè¡¨',
			title: 'éªæ¶ååè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			@@ -776,7 +801,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ä»åºåè¡¨',
			title: 'ä¿ç®¡ååè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],

			@@ -76,8 +76,8 @@
			<div class="layui-inline">
			<label class="layui-form-label">éªæ¶å</label>
			<div class="layui-input-inline">
			<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSecManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -248,36 +248,67 @@
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			};
			//å¤ææ¯å¦æ°å¢
			//if (hID == null \|\| hID == 0) {
			// //åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			// option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "","HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
			// table.render(option);
			//}
			//else {
			// $("#HInterID").val(hID);//ä¿®æ¹æ¶ä¸»è¡¨ID
			// //ç¼è¾å è½½æ°æ®
			// var ajaxLoad = layer.load();
			// $.ajax({
			// url: GetWEBURL() + 'Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListCheckDetai',
			// type: "GET",
			// data: { "HID": hID },
			// success: function (result) {
			// //console.log(result);
			// //console.log('gouba' + result);
			// if (result.code == 1) {
			// option.data = result.data;
			// layer.close(ajaxLoad);

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

			//}

			var date = new Date();
			var day = date.getDate();
			var month = date.getMonth() + 1;
			var year = date.getFullYear();
			var shijian = year + "-" + month + "-" + day;

			//å¤ææ¯å¦æ°å¢
			if (hID == null \|\| hID == 0) {
			//åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "","HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
			table.render(option);
			}
			else {
			$("#HInterID").val(hID);//ä¿®æ¹æ¶ä¸»è¡¨ID
			//ç¼è¾å è½½æ°æ®
			//è·åæå¤§åæ®å· new
			$("#HInterID").val("0");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + 'Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListProjectDetai',
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "sqlWhere": "and hmainid=" + hID },
			success: function (result) {
			//console.log(result);
			//console.log('gouba' + result);
			if (result.count == 1) {
			option.data = result.data;
			table.render(option);

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index0);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			data: { "HBillType": '3828' },
			success: function (d) {
			//console.log(d.data);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(shijian);
			$("#HInterID").val(0);
			}
			});

			}

			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(hID);
			/* RoadBillSub(linterid);*/
			}

			//å¤´å·¥å·æ äºä»¶
			var rowid = 0;
			@@ -2282,7 +2313,7 @@

			function RoadBillMain(hID)//å è½½è¡¨å¤´
			{
			alert(hID);
			//alert(hID);
			//æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
			$.ajax({
			url: GetWEBURL() + "Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListCheckDetai",
			@@ -2290,29 +2321,44 @@
			data: {
			"HID": hID
			},

			success: function (result) {

			option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHName": "", "HRemark": "" }];
			table.render(option);
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data.h_v_Sc_MouldOtherOutBillList[0];
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HInnerBillNo": data.åé¨åæ®å·
			, "HWHID": data.HWHID //ä»åºID
			, "HWHName": data.ä»åºåç§° //ä»åºåç§°
			, "HSecManagerID": data.HSecManagerID //éªæ¶åID
			, "HSecManagerName": data.éªæ¶äºº //éªæ¶ååç§°
			, "HKeeperID": data.HKeeperID //ä¿ç®¡åID
			, "HKeeperName": data.ä¿ç®¡å //ä¿ç®¡ååç§°
			, "HManagerName": data.è´è´£äººåç§° //è´è´£äººåç§°
			, "HDeptID": data.HDeptID //é¨é¨ID
			, "HDeptName": data.é¨é¨ //é¨é¨åç§°
			, "HSourceBillType":"" //æºåç±»å
			, "XDH": "" //éåå·
			, "HExplanation": data.æè¦ //æè¦
			, "HRemark": data.è¡¨å¤´å¤æ³¨ //å¤æ³¨
			});
			//form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			// "HBillNo": data.åæ®å·
			// , "HDate": formatDate(data.æ¥æ)
			// , "HInnerBillNo": data.åé¨åæ®å·
			// , "HWHID": data.HWHID //ä»åºID
			// , "HWHName": data.ä»åºåç§° //ä»åºåç§°
			// , "HSecManagerID": data.HSecManagerID //éªæ¶åID
			// , "HSecManagerName": data.éªæ¶äºº //éªæ¶ååç§°
			// , "HKeeperID": data.HKeeperID //ä¿ç®¡åID
			// , "HKeeperName": data.ä¿ç®¡å //ä¿ç®¡ååç§°
			// , "HManagerName": data.è´è´£äººåç§° //è´è´£äººåç§°
			// , "HDeptID": data.HDeptID //é¨é¨ID
			// , "HDeptName": data.é¨é¨ //é¨é¨åç§°
			// , "HSourceBillType":"" //æºåç±»å
			// , "XDH": "" //éåå·
			// , "HExplanation": data.æè¦ //æè¦
			// , "HRemark": data.è¡¨å¤´å¤æ³¨ //å¤æ³¨
			//});

			$("#HBillNo").val(data.åæ®å·);
			$("#HDate").val(formatDate(data.æ¥æ));
			$("#HInnerBillNo").val(data.åé¨åæ®å·);
			$("#HWHID").val(data.HWHID);
			$("#HWHName").val(data.ä»åº);
			$("#HManagerID").val(data.HSecManagerID);
			$("#HManagerName").val(data.éªæ¶äºº);
			$("#HKeeperID").val(data.HKeeperID);
			$("#HKeeperName").val(data.ä¿ç®¡å);
			$("#HDeptID").val(data.HDeptID);
			$("#HDeptName").val(data.é¨é¨);
			$("#HExplanation").val(data.æè¦);
			$("#HRemark").val(data.è¡¨å¤´å¤æ³¨);
			} else {
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			@@ -2323,33 +2369,6 @@
			}


			var date = new Date();
			var day = date.getDate();
			var month = date.getMonth() + 1;
			var year = date.getFullYear();
			var shijian = year + "-" + month + "-" + day;

			//å¤ææ¯å¦æ°å¢
			if (hID == null \|\| hID == 0) {
			//è·åæå¤§åæ®å· new
			$("#HInterID").val("0");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '3828' },
			success: function (d) {
			//console.log(d.data);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(shijian);
			$("#HInterID").val(0);
			}
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(hID);
			/* RoadBillSub(linterid);*/
			}

			//è¡¨å¤´ä¿¡æ¯ä»åºå¼¹çª
			form.on('submit(WareHouse)', function () {

			@@ -140,23 +140,23 @@
			, { field: 'hmainid', title: 'hmainid', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			, { field: 'HWHID', title: 'HWHID', width: 160 }
			, { field: 'HWHID', title: 'HWHID', width: 160, hide: true}
			, { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 160, hide: true }
			, { field: 'ä»åº', title: 'ä»åº', width: 200 }
			, { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
			, { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
			, { field: 'éªæ¶äººä»£ç ', title: 'éªæ¶äººä»£ç ', width: 200 }
			, { field: 'éªæ¶äºº', title: 'éªæ¶äºº', width: 200 }
			, { field: 'HKeeperID', title: 'HKeeperID', width: 200 }
			, { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
			, { field: 'ä¿ç®¡åä»£ç ', title: 'ä¿ç®¡åä»£ç ', width: 200 }
			, { field: 'HDeptID', title: 'HDeptID', width: 200 }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true}
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 200 }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 115 }
			, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
			, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 200 }
			//, { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ', width: 200 }
			//, { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°', width: 200 }
			, { field: 'æ¡ç ç¼å·', title: 'æ¡ç ç¼å·', width: 200 }
			, { field: 'æ¨¡å·åç±»', title: 'æ¨¡å·åç±»', width: 200 }
			, { field: 'æ¨¡å·ä»åº', title: 'æ¨¡å·ä»åº', width: 200 }
			, { field: 'HSPID', title: 'HSPID', width: 200 }
			//, { field: 'æ¨¡å·åç±»', title: 'æ¨¡å·åç±»', width: 200 }
			//, { field: 'æ¨¡å·ä»åº', title: 'æ¨¡å·ä»åº', width: 200 }
			, { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
			, { field: 'ä»ä½', title: 'ä»ä½', width: 200 }
			, { field: 'è®¾è®¡å¯¿å½', title: 'è®¾è®¡å¯¿å½', width: 200 }
			, { field: 'ç´¯ç§¯ä½¿ç¨å¯¿å½', title: 'ç´¯ç§¯ä½¿ç¨å¯¿å½', width: 200 }
			@@ -166,7 +166,7 @@
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 115, hide: true }
			, { field: 'å³éç±»å', title: 'å³éç±»å', width: 200 }
			, { field: 'å³èæ°é', title: 'å³èæ°é', width: 200 }
			, { field: 'hsupid', title: 'hsupid', width: 200 }
			, { field: 'hsupid', title: 'hsupid', width: 200, hide: true}
			, { field: 'æ¨¡å·ä¾åºåä»£ç ', title: 'æ¨¡å·ä¾åºåä»£ç ', width: 200 }
			, { field: 'æ¨¡å·ä¾åºå', title: 'æ¨¡å·ä¾åºå', width: 200 }
			, { field: 'æè¦', title: 'æè¦', width: 200 }
			@@ -186,7 +186,7 @@
			, { field: 'æºåååç ', title: 'æºåååç ', width: 200, hide: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 200 }
			, { field: 'æºåç±»å', title: 'æºåç±»å', width: 200 }
			, { field: 'hbilltype', title: 'hbilltype', width: 200 }
			//, { field: 'hbilltype', title: 'hbilltype', width: 200 }
			]]
			};
			}
			@@ -195,7 +195,7 @@
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Sc_MouldOtherOutBill/GetMouldOtherOutBillList',
			url: GetWEBURL() + '/Sc_MouldProdMoveBillList/GetMouldOtherOutBillList',
			type: "GET",
			data: { "sWhere": sWhere },
			success: function (data1) {

			@@ -307,7 +307,7 @@
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(linterid);
			RoadBillSub(linterid);
			//RoadBillSub(linterid);
			}
			//åå§è¡¨æ ¼æ°æ®
			var rowdata = [{