Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 13:25:47
+ * @LastEditTime: 2023-11-02 11:23:39
 -->
 <template>
   <!-- 受理信息 -->
@@ -45,10 +45,11 @@
             <el-form-item
               label="抵押不动产信息："
               prop="ztQlxx.bdcqzh"
+              style="display:flex"
               :rules="rules.ztQlxxrules">
               <select-table
                 v-model="ruleForm.ztQlxx"
-                :table-width="730"
+                table-width="100%"
                 :tableData="ztQlxxList"
                 :props="props"
                 @change="ztQlxxchange">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-30 11:00:20
+ * @LastEditTime: 2023-11-01 14:31:16
 -->
 <template>
   <div class="tableBox">
@@ -152,6 +152,10 @@
             let arr = store.getters.dictData['A36'].filter(item => item.dcode === label);
             return arr.length > 0 ? arr[0].dname : label;
           },
+          qlrzjzl: (label) => {
+            let arr = store.getters.dictData['A30'].filter(item => item.dcode === label);
+            return arr.length > 0 ? arr[0].dname : label;
+          },
           default: (label) => label
         };
 

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-10-30 10:59:40
+ * @LastEditTime: 2023-11-01 14:24:12
 -->
 <template>
   <div class="djxxTable">
@@ -101,7 +101,7 @@
                 <div
                   v-for="(label, index) in row.djQlxxFdcqxmDoList"
                   :key="index">
-                  {{ label[item.prop] }}
+                  {{ getLable(item.prop,label[item.prop]) }}
                 </div>
               </div>
             </td>
@@ -169,6 +169,10 @@
             let arr = store.getters.dictData['A36'].filter(item => item.dcode === label);
             return arr.length > 0 ? arr[0].dname : label;
           },
+          fwjg: (label) => {
+            let arr = store.getters.dictData['A46'].filter(item => item.dcode === label);
+            return arr.length > 0 ? arr[0].dname : label;
+          },
           default: (label) => label
         };