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

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-07-14 16:24:26
+ * @LastEditTime: 2023-07-17 13:31:39
  */
 import store from '@/store'
 // table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器
@@ -44,26 +44,31 @@ export default class filter {
   getDictData (val) {
     return store.getters.dictData[val]
   }
-  // 状态
   yWstatus (row) {
     let text = "";
+    let keys = 0;
     // 定义策略对象
     const strategies = {
       djblzt: "正在办理",
-      zjgcdyzt: ",在建工程抵押",
-      ycfzt: ",已预查封",
-      cfzt: ",已查封",
-      diyizt: ",已地役",
-      yyzt: ",异议中",
-      xzzt: ",已限制",
-      ygmmzt: ",已预告买卖",
-      ygdyzt: ",已预告抵押",
-      dyzt: ",已抵押"
+      zjgcdyzt: "在建工程抵押",
+      ycfzt: "已预查封",
+      cfzt: "已查封",
+      diyizt: "已地役",
+      yyzt: "异议中",
+      xzzt: "已限制",
+      ygmmzt: "已预告买卖",
+      ygdyzt: "已预告抵押",
+      dyzt: "已抵押"
     };
 
     for (let key in row) {
       if (row[key] === 1 && strategies[key]) {
+        keys++;
+        if (keys == 1) {
           text += strategies[key];
+        } else {
+          text += ',' + strategies[key];
+        }
       }
     }
 

@@ -2,13 +2,13 @@
 /*
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Autor: renchao
- * @LastEditTime: 2023-06-20 10:12:53
+ * @LastEditTime: 2023-07-17 13:22:05
  */
 import axios from 'axios'
 import Router from '@/router'
 import { Message } from 'element-ui'
 import { endLoadingSubCount } from './requestLoading'
-import {getToken, setToken} from "@/utils/util";
+import { getToken, setToken } from "@/utils/util";
 
 // create an axios instance
 const service = axios.create({
@@ -84,7 +84,7 @@ service.interceptors.response.use(
         } else {
             // 对响应错误做点什么
             Message({
-                message: '服务器异常,请联系管理员',
+                message: error,
                 type: 'error',
                 duration: 5 * 1000,
                 customClass: 'messageIndex'

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-05-25 10:42:50
+ * @LastEditTime: 2023-07-17 16:16:13
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
     <div v-if="this.isShowdrawer">
       <el-menu
         @select="djbClick"
-        class="title-batch"
-      >
+        class="title-batch">
         <el-menu-item index="-1" key="-1" class="menus">
           <div>登记簿</div>
         </el-menu-item>
@@ -17,8 +16,7 @@
       <div class="blxx">
         <el-menu
           @select="blxxClick"
-          class="title-batch"
-        >
+          class="title-batch">
           <el-menu-item index="-1" key="-1" class="menus">
             <div>补录信息</div>
           </el-menu-item>
@@ -27,11 +25,10 @@
           <el-menu-item
             v-for="(item, index) in supplementarylist"
             :index="index.toString()"
-            :key="index"
-          >
+            :key="index">
             <div>
               <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
-              <p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
+              <p v-else>{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
             </div>
             <i class="el-icon-delete" @click.stop="handleDel(item)" v-if="delel"></i>
           </el-menu-item>
@@ -45,8 +42,7 @@
         () => {
           this.isShowdrawer = !this.isShowdrawer;
         }
-      "
-    ></div>
+      "></div>
     <div
       class="map-drawer-expand map-drawer"
       v-else
@@ -54,19 +50,18 @@
         () => {
           this.isShowdrawer = !this.isShowdrawer;
         }
-      "
-    ></div>
+      "></div>
   </div>
 </template>
 <script>
-import { mapGetters } from "vuex";
-import { leftMenu, deleteSlbdcdy } from "@/api/workFlow.js";
-import { deleteRepairRecord } from"@/api/djbRepair.js";
-import { leftMenubl } from"@/api/djbRepair.js";
-import { getBdcqljqtsx } from "@/api/djbDetail.js";
-import { loadTreeData, getNode } from "./djbFrameData.js";
-export default {
-  data() {
+  import { mapGetters } from "vuex";
+  import { leftMenu, deleteSlbdcdy } from "@/api/workFlow.js";
+  import { deleteRepairRecord } from "@/api/djbRepair.js";
+  import { leftMenubl } from "@/api/djbRepair.js";
+  import { getBdcqljqtsx } from "@/api/djbDetail.js";
+  import { loadTreeData, getNode } from "./djbFrameData.js";
+  export default {
+    data () {
       return {
         supplementarylist: [],
         //受理申请标识码
@@ -100,12 +95,9 @@ export default {
         showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
       };
     },
-  mounted() {
-    this.delel=this.$parent.isEdit
+    mounted () {
+      this.delel = this.$parent.isEdit
       this.loadBdcdylist();
-    //  this.getleftMenubl();
-
-
     },
     computed: {
       // ...mapGetters(["isRefresh"]),
@@ -120,9 +112,9 @@ export default {
     },
     methods: {
       //读取申请单元信息
-    loadBdcdylist() {
+      loadBdcdylist () {
         var formdata = new FormData();
-      if(this.bsmSlsq){
+        if (this.bsmSlsq) {
           formdata.append("bsmSlsq", this.bsmSlsq);
           formdata.append("bestepid", this.bestepid);
           leftMenu(formdata).then((res) => {
@@ -136,44 +128,44 @@ export default {
 
       },
       // 获取右侧菜单
-    getleftMenubl(row) {
+      getleftMenubl (row) {
 
         leftMenubl(this.bsmSlsq).then((res) => {
           this.supplementarylist = res.result;
-          if(row==1){
-        this.delel=false
+          if (row == 1) {
+            this.delel = false
           }
-        if(row&&row!=1){
-          this.supplementarylist.forEach((item,index) => {
-            if(item.bsmRepair==row.bsmRepair){
-              this.activeIndex=index.toString()
+          if (row && row != 1) {
+            this.supplementarylist.forEach((item, index) => {
+              if (item.bsmRepair == row.bsmRepair) {
+                this.activeIndex = index.toString()
                 // 补录成功后定位到该条记录
                 this.unitClick(index)
               }
             })
           }
-       if(this.supplementarylist.length){
+          if (this.supplementarylist.length) {
             this.unitClick(0)
-       }else{
+          } else {
             this.$emit("getCurrentSelectProps", this.currentSelectProps);
           }
         });
       },
-    handleNodeClick(data, node, elem) {
+      handleNodeClick (data, node, elem) {
         this.$parent.loadComponent(this.currentSelectProps, data);
         this.$parent.tabset();
       },
       //申请单元点击事件
-    unitClick(index) {
+      unitClick (index) {
         this.currentSelectProps = this.supplementarylist[index];
         this.$emit("getCurrentSelectProps", this.currentSelectProps);
       },
       //登记簿点击事件
-    djbClick() {
+      djbClick () {
         this.loadBdcdylist();
       },
       // 删除补录记录
-    handleDel(row) {
+      handleDel (row) {
         this.$confirm("此操作将永久删除该条补录记录, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -188,7 +180,7 @@ export default {
               this.$nextTick(() => {
                 this.getleftMenubl();
                 this.blxxClick()
-              if(!this.supplementarylist.length){
+                if (!this.supplementarylist.length) {
                   getdjblist()
                 }
 
@@ -203,26 +195,26 @@ export default {
           });
       },
       //补录信息点击事件默认展示第一条补录记录
-    blxxClick() {
-      if(this.supplementarylist.length){
+      blxxClick () {
+        if (this.supplementarylist.length) {
           this.unitClick(0);
         }
 
       },
     },
-};
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
-@import "../../workFrame.scss";
-.leftmenu ul {
+  @import "~@/styles/mixin.scss";
+  @import "../../workFrame.scss";
+  .leftmenu ul {
     height: calc(100vh - 120px);
-}
-/deep/.rollTable {
+  }
+  /deep/.rollTable {
     height: calc(100vh - 240px) !important;
-}
+  }
 
-.content {
+  .content {
     width: 100%;
     height: 100%;
     display: flex;
@@ -243,57 +235,55 @@ export default {
       background-color: #f5f5f5;
       border: 1px solid rgb(228, 228, 228);
     }
-}
+  }
 
-/deep/ .expanded.el-tree-node__expand-icon,
-/deep/ .el-tree-node__expand-icon {
+  /deep/ .expanded.el-tree-node__expand-icon,
+  /deep/ .el-tree-node__expand-icon {
     visibility: hidden;
-}
+  }
 
-/deep/ .el-tree-node__content {
+  /deep/ .el-tree-node__content {
     border: 1px solid rgb(228, 228, 228);
     height: 45px;
-}
+  }
 
-/deep/ .el-tree-node:focus > .el-tree-node__content {
+  /deep/ .el-tree-node:focus > .el-tree-node__content {
     background-color: #f5f5f5;
     color: #0079fe;
     border-right: 4px solid #0079fe;
-}
+  }
 
-/deep/.el-tree-node {
+  /deep/.el-tree-node {
     white-space: pre-wrap;
-}
+  }
 
-/deep/ .is-current > .el-tree-node__content {
+  /deep/ .is-current > .el-tree-node__content {
     background-color: #f5f5f5;
     color: #0079fe;
     border-right: 4px solid #0079fe;
-}
-.menus {
+  }
+  .menus {
     background-color: #e7f4fe;
-  div{
+    div {
       font-size: 16px;
       font-weight: 600;
     }
-
-}
-.blxx {
-  .el-menu-item{
+  }
+  .blxx {
+    .el-menu-item {
       display: flex;
       justify-content: space-between;
     }
     border: #b0d9f8 solid 1px;
-  .tpcolor{
+    .tpcolor {
       color: red;
       line-height: 22px;
     }
-  .el-icon-delete{
+    .el-icon-delete {
       margin-right: 3px;
       // background-color: saddlebrown;
       height: 27px;
       float: left;
-
     }
-}
+  }
 </style>

 /*
  * @Description:workFramezu.vue组件的方法  头部按钮弹框方法
  * @Autor: miaofang
- * @LastEditTime: 2023-06-14 15:01:31
+ * @LastEditTime: 2023-07-17 16:14:23
  */
 import { getPrintTemplateByCode } from "@/api/print";
 import { getQllxByBdcdyid } from "@/api/djbDetail.js";
@@ -18,7 +18,6 @@ import {
   unClaimTask
 } from "@/api/workFlow.js";
 import { mapGetters } from 'vuex'
-import { log } from "bpmn-js-token-simulation";
 export default {
   data () {
     return {
@@ -36,7 +35,7 @@ export default {
       batchButtonName: '',
       // 受理申请信息
       slsq: {},
-      ableOperation:true
+      ableOperation: true
     }
   },
   mounted () {
@@ -56,14 +55,14 @@ export default {
         if (res.code === 200) {
           this.leftButtonList = res.result.button;
           this.rightButtonList = res.result.operation;
-           let arr=this.rightButtonList.filter((item) => {
-              return item.name=="删除"
+          let arr = this.rightButtonList.filter((item) => {
+            return item.name == "删除"
           })
 
-            if(arr.length){
+          if (arr.length) {
             this.$refs.Menu.getleftMenubl();
-            }else{
-              this.ableOperation=false
+          } else {
+            this.ableOperation = false
             this.$refs.Menu.getleftMenubl(1);
           }
         }
@@ -77,7 +76,10 @@ export default {
       let that = this;
       switch (item.value) {
         case "B0":
-          this.openDialog()
+          // this.openDialog()
+          this.$alert('此功能正在开发', '提示', {
+            confirmButtonText: '确定',
+          })
           break;
         case "B1":
           getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(res => {
@@ -90,7 +92,7 @@ export default {
                 rejectedTaskSet: {},
                 finishedSequenceFlowSet: result.finishedSequenceFlowIds
               },
-                handlinglist:result.runningTasks,
+              handlinglist: result.runningTasks,
               allCommentList: result.finishedTasks
             }, '80%', true)
           })

@@ -12,8 +12,7 @@
         <li
           @click="operation(item)"
           v-for="(item, index) in leftButtonList"
-          :key="index"
-        >
+          :key="index">
           <svg-icon class="icon" :icon-class="item.icon" />
           <span class="iconName">{{ item.name }}</span>
         </li>
@@ -22,8 +21,7 @@
         <li
           @click="operation(item)"
           v-for="(item, index) in rightButtonList"
-          :key="index"
-        >
+          :key="index">
           <svg-icon class="icon" :icon-class="item.icon" />
           <span class="iconName">{{ item.name }}</span>
         </li>
@@ -50,15 +48,13 @@
               :label="item.name"
               :name="item.value"
               v-for="item in tabList"
-              :key="item.value"
-            >
+              :key="item.value">
             </el-tab-pane>
           </el-tabs>
           <component
             :key="fresh"
             :is="componentTag"
-            v-bind="currentSelectProps"
-          />
+            v-bind="currentSelectProps" />
         </div>
       </div>
     </div>
@@ -67,26 +63,26 @@
   </div>
 </template>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
-@import "./workFrame.scss";
+  @import "~@/styles/mixin.scss";
+  @import "./workFrame.scss";
 </style>
 <script>
-import WorkFlow from "./mixin/index";
-import { getForm } from "./flowform";
-import { getBlYbxStepFormInfo } from "@/api/workFlow.js";
-import NoticeBar from "@/components/NoticeBar/index";
-import ProcessViewer from "./components/processViewer.vue";
-// 引入左侧菜单
-import { leftMenubl } from "@/api/djbRepair.js";
-import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
-import qllxDailog from "./djbBook/components/qllxDailog";
-import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
-import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
-// 登记簿数据信息
-import { addRepairRecord } from "@/api/djbRepair.js";
+  import WorkFlow from "./mixin/index";
+  import { getForm } from "./flowform";
+  import { getBlYbxStepFormInfo } from "@/api/workFlow.js";
+  import NoticeBar from "@/components/NoticeBar/index";
+  import ProcessViewer from "./components/processViewer.vue";
+  // 引入左侧菜单
+  import { leftMenubl } from "@/api/djbRepair.js";
+  import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
+  import qllxDailog from "./djbBook/components/qllxDailog";
+  import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
+  import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
+  // 登记簿数据信息
+  import { addRepairRecord } from "@/api/djbRepair.js";
 
-import { getBdcqljqtsx } from "@/api/djbDetail.js";
-export default {
+  import { getBdcqljqtsx } from "@/api/djbDetail.js";
+  export default {
     components: {
       selectBdc,
       NoticeBar,
@@ -95,15 +91,16 @@ export default {
       qllxDailog,
     },
     mixins: [WorkFlow],
-  data() {
+    data () {
       return {
         bsmSlsq: this.$route.query.bsmSlsq,
         bestepid: this.$route.query.bestepid,
+        bsmBusiness: this.$route.query.bsmBusiness,
         //设置那个表单选中
         tabName: "",
         // 弹框显示
         dialogVisible: true,
-      isEdit:false,
+        isEdit: false,
         //表单集合
         tabList: [],
         type: "READ_ONLY",
@@ -118,18 +115,18 @@ export default {
         //页面监听时间
         _beforeUnload_time: "",
         treedata: {},
-      bsmRepair:"",
+        bsmRepair: "",
         tabdata: [],
         defaultNode: {},
-      ableOperation:false
+        ableOperation: false
       };
     },
-  mounted() {
+    mounted () {
       // this.getleftMenubl()
     },
 
     methods: {
-    stepForm(qllx) {
+      stepForm (qllx) {
         this.oneSelectProps.qllx = qllx;
         if (this.$refs.Menu.supplementarylist.length) {
           this.oneSelectProps.type = this.type
@@ -137,16 +134,16 @@ export default {
             this.$nextTick(function () {
               this.tabList = res.result;
               this.tabName = this.tabList[0].value;
-            console.log("是否只读",this.tabList[0].ableOperation);
-             this.ableOperation=this.tabList[0].ableOperation
+              console.log("是否只读", this.tabList[0].ableOperation);
+              this.ableOperation = this.tabList[0].ableOperation
               this.getFromRouter(this.tabName);
             });
           });
         }
       },
       // 获取右侧选项卡
-    getCurrentSelectProps(val) {
-      this.bsmRepair= val.bsmRepair
+      getCurrentSelectProps (val) {
+        this.bsmRepair = val.bsmRepair
         if (val.bdcdyid) {
           this.oneSelectProps = val;
         }
@@ -162,7 +159,7 @@ export default {
         }
       },
       // 获取渲染登记簿列表
-    getdjblist() {
+      getdjblist () {
         getBdcqljqtsx({
           bdcdyid: this.currentSelectProps.bdcdyid,
           bdcdyh: this.currentSelectProps.bdcdyh,
@@ -191,21 +188,21 @@ export default {
         });
       },
       //右侧表单选项卡事件
-    beforeLeave(activeName) {
+      beforeLeave (activeName) {
         if (activeName && activeName != 0) this.getFromRouter(activeName);
       },
       //切换选项卡内容组件
-    getFromRouter(tabname) {
+      getFromRouter (tabname) {
         this.componentTag = getForm(tabname);
       },
-    closefp() {
+      closefp () {
         this.splitScreen = this.splitScreen ? false : true;
         this.$store.dispatch("app/set1tScreen", this.splitScreen);
         this.getFromRouter(this.tabList[0].value);
         this.clxxForm = getForm(this.tabList[1].value);
       },
       // 增加补录记录
-    addRepairRecord(row, del) {
+      addRepairRecord (row, del) {
         let from = {
           bsmQlxx: "",
           bsmSlsq: this.bsmSlsq,
@@ -245,6 +242,6 @@ export default {
           });
       },
     },
-};
+  };
 </script>
 <style scoped lang="scss"></style>

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-07-11 10:26:50
+ * @LastEditTime: 2023-07-17 13:51:03
 -->
 <template>
   <div>
@@ -168,5 +168,11 @@
     }
   }
 </script>
-<style scoped lang='scss'>
+<style scoped lang="scss">
+  /deep/.el-table th {
+    height: 30px !important;
+  }
+  /deep/.el-table--small .el-table__cell {
+    padding: 5px;
+  }
 </style>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:40:48
+ * @LastEditTime: 2023-07-17 13:51:29
 -->
 <template>
   <lb-table :column="column" :maxHeight="200" :heightNumSetting="true" :pagination="false" :key="key" :data="tableData">
@@ -127,4 +127,10 @@
   }
 </script>
 <style scoped lang='scss'>
+  /deep/.el-table th {
+    height: 30px !important;
+  }
+  /deep/.el-table--small .el-table__cell {
+    padding: 5px;
+  }
 </style>

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-05-09 09:20:10
+ * @LastEditTime: 2023-07-18 08:55:31
 -->
 <template>
   <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
     :isFullscreen="false">
-    <el-form :model="ruleForm" ref="ruleForm" label-width="70px">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px">
       <el-row>
         <el-col :span="24">
-          <el-form-item label="材料类型">
+          <el-form-item label="材料类型" prop="cllx">
             <el-select v-model="ruleForm.cllx" class="width100" placeholder="请选择">
               <el-option v-for="item in dictData['A40']" :key="item.dcode" :label="item.dname" :value="item.dcode">
               </el-option>
@@ -19,7 +19,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24">
-          <el-form-item label="材料名称">
+          <el-form-item label="材料名称" prop="clmc">
             <el-input v-model="ruleForm.clmc"></el-input>
           </el-form-item>
         </el-col>
@@ -41,7 +41,15 @@
           cllx: "",
           clmc: "",
         },
-      };
+        rules: {
+          cllx: [
+            { required: true, message: '请选择材料类型', trigger: 'change' }
+          ],
+          clmc: [
+            { required: true, message: '请输入材料名称', trigger: 'blur' }
+          ]
+        }
+      }
     },
     computed: {
       ...mapGetters(["dictData"]),
@@ -60,14 +68,21 @@
         }
       },
       handleSubmit () {
+        debugger
+        this.$refs['ruleForm'].validate((valid) => {
+          if (valid) {
             this.$parent.addSave(this.ruleForm);
             this.ruleForm = {
               cllx: "",
               clmc: "",
             }
             this.$emit("input", false);
-      },
-    },
+          } else {
+            return false;
+          }
+        })
+      }
+    }
   };
 </script>
 <style scoped lang="scss">

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-05-25 10:42:50
+ * @LastEditTime: 2023-07-17 16:20:37
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -39,9 +39,9 @@
   </div>
 </template>
 <script>
-import { mapGetters } from 'vuex'
-import { leftMenu, deleteSlbdcdy } from "@/api/workFlow.js"
-export default {
+  import { mapGetters } from 'vuex'
+  import { leftMenu, deleteSlbdcdy } from "@/api/workFlow.js"
+  export default {
     data () {
       return {
         //受理申请标识码
@@ -82,6 +82,9 @@ export default {
         var formdata = new FormData();
         formdata.append("bsmSlsq", this.bsmSlsq);
         formdata.append("bestepid", this.bestepid);
+        if (this.$route.query.bsmBusiness) {
+          formdata.append("bsmBusiness", this.$route.query.bsmBusiness);
+        }
         leftMenu(formdata).then((res) => {
           if (res.code === 200 && res.result) {
             this.unitData = res.result;
@@ -184,12 +187,12 @@ export default {
         this.$store.dispatch('user/refreshPage', false);
       }
     }
-}
+  }
 </script>
 <style scoped lang='scss'>
-@import "~@/styles/mixin.scss";
-@import "../../workFrame.scss";
-.leftmenu ul {
+  @import "~@/styles/mixin.scss";
+  @import "../../workFrame.scss";
+  .leftmenu ul {
     height: calc(100vh - 120px);
-}
+  }
 </style>

 <!--
  * @Description: workFrame左侧菜单列表-分割
  * @Autor: renchao
- * @LastEditTime: 2023-05-25 10:18:02
+ * @LastEditTime: 2023-07-17 16:21:24
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -99,6 +99,9 @@
         var formdata = new FormData();
         formdata.append("bsmSlsq", this.bsmSlsq);
         formdata.append("bestepid", this.bestepid);
+        if (this.$route.query.bsmBusiness) {
+          formdata.append("bsmBusiness", this.$route.query.bsmBusiness);
+        }
         leftMenu(formdata).then((res) => {
           if (res.code === 200 && res.result) {
             this.aroundUnitData = res.result.filter(item => item.bglx == '1')

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:40:48
+ * @LastEditTime: 2023-07-17 13:50:53
 -->
 <template>
   <lb-table :column="column" :maxHeight="200" :heightNumSetting="true" :pagination="false" :key="key" :data="tableData">
@@ -116,5 +116,12 @@
     }
   }
 </script>
-<style scoped lang='scss'>
+<style scoped lang="scss">
+  /deep/.el-table th {
+    height: 30px !important;
+  }
+  /deep/.el-table--small .el-table__cell {
+    padding: 5px;
+  }
 </style>
+

@@ -235,3 +235,11 @@
     }
   }
 </script>
+<style scoped lang="scss">
+  /deep/.el-table th {
+    height: 30px !important;
+  }
+  /deep/.el-table--small .el-table__cell {
+    padding: 3px;
+  }
+</style>

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:41:35
+ * @LastEditTime: 2023-07-17 13:51:09
 -->
 <template>
   <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableData">
@@ -158,5 +158,11 @@
     }
   }
 </script>
-<style scoped lang='scss'>
+<style scoped lang="scss">
+  /deep/.el-table th {
+    height: 30px !important;
+  }
+  /deep/.el-table--small .el-table__cell {
+    padding: 5px;
+  }
 </style>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-11 09:14:44
+ * @LastEditTime: 2023-07-17 13:52:47
 -->
 <template>
   <div>
@@ -14,15 +14,13 @@
       :heightNumSetting="true"
       :minHeight="150"
       height="150"
-      style="width: 100%"
-    >
+      style="width: 100%">
       <el-table-column prop="index" width="50" :render-header="renderHeader">
         <template slot-scope="scope">
           <i
             class="el-icon-minus pointer"
             @click="deleClick(scope.$index, scope.row)"
-            v-if="ableOperation"
-          ></i>
+            v-if="ableOperation"></i>
           <div style="text-align: center" v-else>
             {{ scope.$index + 1 }}
           </div>
@@ -39,8 +37,7 @@
             :normalizer="normalizer"
             :appendToBody="true"
             z-index="9999"
-            @input="addrow(scope.row)"
-          />
+            @input="addrow(scope.row)" />
         </template>
       </el-table-column>
       <el-table-column prop="qssj" label="土地使用起始时间" min-width="100">
@@ -53,8 +50,7 @@
             placeholder="选择日期"
             value-format="yyyy-MM-dd HH:mm:ss"
             format="yyyy-MM-dd"
-            @input="startTime(scope.$index)"
-          >
+            @input="startTime(scope.$index)">
           </el-date-picker>
         </template>
       </el-table-column>
@@ -68,8 +64,7 @@
             placeholder="选择日期"
             value-format="yyyy-MM-dd HH:mm:ss"
             format="yyyy-MM-dd"
-            @input="endTime(scope.$index)"
-          >
+            @input="endTime(scope.$index)">
           </el-date-picker>
         </template>
       </el-table-column>
@@ -80,18 +75,16 @@
             :disabled="!ableOperation"
             v-model="scope.row.syqx"
             placeholder="请输入内容"
-            @input="sumTime(scope.$index,scope.row.syqx)"
-          >
-            ></el-input
-          >
+            @input="sumTime(scope.$index,scope.row.syqx)">
+            ></el-input>
         </template>
       </el-table-column>
     </el-table>
   </div>
 </template>
 <script>
-import { mapGetters } from "vuex";
-export default {
+  import { mapGetters } from "vuex";
+  export default {
     computed: {
       ...mapGetters(["dictData"]),
     },
@@ -107,7 +100,7 @@ export default {
         default: true,
       },
     },
-  data() {
+    data () {
       return {
         // 键名转换，方法默认是label和children进行树状渲染
         tdyt: null,
@@ -122,7 +115,7 @@ export default {
         // 起始时间选择范围
         pickerStart: {},
         pickerEnd: {},
-      normalizer(node) {
+        normalizer (node) {
           if (node.children == null || node.children == "null") {
             delete node.children;
           }
@@ -173,7 +166,7 @@ export default {
       },
     },
     methods: {
-    renderHeader() {
+      renderHeader () {
         return (
           <div>
             {" "}
@@ -191,7 +184,7 @@ export default {
         );
       },
       // 修改事件
-    addrow() {
+      addrow () {
         this.tableDataList = this.tableDataList.map((item) => {
           return {
             ...item,
@@ -200,11 +193,11 @@ export default {
         });
         this.$emit("upDateTdytxxList", this.tableDataList);
       },
-    startTime(index) {
+      startTime (index) {
         //  let startTime = this.tableDataList[index].tdsyqssj;
         let endTime = this.tableDataList[index].jssj;
         let startTime = this.tableDataList[index].qssj;
-      this.tableDataList[index].pickerEnd= {
+        this.tableDataList[index].pickerEnd = {
           disabledDate: (time) => {
             if (Object.keys(startTime).length > 0) {
               return new Date(startTime).getTime() > time.getTime();
@@ -219,10 +212,10 @@ export default {
         ) {
           let startYear = new Date(startTime).getFullYear();
           let endYear = new Date(endTime).getFullYear();
-        this.tableDataList[index].syqx=endYear-startYear;
+          this.tableDataList[index].syqx = endYear - startYear;
         }
       },
-    endTime(index) {
+      endTime (index) {
         //  let startTime = this.tableDataList[index].tdsyqssj;
         let startTime = this.tableDataList[index].qssj;
         let endTime = this.tableDataList[index].jssj;
@@ -241,10 +234,10 @@ export default {
         ) {
           let startYear = new Date(startTime).getFullYear();
           let endYear = new Date(endTime).getFullYear();
-        this.tableDataList[index].syqx=endYear-startYear;
+          this.tableDataList[index].syqx = endYear - startYear;
         }
       },
-      sumTime(index, syqx) {
+      sumTime (index, syqx) {
 
         let startTime = this.tableDataList[index].qssj;
         this.tableDataList[index].jssj =
@@ -254,14 +247,14 @@ export default {
 
       },
       // 新增
-    addClick() {
+      addClick () {
         this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
 
         this.$emit("upDateTdytxxList", this.tableDataList);
       },
 
       // 删除
-    deleClick(index, row) {
+      deleClick (index, row) {
         this.$confirm("确定要删除吗, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -270,19 +263,25 @@ export default {
           .then(() => {
             this.tableData.splice(index, 1);
           })
-        .catch(() => {});
+          .catch(() => { });
       },
     },
-};
+  };
 </script>
 <style scoped lang="scss">
-.el-input {
+  .el-input {
     border: none !important;
-}
-/deep/.el-table__row {
+  }
+  /deep/.el-table__row {
     border: none !important;
-}
-.el-date-editor.el-input {
+  }
+  .el-date-editor.el-input {
     width: 100%;
-}
+  }
+  /deep/.el-table th {
+    height: 30px !important;
+  }
+  /deep/.el-table--small .el-table__cell {
+    padding: 5px;
+  }
 </style>

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 11:06:42
+ * @LastEditTime: 2023-07-17 14:20:17
  */
 import { getPrintTemplateByCode } from "@/api/print";
 import { uploadUndo } from "@/api/clxx";
@@ -65,7 +65,10 @@ export default {
       let that = this;
       switch (item.value) {
         case "B0":
-          this.openDialog()
+          // this.openDialog()
+          this.$alert('此功能正在开发', '提示', {
+            confirmButtonText: '确定',
+          })
           break;
         case "B1":
           getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(res => {

@@ -47,12 +47,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title title-block">
+        <div class="slxx_title title-block flex" style="justify-content: space-between;">
           不动产单元情况
-          <div>
           <el-button @click="compare">变化情况对比+</el-button>
         </div>
-        </div>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="原不动产权证号：">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 14:47:30
+ * @LastEditTime: 2023-07-17 13:38:49
 -->
 <template>
   <div class="from-clues">
     <!-- 表单部分 -->
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" label-width="100px">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="不动产单元号">
+      <el-form :model="queryForm" ref="queryForm" label-width="90px">
+        <el-row style="margin-bottom:10px">
+          <el-col :span="5">
+            <el-form-item label="不动产单元号" label-width="110px">
               <el-input
                 placeholder="请输入不动产单元号"
                 maxlength="28"
                 v-model="queryForm.bdcdyh"
                 clearable
-                class="width200px"></el-input>
+                class="width100"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="5">
             <el-form-item label="查封机关">
-              <el-input placeholder="请输入查封机关" v-model="queryForm.cfjg" clearable class="width200px"></el-input>
+              <el-input placeholder="请输入查封机关" v-model="queryForm.cfjg" clearable class="width100"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="5">
             <el-form-item label="查封文号">
               <el-input
                 placeholder="请输入不动产权证号"
                 v-model="queryForm.cfwh"
                 clearable
-                class="width200px"></el-input>
+                class="width100"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="5">
-            <el-form-item label="坐落">
-              <el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable class="width200px"></el-input>
+          <el-col :span="6">
+            <el-form-item label="坐落" label-width="50px">
+              <el-input placeholder="请输入坐落" v-model="queryForm.zl" clearable class="width100"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="btnColRight">
+          <el-col :span="3" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
               <el-button type="primary" @click="queryClick">查询</el-button>
+              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
             </el-form-item>
           </el-col>
         </el-row>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 14:47:36
+ * @LastEditTime: 2023-07-17 13:16:57
 -->
 <template>
   <!-- 抵押权利信息查询 -->
@@ -38,8 +38,8 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
               <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button type="primary" @click="resetForm(true)">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:23:44
+ * @LastEditTime: 2023-07-17 13:17:12
 -->
 <template>
   <div class="from-clues">
@@ -23,7 +23,7 @@
           </el-col>
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
+              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:23:51
+ * @LastEditTime: 2023-07-17 13:17:17
 -->
 <template>
   <div class="from-clues">
@@ -23,7 +23,7 @@
           </el-col>
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
+              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:26:40
+ * @LastEditTime: 2023-07-17 13:17:38
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -38,7 +38,7 @@
           </el-col>
           <el-col :span="3" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
+              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:26:46
+ * @LastEditTime: 2023-07-17 13:17:50
 -->
 <template>
   <div class="from-clues">
@@ -35,7 +35,7 @@
           </el-col>
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
+              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:26:51
+ * @LastEditTime: 2023-07-17 13:18:01
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -30,7 +30,7 @@
           </el-col>
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
+              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:26:55
+ * @LastEditTime: 2023-07-17 13:18:06
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -30,7 +30,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
+              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:27:00
+ * @LastEditTime: 2023-07-17 13:18:12
 -->
 <template>
   <div class="from-clues">
@@ -37,8 +37,8 @@
           </el-col>
           <el-col :span="6" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
               <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button type="primary" @click="resetForm(true)">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-07 09:27:48
+ * @LastEditTime: 2023-07-17 13:18:17
 -->
 <template>
   <div class="from-clues">
@@ -37,8 +37,8 @@
           </el-col>
           <el-col :span="6" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
               <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button type="primary" @click="resetForm(true)">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:27:13
+ * @LastEditTime: 2023-07-17 13:16:27
 -->
 <template>
   <div class="from-clues">
@@ -29,7 +29,7 @@
           </el-col>
           <el-col :span="6" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
+              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:27:16
+ * @LastEditTime: 2023-07-17 13:18:26
 -->
 <template>
   <div class="from-clues">
@@ -37,8 +37,8 @@
           </el-col>
           <el-col :span="6" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
               <el-button type="primary" @click="handleSearch">查询</el-button>
+              <el-button type="primary" @click="resetForm(true)">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:27:19
+ * @LastEditTime: 2023-07-17 13:18:34
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -30,7 +30,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
+              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:27:26
+ * @LastEditTime: 2023-07-17 13:18:39
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -30,7 +30,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm">重置</el-button>
+              <!-- <el-button type="primary" @click="resetForm">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-13 15:27:34
+ * @LastEditTime: 2023-07-17 13:18:43
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -30,7 +30,7 @@
           </el-col>
           <el-col :span="2" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
+              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>