Merge branch 'dev'

+<!--
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-07-17 13:51:29
+-->
+<template>
+  <lb-table :column="column" :maxHeight="200" :heightNumSetting="true" :pagination="false" :key="key" :data="tableData">
+  </lb-table>
+</template>
+<script>
+  import addQlr from './dialog/addQlr.vue'
+  import { mapGetters } from 'vuex'
+  export default {
+    components: {
+      addQlr
+    },
+    computed: {
+      ...mapGetters(["dictData"]),
+    },
+    props: {
+      tableData: {
+        type: Array,
+        default: function () {
+          return []
+        }
+      },
+      gyfs: {
+        type: String,
+        default: '1'
+      }
+    },
+    data () {
+      return {
+        key: 0,
+        dataIndex: 0,
+        dialog: false,
+        details: {},
+        tableDataList: [],
+        qlrCommonTable: [
+          {
+            label: '序号',
+            type: 'index',
+            width: '50',
+            render: (h, scope) => {
+              return (
+                <div>
+                  {scope.$index + 1}
+                </div>
+              )
+            }
+          },
+           {
+            prop: "yg",
+            label: "原告"
+          },
+           {
+            prop: "cfjg",
+            label: "查封机关"
+          },
+          {
+            prop: "cfwh",
+            label: "查封文号"
+          },
+          {
+            prop: "cfqssj",
+            label: "查封开始时间"
+          },
+          {
+            prop: "cfjssj",
+            label: "查封结束时间"
+          },          
+          {
+            prop: "cflxmc",
+            label: "查封类型"
+          },         
+          {
+            prop: "ywrmc",
+            label: "被执行人"
+          },
+          {
+            prop: "bcfzh",
+            label: "被查封证号"
+          },
+          {
+            prop: "bdcdyh",
+            label: "不动产单元号"
+          },
+          {
+            prop: "zl",
+            label: "坐落"
+          },
+          
+          
+        ],
+        column: this.qlrCommonTable
+      }
+    },
+    watch: {
+      tableData: {
+        handler: function (val, oldVal) {
+          let that = this
+          if (val.length == 0 || !val) {
+            that.tableDataList = _.cloneDeep([{
+              sqrmc: '',
+              dlrzjlx: '',
+              dlrzjh: '',
+              fr: ''
+            }])
+          } else {
+            that.tableDataList = _.cloneDeep(val)
+          }
+        },
+        immediate: true,
+        deep: true
+      },
+      gyfs: {
+        handler (newVal, oldValue) {
+          let dataList = _.cloneDeep(this.qlrCommonTable)
+          if (newVal == '1') {
+            this.column = _.cloneDeep(dataList).slice(1, dataList.length)
+          } else if ((newVal == '2')) {
+            this.column = dataList
+          } else {
+            this.column = _.cloneDeep(dataList)
+            this.column.splice(
+              2, 0, {
+              prop: "qlbl",
+              label: "份数"
+            })
+          }
+        },
+        immediate: true
+      }
+    },
+    methods: {
+    }
+  }
+</script>
+<style scoped lang='scss'>
+  /deep/.el-table th {
+    height: 30px !important;
+  }
+  /deep/.el-table--small .el-table__cell {
+    padding: 5px;
+  }
+</style>

@@ -52,16 +52,21 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title title-block">
+        <div class="slxx_title title-block" v-if="ruleForm.slsq.djywbm.includes('400')">
+          解封信息列表（{{ ruleForm.cfdjDetailList.length }} 个）
+          <div class="triangle"></div>
+           <cfdjTable :tableData="ruleForm.cfdjDetailList" />
+        </div>
+       <div class="slxx_title title-block" v-else>
           查封不动产列表（{{ ruleForm.ztQlxxList.length }} 个）
           <div class="triangle"></div>
+           <cfBdcdyTable :tableData="ruleForm.ztQlxxList" />
         </div>
-        <cfBdcdyTable :tableData="ruleForm.ztQlxxList" />
-        <div class="slxx_title title-block">
+        <div class="slxx_title title-block" v-if="!ruleForm.slsq.djywbm.includes('400')">
           批量查封信息
           <div class="triangle"></div>
         </div>
-        <el-row :gutter="10">
+        <el-row :gutter="10" v-if="!ruleForm.slsq.djywbm.includes('400')">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="原告：">
               <el-input v-model="ruleForm.cfdj.yg" :disabled="!ableOperation|| isJfOperation"></el-input>
@@ -78,7 +83,7 @@
             </el-form-item>
           </el-col>       
         </el-row>
-        <el-row :gutter="10">
+        <el-row :gutter="10" v-if="!ruleForm.slsq.djywbm.includes('400')">
            <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封期限：">
               <el-input v-model="ruleForm.cfdj.cfqx" :disabled="!ableOperation|| isJfOperation"></el-input>
@@ -98,7 +103,7 @@
             </el-form-item>
           </el-col>         
         </el-row>
-        <el-row :gutter="10">
+        <el-row :gutter="10" v-if="!ruleForm.slsq.djywbm.includes('400')">
            <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件：">
               <el-input v-model="ruleForm.cfdj.cfwj" :disabled="!ableOperation|| isJfOperation"></el-input>
@@ -110,7 +115,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="10">
+        <el-row :gutter="10" v-if="!ruleForm.slsq.djywbm.includes('400')">
           <el-col>
             <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：">             
                <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.fj"
@@ -118,7 +123,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="10">
+        <el-row :gutter="10" v-if="!ruleForm.slsq.djywbm.includes('400')">
           <el-col>
             <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="cfdj.djyy">
               <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy"
@@ -158,6 +163,7 @@
 </template>
 <script>
   import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
+  import cfdjTable from "@/views/workflow/components/cfdjTable";
   import { BatchInit, batchSaveData } from "@/api/workflow/cfdjFlow.js";
   import { mapGetters } from "vuex";
   export default {
@@ -199,7 +205,7 @@
         }
       })
     },
-    components: { cfBdcdyTable },
+    components: { cfBdcdyTable,cfdjTable },
     props: {
       flag: {
         type: Boolean,