Merge branch 'dev'

@@ -18,12 +18,12 @@
         display: flex;
         font-size: 12px;
         flex-wrap: wrap;
-        padding-top: 5px;
         justify-content: flex-start;
         min-height: 30px;
 
         span {
             display: flex;
+            align-items: center;
         }
 
         i {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-09 10:50:50
+ * @LastEditTime: 2023-10-30 10:45:10
 -->
 <template>
   <div class="djxxTable">
+    9999999999
     <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-23 16:46:47
+ * @LastEditTime: 2023-10-30 11:00:20
 -->
 <template>
   <div class="tableBox">
@@ -96,7 +96,7 @@
 </template>
 <script>
   import Router from '@/router'
-  import { mapGetters } from "vuex";
+  import store from '@/store/index.js'
   import { datas } from "../qlxxFormData.js";
   import { ywPopupDialog } from "@/utils/popup.js";
   import printTemplate from "../components/printTemplate.vue";
@@ -129,9 +129,6 @@
         default: () => []
       },
     },
-    computed: {
-      ...mapGetters(["dictData"]),
-    },
     data () {
       return {
         qsztList: datas.columns().qsztList,
@@ -152,7 +149,7 @@
           sfygdj: (label) => ztObj[label] || label,
           sfczjzhxz: (label) => ztObj[label] || label,
           dyrlx: (label) => {
-            let arr = this.dictData['A36'].filter(item => item.dcode === label);
+            let arr = store.getters.dictData['A36'].filter(item => item.dcode === label);
             return arr.length > 0 ? arr[0].dname : label;
           },
           default: (label) => label

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-09 10:44:26
+ * @LastEditTime: 2023-10-30 10:43:28
 -->
 <template>
   <div class="djxxTable">

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-10-09 10:44:45
+ * @LastEditTime: 2023-10-30 10:36:43
 -->
 <template>
   <div class="djxxTable">

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-10-23 16:48:02
+ * @LastEditTime: 2023-10-30 10:59:40
 -->
 <template>
   <div class="djxxTable">
@@ -116,6 +116,7 @@
 <script>
   import Router from '@/router'
   import printJS from "print-js";
+  import store from '@/store/index.js'
   import { datas } from "./qlxxFormData.js";
   import { getSjlx } from "@/utils/dictionary.js";
   import { getFdcq1List } from "@/api/djbDetail.js";
@@ -165,7 +166,7 @@
           sfygdj: (label) => ztObj[label] || label,
           sfczjzhxz: (label) => ztObj[label] || label,
           dyrlx: (label) => {
-            let arr = this.dictData['A36'].filter(item => item.dcode === label);
+            let arr = store.getters.dictData['A36'].filter(item => item.dcode === label);
             return arr.length > 0 ? arr[0].dname : label;
           },
           default: (label) => label

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-10-09 10:46:58
+ * @LastEditTime: 2023-10-30 10:40:48
 -->
 <template>
   <div class="djxxTable">

@@ -65,6 +65,11 @@ class data extends filter {
         width: '200'
       },
       {
+        prop: "djqxmc",
+        label: "登记情形",
+        width: '200'
+      },
+      {
         label: "权利人",
         width: '120',
         render: (h, scope) => {