MES-WEB-LayUI.git

parent: 36b2c5e5 | 补丁 | 提交 | ignore whitespace

1、工序委外接收单新增修改、审核、反审核功能。 2、工序委外接收单列表新增审核、反审核功能。 3、修复工序流转卡保存未保存委外标记问题。

仲国强

2021-09-16 a17848ee412c393ef6dd3fa0494877a9be8b5cfa

1、工序委外接收单新增修改、审核、反审核功能。
2、工序委外接收单列表新增审核、反审核功能。
3、修复工序流转卡保存未保存委外标记问题。

5个文件已修改

	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html	136 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillList.html	73 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -2,7 +2,7 @@
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/";    //æ¨é²æ¬å°éç½®
@@ -10,7 +10,7 @@
    //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/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò·¢³öµ¥/Cj_StationEntrustInBill.html

@@ -478,6 +478,7 @@

            function RoadBillMain(linterid)//å è½½è¡¨å¤´
            {
                var index = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationEntrustInBill/GetStationEntrustInBill",
                    type: "GET",
@@ -524,6 +525,11 @@
                            $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®ç¦ç¨
                        }
                        PicUpload();
                        layer.close(index);
                    }
                    , error: function () {
                        layer.close(index);
                        layer.msg("æ¥å£è¯·æ±å¤±è´¥");
                    }
                })
            }
@@ -675,16 +681,10 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            //layer.confirm(data.Message, {
                            //    icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
                            //    btn2: function () {
                            //        //parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
                            //        //window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
                            //        parent.location.href = "../../../views/index.html"
                            //    }//å³é
                            //}, function () { window.location.reload(); });//æ°å¢
                            layer.close(index);
                            layer.msg("æäº¤æå");
                            //ä¿ååæµè§
                            ReRoadBillMain();
                        }
                        else {
                            layer.close(index);
@@ -698,6 +698,12 @@
                });
            });

            //#region ä¿ååæµè§æ¹æ³
            function ReRoadBillMain() {
                location.replace('Cj_StationEntrustInBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
            }
            //#endregion

            //éæ©å·¥åº
            form.on('submit(HSQProcID-BT)', function () {
                layer.open({

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

@@ -36,10 +36,10 @@
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">æ°å¢</button>
                            <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Modify" id="set_Modify">ä¿®æ¹</button>-->
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Modify" id="set_Modify">ä¿®æ¹</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="Saver">ä¿å</button>
                            <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">å®¡æ ¸</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">åå®¡æ ¸</button>-->
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">å®¡æ ¸</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">åå®¡æ ¸</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">éåº</button>
                        </div>
                    </div>
@@ -434,10 +434,17 @@
                        PicUpload();
                    }
                });
                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®é»è®¤ç¦ç¨
                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®é»è®¤ç¦ç¨
                $('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//ä¿®æ¹æé®ç¦ç¨
            }
            else if (OperationType == 3) {
                $("#eventType").val("Modify");
                RoadBillMain(linterid);
                $('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//ä¿®æ¹æé®ç¦ç¨
                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//ä¿åæé®å¯ç¨
                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®é»è®¤ç¦ç¨
                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®é»è®¤ç¦ç¨
            }
            else if (OperationType == 4) {
                RoadBillMain(linterid);
@@ -448,6 +455,7 @@

            function RoadBillMain(linterid)//å è½½è¡¨å¤´
            {
                var index = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationEntrustOutBill/GetStationEntrustOutBill",
                    type: "GET",
@@ -482,7 +490,23 @@
                            "HSourceID": data.HSourceID,
                            "HSourceName": data.HSourceName
                        });
                        if (data.æ¯å¦å®¡æ ¸ == "true") {
                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®ç¦ç¨
                            $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//åå®¡æ ¸æé®å¯ç¨
                        } else {
                            $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®ç¦ç¨
                            $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//å®¡æ ¸æé®å¯ç¨
                        }
                        if (OperationType == 3) {
                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®ç¦ç¨
                            $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®ç¦ç¨
                        }
                        PicUpload();
                        layer.close(index);
                    }
                    , error: function () {
                        layer.close(index);
                        layer.msg("æ¥å£è¯·æ±å¤±è´¥");
                    }
                })
            }
