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: "qlrmc",
+            label: "抵押权人"
+          },
+          {
+            prop: "ywrmc",
+            label: "抵押人"
+          },
+          {
+            prop: "bdcqzh",
+            label: "不动产登记证明号"
+          },
+           {
+            prop: "dyjelx",
+            label: "抵押金额类型"
+          },
+           {
+            prop: "dyfsmc",
+            label: "抵押方式"
+          },          
+           {
+            prop: "qdjgmc",
+            label: "抵押金额"
+          }, 
+           {
+            prop: "qlmjmc",
+            label: "抵押面积"
+          },       
+          {
+            prop: "zwlxqssj",
+            label: "债务履行开始时间"
+          },
+          {
+            prop: "zwlxjssj",
+            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>

@@ -55,24 +55,24 @@
         <div
           class="slxx_title title-block"
           v-if="ruleForm.slsq.djywbm.includes('400')">
-          在抵押权信息列表（{{ ruleForm.qlxxList.length }} 个）
+          在抵押权信息列表（{{ ruleForm.diyaqDetailList.length }} 个）
           <div class="triangle"></div>
+           <dyaqTable :tableData="ruleForm.diyaqDetailList" />
         </div>
         <div
           class="slxx_title title-block"
           v-else>
           抵押不动产列表信息（{{ ruleForm.ztQlxxList.length }} 个）
           <div class="triangle"></div>
-        </div>
-        <cfBdcdyTable :tableData="ruleForm.qlxxList" v-if="ruleForm.slsq.djywbm.includes('400')" />
-        <cfBdcdyTable v-else :tableData="ruleForm.ztQlxxList" />
-        <div class="slxx_title title-block">
+           <cfBdcdyTable :tableData="ruleForm.ztQlxxList" />
+        </div>      
+        <div class="slxx_title title-block" v-if="!ruleForm.slsq.djywbm.includes('400')">
           抵押信息
           <div class="triangle"></div>
         </div>
         <el-row
           :gutter="10"
-          v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0">
+          v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0 && !ruleForm.slsq.djywbm.includes('400')">
           <el-col :span="8">
             <el-form-item label="抵押方式：">
               <el-radio-group disabled v-model="ruleForm.diyaqList[0].dyfs">
@@ -106,7 +106,7 @@
         </el-row>
         <el-row
           :gutter="10"
-          v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0">
+          v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0 && !ruleForm.slsq.djywbm.includes('400')">
           <el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 1">
             <el-form-item label="被担保主债权数额：">
               <div style="display: flex">
@@ -165,8 +165,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-
-        <el-row v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0">
+        <el-row v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0 && !ruleForm.slsq.djywbm.includes('400')">
           <el-col :span="24">
             <el-form-item label="担保范围：">
               <el-input
@@ -175,7 +174,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0">
+        <el-row v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0 && !ruleForm.slsq.djywbm.includes('400')">
           <el-col :span="24">
             <el-form-item label="最高债权确定事实和数额：">
               <el-input
@@ -184,7 +183,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0">
+        <el-row v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0 && !ruleForm.slsq.djywbm.includes('400')">
           <el-col>
             <el-form-item label="附记：" prop="fj">
               <el-input
@@ -304,8 +303,8 @@
   </div>
 </template>
 <script>
-  import qjhTable from "@/views/workflow/components/qjhTable";
   import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
+   import dyaqTable from "@/views/workflow/components/dyaqTable";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
   import { batchInit, saveBatchData } from "@/api/workflow/diyaqFlow.js";
   import { mapGetters } from "vuex";
@@ -346,7 +345,7 @@
         this.loading = false
       })
     },
-    components: { qlrCommonTable, qjhTable, cfBdcdyTable },
+    components: { qlrCommonTable, cfBdcdyTable,dyaqTable },
     computed: {
       ...mapGetters(["dictData", "flag"]),
     },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-02-02 14:56:22
+ * @LastEditTime: 2024-02-06 14:43:33
 -->
 <template>
   <div class="from-clues">
@@ -76,7 +76,7 @@
     </div>
     <div class="submit_button">
       <el-button @click="$popupCacel">取消</el-button>
-      <el-button type="primary" plain @click="submitForm" :loading="loading" v-if="sqywInfo.isworkFrame">添加单元</el-button>
+      <el-button type="primary" plain @click="handleAdd" :loading="loading" v-if="sqywInfo.isworkFrame">添加单元</el-button>
       <el-button type="primary" plain @click="submitForm" :loading="loading" v-else>发起申请</el-button>
     </div>
   </div>
