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

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-06-14 15:05:38
+ * @LastEditTime: 2023-09-21 09:27:14
  */
 import Vue from 'vue'
 import Popup from './index.vue'
@@ -50,6 +50,8 @@ const Popup1 = (title, editItem, data, formData) => {
   let instance = new PopupBox({
     data
   }).$mount()
+  // 设置 z-index 并递增层级计数器
+  instance.zIndex = data.zIndexCounter++
   document.body.appendChild(instance.$el)
   Vue.nextTick(() => {
     instance.isShow = true

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 10:19:52
+ * @LastEditTime: 2023-09-21 09:25:47
 -->
 <template>
   <transition name="msgbox-fade">
-    <div class="ls-mask" v-if="myShow">
+    <div class="ls-mask" ref="popup" v-if="myShow">
       <div class="ls-mask-window" :class="isMain ? 'mainCenter' : 'contentCenter'" :style="{ 'width': width }">
         <div class="ls-head">
           <div class="ls-title" :style="{ 'text-align': titleStyle }">
@@ -30,6 +30,7 @@
     name: 'index',
     data () {
       return {
+        zIndexCounter: 2000,
         title: '标题',
         editItem: "",
         isMain: false,

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-15 09:30:33
+ * @LastEditTime: 2023-09-21 09:39:21
 -->
 <template>
   <el-dialog
@@ -12,14 +12,6 @@
     custom-class="insetDialog"
     append-to-body
     width="31%">
-    <!-- <el-radio-group v-model="radio">
-      <el-radio-button
-        v-for="(value, key) in qllxlistdata"
-        :key="key"
-        :label="value"
-      ></el-radio-button>
-
-    </el-radio-group> -->
     <el-button class="gettypebutton" v-for="(value, key) in qllxlistdata"
       :key="key"
       :label="value" @click="clicksss(key)" plain>{{value}}</el-button>

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-18 16:32:42
+ * @LastEditTime: 2023-09-21 09:55:21
  */
 //流程环节操作按钮
 export function getForm (tabName) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 09:12:32
+ * @LastEditTime: 2023-09-21 10:19:25
 -->
 <template>
   <div class="tableBox">
@@ -235,7 +235,10 @@
         } else {
           getBlParamsByYwh(ywh, bsmQlxx).then(res => {
             let data = res.result
-            ywPopupDialog("材料信息", "registerBook/components/clxx/index", data, "60%", true, false)
+            this.$popup('材料信息', 'registerBook/components/clxx/index', {
+              width: '60%',
+              formData: data
+            })
           })
         }
       }

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 15:46:25
+ * @LastEditTime: 2023-09-21 10:46:05
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -90,9 +90,6 @@
         let that = this
         var formdata = new FormData();
         formdata.append("bsmSlsq", this.bsmSlsq);
-        if (this.$route.query.bestepid) {
-          formdata.append("bestepid", this.bestepid);
-        }
         if (this.$route.query.bsmBusiness) {
           formdata.append("bsmBusiness", this.$route.query.bsmBusiness);
         }

 <!--
  * @Description: workFrame左侧菜单列表-分割
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 15:33:05
+ * @LastEditTime: 2023-09-21 10:46:34
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -103,8 +103,6 @@
         var formdata = new FormData();
         // 受理申请标识码
         formdata.append("bsmSlsq", this.paramData.bsmSlsq);
-        // 当前流程所在环节
-        formdata.append("bestepid", this.paramData.bestepid);
         formdata.append("bsmBusiness", this.paramData.bsmBusiness);
         if (this.$route.query.type == 'jdcx') {
           jdcxLeftMenu(formdata).then((res) => {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 17:30:41
+ * @LastEditTime: 2023-09-21 10:46:55
 -->
 <template>
   <div class="container">
@@ -18,7 +18,7 @@
       <ul>
         <li @click="operation(item)" v-for="(item, index) in rightButtonList" :key="index">
           <svg-icon class="icon" :icon-class="item.icon" />
-          <span class="iconName">{{ item.name }} {{ item.value }}</span>
+          <span class="iconName">{{ item.name }}</span>
         </li>
       </ul>
       <NoticeBar class="NoticeBar" :noticeList="noticeList" v-if="noticeList.length > 0" />

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 14:59:46
+ * @LastEditTime: 2023-09-21 10:18:57
 -->
 <template>
   <div class="from-clues">
@@ -252,9 +252,9 @@
         this.$popup("登记簿详情", "registerBook/djbFrame", {
           formData: param
         })
-      },
-    },
-  };
+      }
+    }
+  }
 </script>
 <style scoped lang="scss">
   @import "~@/styles/mixin.scss";

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-23 14:51:26
+ * @LastEditTime: 2023-09-21 09:37:44
 -->
 <template>
   <!-- 抵押权利信息查询 -->