@@ -732,6 +756,96 @@
                });
            }

            //#region å®¡æ ¸æé®
            form.on('submit(set_CheckBill)', function () {
                //å®¡æ ¸æ¹æ³
                set_CheckBill();
            })
            //#endregion

            //#region å®¡æ ¸æ¹æ³
            function set_CheckBill() {
                var wait = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Cj_StationEntrustOutBill/set_CheckBill",
                    data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.alert(result.Message, { icon: 6 });
                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®ç¦ç¨
                            $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//åå®¡æ ¸æé®å¯ç¨
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region åå®¡æ ¸æé®
            form.on('submit(set_AbandonCheck)', function () {
                //åå®¡æ ¸æ¹æ³
                set_AbandonCheck();
            })
            //#endregion

            //#region åå®¡æ ¸æ¹æ³
            function set_AbandonCheck() {
                var wait = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Cj_StationEntrustOutBill/set_AbandonCheck",
                    data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.alert(result.Message, { icon: 6 });
                            $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®ç¦ç¨
                            $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//å®¡æ ¸æé®å¯ç¨
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region ä¿®æ¹æé®
            form.on('submit(set_Modify)', function () {
                //ç¼è¾åå¤æ
                set_ShowBillJudge();
            })
            //#endregion

            //#region ç¼è¾åå¤æ
            function set_ShowBillJudge() {
                var wait = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Cj_StationEntrustOutBill/set_ShowBillJudge",
                    data: { "HBillNo": HBillNo, "CurUserName": sessionStorage["HUserName"], "HInterID": linterid },
                    success: function (result) {
                        if (result.count == 1) {
                            location.replace('Cj_StationEntrustOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&HBillNo=' + HBillNo);
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //æäº¤
            form.on('submit(Saver)', function (data) {//æäº¤
@@ -747,16 +861,10 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            //layer.confirm(data.Message, {
                            //    icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
                            //    btn2: function () {
                            //        //parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
                            //        //window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
                            //        parent.location.href = "../../../views/index.html"
                            //    }//å³é
                            //}, function () { window.location.reload(); });//æ°å¢
                            layer.close(index);
                            layer.msg("æäº¤æå");
                            //ä¿ååæµè§
                            ReRoadBillMain();
                        }
                        else {
                            layer.close(index);
@@ -770,6 +878,12 @@
                });
            });

            //#region ä¿ååæµè§æ¹æ³
            function ReRoadBillMain() {
                location.replace('Cj_StationEntrustOutBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
            }
            //#endregion

            //éæ©ä¾åºå
            form.on('submit(HSupID-BT)', function () {
                layer.open({

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

@@ -78,9 +78,6 @@
                                <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-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>
@@ -238,8 +235,8 @@
            function btnIs() {
                //$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//æ°å¢æé®
                //$('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//å é¤æé®
                $('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®
                $('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®
                //$('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®
                //$('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®
                $('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//é¢è§æé®
                $('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//ä¿ååå®½æé®
                $('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//é»è®¤åå®½æé®
@@ -263,7 +260,7 @@
                    case 'btn-Audit': set_CheckBill();
                        break;
                    //åå®¡æ ¸
                    case 'btn-DeAudit': layer.msg('åå®¡æ ¸ï¼');
                    case 'btn-DeAudit': set_AbandonCheck();
                        break;
                    //é¢è§
                    case 'btn-Cell': layer.msg('é¢è§ï¼');
@@ -279,6 +276,68 @@
                        break;
                };
            });

            //å®¡æ ¸
            function set_CheckBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //é»è¾å®¡æ ¸æ¹æ³
                    var wait = layer.load();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Cj_StationEntrustOutBill/set_CheckBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
                                get_FastQuery(table, option);
                            } else {
                                layer.alert(result.Message, { icon: 5 });
                            }
                            layer.close(wait);
                        }, error: function () {
                            layer.close(wait);
                            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
                }
            }

            //åå®¡æ ¸
            function set_AbandonCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //é»è¾å®¡æ ¸æ¹æ³
                    var wait = layer.load();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Cj_StationEntrustOutBill/set_AbandonCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
                                get_FastQuery(table, option);
                            } else {
                                layer.alert(result.Message, { icon: 5 });
                            }
                            layer.close(wait);
                        }, error: function () {
                            layer.close(wait);
                            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
                }
            }

            //#region å é¤åæ®
            function btn_Delete() {
@@ -346,7 +405,7 @@
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['Cj_StationEntrustOutBill.html?OperationType=4&linterid=' + data[0].HInterID + '&HBillNo=' + data[0].åæ®å·, 'yes']
                        , content: ['Cj_StationEntrustOutBill.html?OperationType=4&linterid=' + data[0].HInterID + '&HSouceBillType=&HBillNo=' + data[0].åæ®å·, 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷×ª¿¨/Sc_ProcessExchangeBill.html

@@ -612,7 +612,7 @@

            //åå§è¡¨æ ¼æ°æ®
            var rowdata = [{
                "HProcNo": "", "hprocid": "", "HProcNumber": "", "å·¥åº": "", "å å·¥è¯´æ": "",
                "HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "å å·¥è¯´æ": "",
                "HCenterID": "", "å·¥ä½ä¸å¿ä»£ç ": "", "å·¥ä½ä¸å¿": "", "HSupID": "",
                "ä¾åºå": "", "ä¾åºåä»£ç ": "", "isEntrust": "false",
                "HQty": "", "å å·¥åä½": "", "HRemark": "", "è¡å·": "", "è¿ç«æ°é": "", "åºç«æ°é": "",
@@ -698,7 +698,7 @@
                    , data = checkStatus.data;
                //æ°å¢è¡è¡¨æ ¼æ°æ®
                var NewRow = {
                    "HProcNo": "", "hprocid": "", "HProcNumber": "", "å·¥åº": "", "å å·¥è¯´æ": "",
                    "HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "å å·¥è¯´æ": "",
                    "HCenterID": "", "å·¥ä½ä¸å¿ä»£ç ": "", "å·¥ä½ä¸å¿": "", "HSupID": "",
                    "ä¾åºå": "", "ä¾åºåä»£ç ": "", "isEntrust": "false",
                    "HQty": "", "å å·¥åä½": "", "HRemark": "", "è¡å·": "", "è¿ç«æ°é": "", "åºç«æ°é": "",
@@ -776,8 +776,8 @@
                                        return layer.msg('è¯·éæ©æ°æ®');
                                    }
                                    obj.update({
                                        å·¥åº: checkStatus.data[0].å·¥åº
                                        , hprocid: checkStatus.data[0].HItemID
                                        HProcName: checkStatus.data[0].å·¥åº
                                        , HProcID: checkStatus.data[0].HItemID
                                        , HProcNumber: checkStatus.data[0].å·¥åºä»£ç 
                                    });
                                    layer.close(layer.index);
@@ -957,6 +957,7 @@
                            //}, function () { window.location.reload(); });//æ°å¢
                            layer.close(index);
                            layer.msg("æäº¤æå");
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//ä¿åæé®ç¦ç¨
                        }
                        else {
                            layer.close(index);

			@@ -2,7 +2,7 @@
			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/"; //æ¨é²æ¬å°éç½®
			@@ -10,7 +10,7 @@
			//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
			}

			@@ -478,6 +478,7 @@

			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			var index = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Cj_StationEntrustInBill/GetStationEntrustInBill",
			type: "GET",
			@@ -524,6 +525,11 @@
			$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®ç¦ç¨
			}
			PicUpload();
			layer.close(index);
			}
			, error: function () {
			layer.close(index);
			layer.msg("æ¥å£è¯·æ±å¤±è´¥");
			}
			})
			}
			@@ -675,16 +681,10 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			//layer.confirm(data.Message, {
			// icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			// btn2: function () {
			// //parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			// //window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			// parent.location.href = "../../../views/index.html"
			// }//å³é
			//}, function () { window.location.reload(); });//æ°å¢
			layer.close(index);
			layer.msg("æäº¤æå");
			//ä¿ååæµè§
			ReRoadBillMain();
			}
			else {
			layer.close(index);
			@@ -698,6 +698,12 @@
			});
			});

			//#region ä¿ååæµè§æ¹æ³
			function ReRoadBillMain() {
			location.replace('Cj_StationEntrustInBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
			}
			//#endregion

			//éæ©å·¥åº
			form.on('submit(HSQProcID-BT)', function () {
			layer.open({

			@@ -36,10 +36,10 @@
			<div class="layui-card-header">
			<div class="layui-btn-group">
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">æ°å¢</button>
			<!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Modify" id="set_Modify">ä¿®æ¹</button>-->
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Modify" id="set_Modify">ä¿®æ¹</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="Saver">ä¿å</button>
			<!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">åå®¡æ ¸</button>-->
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">éåº</button>
			</div>
			</div>
			@@ -434,10 +434,17 @@
			PicUpload();
			}
			});
			$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®é»è®¤ç¦ç¨
			$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®é»è®¤ç¦ç¨
			$('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//ä¿®æ¹æé®ç¦ç¨
			}
			else if (OperationType == 3) {
			$("#eventType").val("Modify");
			RoadBillMain(linterid);
			$('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//ä¿®æ¹æé®ç¦ç¨
			$('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//ä¿åæé®å¯ç¨
			$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®é»è®¤ç¦ç¨
			$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®é»è®¤ç¦ç¨
			}
			else if (OperationType == 4) {
			RoadBillMain(linterid);
			@@ -448,6 +455,7 @@

			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			var index = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Cj_StationEntrustOutBill/GetStationEntrustOutBill",
			type: "GET",
			@@ -482,7 +490,23 @@
			"HSourceID": data.HSourceID,
			"HSourceName": data.HSourceName
			});
			if (data.æ¯å¦å®¡æ ¸ == "true") {
			$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®ç¦ç¨
			$('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//åå®¡æ ¸æé®å¯ç¨
			} else {
			$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®ç¦ç¨
			$('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//å®¡æ ¸æé®å¯ç¨
			}
			if (OperationType == 3) {
			$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®ç¦ç¨
			$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®ç¦ç¨
			}
			PicUpload();
			layer.close(index);
			}
			, error: function () {
			layer.close(index);
			layer.msg("æ¥å£è¯·æ±å¤±è´¥");
			}
			})
			}
			@@ -732,6 +756,96 @@
			});
			}

			//#region å®¡æ ¸æé®
			form.on('submit(set_CheckBill)', function () {
			//å®¡æ ¸æ¹æ³
			set_CheckBill();
			})
			//#endregion

			//#region å®¡æ ¸æ¹æ³
			function set_CheckBill() {
			var wait = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_StationEntrustOutBill/set_CheckBill",
			data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.alert(result.Message, { icon: 6 });
			$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®ç¦ç¨
			$('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//åå®¡æ ¸æé®å¯ç¨
			} else {
			layer.alert(result.Message, { icon: 5 });
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region åå®¡æ ¸æé®
			form.on('submit(set_AbandonCheck)', function () {
			//åå®¡æ ¸æ¹æ³
			set_AbandonCheck();
			})
			//#endregion

			//#region åå®¡æ ¸æ¹æ³
			function set_AbandonCheck() {
			var wait = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_StationEntrustOutBill/set_AbandonCheck",
			data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.alert(result.Message, { icon: 6 });
			$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®ç¦ç¨
			$('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//å®¡æ ¸æé®å¯ç¨
			} else {
			layer.alert(result.Message, { icon: 5 });
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region ä¿®æ¹æé®
			form.on('submit(set_Modify)', function () {
			//ç¼è¾åå¤æ
			set_ShowBillJudge();
			})
			//#endregion

			//#region ç¼è¾åå¤æ
			function set_ShowBillJudge() {
			var wait = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_StationEntrustOutBill/set_ShowBillJudge",
			data: { "HBillNo": HBillNo, "CurUserName": sessionStorage["HUserName"], "HInterID": linterid },
			success: function (result) {
			if (result.count == 1) {
			location.replace('Cj_StationEntrustOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&HBillNo=' + HBillNo);
			} else {
			layer.alert(result.Message, { icon: 5 });
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//æäº¤
			form.on('submit(Saver)', function (data) {//æäº¤
			@@ -747,16 +861,10 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			//layer.confirm(data.Message, {
			// icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			// btn2: function () {
			// //parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			// //window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			// parent.location.href = "../../../views/index.html"
			// }//å³é
			//}, function () { window.location.reload(); });//æ°å¢
			layer.close(index);
			layer.msg("æäº¤æå");
			//ä¿ååæµè§
			ReRoadBillMain();
			}
			else {
			layer.close(index);
			@@ -770,6 +878,12 @@
			});
			});

			//#region ä¿ååæµè§æ¹æ³
			function ReRoadBillMain() {
			location.replace('Cj_StationEntrustOutBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
			}
			//#endregion

			//éæ©ä¾åºå
			form.on('submit(HSupID-BT)', function () {
			layer.open({

			@@ -78,9 +78,6 @@
			<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-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>
			@@ -238,8 +235,8 @@
			function btnIs() {
			//$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//æ°å¢æé®
			//$('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//å é¤æé®
			$('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®
			$('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®
			//$('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//å®¡æ ¸æé®
			//$('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//åå®¡æ ¸æé®
			$('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//é¢è§æé®
			$('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//ä¿ååå®½æé®
			$('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//é»è®¤åå®½æé®
			@@ -263,7 +260,7 @@
			case 'btn-Audit': set_CheckBill();
			break;
			//åå®¡æ ¸
			case 'btn-DeAudit': layer.msg('åå®¡æ ¸ï¼');
			case 'btn-DeAudit': set_AbandonCheck();
			break;
			//é¢è§
			case 'btn-Cell': layer.msg('é¢è§ï¼');
			@@ -279,6 +276,68 @@
			break;
			};
			});

			//å®¡æ ¸
			function set_CheckBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			var wait = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_StationEntrustOutBill/set_CheckBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { icon: 1 });
			get_FastQuery(table, option);
			} else {
			layer.alert(result.Message, { icon: 5 });
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}

			//åå®¡æ ¸
			function set_AbandonCheck() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			var wait = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_StationEntrustOutBill/set_AbandonCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { icon: 1 });
			get_FastQuery(table, option);
			} else {
			layer.alert(result.Message, { icon: 5 });
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}

			//#region å é¤åæ®
			function btn_Delete() {
			@@ -346,7 +405,7 @@
			, shade: 0.6
			, maxmin: false
			, anim: 0
			, content: ['Cj_StationEntrustOutBill.html?OperationType=4&linterid=' + data[0].HInterID + '&HBillNo=' + data[0].åæ®å·, 'yes']
			, content: ['Cj_StationEntrustOutBill.html?OperationType=4&linterid=' + data[0].HInterID + '&HSouceBillType=&HBillNo=' + data[0].åæ®å·, 'yes']
			, resize: false
			, cancel: function () {
			btnIs();

			@@ -612,7 +612,7 @@

			//åå§è¡¨æ ¼æ°æ®
			var rowdata = [{
			"HProcNo": "", "hprocid": "", "HProcNumber": "", "å·¥åº": "", "å å·¥è¯´æ": "",
			"HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "å å·¥è¯´æ": "",
			"HCenterID": "", "å·¥ä½ä¸å¿ä»£ç ": "", "å·¥ä½ä¸å¿": "", "HSupID": "",
			"ä¾åºå": "", "ä¾åºåä»£ç ": "", "isEntrust": "false",
			"HQty": "", "å å·¥åä½": "", "HRemark": "", "è¡å·": "", "è¿ç«æ°é": "", "åºç«æ°é": "",
			@@ -698,7 +698,7 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HProcNo": "", "hprocid": "", "HProcNumber": "", "å·¥åº": "", "å å·¥è¯´æ": "",
			"HProcNo": "", "HProcID": "", "HProcNumber": "", "HProcName": "", "å å·¥è¯´æ": "",
			"HCenterID": "", "å·¥ä½ä¸å¿ä»£ç ": "", "å·¥ä½ä¸å¿": "", "HSupID": "",
			"ä¾åºå": "", "ä¾åºåä»£ç ": "", "isEntrust": "false",
			"HQty": "", "å å·¥åä½": "", "HRemark": "", "è¡å·": "", "è¿ç«æ°é": "", "åºç«æ°é": "",
			@@ -776,8 +776,8 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			å·¥åº: checkStatus.data[0].å·¥åº
			, hprocid: checkStatus.data[0].HItemID
			HProcName: checkStatus.data[0].å·¥åº
			, HProcID: checkStatus.data[0].HItemID
			, HProcNumber: checkStatus.data[0].å·¥åºä»£ç
			});
			layer.close(layer.index);
			@@ -957,6 +957,7 @@
			//}, function () { window.location.reload(); });//æ°å¢
			layer.close(index);
			layer.msg("æäº¤æå");
			$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//ä¿åæé®ç¦ç¨
			}
			else {
			layer.close(index);