MES-WEB-LayUI.git

parent: 2966dd6c | 补丁 | 提交 | show whitespace

王垚

2021-10-13 d2e982c59a63fd3b1aabdbdd082d2bf7ee71fc92

问题修复

4个文件已修改

	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillEdit.html	72 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill.html	157 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -74,7 +74,7 @@
                                        <div class=" layui-inline">
                                            <label class="layui-form-label">æ¹å¶é¡¹ç®</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HRepairName" id="HRepairName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HRepairList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -86,7 +86,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æ¹å¶é¨é¨</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -96,7 +96,7 @@
                                        <div class=" layui-inline">
                                            <label class="layui-form-label">ä¾åºå</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -106,7 +106,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ç³è¯·äºº</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HEmpName" id="HEmpName"  readonly class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -116,7 +116,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è´è´£äºº</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HManagerName" id="HManagerName" readonly  class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -151,19 +151,19 @@
                                        <div class=" layui-inline">
                                            <label class="layui-form-label">è®¡åå·¥æ¶</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HPlanTimes" id="HPlanTimes">
                                                <input class="layui-input" name="HPlanTimes" id="HPlanTimes" value="0">
                                            </div>
                                        </div>
                                        <div class=" layui-inline">
                                            <label class="layui-form-label">å®éå·¥æ¶</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HTimes" id="HTimes">
                                                <input class="layui-input" name="HTimes" id="HTimes" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æ¹å¶æ°é</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HChangeNum" id="HChangeNum">
                                                <input class="layui-input" name="HChangeNum" id="HChangeNum" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -180,7 +180,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æ°ç©æ</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HNewMaterName" id="HNewMaterName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HNewMaterName" id="HNewMaterName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HNewMaterID" id="HNewMaterID" class="layui-input" value="" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HNewMaterList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -308,15 +308,18 @@
    </div>
    <script>
        //è·ååæ°
        debugger;
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//æä½ç±»å
            var closeType = 2;  //å³éç±»å
        } else {
            debugger;
            var OperationType = params[params[0]];//æä½ç±»å
            var linterid = params[params[1]];//æºåid
            var HSouceBillType = params[params[2]];//æºåç±»å
            var closeType = params[params[3]];  //å³éç±»å
        }


        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
