xinyb
2022-08-01 a1e8c702ed379cea5c78539ec67b70c9e3203914
下一单审核功能
2个文件已添加
10个文件已修改
125 ■■■■■ 已修改文件
WebRoot/js/index/index.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/js/panel.js 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/public/template/0/16/jsCssHead.jsp 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/public/template/0/16/top.jsp 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/public/template/0/496/jsCssHead.jsp 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/public/template/0/496/top.jsp 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/public/template/0/5/top.jsp 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/public/template/0/8/top.jsp 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/style/commons.css 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/style/icon.css 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/style/icons/nextIco.png 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/style/icons/oashIco.png 补丁 | 查看 | 原始文档 | blame | 历史
WebRoot/js/index/index.js
@@ -228,6 +228,7 @@
                                            };
                                            $(target).tabs('close', index);
                                            opts.onBeforeClose = bc;
                                            approvedDoc.excludeDocs=""//清空排除下一单的单号 xin 2022-7-30 17:30:59
                                            delCTab($($.parseHTML(title)).attr(
                                                    "frameid"));
                                            myFresh.panel[index+'-t']=false;
@@ -235,9 +236,11 @@
                                    });
                            return false; // 阻止关闭
                        } else {
                            approvedDoc.excludeDocs=""//清空排除下一单的单号 xin 2022-7-30 17:30:59
                            delCTab($($.parseHTML(title)).attr("frameid"));
                        }
                    } else {
                        approvedDoc.excludeDocs=""//清空排除下一单的单号 xin 2022-7-30 17:30:59
                        delCTab($($.parseHTML(title)).attr("frameid"));
                    }
                    myFresh.formType = (myFresh.Type == 0 ? myFresh.formType
WebRoot/js/panel.js
@@ -930,6 +930,8 @@
                                            if (info[j].value == "1") {//这里判断把,放在下面bzc判断有问题。xin 2021-11-20 11:19:03
                                                //显示审核按钮 xin 2021-10-21 17:23:17
                                                $(".OAVerify").css("display", "inline-block");
                                                //显示下一单按钮 xin 2022-7-30 11:47:49
                                                $(".nextDocIco").css("display", "inline-block");
                                            }
                                            break;
                                        }
@@ -1918,8 +1920,10 @@
                                    var option = new Option(data[i].text, data[i].id, isSelect, isSelect);//后面两个true分别表示默认被选中和有效!
                                    $(thant).append(option);
                                });
                                panIndex=index;
                                $(thant).trigger("change");
                            }
                        }
                    })
                },
