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

@@ -43,7 +43,7 @@ class data extends filter {
             case '2':
             case '2':
               return <div class='prohibit'>已结束</div>
               return <div class='prohibit'>已结束</div>
             case '3':
             case '3':
-              return <span>进行中</span>
+              return <div class='allow'>进行中</div>
           }
           }
         }
         }
       },
       },

@@ -108,6 +108,9 @@ export default {
             if (item.ywrmc.length != 0) {
             if (item.ywrmc.length != 0) {
               item.ywrmcStr = String(item.ywrmc)
               item.ywrmcStr = String(item.ywrmc)
             }
             }
+            if(item.zlList.length != 0){
+              item.zlStr = String(item.zlList)
+            }
           })
           })
           this.pageData.total = total;
           this.pageData.total = total;
           this.tableData.data = records
           this.tableData.data = records

@@ -21,14 +21,21 @@ class data extends filter {
       },
       },
       {
       {
         label: "流程状态",
         label: "流程状态",
+        width: '80',
         render: (h, scope) => {
         render: (h, scope) => {
+          if(scope.row.cfgqzt == '1'){
+            return <div class='suspend'>查封挂起</div>
+          }
+          if(scope.row.yygqzt == '1'){
+            return <div class='suspend'>异议挂起</div>
+          }
           switch (scope.row.lczt) {
           switch (scope.row.lczt) {
             case '1':
             case '1':
-              return <span>进行中</span>
+              return <div class='allow'>进行中</div>
             case '2':
             case '2':
-              return <span>已结束</span>
+              return <div class='prohibit'>已结束</div>
             case '3':
             case '3':
-              return <span>进行中</span>
+              return <div class='allow'>进行中</div>
           }
           }
         }
         }
       },
       },
@@ -77,7 +84,7 @@ class data extends filter {
         }
         }
       },
       },
       {
       {
-        prop: "zl",
+        prop: "zlStr",
         label: "坐落",
         label: "坐落",
       },
       },
       {
       {