优化在线支付功能存在弹出数据范围检查的处理流程

fs-danaus

2022-03-26 59226b7f7f2986501b3dc3efcf9c646bb0e64ff3

 WebRoot/public/template/0/16/jsCssHead.jsp

@@ -2,12 +2,12 @@
<link rel="stylesheet" type="text/css" href="/style/commons.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/style/commons.css")%>"> 
<link rel="stylesheet" type="text/css" href="/style/icon.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/style/icon.css")%>">
<link rel="stylesheet" type="text/css" href="/style/default/easyui.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/style/default/easyui.css")%>"> 
<link rel="stylesheet" type="text/css" href="/js/bootstrap-upload/css/bootstrap.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/css/bootstrap.css")%>"> 
<%--<link rel="stylesheet" type="text/css" href="/js/bootstrap-upload/css/bootstrap.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/css/bootstrap.css")%>"> --%>
<link rel="stylesheet" type="text/css" href="/js/select2/dist/css/select2.min.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/select2/dist/css/select2.min.css")%>">
<link rel="stylesheet" type="text/css" href="/js/bootstrap-upload/css/fileinput.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/css/fileinput.css")%>">
<link rel="stylesheet" type="text/css" href="/js/bootstrap-upload/css/bootstrap.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/css/bootstrap.css")%>">
<link rel="stylesheet" type="text/css" href="/js/bootstrap-upload/css/rotationscaling.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/css/rotationscaling.css")%>">
<link rel="stylesheet" type="text/css" href="/js/bootstrap-upload/css/bootstrap.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/css/bootstrap.css")%>">
<%--<link rel="stylesheet" type="text/css" href="/js/bootstrap-upload/css/fileinput.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/css/fileinput.css")%>">--%>
<%--<link rel="stylesheet" type="text/css" href="/js/bootstrap-upload/css/bootstrap.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/css/bootstrap.css")%>">--%>
<%--<link rel="stylesheet" type="text/css" href="/js/bootstrap-upload/css/rotationscaling.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/css/rotationscaling.css")%>">--%>
<%--<link rel="stylesheet" type="text/css" href="/js/bootstrap-upload/css/bootstrap.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/css/bootstrap.css")%>">--%>
<link rel="stylesheet"  type="text/css" href="/layui/css/layui.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/layui/css/layui.css")%>">
<script src="/layui/layui.all.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/layui/layui.all.js")%>" type="text/javascript"></script>
<script type="text/javascript" src="/shopping/view/javascript/gotop/js/jquery-1.10.2.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/shopping/view/javascript/gotop/js/jquery-1.10.2.min.js")%>"></script>
@@ -25,16 +25,27 @@
<script type="text/javascript" src="/Grid/GridE.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/Grid/GridE.js")%>"></script>
<script type="text/javascript" src="/js/hotkey.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/hotkey.js")%>" ></script>
<script type="text/javascript" src="/js/iscroll5.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/iscroll5.js")%>" ></script> 
<script type="text/javascript" src="/shopping/view/javascript/bootstrap/js/bootstrap.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/shopping/view/javascript/bootstrap/js/bootstrap.min.js")%>"></script>
<%--<script type="text/javascript" src="/shopping/view/javascript/bootstrap/js/bootstrap.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/shopping/view/javascript/bootstrap/js/bootstrap.min.js")%>"></script>--%>
<script type="text/javascript" src="/js/select2/dist/js/pinyin.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/select2/dist/js/pinyin.js")%>"></script>
<script type="text/javascript" src="/js/select2/dist/js/select2.full.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/select2/dist/js/select2.full.js")%>"></script>
<script type="text/javascript" src="/js/select2/dist/js/i18n/zh-CN.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/select2/dist/js/i18n/zh-CN.js")%>"></script>
<script type="text/javascript" src="/js/bootstrap-upload/js/fileinput.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/js/fileinput.js")%>"></script>
<script type="text/javascript" src="/js/bootstrap-upload/js/locales/zh.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/js/locales/zh.js")%>"></script>
<script type="text/javascript" src="/shopping/view/javascript/bootstrap/js/bootstrap.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/shopping/view/javascript/bootstrap/js/bootstrap.min.js")%>"></script>
<%--<script type="text/javascript" src="/js/bootstrap-upload/js/fileinput.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/js/fileinput.js")%>"></script>--%>
<%--<script type="text/javascript" src="/js/bootstrap-upload/js/locales/zh.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap-upload/js/locales/zh.js")%>"></script>--%>
<%--<script type="text/javascript" src="/shopping/view/javascript/bootstrap/js/bootstrap.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/shopping/view/javascript/bootstrap/js/bootstrap.min.js")%>"></script>--%>
<script type="text/javascript" src="/ckeditor/ckeditor.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/ckeditor/ckeditor.js")%>"></script> 
<script type="text/javascript" src="/ckeditor/samples/js/ckimpl.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/ckeditor/samples/js/ckimpl.js")%>"></script>
<script type="text/javascript" src="/shopping/view/javascript/bootstrap/js/bootstrap.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/shopping/view/javascript/bootstrap/js/bootstrap.min.js")%>"></script>
<%--<script type="text/javascript" src="/shopping/view/javascript/bootstrap/js/bootstrap.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/shopping/view/javascript/bootstrap/js/bootstrap.min.js")%>"></script>--%>
<!--Bootstrap插件包（包含fileInput）,bootstrap版本是5.1.3-->
<link rel="stylesheet" type="text/css" href="/js/bootstrap/v5.1.3/css/bootstrap.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap/v5.1.3/css/bootstrap.css")%>">
<link rel="stylesheet" type="text/css" href="/js/bootstrap/v5.1.3/icons/font/bootstrap-icons.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap/v5.1.3/icons/font/bootstrap-icons.css")%>">
<link rel="stylesheet" type="text/css" href="/js/bootstrap/fileinput/css/fileinput.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap/fileinput/css/fileinput.css")%>">
<link rel="stylesheet" type="text/css" href="/general/Viewer/css/viewer.min.css?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/general/Viewer/css/viewer.min.css")%>">
<script type="text/javascript" src="/js/bootstrap/v5.1.3/js/bootstrap.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap/v5.1.3/js/bootstrap.js")%>"></script>
<script type="text/javascript" src="/js/bootstrap/v5.1.3/js/bootstrap.bundle.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap/v5.1.3/js/bootstrap.bundle.js")%>"></script>
<script type="text/javascript" src="/js/bootstrap/fileinput/js/fileinput.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap/fileinput/js/fileinput.js")%>"></script>
<script type="text/javascript" src="/js/bootstrap/fileinput/js/locales/zh.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/js/bootstrap/fileinput/js/locales/zh.js")%>"></script>
<script type="text/javascript" src="/general/Viewer/js/viewer.min.js?v=<%=com.yc.utils.FileUtil.getVerstion(request,"/general/Viewer/js/viewer.min.js")%>"></script>