@@ -155,6 +155,35 @@
        * @description: submitForm
        * @author: renchao
        */
+      handleAdd () {
+        let that = this
+        this.loading = true;
+        store.dispatch('user/reMenuRefresh', false)
+        againAddSldy({
+          bsmSqyw: that.sqywInfo.bsmSqyw,
+          bdcdysz: that.bdcdysz,
+          bsmSlsq: that.sqywInfo.bsmSlsq,
+        }).then(res => {
+          that.loading = false
+          if (res.code == 200) {
+            if (this.sqywInfo.sqywdylx != "1") {
+              that.bdcdysz = []
+              that.$refs.table.clearSelection()
+            }
+            store.dispatch('user/reMenuRefresh', true)
+            that.queryClick()
+            that.$message({
+              showClose: true,
+              message: '添加成功',
+              type: 'success'
+            })
+          } else {
+            that.$message.error(res.message);
+          }
+        }).catch(() => {
+          that.loading = false
+        })
+      },
       submitForm () {
         let that = this
         if (this.bdcdysz.length == 0) {
@@ -162,83 +191,55 @@
           return;
         }
         this.loading = true
-        if (this.sqywInfo.isworkFrame) {
-          store.dispatch('user/reMenuRefresh', false)
-          againAddSldy({
+        if (!that.isJump) {
+          startBusinessFlow({
             bsmSqyw: that.sqywInfo.bsmSqyw,
             bdcdysz: that.bdcdysz,
-            bsmSlsq: that.sqywInfo.bsmSlsq,
-          }).then(res => {
+          }).then((res) => {
             that.loading = false
             if (res.code == 200) {
-              if (this.sqywInfo.sqywdylx != "1") {
-                that.bdcdysz = []
-                that.$refs.table.clearSelection()
+              that.$message({
+                showClose: true,
+                message: "发起申请成功",
+                type: "success",
+              });
+              if (!that.isJump) {
+                that.jump(res.result, that.sqywInfo.djywbm);
+              } else {
+                store.dispatch('user/refreshPage', true);
+              }
+              that.$popupCacel()
+
+            } else {
+              if (res.result && res.result.length > 0) {
+                ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+              } else {
+                ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
               }
-              store.dispatch('user/reMenuRefresh', true)
-              that.queryClick()
+            }
+          }).catch(() => {
+            that.loading = false
+          })
+        } else {
+          choiceBdcdy({
+            bsmSlsq: that.$route.query.bsmSlsq,
+            bdcdysz: that.bdcdysz,
+          }).then((res) => {
+            that.loading = false
+            if (res.code == 200) {
               that.$message({
                 showClose: true,
-                message: '添加成功',
-                type: 'success'
-              })
+                message: "发起申请成功",
+                type: "success",
+              });
+              store.dispatch("user/refreshPage", true);
             } else {
               that.$message.error(res.message);
             }
+            that.$popupCacel();
           }).catch(() => {
             that.loading = false
           })
-        } else {
-          if (!that.isJump) {
-            startBusinessFlow({
-              bsmSqyw: that.sqywInfo.bsmSqyw,
-              bdcdysz: that.bdcdysz,
-            }).then((res) => {
-              that.loading = false
-              if (res.code == 200) {
-                that.$message({
-                  showClose: true,
-                  message: "发起申请成功",
-                  type: "success",
-                });
-                if (!that.isJump) {
-                  that.jump(res.result, that.sqywInfo.djywbm);
-                } else {
-                  store.dispatch('user/refreshPage', true);
-                }
-                that.$popupCacel()
-
-              } else {
-                if (res.result && res.result.length > 0) {
-                  ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
-                } else {
-                  ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
-                }
-              }
-            }).catch(() => {
-              that.loading = false
-            })
-          } else {
-            choiceBdcdy({
-              bsmSlsq: that.$route.query.bsmSlsq,
-              bdcdysz: that.bdcdysz,
-            }).then((res) => {
-              that.loading = false
-              if (res.code == 200) {
-                that.$message({
-                  showClose: true,
-                  message: "发起申请成功",
-                  type: "success",
-                });
-                store.dispatch("user/refreshPage", true);
-              } else {
-                that.$message.error(res.message);
-              }
-              that.$popupCacel();
-            }).catch(() => {
-              that.loading = false
-            })
-          }
         }
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-02-02 16:35:05
+ * @LastEditTime: 2024-02-06 14:43:44
 -->
 <template>
   <!-- 抵押权利信息查询 -->
@@ -67,7 +67,7 @@
     </div>
     <div class="submit_button">
       <el-button @click="$popupCacel">取消</el-button>
-      <el-button type="primary" plain @click="submitFormClick()" :loading="loading" v-if="sqywInfo.isworkFrame">添加单元</el-button>
+      <el-button type="primary" plain @click="handleAdd" :loading="loading" v-if="sqywInfo.isworkFrame">添加单元</el-button>
       <el-button type="primary" plain @click="submitFormClick()" :loading="loading" v-else>发起申请</el-button>
     </div>
   </div>
@@ -147,6 +147,35 @@
        * @description: submitFormClick
        * @author: renchao
        */
+      handleAdd () {
+        let that = this
+        this.loading = true;
+        store.dispatch('user/reMenuRefresh', false)
+        againAddSldy({
+          bsmSqyw: that.sqywInfo.bsmSqyw,
+          bdcdysz: that.bdcdysz,
+          bsmSlsq: that.sqywInfo.bsmSlsq,
+        }).then(res => {
+          that.loading = false
+          if (res.code == 200) {
+            if (this.sqywInfo.sqywdylx != "1") {
+              that.bdcdysz = []
+              that.$refs.table.clearSelection()
+            }
+            store.dispatch('user/reMenuRefresh', true)
+            that.queryClick()
+            that.$message({
+              showClose: true,
+              message: '添加成功',
+              type: 'success'
+            })
+          } else {
+            that.$message.error(res.message);
+          }
+        }).catch(() => {
+          that.loading = false
+        })
+      },
       submitFormClick () {
         let that = this
         if (this.bdcdysz.length == 0) {
@@ -154,63 +183,35 @@
           return;
         }
         this.loading = true;
-        if (this.sqywInfo.isworkFrame) {
-          store.dispatch('user/reMenuRefresh', false)
-          againAddSldy({
-            bsmSqyw: that.sqywInfo.bsmSqyw,
-            bdcdysz: that.bdcdysz,
-            bsmSlsq: that.sqywInfo.bsmSlsq,
-          }).then(res => {
-            that.loading = false
-            if (res.code == 200) {
-              if (this.sqywInfo.sqywdylx != "1") {
-                that.bdcdysz = []
-                that.$refs.table.clearSelection()
-              }
-              store.dispatch('user/reMenuRefresh', true)
-              that.queryClick()
-              that.$message({
-                showClose: true,
-                message: '添加成功',
-                type: 'success'
-              })
+        startBusinessFlow({
+          bsmSqyw: this.sqywInfo.bsmSqyw,
+          bdcdysz: this.bdcdysz,
+          // djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
+          // djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
+        }).then((res) => {
+          this.loading = false
+          if (res.code == 200) {
+            that.$message({
+              showClose: true,
+              message: "发起申请成功",
+              type: "success",
+            });
+            if (!that.isJump) {
+              that.jump(res.result, that.sqywInfo.djywbm);
             } else {
-              that.$message.error(res.message);
+              store.dispatch('user/refreshPage', true);
             }
-          }).catch(() => {
-            that.loading = false
-          })
-        } else {
-          startBusinessFlow({
-            bsmSqyw: this.sqywInfo.bsmSqyw,
-            bdcdysz: this.bdcdysz,
-            // djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
-            // djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
-          }).then((res) => {
-            this.loading = false
-            if (res.code == 200) {
-              that.$message({
-                showClose: true,
-                message: "发起申请成功",
-                type: "success",
-              });
-              if (!that.isJump) {
-                that.jump(res.result, that.sqywInfo.djywbm);
-              } else {
-                store.dispatch('user/refreshPage', true);
-              }
-              that.$popupCacel()
+            that.$popupCacel()
+          } else {
+            if (res.result && res.result.length > 0) {
+              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
             } else {
-              if (res.result && res.result.length > 0) {
-                ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
-              } else {
-                ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
-              }
+              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
             }
-          }).catch(() => {
-            this.loading = false
-          })
-        }
+          }
+        }).catch(() => {
+          this.loading = false
+        })
       },
       /**
        * @description: handleSelectionChange