@@ -223,9 +223,9 @@
         this.$popup("登记簿详情", "registerBook/djbFrame", {
           formData: param
         })
-      },
-    },
-  };
+      }
+    }
+  }
 </script>
 <style scoped lang="scss">
   @import "~@/styles/mixin.scss";

@@ -38,7 +38,6 @@
           </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="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>
@@ -67,7 +66,7 @@
   import { datas, sendThis } from "../javascript/selecBdcql.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { selectQlxx } from "@/api/ywsq.js";
-  import { startBusinessFlow,startTogetherFlow } from "@/api/workFlow.js";
+  import { startBusinessFlow, startTogetherFlow } from "@/api/workFlow.js";
   import { getQllxByBsmSqyw } from "@/api/sysSqdjyw.js";
   export default {
     mixins: [table, jump],
@@ -127,64 +126,64 @@
           return;
         }
         this.loading = true;
-        if(this.sqywInfo.sqfl=='1'){
+        if (this.sqywInfo.sqfl == '1') {
           startBusinessFlow({
-                    bsmSqyw: this.sqywInfo.bsmSqyw,
-                    bdcdysz: this.bdcdysz,
-                  }).then((res) => {
-                    this.loading = false
-                    if (res.code == 200) {
-                      this.$message({
-                        showClose: true,
-                        message: "发起申请成功",
-                        type: "success",
-                      });
-                      if (!this.isJump) {
-                        this.jump(res.result, this.sqywInfo.djywbm);
-                      } else {
-                        store.dispatch('user/refreshPage', true);
-                      }
-                      this.$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(() => {
-                    this.loading = false
-                  })
-        }else{
-           startTogetherFlow({
-          bsmSqyw: this.sqywInfo.bsmSqyw,
-          bdcdysz: this.bdcdysz,
-        }).then((res) => {
-          this.loading = false
-          if (res.code == 200) {
-            this.$message({
-              showClose: true,
-              message: '发起申请成功',
-              type: 'success'
-            })
-            if (!this.isJump) {
-              this.jump(res.result, this.sqywInfo.djywbm)
-            } else {
-              store.dispatch('user/refreshPage', true);
+            bsmSqyw: this.sqywInfo.bsmSqyw,
+            bdcdysz: this.bdcdysz,
+          }).then((res) => {
+            this.loading = false
+            if (res.code == 200) {
+              this.$message({
+                showClose: true,
+                message: "发起申请成功",
+                type: "success",
+              });
+              if (!this.isJump) {
+                this.jump(res.result, this.sqywInfo.djywbm);
+              } else {
+                store.dispatch('user/refreshPage', true);
+              }
               this.$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)
+              }
             }
-          } else {
-            if (res.result && res.result.length > 0) {
-              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+          }).catch(() => {
+            this.loading = false
+          })
+        } else {
+          startTogetherFlow({
+            bsmSqyw: this.sqywInfo.bsmSqyw,
+            bdcdysz: this.bdcdysz,
+          }).then((res) => {
+            this.loading = false
+            if (res.code == 200) {
+              this.$message({
+                showClose: true,
+                message: '发起申请成功',
+                type: 'success'
+              })
+              if (!this.isJump) {
+                this.jump(res.result, this.sqywInfo.djywbm)
+              } else {
+                store.dispatch('user/refreshPage', true);
+                this.$popupCacel()
+              }
             } else {
-              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+              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(() => {
-          this.loading = false
-        })
+          }).catch(() => {
+            this.loading = false
+          })
         }
-        
+
       },
       /**
        * @description: handleSelectionChange

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:58:45
+ * @LastEditTime: 2023-09-21 10:16:16
 -->
 <template>
   <div class="from-clues">
     <!-- 表单部分 -->
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px">
+      <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="100px">
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="不动产单元号" label-width="105px">
+          <el-col :span="8">
+            <el-form-item label="不动产单元号">
               <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="不动产权证号" label-width="105px">
+          <el-col :span="8">
+            <el-form-item label="不动产权证号">
               <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="业务号">
               <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="坐落">
-              <el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width200px">
+              <el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="btnColRight">
+          <el-col :span="16" 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>
@@ -122,14 +122,6 @@
       },
       // 高级查询
       moreQueryClick () { },
-      // openDialog (scroll) {
-      //   this.$popupDialog('登记簿详情', 'registerBook/djbFrame', scroll, '85%');
-      // },
-      // handleLpbClick (item) {
-      //   this.$popupDialog('楼盘表', 'lpb/index', {
-      //     bsm: ''
-      //   }, '85%')
-      // },
       /**
        * @description: ywhClick
        * @param {*} item)
@@ -249,10 +241,8 @@
           bdcdyh: row.bdcdyh,
           bsmQlxx: row.bsmQlxx,
         };
-        this.$popup("登记簿详情", "registerBook/djbFrame", {
-          formData: param
-        })
-      },
+        ywPopupDialog("登记簿详情", "registerBook/djbFrame", param, '80%', true)
+      }
     }
   }
 </script>

@@ -39,6 +39,7 @@
        */
 
       loadView (view) {
+        console.log(view, 'viewviewview');
         return (r) =>
           require.ensure([], () => r(require(`./components/${view}.vue`)));
       },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-18 11:25:30
+ * @LastEditTime: 2023-09-21 10:39:16
 -->
 <template>
   <div class="from-clues">
@@ -184,7 +184,6 @@
        * @author: renchao
        */
       handleLpbClick (item) {
-        console.log("item", item);
         this.$popup('楼盘表', 'lpb/index', {
           width: '85%',
           formData: {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 10:04:04
+ * @LastEditTime: 2023-09-21 10:35:34
 -->
 <template>
   <div class="from-clues">
@@ -150,8 +150,8 @@
           const { href } = this.$router.resolve(
             "/djbworkFrameview?bsmSlsq=" +
             item.bsmSlsq +
-            "&bestepid=" +
-            item.bestepid +
+            "&bsmBusiness=" +
+            item.bsmBusiness +
             "&sqywbm=" +
             item.djywbm
           );
@@ -160,10 +160,10 @@
           const { href } = this.$router.resolve(
             "/workFrameView?bsmSlsq=" +
             item.bsmSlsq +
-            "&bestepid=" +
-            item.bestepid
+            "&bsmBusiness=" +
+            item.bsmBusiness
           );
-          window.open(href, `workFrameView${item.bsmSlsq}`);
+          window.open(href, `workFrameView${item.bsmSlsq}`)
         }
       }
     }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-18 11:22:10
+ * @LastEditTime: 2023-09-21 10:41:10
 -->
 <template>
   <div class="from-clues">
@@ -116,8 +116,26 @@
        * @author: renchao
        */
       openYwDialog (item) {
-        const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3' + '&type=jdcx')
-        window.open(href, `urlname${item.bsmSlsq}`)
+        if (item.sjlx == "3") {
+          item.djywbm = "DJBBL";
+          const { href } = this.$router.resolve(
+            "/djbworkFrameview?bsmSlsq=" +
+            item.bsmSlsq +
+            "&bsmBusiness=" +
+            item.bsmBusiness +
+            "&sqywbm=" +
+            item.djywbm
+          );
+          window.open(href, `djbworkFrameview${item.bsmSlsq}`);
+        } else {
+          const { href } = this.$router.resolve(
+            "/workFrameView?bsmSlsq=" +
+            item.bsmSlsq +
+            "&bsmBusiness=" +
+            item.bsmBusiness
+          );
+          window.open(href, `workFrameView${item.bsmSlsq}`)
+        }
       }
     }
   }