<%
   String isShowOnlineMsg="[?isShowOnlineMsg]";
   String isShowProcessTracking="[?isShowProcessTracking]";
@@ -70,7 +81,7 @@
 var isNew='<%=isNew%>';
 var iscanelProc=false;
 var isrevokeProc=false;

 var postUuid=systemUuid.uuid;
 function commitIs(check,flag){
   //flag标记数据范围检查已通过
    var url='';
@@ -82,46 +93,54 @@
        }else if(isrevokeProc){
           url="<%=URL%>/gtGrid.do?m=save&formID=<%=formId%>&winType=17@p@1&field=DocCode@p@rowid&doccode="+doccode+"&ProcGroupafterSavedoc=0&DealAfterDocSave=&revokeProc="+encodeText("<%=revokeProc%>")+"&revokePric=1";
        }else{
           url="<%=URL%>/gtGrid.do?m=save&formID=<%=formId%>&winType=17@p@1&field=DocCode@p@rowid&doccode="+doccode+"&ProcGroupafterSavedoc=0&DealAfterDocSave=";
        }	   	
         if(cp){
            url=url.replace(/doccode=.*?&/g,"doccode=doccode=\'\'&");
         }
        if(anPai){
            $.post(url,{"_gt_json":getSaveInfo(flag)},function(){panelHasSave=true;anPai=false;_link();closeLoading();}); 
         }else{
             $.post(url,{"_gt_json":getSaveInfo(flag)},function(data){
                show_success(data);closeLoading();
               if(typeof(savedExecFunclink)=='function'){
                    savedExecFunclink();//针对16类型保存后执行功能连接
               }
             },'text');	      
         }
         panelHasSave=true;
    }else {
          var url="<%=URL%>/gtGrid.do?m=tran&formID=<%=formId%>&winType=17@p@1&doccode=<%=doccode%>&trangroup=#transgroupcode#";   
                url=url.replace(/doccode=.*?&/g,"doccode="+encodeText("doccode=\'"+getDoc('doccode','.value')+"\'")+"&");
            $.post(url,{"_gt_json":getTranInfo(flag)},function(data){
                       show_success(data);
                       closeLoading();
                    if(typeof(savedExecFunclink)=='function'){
                           savedExecFunclink();//针对16类型保存后执行功能连接
                   }
           },'text');
    }
 }
 var refUrl="";
 function show_success(tx,fl){
      if(tx.indexOf("datacheckError#|#")==0){//处理弹出数据范围检查窗体	
          parent.errShow.frame=parent.frames[inThisFrame];
         parent.errShow.show_divErro(tx.replace("datacheckError#|#",""),check);
         return;
           url="<%=URL%>/gtGrid.do?m=save&formID=<%=formId%>&winType=17@p@1&field=DocCode@p@rowid&doccode=" + doccode + "&ProcGroupafterSavedoc=0&DealAfterDocSave=";
        }
      if (cp) {
         url = url.replace(/doccode=.*?&/g, "doccode=doccode=\'\'&");
      }
      if(tx){//保存
          var txS=tx.split("#|#");	
          if(txS.length>1&&txS[1]=="@success"){//成功处理的
              refUrl="?"+txS[3];
            if(txS.length==6){//弹出取消确认返回内容
      if (anPai) {
         $.post(url, {"_gt_json": getSaveInfo(flag)}, function () {
            panelHasSave = true;
            anPai = false;
            _link();
            closeLoading();
         });
      } else {
         $.post(url, {"_gt_json": getSaveInfo(flag)}, function (data, check) {
            show_success(data, check);
            closeLoading();
            if (typeof (savedExecFunclink) == 'function') {
               savedExecFunclink();//针对16类型保存后执行功能连接
            }
         }, 'text');
      }
      panelHasSave = true;
   } else {
      var url = "<%=URL%>/gtGrid.do?m=tran&formID=<%=formId%>&winType=17@p@1&doccode=<%=doccode%>&trangroup=#transgroupcode#";
      url = url.replace(/doccode=.*?&/g, "doccode=" + encodeText("doccode=\'" + getDoc('doccode', '.value') + "\'") + "&");
      $.post(url, {"_gt_json": getTranInfo(flag)}, function (data, check) {
         show_success(data, check);
         closeLoading();
         if (typeof (savedExecFunclink) == 'function') {
            savedExecFunclink();//针对16类型保存后执行功能连接
         }
      }, 'text');
   }
 }

 var refUrl = "";

 function show_success(tx, check) {
    if (tx.indexOf("datacheckError#|#") == 0) {//处理弹出数据范围检查窗体
       parent.errShow.frame = parent.frames[inThisFrame];
       parent.errShow.show_divErro(tx.replace("datacheckError#|#", ""), check);
       return;
    }
    if (tx) {//保存
       var txS = tx.split("#|#");
       if (txS.length > 1 && txS[1] == "@success") {//成功处理的
          refUrl = "?" + txS[3];
          if (txS.length == 6) {//弹出取消确认返回内容
                   procCallBack(txS[5],1,0);
                }
            if(typeof(savedExecFunclink)!='function'){
@@ -137,27 +156,37 @@
          }
       }else{//确定
          if(refTo){
              location.href=refUrl;
          }
       }	
            location.href = refUrl;
         }
    }
 }
 function save(o,c){
       var flag = checkSession();//session失效后弹出登录框,flag为true时表示已经失效
       if(flag){
          return;
       }
       if(!c||c==0){
          save$(o);
       }else{
          centerPopup(formId,2,function(){
                     save$(o);
          },'');
       }

 function save(o, c) {
    var flag = checkSession();//session失效后弹出登录框,flag为true时表示已经失效
    if (flag) {
       return;
    }
    if (!c || c == 0) {
       if (o == 5) {//表示单据类型直接点保存，是为区分有在线支付功能时，确认也是执行保存操作
          if ("undefined" != typeof onlinePay && onlinePay != null) {
             onlinePay.pay = 0;
             onlinePay.refund = 0;
             onlinePay.isOnlinePay = false;
          }
          o = 2;//转换为2
       }
       save$(o);
    } else {
       centerPopup(formId, 2, function () {
          save$(o);
       }, '');
    }
 }
 function save$(op){
       showLoading();
        if(panMain[panIndex].checkUp()){
             check=op;

 function save$(op) {
    showLoading();
    if (panMain[panIndex].checkUp()) {
       check = op;
             isInspection=false;//还原禁止必录检查
             commitPan(check);   
        }else{
@@ -189,15 +218,12 @@
       jt.oa = OA;
       jt.gType=17;
       jt.dcFlag=flag;
       jt.disableDuplicateSubmitUUID=systemUuid.uuid;
       jt.disableDuplicateSubmitUUID=postUuid;
       jt.cudoc='@CustomDoccode@';
       jt.funlink=savedFunclink16;//保存后执行功能连接   
       //审计数据集
       var doc=getDoc('doccode','.value');   
       jt.auditRecords=shenji(panIndex,plane,doc); //审计处理
       if(isOnlinePay!=null && isOnlinePay){//收款，退款调用到 xin 2021-9-13 11:21:58
         jt.clickTran=2;
       }
       return jt;
 }
 function getSaveInfo(flag){