Merge branch 'master' of yun.pashanhoo.com:renchao/portalStaticPage

@@ -2,7 +2,7 @@ layui.use('element', function () {
     let element = layui.element; //导航的hover效果、二级菜单等功能，需要依赖element模块
     let element = layui.element; //导航的hover效果、二级菜单等功能，需要依赖element模块
 });
 });
 addTabs('#wssq')
 addTabs('#wssq')
-setAcceptFlow(GetQueryString('ywid'),GetQueryString('lclb'));
+setAcceptFlow(GetQueryString('bsm_slsq'),GetQueryString('businessno'));
 // form 表单
 // form 表单
 layui.use('form', function () {
 layui.use('form', function () {
     var form = layui.form;
     var form = layui.form;

 var business;
 var business;
-//获取创建的流程业务
-function getCreateFlow(ywid, businessno) {
+//获取业务配置信息
+function getBusinessConfig(ywid, businessno) {
     $.ajax({
     $.ajax({
         type: "post",  //提交方式  
         type: "post",  //提交方式  
         url: portal.api_url + "/portal/ApplyBusinessService/getBusinessFlow",//路径  
         url: portal.api_url + "/portal/ApplyBusinessService/getBusinessFlow",//路径  
@@ -20,15 +20,17 @@ function getCreateFlow(ywid, businessno) {
 
 
 //获取正在办理的流程业务
 //获取正在办理的流程业务
 function getAcceptFlow(bsm_slsq, businessno) {
 function getAcceptFlow(bsm_slsq, businessno) {
+    var data = {
+        "bsmSlsq": bsm_slsq,
+        "businessNo": businessno,
+    };
     $.ajax({
     $.ajax({
-        type: "post",  //提交方式  
+        type: "get",  //提交方式  
+        //contentType: 'application/json',
         url: portal.api_url + "/portal/ApplyBusinessService/getApplyFlow",//路径  
         url: portal.api_url + "/portal/ApplyBusinessService/getApplyFlow",//路径  
         dataType: "json",
         dataType: "json",
         async: false,
         async: false,
-        data: {
-            "bsm_slsq": bsm_slsq,
-            "businessno": businessno
-        },
+        data: data,
         //数据，这里使用的是Json格式进行传输  
         //数据，这里使用的是Json格式进行传输  
         success: function (result) {//返回数据根据结果进行相应的处理
         success: function (result) {//返回数据根据结果进行相应的处理
             if (result.code == 200 && result.data != null) {
             if (result.code == 200 && result.data != null) {
@@ -46,15 +48,21 @@ function setArticleSteps() {
         switch (item.stepState) {
         switch (item.stepState) {
             case 0:
             case 0:
                 ArticleContent.append('<li class="item_proress"><p></p><h5>' + item.stepname + '</h5></li>');
                 ArticleContent.append('<li class="item_proress"><p></p><h5>' + item.stepname + '</h5></li>');
-                ArticleContent.append('<li class="layui-progress"><div class="layui-progress-bar" lay-percent="0%"></div></li>');
+                if ((index + 1) < business.stepList.length) {
+                    ArticleContent.append('<li class="layui-progress"><div class="layui-progress-bar" lay-percent="0%"></div></li>');
+                }
                 break;
                 break;
             case 1:
             case 1:
                 ArticleContent.append('<li class="item_proress"><p class="activeing"></p><h5 class="activeingtext">' + item.stepname + '</h5></li>');
                 ArticleContent.append('<li class="item_proress"><p class="activeing"></p><h5 class="activeingtext">' + item.stepname + '</h5></li>');
-                ArticleContent.append('<li class="layui-progress"><div class="layui-progress-bar" lay-percent="50%"></div></li>');
+                if ((index + 1) < business.stepList.length) {
+                    ArticleContent.append('<li class="layui-progress"><div class="layui-progress-bar" lay-percent="50%"></div></li>');
+                }
                 break;
                 break;
             case 2:
             case 2:
                 ArticleContent.append('<li class="item_proress"><p class="active"></p><h5>' + item.stepname + '</h5></li>');
                 ArticleContent.append('<li class="item_proress"><p class="active"></p><h5>' + item.stepname + '</h5></li>');
-                ArticleContent.append('<li class="layui-progress"><div class="layui-progress-bar" lay-percent="100%"></div></li>');
+                if ((index + 1) < business.stepList.length) {
+                    ArticleContent.append('<li class="layui-progress"><div class="layui-progress-bar" lay-percent="100%"></div></li>');
+                }
                 break;
                 break;
         }
         }
     });
     });
@@ -62,7 +70,7 @@ function setArticleSteps() {
 
 
 //获取业务发起流程方法
 //获取业务发起流程方法
 function getInitiateFLow(ywid, businessno) {
 function getInitiateFLow(ywid, businessno) {
-    getCreateFlow(ywid, businessno);
+    getBusinessConfig(ywid, businessno);
     window.open(portal.rootPath + business.stepList[0].pageurl + "?ywid=" + ywid + "&businessno=" + businessno, "_self")
     window.open(portal.rootPath + business.stepList[0].pageurl + "?ywid=" + ywid + "&businessno=" + businessno, "_self")
 }
 }
 
 
@@ -82,7 +90,7 @@ function getWorkBoxFLow(bsm_slsq, businessno) {
 
 
 //设置首环节页面相关内容
 //设置首环节页面相关内容
 function setFristStepPageFLow(ywid) {
 function setFristStepPageFLow(ywid) {
-    getCreateFlow(ywid);
+    getBusinessConfig(ywid);
     setArticleSteps();
     setArticleSteps();
 }
 }