Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-20 10:27:25
+ * @LastEditTime: 2023-10-23 16:46:47
 -->
 <template>
   <div class="tableBox">
@@ -247,7 +247,7 @@
           getXtParamsByYwh(ywh).then(res => {
             let data = res.result
             const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
-            window.open(href, `urlname${data.bsmSlsq}`)
+            window.open(href, `urlname${new Date().getTime()}`)
           })
         } else {
           getBlParamsByYwh(ywh, bsmQlxx).then(res => {

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-10-20 10:28:07
+ * @LastEditTime: 2023-10-23 16:48:02
 -->
 <template>
   <div class="djxxTable">
@@ -302,7 +302,7 @@
           getXtParamsByYwh(ywh).then(res => {
             let data = res.result
             const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
-            window.open(href, `urlname${data.bsmSlsq}`)
+            window.open(href, `urlname${new Date().getTime()}`)
           })
         } else {
           getBlParamsByYwh(ywh, bsmQlxx).then(res => {

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-19 14:04:13
+ * @LastEditTime: 2023-10-23 16:16:24
 -->
 <template>
   <div
@@ -178,9 +178,8 @@
         getCertificateList(this.formdata).then((res) => {
           if (res.code === 200) {
             this.tableDatas.data = res.result ? res.result : [];
-            console.log("this.tableDatas", this.tableDatas);
           }
-        });
+        })
       },
       /**
        * @description: query
@@ -192,7 +191,7 @@
             this.szxxtableData.data = res.result;
             this.key++;
           }
-        });
+        })
       },
       /**
        * @description: 获取证书内容
@@ -208,13 +207,11 @@
        * @author: miaofang
        */
       getHeadTabBdcqz () {
-        console.log("formData", this.formData);
         this.loading = true;
         getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then((res) => {
           if (res.code == 200) {
             this.noData = true;
             if (res.result && res.result.length > 0) {
-              console.log("res.resultttttttttttttttttttt", res.result);
               this.bdcqz = res.result[0];
               this.headTabBdcqz = res.result;
               if (this.bdcqz.bdcqzlx == 1) {

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-09-06 09:09:45
+ * @LastEditTime: 2023-10-23 14:08:31
 -->
 <template>
   <div class='sfxx'>
@@ -67,7 +67,6 @@
   </div>
 </template>
 <script>
-
   export default {
     components: {},
     data () {

 <!--
  * @Description: 审批意见
  * @Autor: renchao
- * @LastEditTime: 2023-10-08 14:48:32
+ * @LastEditTime: 2023-10-23 17:19:05
 -->
 <template>
-  <div class="spyj loadingtext">
+  <div class="spyj" v-Loading="loading">
     <div class="box">
       <div class="spyj_title">
         <div class="righttitle">审批表</div>
@@ -59,7 +59,6 @@
         <el-button type="primary" :disabled="shows" @click="onSubmit()">保存</el-button>
       </div>
     </div>
-    <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
   </div>
 </template>
 <script>
@@ -72,6 +71,7 @@
     },
     data () {
       return {
+        loading: false,
         currentindex: 0,
         refresh: 10,
         viewEdit: false,
@@ -103,7 +103,6 @@
       },
 
     },
-    created () { },
     methods: {
       /**
       * @description: dataset
@@ -112,20 +111,6 @@
       */
       dataset () {
         this.viewEdit = this.$parent.currentSelectTab.ableOperation;
-        // switch (this.$parent.dqhj) {
-        //   case "cs":
-        //     this.indexdqlc = 0;
-        //     this.jdmc = "初审";
-        //     break;
-        //   case "fs":
-        //     this.indexdqlc = 1;
-        //     this.jdmc = "复审";
-        //     break;
-        //   case "hd":
-        //     this.indexdqlc = 2;
-        //     this.jdmc = "核定";
-        //     break;
-        // }
       },
       /**
        * @description: getShList
@@ -133,19 +118,17 @@
        * @author: renchao
        */
       getShList () {
-        this.$startLoading();
+        this.loading = true
         var formdata = new FormData();
         formdata.append("bsmBusiness", this.propsParam.bsmBusiness);
         formdata.append("bestepid", this.$route.query.bestepid);
 
         getSpyjList(formdata).then((res) => {
-
           if (res.code === 200 && res.result) {
             this.tableData = res.result;
             if (this.shows) {
               this.shows = false;
             }
-
             var index = this.tableData.findIndex(
               (item) => item.jddm === this.$parent.dqhj
             );
@@ -176,12 +159,9 @@
               }
                 console.log("this.tableData333",this.tableData);
             });
-            this.$endLoading();
-
+            this.loading = false
           }
-
-        });
-
+        })
       },
       /**
        * @description: onSubmit

@@ -73,6 +73,11 @@ class data extends filter {
         width: '200'
       },
       {
+        prop: "djqxmc",
+        label: "登记情形",
+        width: '200'
+      },
+      {
         prop: "bdcdyh",
         label: "不动产单元号",
         minWidth: '150',

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-09 09:50:37
+ * @LastEditTime: 2023-10-23 17:17:34
 -->
 <template>
   <!-- 受理信息 -->
@@ -89,6 +89,7 @@
               <div class="flex">
                 <el-input
                   maxlength="12"
+                  :disabled="!viewEdit"
                   v-model="ruleForm.jsydsyq.syqmj"
                   oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
                 <el-select disabled v-model="mjdw" style="width: 68px">
@@ -104,7 +105,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="权利设定方式：">
-              <el-input maxlength="25" v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
+              <el-input maxlength="25" :disabled="!viewEdit" v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -112,6 +113,7 @@
               <div style="display: flex">
                 <el-input
                   maxlength="11"
+                  :disabled="!viewEdit"
                   v-model="ruleForm.jsydsyq.qdjg"
                   style="width: 500%"
                   oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
@@ -129,7 +131,7 @@
 
           <el-col :span="16">
             <el-form-item label="坐落：">
-              <el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input>
+              <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.sldy.zl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

@@ -141,7 +141,6 @@
           this.sqywQllxList = res.result;
         })
       },
-      //申请业务类型菜单事件
       /**
        * @description: 申请业务类型菜单事件
        * @param {*} item

@@ -73,6 +73,11 @@ class data extends filter {
         minWidth: '150',
       },
       {
+        prop: "djqxmc",
+        label: "登记情形",
+        minWidth: '150',
+      },
+      {
         prop: "bdcdyh",
         label: "不动产单元号",
         minWidth: '150',