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

@@ -168,7 +168,7 @@
 .layui-layer-btn {
     position: relative;
     top: 50px;
-    left: -89px;
+    left: -153px;
 }
 .layui-layer-btn0 {
     width: 120px!important;

@@ -156,6 +156,16 @@
     margin-top: 26px;
     cursor: pointer;
 }
+.delete {
+    color: red;
+    float: right;
+    cursor: pointer;
+    margin-left: 20px;
+    margin-top: 26px;
+}
+.delete:hover {
+    color: red;
+}
 .handle:hover {
     color: #0091FF;
 }

@@ -4,7 +4,7 @@ $(function () {
         let element = layui.element;
     });
     addTabs('#wssq');
-    setFristStepPageFLow(GetQueryString('ywid'));
+    setFristStepPageFLow(GetQueryString('ywid'), GetQueryString('businessno'));
     // 业务
     layui.use(['form'], function () {
         var form = layui.form

@@ -3,40 +3,7 @@ $(function () {
         let element = layui.element; //导航的hover效果、二级菜单等功能，需要依赖element模块
     });
     addTabs('#wssq')
-    // 业务
-    // 业务
-    var data = {
-        'progressList': [
-            {
-                stepName: "信息效验",
-                stepState: 2 //0：未办理 1：正在办理 2：已办理
-            },
-            {
-                stepName: "填报信息",
-                stepState: 2
-            },
-            {
-                stepName: "完税核税",
-                stepState: 2
-            },
-            {
-                stepName: "身份认证",
-                stepState: 1
-            },
-            {
-                stepName: "资料审核",
-                stepState: 0
-            },
-            {
-                stepName: "线上缴费",
-                stepState: 0
-            },
-            {
-                stepName: "生成电子证书",
-                stepState: 0
-            }
-        ],
-    }
+    setAcceptFlow(GetQueryString('bsm_slsq'),GetQueryString('businessno'));
 
     layui.use('laytpl', function () {
         laytpl = layui.laytpl;
@@ -70,3 +37,7 @@ function take_snapshot() {
             '<img src="' + data_uri + '"/>';
     });
 }
+//下一步事件
+function skipClick(){
+    skipNextPage(GetQueryString('bsm_slsq'),GetQueryString('businessno'));
+}
\ No newline at end of file

@@ -7,40 +7,7 @@ $(function () {
         });
     });
     addTabs('#wssq')
-    // 业务
-    // 进度条
-    var data = {
-        'progressList': [
-            {
-                stepName: "信息效验",
-                stepState: 2 //0：未办理 1：正在办理 2：已办理
-            },
-            {
-                stepName: "填报信息",
-                stepState: 2
-            },
-            {
-                stepName: "完税核税",
-                stepState: 1
-            },
-            {
-                stepName: "身份认证",
-                stepState: 0
-            },
-            {
-                stepName: "资料审核",
-                stepState: 0
-            },
-            {
-                stepName: "线上缴费",
-                stepState: 0
-            },
-            {
-                stepName: "生成电子证书",
-                stepState: 0
-            }
-        ],
-    }
+    setAcceptFlow(GetQueryString('bsm_slsq'),GetQueryString('businessno'));
 
     layui.use('laytpl', function () {
         laytpl = layui.laytpl;
@@ -57,3 +24,7 @@ $(function () {
         });
     });
 })
+//下一步事件
+function skipClick(){
+    skipNextPage(GetQueryString('bsm_slsq'),GetQueryString('businessno'));
+}
\ No newline at end of file

