采购订单超链接格式修改，工作联系单bug修复

wtt

2024-06-11 d6a5691b9aacbae7d09a4ea5a7b4fbc1474f376a

采购订单超链接格式修改，工作联系单bug修复

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -268,6 +268,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductInBill" id="btn-PushProductInBill"><i class="layui-icon layui-icon-delete"></i>下推(生产入库单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushQualityReportBill" id="btn-PushQualityReportBill"><i class="layui-icon layui-icon-delete"></i>下推(生产质量汇报单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductionReturnBill" id="btn-PushProductionReturnBill"><i class="layui-icon layui-icon-delete"></i>下推(生产退库单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushWorkLinkBill" id="btn-PushWorkLinkBill"><i class="layui-icon layui-icon-delete"></i>联系单</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>复制</button>
@@ -413,6 +414,9 @@
                        break;
                    //下推(生产订单变更单)
                    case 'btn-PushICMOChangeBill': set_PushICMOChangeBill();
                        break;
                    //联系单
                    case 'btn-PushWorkLinkBill': set_PushWorkLinkBill();
                        break;
                    //下推(生产入库单)
                    case 'btn-PushProductInBill': set_PushProductInBill();
@@ -1246,6 +1250,7 @@
            //#endregion



            //#region ä¸‹æŽ¨ï¼ˆç”Ÿäº§å…¥åº“单）
            function set_PushProductInBill() {
                var checkStatus = table.checkStatus('mainTable')
@@ -1368,7 +1373,7 @@
                            return;
                        }

                        if (data[i].行状态 != "" ) {
                        if (data[i].行状态 != "") {
                            var err = "下推失败!单据【" + data[i].单据号 + "】的状态为“" + data[0].行状态 + "”,不允许下推！";
                            layer.alert(err, { icon: 5 });
                            return;
@@ -1399,6 +1404,73 @@
            }
            //#endregion

            //#region è”系单
            function set_PushWorkLinkBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var temp = {
                        "HRelationInterID":data[0].hmainid,
                        "HRelationEntryID":data[0].hsubid,
                        "HRelationBillNo":data[0].单据号,
                        "HRelationBillType":"3710"
                    }
                    var HRelationInterID = data[0].hmainid;
                    var HRelationEntryID = data[0].hsubid;
                    $.ajax({
                        url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListBySourceID',
                        type: "GET",
                        data: { "HRelationInterID": HRelationInterID.toString(), "HRelationEntryID": HRelationEntryID.toString() },
                        success: function (result) {
                            if (result.count == 1) {
                                var HInterID = result.data[0].HInterID;
                                var HEntryID = result.data[0].HEntryID;
                                var url = encodeURI('../../质量管理/工作联系单/OA_Reply_WorkLinkBill.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=3710&res=' + JSON.stringify(temp));
                                layer.open({
                                    type: 2
                                    , area: ['100%', '100%']
                                    , title: '生产订单回复工作联系单'
                                    , closeBtn: 1
                                    , shade: 0.6 //遮罩透明度
                                    , maxmin: true //允许全屏最小化
                                    , anim: 0 //0-6的动画形式，-1不开启
                                    , content: url
                                    , resize: false,
                                    end: function () {
                                        get_FastQuery(table, option);
                                    }
                                    , cancel: function () {
                                        //$(".layui-btn").removeClass("layui-btn-disabled");
                                    }
                                })
                            } else {
                                var url = encodeURI('../../质量管理/工作联系单/OA_Add_Edit_WorkLinkBill.html?OperationType=2&linterid=&HEntryID=&HSouceBillType=3710&res=' + JSON.stringify(temp))
                                layer.open({
                                    type: 2,
                                    skin: 'layui-layer-rim', //加上边框
                                    title: '下推新增工作联系单',
                                    closeBtn: 1,
                                    shift: 2,
                                    area: ['100%', '100%'],
                                    maxmin: true,
                                    content: url,
                                    end: function () {
                                        //刷新页面,
                                        get_FastQuery(table, option);
                                    },
                                });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                            layer.close(wait);
                        }
                    });
                } else {
                    layer.msg('请选择数据联系！');
                }
            }
            //#endregion

            //新增
            function set_AddNew() {
                layer.open({

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤×÷ÁªÏµµ¥/OA_Add_Edit_WorkLinkBill.html

@@ -16,6 +16,7 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <style type="text/css">
        .layui-form-label {
            width: 85px;
@@ -233,15 +234,15 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">关联单号:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HRelationBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
                                                            <input id="HMainSourceInterID" name="HRelationInterID" value="0" type="hidden" />
                                                            <input id="HMainSourceEntryID" name="HRelationEntryID" value="0" type="hidden" />
                                                            <input class="layui-input" name="HRelationBillNo" lay-verify="HRelationBillNo" id="HRelationBillNo" disabled autocomplete="off">
                                                            <input id="HRelationInterID" name="HRelationInterID" value="0" type="hidden" />
                                                            <input id="HRelationEntryID" name="HRelationEntryID" value="0" type="hidden" />
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">关联类型:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HRelationBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
                                                            <input class="layui-input" name="HRelationBillType" lay-verify="HMainSourceBillType" id="HRelationBillType" disabled autocomplete="off">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -378,15 +379,16 @@
                set_AddFNew();
            }
            else if (OperationType == 2) {
                //联单初始化
                var HRelationInterID = params[params[1]];
                var HRelationEntryID = params[params[2]];
                var HRelationBillNo = params[params[3]];
                var HRelationBillType = params[params[4]];
                $("#HRelationInterID").val(HRelationInterID); //联系单单号（暂时取值订单编号）
                $("#HRelationEntryID").val(HRelationEntryID); //联系单主内码(取值HInterID)
                $("#HRelationBillNo").val(HRelationBillNo); //联系单子内码(源单行号)
                $("#HRelationBillType").val(HRelationBillType); //联系单类型
                //源单新增
                var datajson;
                var str = window.location.search; //获取链接中传递的参数
                var arr = str.substring(str.lastIndexOf("=") + 1);
                datajson = $.parseJSON(decodeURI(arr));
                $("#HRelationInterID").val(datajson.HRelationInterID);
                $("#HRelationEntryID").val(datajson.HRelationEntryID);
                $("#HRelationBillNo").val(datajson.HRelationBillNo);
                $("#HRelationBillType").val(datajson.HRelationBillType);
 
                set_AddFNew();
            }
            else if (OperationType == 3) {//编辑
@@ -437,54 +439,6 @@
                $("#HDeptName").val(sessionStorage["HDept"]);  //部门
            }

            //#region æœ‰æºå•æ–°å¢žæ— ç”¨
     
            //function set_AddNew() {
            //    refSav = "Add";
            //    //初始基本信息赋值
            //    $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
            //    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
            //    $("#HMaker").val(sessionStorage["HUserName"]);     //制单人
            //    $("#HSendMan").val(sessionStorage["HUserName"]);   //发送人
            //    $("#HDeptID").val(sessionStorage["HDeptID"]);  //部门ID
            //    $("#HDeptName").val(sessionStorage["HDept"]);  //部门

            //    $.ajax(
            //        {
            //            type: "GET",
            //            url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkFrom", //方法所在页面和方法名
            //            async: true,
            //            data: {
            //                "HRelationInterID": HRelationInterID,
            //                "HSourceEntryID": HMainSourceEntryID,
            //                "HSourceBillNo": HMainSourceBillNo,
            //                "HSourceBillType": HBillType
            //            },
            //            dataType: "json",
            //            success: function (data) {
            //                if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
            //                {
            //                    var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
            //                    $("#HMaterName").val(LoadData[0].HMaterName); //产品名称
            //                    $("#HMaterModel").val(LoadData[0].HModel); //产品规格
            //                    $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //源单单号（暂时取值订单编号）
            //                    $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码(取值HInterID)
            //                    $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
            //                    $("#HMainSourceBillType").val(LoadData[0].HSourceBillType); //源单类型
            //                    $("#HQty").val(LoadData[0].HDatePlanQty); //计划数量
            //                    Qty = LoadData[0].HDatePlanQty;
            //                }
            //                else {
            //                    layer.alert(data.Message, { icon: 5 });

            //                }
            //            },
            //            error: function (err) {
            //                layer.alert(err, { icon: 5 });
            //            }
            //        });
            //}
            //#endregion
            //编辑
            function set_EditFromGrid()
            {

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤×÷ÁªÏµµ¥/OA_Reply_WorkLinkBill.html

@@ -15,6 +15,7 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <style type="text/css">
        .layui-form-label {
@@ -109,7 +110,7 @@
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off" style="background-color: #f7f4f4; ">
                                                            <input id="HInterID" name="HInterID" type="hidden" />
                                                            <input id="HEntryID" name="HEntryID" type="hidden" />
                                                            <input id="HEntryID" name="HEntryID" value="0" type="hidden" />
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -259,6 +260,14 @@
                                                        <label class="layui-form-label">催促次数:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0" disabled>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HSourceBillNo" lay-verify="HSourceBillNo" id="HSourceBillNo" disabled autocomplete="off" type="hidden">
                                                            <input id="HSourceInterID" name="HSourceInterID" value="0" type="hidden" />
                                                            <input id="HSourceEntryID" name="HSourceEntryID" value="0" type="hidden" />
                                                            <input id="HSourceBillType" name="HSourceBillType" value="0" type="hidden" />
                                                        </div>
                                                    </div>
                                                </div>
@@ -417,9 +426,19 @@
                set_AddFNew();
            }
            else if (OperationType == 2) {//有源单
                /*set_AddNew();*/
                var datajson;
                var str = window.location.search; //获取链接中传递的参数
                var arr = str.substring(str.lastIndexOf("=") + 1);
                datajson = $.parseJSON(decodeURI(arr));
                $("#HSourceInterID").val(datajson.HRelationInterID);
                $("#HSourceEntryID").val(datajson.HRelationEntryID);
                $("#HSourceBillNo").val(datajson.HRelationBillNo);
                $("#HSourceBillType").val(datajson.HRelationBillType);
                set_EditFromGrid();
                get_Display(sWhere);
            }
            else if (OperationType == 3) {//编辑/回复，这里是回复
                
                set_EditFromGrid();
                get_Display(sWhere);
            }
@@ -493,55 +512,6 @@
                $("#HDeptName").val(sessionStorage["HDept"]);  //部门
            }


            //#region æœ‰æºå•æ–°å¢ž
            //function set_AddNew() {
            //    refSav = "Add";
            //    //初始基本信息赋值
            //    $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
            //    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
            //    $("#HMaker").val(sessionStorage["HUserName"]);     //制单人
            //    $("#HSendMan").val(sessionStorage["HUserName"]);   //发送人
            //    $("#HDeptID").val(sessionStorage["HDeptID"]);  //部门ID
            //    $("#HDeptName").val(sessionStorage["HDept"]);  //部门

            //    $.ajax(
            //        {
            //            type: "GET",
            //            url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkFrom", //方法所在页面和方法名
            //            async: true,
            //            data: {
            //                "HSourceInterID": HMainSourceInterID,
            //                "HSourceEntryID": HMainSourceEntryID,
            //                "HSourceBillNo": HMainSourceBillNo,
            //                "HSourceBillType": HBillType
            //            },
            //            dataType: "json",
            //            success: function (data) {
            //                if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
            //                {
            //                    var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
            //                    $("#HMaterName").val(LoadData[0].HMaterName); //产品名称
            //                    $("#HMaterModel").val(LoadData[0].HModel); //产品规格
            //                    $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //源单单号（暂时取值订单编号）
            //                    $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码(取值HInterID)
            //                    $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
            //                    $("#HMainSourceBillType").val(LoadData[0].HSourceBillType); //源单类型
            //                    $("#HQty").val(LoadData[0].HDatePlanQty); //计划数量
            //                    Qty = LoadData[0].HDatePlanQty;
            //                }
            //                else {
            //                    layer.alert(data.Message, { icon: 5 });

            //                }
            //            },
            //            error: function (err) {
            //                layer.alert(err, { icon: 5 });
            //            }
            //        });
            //}
            //#endregion

            //编辑
            function set_EditFromGrid() {
                refSav = "Update";
@@ -558,7 +528,7 @@
                            var data = result.data[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HInterID": data.HInterID
                                , "HEntryID": data.HEntryID
                               /* , "HEntryID": data.HEntryID*/
                                , "HBillNo": data.HBillNo
                                , "HDate": formatDate(data.HDate)
                                , "HContext": data.HContext
@@ -577,6 +547,10 @@
                                , "HRelationEntryID": data.HRelationEntryID                 //关联单子ID
                                , "HRelationBillNo": data.HRelationBillNo                   //关联单单号
                                , "HRelationBillType": data.HRelationBillType               //关联单类型
                                //, "HSourceInterID": data.HSourceInterID                 //源单ID
                                //, "HSourceEntryID": data.HSourceEntryID                 //源单子ID
                                //, "HSourceBillNo": data.HSourceBillNo                   //源单单号
                                //, "HSourceBillType": data.HSourceBillType               //源单类型
                                , "HMaker": data.HMaker                            //制单人
                                , "HMakeDate": data.HMakeDate                      //制单日期
                                , "HUpDater": sessionStorage["HUserName"]             //修改人

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -713,8 +713,12 @@
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event:'单据号' });
                                } else if (data[i].name == '单据号') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', templet: function (d) {
                                            return '<span style="color: blue;">' + d.单据号 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }else {
                                    switch (data[i].Type) {
                                        //int