@@ -600,11 +603,10 @@
                data.field.HMaker = sessionStorage["HUserName"];//å¶åäºº
                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + refSav + ';' + sessionStorage["HUserName"];

                //if (!AllowLoadData(sMainStr))//æ°æ®éªè¯
                //{
                //    return false;
                //}
                if (!AllowLoadData(sMainStr))//æ°æ®éªè¯
                {
                    return false;
                }
                $.ajax(
                    {
                        type: "POST",
@@ -705,8 +707,19 @@
                }
            });
            //éåº
            form.on('submit(Exit)', function (data) {//
                Pub_Close(1);
            form.on('submit(Exit)', function (data) {
                if (closeType == 0) {
                    //å³éé¡µç¾
                    parent.layui.admin.events.closeThisTabs();
                }
                if (closeType == 1) {
                    //å³éå¼¹çª
                    var index = parent.layer.getFrameIndex(window.name);
                    parent.layer.close(index);
                } else if (closeType == 2) {
                    //å³éé¡µç¾
                    parent.layui.admin.events.closeThisTabs();
                }
            });
            //æå°Printing
            form.on("submit(print)", function (data) {
@@ -856,12 +869,29 @@
            //éç©ºéªè¯
            function AllowLoadData(sSubStr) {
                var Result = true;
                if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
                    layer.msg("éªæ¶åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

                if ($("#HRepairID").val() == '' || $("#HRepairID").val() == null) {
                    layer.msg("æ¹å¶é¡¹ç®ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
                    layer.msg("ä¿ç®¡åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
                    layer.msg("æ¹å¶é¨é¨ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                if ($("#HSupID").val() == '' || $("#HSupID").val() == null) {
                    layer.msg("ä¾åºåä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
                    layer.msg("ç³è¯·äººä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                if ($("#HManagerID").val() == '' || $("#HManagerID").val() == null) {
                    layer.msg("è´è´£äººä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                if ($("#HNewMaterID").val() == '' || $("#HNewMaterID").val() == null) {
                    layer.msg("æ°ç©æä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                else {

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

@@ -271,7 +271,7 @@
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldRepairChangeBillEdit.html?OperationType=1&linterid=&HSouceBillType=',
                    content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldRepairChangeBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
                    end: function () {
                        //å·æ°é¡µé¢,
                        location.reload();
@@ -296,7 +296,7 @@
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: true //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldRepairChangeBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldRepairChangeBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
                        , resize: false,
                        end: function () {
                            //å·æ°é¡µé¢,

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

@@ -68,7 +68,7 @@
                                            <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="text" name="HWHName" id="HWHName" readonly 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>
@@ -80,7 +80,7 @@
                                            <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="" style="float:left;width:150px;">
                                                    <input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -90,7 +90,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">ä¿ç®¡å</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -100,7 +100,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è´è´£äºº</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -110,7 +110,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">é¨é¨</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -119,6 +119,26 @@
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">å¾æ¥ç±»å</label>
                                                <div class="layui-input-inline">
                                                    <select name="HSupTypeID" id="HSupTypeID" class="layui-input" value="" style="float:left;width:150px">
                                                        <option value="1">ä¾åºå</option>
                                                        <option value="2">å®¢æ·</option>
                                                        <option value="3">è½¦é´é¨é¨</option>
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">å¾æ¥åä½</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">æºåç±»å</label>
                                                <div class="layui-input-inline">
@@ -131,6 +151,8 @@
                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">æè¦</label>
                                                <div class="layui-input-inline">
@@ -272,6 +294,64 @@
                        }
                        $("#HWHName").val(checkStatus.data[0].HName);
                        $("#HWHID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) {
                        //æé®ãæé®äºãçåè°
                        //return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });
            function getSupType() {
                var type = $("#HSupTypeID").val();
                console.log(type)
                switch (type) {
                    case '1':
                        return "SupplierInformation";
                        break;
                    case '2':
                        return "CustomerInformation";
                        break;
                    case '3':
                        return "DeptInformation";
                        break;
                }
            }
            //è¡¨å¤´ä¿¡æ¯å¾æ¥åä½å¼¹çª
            form.on('submit(HSupList)', function () {
                debugger;
                if ($("#HSupTypeID").val() == 0 || $("#HSupTypeID").val() == null) {
                    return layer.msg('è¯·éæ©å¾æ¥ç±»å');
                }
                //é¡µé¢å±-èªå®ä¹
                var url = '../../PublicPage/' + getSupType() + '.html';
                //alert(url);
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                    title: 'å¾æ¥åä½åè¡¨',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: [url, 'yes'],
                    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('è¯·éæ©æ°æ®');
                        }
                        $("#HSupName").val(checkStatus.data[0].HName);
                        $("#HSupID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) {
@@ -597,14 +677,14 @@
                    , { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true }
                    , { field: 'HPropertyCode', title: 'è¾å©å±æ§ä»£ç ', edit: 'text', event: 'HPropertyCode', width: 100 }
                    , { field: 'HPropertyName', title: 'è¾å©å±æ§åç§°', edit: 'text', width: 100 }
                    , { field: 'HPropertyCode', title: 'è¾å©å±æ§ä»£ç ', edit: 'text', event: 'HPropertyCode', width: 120 }
                    , { field: 'HPropertyName', title: 'è¾å©å±æ§åç§°', edit: 'text', width: 120 }
                    , { field: 'HSecUnitID', title: 'HSecUnitID', edit: 'text', width: 100, hide: true }
                    , { field: 'HSecUnitCode', title: 'è¾å©è®¡éåä½ä»£ç ', edit: 'text', event: 'HSecUnitCode', width: 100 }
                    , { field: 'HSecUnitName', title: 'è¾å©è®¡éåä½åç§°', edit: 'text', width: 100 }
                    , { field: 'HSecUnitCode', title: 'è¾å©è®¡éåä½ä»£ç ', edit: 'text', event: 'HSecUnitCode', width: 120 }
                    , { field: 'HSecUnitName', title: 'è¾å©è®¡éåä½åç§°', edit: 'text', width: 120 }
                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
                    , { field: 'HUnitCode', title: 'è®¡éåä½ä»£ç ', edit: 'text', event: 'HUnitCode', width: 100 }
                    , { field: 'HUnitName', title: 'è®¡éåä½åç§°', edit: 'text', width: 100 }
                    , { field: 'HUnitCode', title: 'è®¡éåä½ä»£ç ', edit: 'text', event: 'HUnitCode', width: 120 }
                    , { field: 'HUnitName', title: 'è®¡éåä½åç§°', edit: 'text', width: 120 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
                    , { field: 'HLeaveLife', title: 'å©ä½å¯¿å½', edit: 'text', width: 100 }
@@ -613,12 +693,13 @@
                    , { 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: 'HWHCode', title: 'æ¶æä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 100 }
                    , { field: 'HWHName', title: 'æ¶æä»åºåç§°', edit: 'text', width: 100 }
                    , { field: 'HWHCode', title: 'æ¶æä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 120 }
                    , { field: 'HWHName', title: 'æ¶æä»åºåç§°', edit: 'text', width: 120 }
                    , { field: 'HSPID', title: 'ä»ä½ä»£ç ', edit: 'text', width: 100, hide: true }
                    , { field: 'HSPCode', title: 'ä»ä½ä»£ç ', edit: 'text', event: 'HSPCode', width: 100 }
                    , { field: 'HSPName', title: 'ä»ä½åç§°', edit: 'text', width: 100 }
                    , { field: 'HRemark', title: 'å¤æ³¨', edit: 'text', width: 100 }

                ];
                option = {
                    id: 'mainTable'
@@ -694,6 +775,9 @@
                                , "XDH": ""                               //éåå·
                                , "HExplanation": data.æè¦              //æè¦
                                , "HRemark": data.å¤æ³¨                    //å¤æ³¨
                                , "HSupTypeID": data.å¾æ¥ç±»å                             //éåå·
                                , "HSupName": data.å¾æ¥åä½              //æè¦
                                , "HSupID": data.HSupID                    //å¤æ³¨
                            });

                        } else {
@@ -1048,26 +1132,59 @@

            }
            //éç©ºéªè¯
            function AllowLoadData(sSubStr) {
            function AllowLoadData(sSubStr) {  //éç©ºéªè¯
                var Result = true;

                
                if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
                    layer.msg("ä»åºä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
                    layer.msg("éªæ¶åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    layer.msg("éªæ¶åä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
                    layer.msg("ä¿ç®¡åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    layer.msg("ä¿ç®¡åä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }

                if (typeof (sSubStr) == "undefined" || sSubStr == "") {
                    layer.msg("æ²¡æç©ææç»è®°å½", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                if ($("#HManagerID").val() == '' || $("#HManagerID").val() == null) {
                    layer.msg("è´è´£äººä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
                    layer.msg("é¨é¨ä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                if ($("#HSupID").val() == '' || $("#HSupID").val() == null) {
                    layer.msg("å¾æ¥åä½ä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                    layer.msg("åè¡¨æç»è®°å½ä¸è½ä¸ºç©º", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return Result = false;
                }
                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HMaterID == "") {
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä»£ç ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            return Result = false;
                        }
                        if (sSubStr[i].HUnitID == "") {
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,è®¡éåä½ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            return Result = false;
                        }
                        if (sSubStr[i].HDesignLife == "") {
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,è®¾è®¡å¯¿å½ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            return Result = false;
                        }
                        if (sSubStr[i].HQty == "") {
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å®åæ°éä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            return Result = false;
                        }
                        if (sSubStr[i].HWHID == "") {
                            layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æ¶æä»åºä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            return Result = false;
                        }
                    }

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

@@ -68,7 +68,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">è´è´£äºº</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="ZRPerson" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -78,7 +78,7 @@
                                            <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="text" name="HWHName" id="HWHName" readonly 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>
@@ -88,7 +88,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">åè´§å</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="FHPerson" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -98,7 +98,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">é¨é¨</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>

			@@ -74,7 +74,7 @@
			<div class=" layui-inline">
			<label class="layui-form-label">æ¹å¶é¡¹ç®</label>
			<div class="layui-input-inline">
			<input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HRepairName" id="HRepairName" readonly class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HRepairList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -86,7 +86,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">æ¹å¶é¨é¨</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -96,7 +96,7 @@
			<div class=" layui-inline">
			<label class="layui-form-label">ä¾åºå</label>
			<div class="layui-input-inline">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -106,7 +106,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">ç³è¯·äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -116,7 +116,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">è´è´£äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -151,19 +151,19 @@
			<div class=" layui-inline">
			<label class="layui-form-label">è®¡åå·¥æ¶</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HPlanTimes" id="HPlanTimes">
			<input class="layui-input" name="HPlanTimes" id="HPlanTimes" value="0">
			</div>
			</div>
			<div class=" layui-inline">
			<label class="layui-form-label">å®éå·¥æ¶</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HTimes" id="HTimes">
			<input class="layui-input" name="HTimes" id="HTimes" value="0">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¹å¶æ°é</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HChangeNum" id="HChangeNum">
			<input class="layui-input" name="HChangeNum" id="HChangeNum" value="0">
			</div>
			</div>
			<div class="layui-inline">
			@@ -180,7 +180,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">æ°ç©æ</label>
			<div class="layui-input-inline">
			<input type="text" name="HNewMaterName" id="HNewMaterName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HNewMaterName" id="HNewMaterName" readonly class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HNewMaterID" id="HNewMaterID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HNewMaterList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -308,15 +308,18 @@
			</div>
			<script>
			//è·ååæ°
			debugger;
			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			var OperationType = 1;//æä½ç±»å
			var closeType = 2; //å³éç±»å
			} else {
			debugger;
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			var closeType = params[params[3]]; //å³éç±»å
			}


			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -600,11 +603,10 @@
			data.field.HMaker = sessionStorage["HUserName"];//å¶åäºº
			var sMainStr = JSON.stringify(data.field);
			var sMainSub = sMainStr + ';' + refSav + ';' + sessionStorage["HUserName"];

			//if (!AllowLoadData(sMainStr))//æ°æ®éªè¯
			//{
			// return false;
			//}
			if (!AllowLoadData(sMainStr))//æ°æ®éªè¯
			{
			return false;
			}
			$.ajax(
			{
			type: "POST",
			@@ -705,8 +707,19 @@
			}
			});
			//éåº
			form.on('submit(Exit)', function (data) {//
			Pub_Close(1);
			form.on('submit(Exit)', function (data) {
			if (closeType == 0) {
			//å³éé¡µç¾
			parent.layui.admin.events.closeThisTabs();
			}
			if (closeType == 1) {
			//å³éå¼¹çª
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			} else if (closeType == 2) {
			//å³éé¡µç¾
			parent.layui.admin.events.closeThisTabs();
			}
			});
			//æå°Printing
			form.on("submit(print)", function (data) {
			@@ -856,12 +869,29 @@
			//éç©ºéªè¯
			function AllowLoadData(sSubStr) {
			var Result = true;
			if ($("#HSecManagerID").val() == '' \|\| $("#HSecManagerID").val() == null) {
			layer.msg("éªæ¶åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });

			if ($("#HRepairID").val() == '' \|\| $("#HRepairID").val() == null) {
			layer.msg("æ¹å¶é¡¹ç®ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HKeeperID").val() == '' \|\| $("#HKeeperID").val() == null) {
			layer.msg("ä¿ç®¡åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			if ($("#HDeptID").val() == '' \|\| $("#HDeptID").val() == null) {
			layer.msg("æ¹å¶é¨é¨ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HSupID").val() == '' \|\| $("#HSupID").val() == null) {
			layer.msg("ä¾åºåä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HEmpID").val() == '' \|\| $("#HEmpID").val() == null) {
			layer.msg("ç³è¯·äººä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HManagerID").val() == '' \|\| $("#HManagerID").val() == null) {
			layer.msg("è´è´£äººä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HNewMaterID").val() == '' \|\| $("#HNewMaterID").val() == null) {
			layer.msg("æ°ç©æä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			else {

			@@ -271,7 +271,7 @@
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldRepairChangeBillEdit.html?OperationType=1&linterid=&HSouceBillType=',
			content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldRepairChangeBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
			end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			@@ -296,7 +296,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldRepairChangeBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
			, content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_MouldRepairChangeBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
			, resize: false,
			end: function () {
			//å·æ°é¡µé¢,

			@@ -68,7 +68,7 @@
			<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="text" name="HWHName" id="HWHName" readonly 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>
			@@ -80,7 +80,7 @@
			<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="" style="float:left;width:150px;">
			<input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -90,7 +90,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">ä¿ç®¡å</label>
			<div class="layui-input-inline">
			<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -100,7 +100,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">è´è´£äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -110,7 +110,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -119,6 +119,26 @@
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å¾æ¥ç±»å</label>
			<div class="layui-input-inline">
			<select name="HSupTypeID" id="HSupTypeID" class="layui-input" value="" style="float:left;width:150px">
			<option value="1">ä¾åºå</option>
			<option value="2">å®¢æ·</option>
			<option value="3">è½¦é´é¨é¨</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¾æ¥åä½</label>
			<div class="layui-input-inline">
			<input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æºåç±»å</label>
			<div class="layui-input-inline">
			@@ -131,6 +151,8 @@
			<input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-inline">
			@@ -272,6 +294,64 @@
			}
			$("#HWHName").val(checkStatus.data[0].HName);
			$("#HWHID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});
			function getSupType() {
			var type = $("#HSupTypeID").val();
			console.log(type)
			switch (type) {
			case '1':
			return "SupplierInformation";
			break;
			case '2':
			return "CustomerInformation";
			break;
			case '3':
			return "DeptInformation";
			break;
			}
			}
			//è¡¨å¤´ä¿¡æ¯å¾æ¥åä½å¼¹çª
			form.on('submit(HSupList)', function () {
			debugger;
			if ($("#HSupTypeID").val() == 0 \|\| $("#HSupTypeID").val() == null) {
			return layer.msg('è¯·éæ©å¾æ¥ç±»å');
			}
			//é¡µé¢å±-èªå®ä¹
			var url = '../../PublicPage/' + getSupType() + '.html';
			//alert(url);
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'å¾æ¥åä½åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: [url, 'yes'],
			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('è¯·éæ©æ°æ®');
			}
			$("#HSupName").val(checkStatus.data[0].HName);
			$("#HSupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -597,14 +677,14 @@
			, { field: 'HMaterName', title: 'å¨å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true }
			, { field: 'HPropertyCode', title: 'è¾å©å±æ§ä»£ç ', edit: 'text', event: 'HPropertyCode', width: 100 }
			, { field: 'HPropertyName', title: 'è¾å©å±æ§åç§°', edit: 'text', width: 100 }
			, { field: 'HPropertyCode', title: 'è¾å©å±æ§ä»£ç ', edit: 'text', event: 'HPropertyCode', width: 120 }
			, { field: 'HPropertyName', title: 'è¾å©å±æ§åç§°', edit: 'text', width: 120 }
			, { field: 'HSecUnitID', title: 'HSecUnitID', edit: 'text', width: 100, hide: true }
			, { field: 'HSecUnitCode', title: 'è¾å©è®¡éåä½ä»£ç ', edit: 'text', event: 'HSecUnitCode', width: 100 }
			, { field: 'HSecUnitName', title: 'è¾å©è®¡éåä½åç§°', edit: 'text', width: 100 }
			, { field: 'HSecUnitCode', title: 'è¾å©è®¡éåä½ä»£ç ', edit: 'text', event: 'HSecUnitCode', width: 120 }
			, { field: 'HSecUnitName', title: 'è¾å©è®¡éåä½åç§°', edit: 'text', width: 120 }
			, { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
			, { field: 'HUnitCode', title: 'è®¡éåä½ä»£ç ', edit: 'text', event: 'HUnitCode', width: 100 }
			, { field: 'HUnitName', title: 'è®¡éåä½åç§°', edit: 'text', width: 100 }
			, { field: 'HUnitCode', title: 'è®¡éåä½ä»£ç ', edit: 'text', event: 'HUnitCode', width: 120 }
			, { field: 'HUnitName', title: 'è®¡éåä½åç§°', edit: 'text', width: 120 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
			, { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
			, { field: 'HLeaveLife', title: 'å©ä½å¯¿å½', edit: 'text', width: 100 }
			@@ -613,12 +693,13 @@
			, { 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: 'HWHCode', title: 'æ¶æä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 100 }
			, { field: 'HWHName', title: 'æ¶æä»åºåç§°', edit: 'text', width: 100 }
			, { field: 'HWHCode', title: 'æ¶æä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 120 }
			, { field: 'HWHName', title: 'æ¶æä»åºåç§°', edit: 'text', width: 120 }
			, { field: 'HSPID', title: 'ä»ä½ä»£ç ', edit: 'text', width: 100, hide: true }
			, { field: 'HSPCode', title: 'ä»ä½ä»£ç ', edit: 'text', event: 'HSPCode', width: 100 }
			, { field: 'HSPName', title: 'ä»ä½åç§°', edit: 'text', width: 100 }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text', width: 100 }

			];
			option = {
			id: 'mainTable'
			@@ -694,6 +775,9 @@
			, "XDH": "" //éåå·
			, "HExplanation": data.æè¦ //æè¦
			, "HRemark": data.å¤æ³¨ //å¤æ³¨
			, "HSupTypeID": data.å¾æ¥ç±»å //éåå·
			, "HSupName": data.å¾æ¥åä½ //æè¦
			, "HSupID": data.HSupID //å¤æ³¨
			});

			} else {
			@@ -1048,26 +1132,59 @@

			}
			//éç©ºéªè¯
			function AllowLoadData(sSubStr) {
			function AllowLoadData(sSubStr) { //éç©ºéªè¯
			var Result = true;


			if ($("#HWHID").val() == '' \|\| $("#HWHID").val() == null) {
			layer.msg("ä»åºä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HSecManagerID").val() == '' \|\| $("#HSecManagerID").val() == null) {
			layer.msg("éªæ¶åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("éªæ¶åä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HKeeperID").val() == '' \|\| $("#HKeeperID").val() == null) {
			layer.msg("ä¿ç®¡åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("ä¿ç®¡åä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}

			if (typeof (sSubStr) == "undefined" \|\| sSubStr == "") {
			layer.msg("æ²¡æç©ææç»è®°å½", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			if ($("#HManagerID").val() == '' \|\| $("#HManagerID").val() == null) {
			layer.msg("è´è´£äººä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HDeptID").val() == '' \|\| $("#HDeptID").val() == null) {
			layer.msg("é¨é¨ä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HSupID").val() == '' \|\| $("#HSupID").val() == null) {
			layer.msg("å¾æ¥åä½ä¸è½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if (typeof (sSubStr) == "undefined" \|\| sSubStr == "" \|\| sSubStr == "[]") {
			layer.msg("åè¡¨æç»è®°å½ä¸è½ä¸ºç©º", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
			sSubStr = JSON.parse(sSubStr);
			for (var i = 0; i < sSubStr.length; i++) {
			if (sSubStr[i].HMaterID == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å¨å·ä»£ç ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if (sSubStr[i].HUnitID == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,è®¡éåä½ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if (sSubStr[i].HDesignLife == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,è®¾è®¡å¯¿å½ä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if (sSubStr[i].HQty == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å®åæ°éä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if (sSubStr[i].HWHID == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,æ¶æä»åºä¿¡æ¯ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			}