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

@@ -4,6 +4,7 @@
  * @LastEditTime: 2023-09-25 10:56:39
  */
 import store from '@/store'
+import { log } from 'bpmn-js-token-simulation'
 // table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器
 export default class filter {
   /**
@@ -153,17 +154,35 @@ export default class filter {
       ygmmzt: "已预告买卖",
       ygdyzt: "已预告抵押",
       dyzt: "已抵押",
-      sfbl: "正在补录"
+      sfbl: "正在补录",
+      qqzt:"已确权"
     };
 
     for (let key in row) {
+      console.log("row[key]11",row[key],key);
+      console.log("www",strategies[key],key);
       if (row[key] === 1 && strategies[key]) {
+        console.log("row[key]22",row[key]);
         keys++;
         if (keys == 1) {
           text += strategies[key];
         } else {
           text += ',' + strategies[key];
         }
+      }else if(row[key] ==2 && key=="qqzt"){
+        if(text){
+          text += ','+"已灭失";
+        }else{
+          text += "已灭失";
+        }
+
+      }else if(row[key] ==0 && key=="qqzt"){
+        if(text){
+          text += ','+"未确权";
+        }else{
+          text += "未确权";
+        }
+
       }
     }
 

@@ -33,7 +33,7 @@
       </tr>
       <tr>
         <td>等级</td>
-        <td>{{ zdjbxx.djmc }}</td>
+        <td>{{ zdjbxx.dj|dictionary("A50") }}</td>
         <td>价格</td>
         <td>{{ zdjbxx.jg }}</td>
       </tr>