Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -235,10 +235,10 @@
           if (res.code === 200) {
             let { total, records } = res.result;
             records.forEach((item) => {
-              item.qlrmc = item.qlrmc.join(",");
-              item.ywh = item.ywh.join(",");
-              item.zl = item.zl.join(",");
-              item.outstepdate = item.outstepdate[0];
+              // item.qlrmc = item.qlrmc.join(",");
+              // item.ywh = item.ywh.join(",");
+              // item.zl = item.zl.join(",");
+              // item.outstepdate = item.outstepdate[0];
             });
             this.tableData.total = total ? total : 0;
             this.tableData.data = records ? records : [];
@@ -270,9 +270,10 @@
           );
           window.open(href, `djbworkFrameview${item.bsmSlsq}`);
         } else {
+          let bestepid=item.bestepid==null?"":item.bestepid;
           const { href } = this.$router.resolve(
             "/workFrameView?bsmSlsq=" + item.bsmSlsq +
-            "&bestepid=" + item.bestepid
+            "&bestepid=" + bestepid
           );
           window.open(href, `workFrameView${item.bsmSlsq}`)
         }

@@ -42,14 +42,11 @@ class data extends filter {
           if (scope.row.yygqzt == '1') {
             return <div class='suspend'>异议挂起</div>
           }
-          switch (scope.row.lczt) {
-            case '1':
-              return <div class='allow'>进行中</div>
-            case '2':
-              return <div class='prohibit'>已结束</div>
-            case '3':
-              return <span>进行中</span>
-          }
+          if (scope.row.jssj == null) {
+            return <div class='allow'>进行中</div>
+          }else{
+            return <div class='prohibit'>已结束</div>
+          }          
         }
       },
       {
@@ -70,6 +67,11 @@ class data extends filter {
         width: '200'
       },
       {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+        minWidth: '150',
+      },
+      {
         label: "权利人",
         width: '120',
         render: (h, scope) => {