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

任超
Showing 2 changed files with 18 additions and 10 deletions
staticJs/onlineApply/houseFill.js
staticJs/onlineApply/workFlow.js
--- a/staticJs/onlineApply/houseFill.js
View file @c90c32b
+++ b/staticJs/onlineApply/houseFill.js
View file @c90c32b
@@ -2,7 +2,7 @@ layui.use('element', function () {
    let element = layui.element; //导航的hover效果、二级菜单等功能，需要依赖element模块
 });
 addTabs('#wssq')
-setAcceptFlow(GetQueryString('ywid'),GetQueryString('lclb'));
+setAcceptFlow(GetQueryString('bsm_slsq'),GetQueryString('businessno'));
 // form 表单
 layui.use('form', function () {
    var form = layui.form;
--- a/staticJs/onlineApply/workFlow.js
View file @c90c32b
+++ b/staticJs/onlineApply/workFlow.js
View file @c90c32b
 var business;
-//获取创建的流程业务
+//获取业务配置信息
-function getCreateFlow(ywid, businessno) {
+function getBusinessConfig(ywid, businessno) {
    $.ajax({
        type: "post",  //提交方式  
        url: portal.api_url + "/portal/ApplyBusinessService/getBusinessFlow",//路径  
@@ -20,15 +20,17 @@ function getCreateFlow(ywid, businessno) {
 //获取正在办理的流程业务
 function getAcceptFlow(bsm_slsq, businessno) {
+    var data = {
+        "bsmSlsq": bsm_slsq,
+        "businessNo": businessno,
+    };
    $.ajax({
-        type: "post",  //提交方式  
+        type: "get",  //提交方式  
+        //contentType: 'application/json',
        url: portal.api_url + "/portal/ApplyBusinessService/getApplyFlow",//路径  
        dataType: "json",
        async: false,
-        data: {
+        data: data,
-            "bsm_slsq": bsm_slsq,
-            "businessno": businessno
-        },
        //数据，这里使用的是Json格式进行传输  
        success: function (result) {//返回数据根据结果进行相应的处理
            if (result.code == 200 && result.data != null) {
@@ -46,15 +48,21 @@ function setArticleSteps() {
        switch (item.stepState) {
            case 0:
                ArticleContent.append('<li class="item_proress"><p></p><h5>' + item.stepname + '</h5></li>');
+                if ((index + 1) < business.stepList.length) {
                    ArticleContent.append('<li class="layui-progress"><div class="layui-progress-bar" lay-percent="0%"></div></li>');
+                }
                break;
            case 1:
                ArticleContent.append('<li class="item_proress"><p class="activeing"></p><h5 class="activeingtext">' + item.stepname + '</h5></li>');
+                if ((index + 1) < business.stepList.length) {
                    ArticleContent.append('<li class="layui-progress"><div class="layui-progress-bar" lay-percent="50%"></div></li>');
+                }
                break;
            case 2:
                ArticleContent.append('<li class="item_proress"><p class="active"></p><h5>' + item.stepname + '</h5></li>');
+                if ((index + 1) < business.stepList.length) {
                    ArticleContent.append('<li class="layui-progress"><div class="layui-progress-bar" lay-percent="100%"></div></li>');
+                }
                break;
        }
    });
@@ -62,7 +70,7 @@ function setArticleSteps() {
 //获取业务发起流程方法
 function getInitiateFLow(ywid, businessno) {
-    getCreateFlow(ywid, businessno);
+    getBusinessConfig(ywid, businessno);
    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) {
-    getCreateFlow(ywid);
+    getBusinessConfig(ywid);
    setArticleSteps();
 }