@@ -7,7 +7,8 @@ function getBusinessConfig(ywid, businessno) {
         dataType: "json",
         async: false,
         data: {
-            "ywid": ywid
+            "ywid": ywid,
+            "businessNo": businessno
         },
         //数据，这里使用的是Json格式进行传输  
         success: function (result) {//返回数据根据结果进行相应的处理
@@ -88,8 +89,8 @@ function getWorkBoxFLow(bsm_slsq, businessno) {
 
 
 //设置首环节页面相关内容
-function setFristStepPageFLow(ywid) {
-    getBusinessConfig(ywid);
+function setFristStepPageFLow(ywid, businessno) {
+    getBusinessConfig(ywid, businessno);
     setArticleSteps();
 }
 

@@ -13,28 +13,62 @@ $(function () {
         $('.business_titleList li a').removeClass('itemTitleActive')
         $(this).addClass('itemTitleActive')
         let dataId = ($(this).attr('data-id'))
-        if(dataId=='1') {
+        if (dataId == '1') {
             _applyBusinessRecord()
             dataRendering(dataList.list)
-        }else if (dataId=='2') {
+        } else if (dataId == '2') {
             _applyBusinessWiat()
             dataRendering(dataList.list)
-        }else if (dataId=='3') {
+        } else if (dataId == '3') {
             _applyBusinessIn()
             dataRendering(dataList.list)
-        }else if (dataId=='6') {
+        } else if (dataId == '6') {
             _applyBusinessEnd()
             dataRendering(dataList.list)
         }
     })
 
-    $(document).on("click", ".appintmentList li", function (e) {
+    $(document).on("click", ".appintmentList li .handle", function () {
         let businessNo = $(this).attr('data-businessNo');
         let slsqBsm = $(this).attr('data-slsqBsm');
         getWorkBoxFLow(slsqBsm, businessNo)
     })
+    // 业务列表操作
+
+    $(document).on("click", ".delete", function () {
+        let slsqBsm = $(this).attr('slsqBsm')
+        layui.use('layer', function () {
+            var layer = layui.layer;
+            layer.confirm('此操作将删除业务是否继续？', {
+                scrollbar: false,
+                btn: ['是', '否'] //按钮
+            }, function () {
+                _listDel(slsqBsm)
+            }, function () {
+                layer.closeAll();
+            });
+        });
+    })
 })
 
+// 列表操作
+
+function _listDel(slsqBsm) {
+    $.ajax({
+        type: "delete",  //提交方式  
+        url: portal.api_url + "/portal/FillInformation/deleteSlsqBybsmSlsq?bsmSlsq="+slsqBsm,//路径  
+        dataType: "json",
+        //数据，这里使用的是Json格式进行传输  
+        success: function (result) {//返回数据根据结果进行相应的处理      
+            if (result.code == 200) {
+                layer.msg('操作成功！');
+                _applyBusinessRecord()
+                dataRendering(dataList.list)
+            }
+        }
+    });
+}
+
 
 //网上申请业务待提交
 function _applyBusinessWiat(currentPage = 1) {
@@ -50,7 +84,7 @@ function _applyBusinessWiat(currentPage = 1) {
         },
         //数据，这里使用的是Json格式进行传输  
         success: function (result) {//返回数据根据结果进行相应的处理      
-            $('.appintmentList').empty();     
+            $('.appintmentList').empty();
             if (result.code == 200 && result.data != null) {
                 dataList.list = result.data.records
                 dataRendering()
@@ -73,7 +107,7 @@ function _applyBusinessIn(currentPage = 1) {
         },
         //数据，这里使用的是Json格式进行传输  
         success: function (result) {//返回数据根据结果进行相应的处理      
-            $('.appintmentList').empty();     
+            $('.appintmentList').empty();
             if (result.code == 200 && result.data != null) {
                 dataList.list = result.data.records
                 dataRendering()
@@ -97,7 +131,7 @@ function _applyBusinessEnd(currentPage = 1) {
         },
         //数据，这里使用的是Json格式进行传输  
         success: function (result) {//返回数据根据结果进行相应的处理      
-            $('.appintmentList').empty();     
+            $('.appintmentList').empty();
             if (result.code == 200 && result.data != null) {
                 dataList.list = result.data.records
                 dataRendering()
@@ -121,12 +155,12 @@ function _applyBusinessRecord(currentPage = 1) {
         },
         //数据，这里使用的是Json格式进行传输  
         success: function (result) {//返回数据根据结果进行相应的处理      
-            $('.appintmentList').empty();     
+            $('.appintmentList').empty();
             if (result.code == 200 && result.data != null) {
                 dataList.list = result.data.records
                 dataRendering()
             }
-            paged(result.data.total, result.data.current );
+            paged(result.data.total, result.data.current);
         }
     });
 }
@@ -135,7 +169,7 @@ function _applyBusinessRecord(currentPage = 1) {
 function _applyBusinessAJZTCount() {
     $.ajax({
         type: "get",  //提交方式  
-        url: portal.api_url + "/portal/WorkBoxService/applyBusinessAJZTCount?userId="+dataList.userid,//路径  
+        url: portal.api_url + "/portal/WorkBoxService/applyBusinessAJZTCount?userId=" + dataList.userid,//路径  
         dataType: "json",
         //数据，这里使用的是Json格式进行传输  
         success: function (result) {//返回数据根据结果进行相应的处理
@@ -173,7 +207,7 @@ function paged(pageCount, curr) {
 
 // 列表数据渲染
 
-function dataRendering () {
+function dataRendering() {
     for (var i = 0; i < dataList.list.length; i++) {
         li = '<li data-slsqBsm="' + dataList.list[i].slsqBsm + '" data-businessNo="' + dataList.list[i].businessNo + '">';
         if (dataList.list[i].ajzt == '1') {
@@ -209,16 +243,17 @@ function dataRendering () {
         li += '<p>办理时间</p>'
         li += '<p>' + dataList.list[i].sqrq + '</p>'
         li += '</div>'
+        li += '<a slsqBsm="'+dataList.list[i].slsqBsm+'" class="delete">删除</a>'
         if (dataList.list[i].ajzt == '1') {
             li += '<a class="handle">继续办理</a>'
         } else if (dataList.list[i].ajzt == '3') {
-            li += '<a class="handle">缴费</a>'
+            li += '<a slsqBsm="'+dataList.list[i].slsqBsm+'" class="handle">缴费</a>'
         }
         $('.appintmentList').append(li)
     }
 }
 
-var dataList = { 
+var dataList = {
     "list": [],
-    "userid":'0026609ddc6d2afabaa3c9b0ea3b0ec3'
+    "userid": '0026609ddc6d2afabaa3c9b0ea3b0ec3'
 };
\ No newline at end of file

@@ -7,9 +7,9 @@
     </style>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>立即办理-资料审核</title>
-    <script type="text/javascript" src="../staticJs/head.js"></script>
-    <link rel="stylesheet" type="text/css" href="../staticCss/progress.css">
-    <link rel="stylesheet" type="text/css" href="../staticCss/zlsh.css">
+    <script type="text/javascript" src="../../staticJs/head.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../staticCss/progress.css">
+    <link rel="stylesheet" type="text/css" href="../../staticCss/zlsh.css">
 </head>
 
 <body>
@@ -165,9 +165,9 @@
         </div>
     </div>
 </body>
-<script type="text/javascript" src="../staticJs/common.js"></script>
-<script type="text/javascript" src="../staticJs/down.js"></script>
-<script type="text/javascript" src="../staticJs/zlsh.js"></script>
+<script type="text/javascript" src="../../staticJs/common.js"></script>
+<script type="text/javascript" src="../../staticJs/down.js"></script>
+<script type="text/javascript" src="../../staticJs/onlineApply/dataReview.js"></script>
 <script id="progress" type="text/html">
     {{#  layui.each(d.progressList, function(index, item){ }}
     {{#  if(item.stepState==2){ }}

@@ -7,9 +7,9 @@
     </style>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>立即办理-身份认证</title>
-    <script type="text/javascript" src="../staticJs/head.js"></script>
-    <link rel="stylesheet" type="text/css" href="../staticCss/progress.css">
-    <link rel="stylesheet" type="text/css" href="../staticCss/sfrz.css">
+    <script type="text/javascript" src="../../staticJs/head.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../staticCss/progress.css">
+    <link rel="stylesheet" type="text/css" href="../../staticCss/sfrz.css">
 </head>
 
 <body>
@@ -46,16 +46,18 @@
             </div>
             <div class="next_button">
                 <button type="button" class="layui-btn layui-btn-normal">
-                    <a href="./zlsh.html">下一步</a>
+                    <a onclick="skipClick()">下一步</a>
                 </button>
             </div>
         </div>
     </div>
 </body>
-<script type="text/javascript" src="../staticJs/common.js"></script>
-<script type="text/javascript" src="../staticJs/down.js"></script>
-<script type="text/javascript" src="../staticJs/jquery.webcam.min.js"></script>
-<script type="text/javascript" src="../staticJs/sfrz.js"></script>
+<script type="text/javascript" src="../../staticJs/common.js"></script>
+<script type="text/javascript" src="../../staticJs/down.js"></script>
+<script type="text/javascript" src="../../staticJs/jquery.webcam.min.js"></script>
+<script type="text/javascript" src="../../staticJs/onlineApply/workFlow.js"></script>
++88
+<script type="text/javascript" src="../../staticJs/onlineApply/identityAuthentication.js"></script>
 <script id="progress" type="text/html">
     {{#  layui.each(d.progressList, function(index, item){ }}
     {{#  if(item.stepState==2){ }}

@@ -7,9 +7,9 @@
     </style>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>立即办理-完税核税</title>
-    <script type="text/javascript" src="../staticJs/head.js"></script>
-    <link rel="stylesheet" type="text/css" href="../staticCss/progress.css">
-    <link rel="stylesheet" type="text/css" href="../staticCss/yyws.css">
+    <script type="text/javascript" src="../../staticJs/head.js"></script>
+    <link rel="stylesheet" type="text/css" href="../../staticCss/progress.css">
+    <link rel="stylesheet" type="text/css" href="../../staticCss/yyws.css">
 </head>
 
 <body>
@@ -36,7 +36,7 @@
             <div class="query_results">
                 <div class="success_info">
                     <h2>
-                        <img src="../staticImages/xuanzhong.png" />
+                        <img src="../../staticImages/xuanzhong.png" />
                         温馨提示：完税校验通过！
                     </h2>
                 </div>
@@ -132,15 +132,16 @@
             </div>
             <div class="next_button">
                 <button type="button" class="layui-btn layui-btn-normal">
-                    <a href="./sfrz.html">下一步</a>
+                    <a onclick="skipClick()">下一步</a>
                 </button>
             </div>
         </div>
     </div>
 </body>
-<script type="text/javascript" src="../staticJs/common.js"></script>
-<script type="text/javascript" src="../staticJs/down.js"></script>
-<script type="text/javascript" src="../staticJs/yyws.js"></script>
+<script type="text/javascript" src="../../staticJs/common.js"></script>
+<script type="text/javascript" src="../../staticJs/down.js"></script>
+<script type="text/javascript" src="../../staticJs/onlineApply/workFlow.js"></script>
+<script type="text/javascript" src="../../staticJs/onlineApply/taxAssessment.js"></script>
 <script id="progress" type="text/html">
     {{#  layui.each(d.progressList, function(index, item){ }}
     {{#  if(item.stepState==2){ }}