@@ -1965,8 +1969,65 @@
                }
            }
            return option;
       },
       nextDocIco:function (callback) {//审核下一单 xin 2022-7-30 11:47:23
           let thant = this;
           let docCode = $("#doccode").val() || "";//当前单号
           if (docCode == "") {
               layer.msg("获取不到这张被排除的单据单号");
               return;
           }
           let formIds = $("#formid").val() || 0;
           let excludeDoc = top.approvedDoc.excludeDocs || "";
           let parm = "excludeSelectNextDocument=" + excludeDoc;
           if (docCode != "") {
               if (excludeDoc != "") {
                   parm += ";" + docCode;
                   // parm += excludeDoc.indexOf(docCode) != -1 ? "" : ";" + docCode;
               } else {
                   parm += docCode;
               }
           }
           parm += "&formid=" + (formIds == 0 ? formId : formIds) + "&docCode=" + docCode;
           $.get("/app/v2/nextDoc.do?" + parm, function (data) {
               if (data != null && data.msg == "success") {
                   let value = data.data;
                   if (value == null || value == "") {
                       callback("没有更多的待审核单据");//回调提示
                       return;
                   }
                   if (excludeDoc != "") {
                       let docs = excludeDoc.split(";");
                       if ($.inArray(docCode, docs) == -1) {//不存在就添加进去
                           docs.push(docCode);
                           top.approvedDoc.excludeDocs = docs.join(";");
                       }
                   } else {
                       top.approvedDoc.excludeDocs = docCode;
                   }
                   thant.nextDocLink(value);//刷新连接
               }
           })
       }, nextDocLink: function (value,isCode) {//组装功能号单据连接数据 xin 2022-7-30 17:03:40
            if(isCode){//isCode是经过编码需要解析
                value=value.replaceAll("%2B", "+").replaceAll("%2F", "/").replaceAll("%3D", "=");
                value=new Base64().decode(value);
            }
            var formInfo = value.split(";");//formid;formtype;doccode;formName
            var pageUrl = document.URL.split("/");
            for (var i = 0; i < pageUrl.length; i++) {
                if (i == pageUrl.length - 3) {
                   pageUrl[i] = formInfo[0];
                } else if (i == pageUrl.length - 2) {
                   pageUrl[i] = formInfo[1];
                } else if (i == pageUrl.length - 1) {
                   pageUrl[i] = "index.jsp?" + (new Base64().encode("where=doccode='" + formInfo[2] + "'"));
                }
            }
            parent.jQuery(parent.jQuery("#home-tabs").find("li.tabs-selected > a > span.tabs-title")).html(formInfo[3] + "-" + formInfo[0] + "-" + formInfo[2]);
            location.href = pageUrl.join("/");
       }
    };
};
panPar.isChange = 0;
//--------------------【panPar】 
//--------------------------------------------------------------------function---------------------------------------------------------------------
@@ -3303,4 +3364,9 @@
            $(that).append('<li><img src="' + path + '" alt="" style="width: 100%;height: 150px"/></li>');
        }
    })
    $(".nextDocIco a").on("click", function () {//下一单点击事件 xin 2022-7-29 10:19:30
        panPar.nextDocIco(function (msg) {
            layer.msg(msg || "没有更多的待审核单据");
        })
    })
})
WebRoot/public/template/0/16/jsCssHead.jsp
@@ -143,6 +143,13 @@
                    procCallBack(txS[5],1,0);
                }
                if(typeof(savedExecFunclink)!='function'){
                    if(txS[0]!=null && txS[0]!=""){//下一单 xin 2022-8-1 10:00:01
                        let nextDoc=txS[0].split(",");
                        if(nextDoc.length==2){
                            panPar.nextDocLink(nextDoc[1],true);//跳转
                            return;
                        }
                    }
                    location.href=refUrl;//如果要保存后执行功能链接则不刷新
                }
            }else{
@@ -153,7 +160,7 @@
                }
                alert(st);
            }
        }else{//确定
     }else{//确定
            if(refTo){
                location.href = refUrl;
            }
@@ -218,6 +225,7 @@
        jt.gType=17;
        jt.dcFlag=flag;
        jt.disableDuplicateSubmitUUID=postUuid;
        jt.excludeSelectNextDocument=top.approvedDoc.excludeDocs || "";//排除的单号 xin 2022-7-30 16:55:02
        jt.cudoc='@CustomDoccode@';
        jt.funlink=savedFunclink16;//保存后执行功能连接    
        //审计数据集
WebRoot/public/template/0/16/top.jsp
@@ -141,6 +141,7 @@
    %>
        <span id="docStatuInfo"></span>
        <span class="OAVerify"></span>
        <span class="nextDocIco"><a class="easyui-linkbutton" plain="true" iconCls="icon-nextDoc" title="审核下一单">下一单</a></span>
        <div id="tpUpDownDoc">
            <a href="javascript:void(0);" id="Traces" class="easyui-linkbutton" style="display:none" plain="true" title='物流信息' iconCls="icon-kuaid"></a>
            <a href="javascript:void(0);" id="tpqrCodeDoc" class="easyui-linkbutton" plain="true" iconCls="icon-qrbill"></a>
WebRoot/public/template/0/496/jsCssHead.jsp
@@ -104,6 +104,7 @@
            panel["panelTable"]=palname;
            panel["funlink"]=savedFunclink16;//保存后执行功能连接
            panel["disableDuplicateSubmitUUID"]=systemUuid.uuid;
            panel["excludeSelectNextDocument"]=top.approvedDoc.excludeDocs || "";
            var tojson=panel;      
            panJson=obj2str(panel);        
            if(check==2){
@@ -178,6 +179,13 @@
                    procCallBack(txS[5],1,0);
                }
                if(typeof(savedExecFunclink)!='function'){
                    if(txS[0]!=null && txS[0]!=""){//下一单 xin 2022-8-1 10:00:01
                        let nextDoc=txS[0].split(",");
                        if(nextDoc.length==2){
                            panPar.nextDocLink(nextDoc[1],true);//跳转
                            return;
                        }
                    }
                    location.href=refUrl;//如果要保存后执行功能链接则不刷新
                }
            }else{
WebRoot/public/template/0/496/top.jsp
@@ -150,6 +150,7 @@
    %>
        <span id="docStatuInfo"></span>
        <span class="OAVerify"></span>
        <span class="nextDocIco"><a class="easyui-linkbutton" plain="true" iconCls="icon-nextDoc" title="审核下一单">下一单</a></span>
        <div id="tpUpDownDoc">
            <a href="javascript:void(0);" id="Traces" class="easyui-linkbutton" style="display:none" plain="true" title='物流信息' iconCls="icon-kuaid"></a>
            <a href="javascript:void(0);" id="tpqrCodeDoc" class="easyui-linkbutton" plain="true" iconCls="icon-qrbill"></a>
WebRoot/public/template/0/5/top.jsp
@@ -139,6 +139,7 @@
    %>
        <span id="docStatuInfo"></span>
        <span class="OAVerify"></span>
        <span class="nextDocIco"><a class="easyui-linkbutton" plain="true" iconCls="icon-nextDoc" title="审核下一单">下一单</a></span>
        <div id="tpUpDownDoc">
            <a href="javascript:void(0);" id="Traces" class="easyui-linkbutton" style="display:none" plain="true" title='物流信息' iconCls="icon-kuaid"></a>
            <a href="javascript:void(0);" id="tpqrCodeDoc" class="easyui-linkbutton" plain="true" iconCls="icon-qrbill"></a>
WebRoot/public/template/0/8/top.jsp
@@ -148,6 +148,7 @@
    %>
        <span id="docStatuInfo"></span>
        <span class="OAVerify"></span>
        <span class="nextDocIco"><a class="easyui-linkbutton" plain="true" iconCls="icon-nextDoc" title="审核下一单">下一单</a></span>
        <div id="tpUpDownDoc">
            <a href="javascript:void(0);" id="Traces" class="easyui-linkbutton" style="display:none" plain="true" title='物流信息' iconCls="icon-kuaid"></a>
            <a href="javascript:void(0);" id="tpqrCodeDoc" class="easyui-linkbutton" plain="true" iconCls="icon-qrbill"></a>
WebRoot/style/commons.css
@@ -972,3 +972,27 @@
.searchWindsType .posPan .control_div .preciseQuery{
    display: none;
}
/*------------------------------*/
.select2-selection--single{
    height: 24px!important;
    border: 1px solid #99BBE8!important;
}
.select2-selection--single .select2-selection__rendered{
    line-height: 24px!important;
}
.select2-selection--single .select2-selection__arrow{
    height: 22px!important;
}
.isdisabled31{
    background-color: rgb(204, 204, 204)!important;
}
.nextDocIco{
    display: none;
}
.nextDocIco a{
    width: 75px;
    height: 24px;
    margin: -3px 0px 0px 10px!important;
    color: white!important;
    background: linear-gradient(to bottom,rgb(93 167 243) 0,#2274c7 90%)!important;
}
WebRoot/style/icon.css
@@ -155,7 +155,8 @@
}
.icon-oasht{
    /*这个是新审核界面的按钮图标*/
    background:url('icons/oashss.ico') no-repeat left center;
    /*background:url('icons/oashss.ico') no-repeat left center;*/
    background:url('icons/oashIco.png') no-repeat left center;
}
.icon-kuaid{
    background:url('icons/kuaid.png') no-repeat left center;
@@ -279,7 +280,10 @@
.icon-cron-expression{
    background:url('icons/quick/cron-expression.png') no-repeat left center;
}
.icon-nextDoc{
    background: url("icons/nextIco.png") no-repeat left center;
    width: 18px!important;
}
WebRoot/style/icons/nextIco.png
WebRoot/style/icons/oashIco.png