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

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-05-24 15:31:00
+ * @LastEditTime: 2023-07-11 08:58:31
 -->
 <template>
   <div class="container">
@@ -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,28 +63,28 @@
   </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 { getStepFormInfo } from "@/api/fqsq.js";
-import NoticeBar from "@/components/NoticeBar/index";
-import ProcessViewer from "./components/processViewer.vue";
-// 引入左侧菜单
-import { leftMenubl } from "@/api/djbbl.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/djbbl.js";
-// 获取权利类型数组
-import { getQllxByBdcdyid } from "@/api/djbbl.js";
+  import WorkFlow from "./mixin/index";
+  import { getForm } from "./flowform";
+  import { getStepFormInfo } from "@/api/fqsq.js";
+  import NoticeBar from "@/components/NoticeBar/index";
+  import ProcessViewer from "./components/processViewer.vue";
+  // 引入左侧菜单
+  import { leftMenubl } from "@/api/djbbl.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/djbbl.js";
+  // 获取权利类型数组
+  import { getQllxByBdcdyid } from "@/api/djbbl.js";
 
-import { getBdcqljqtsx } from "@/api/registerBook.js";
-export default {
+  import { getBdcqljqtsx } from "@/api/registerBook.js";
+  export default {
     components: {
       selectBdc,
       NoticeBar,
@@ -97,7 +93,7 @@ export default {
       qllxDailog,
     },
     mixins: [WorkFlow],
-  data() {
+    data () {
       return {
         bsmSlsq: this.$route.query.bsmSlsq,
         //当前流程所在环节
@@ -109,7 +105,7 @@ export default {
         qllx: this.$route.query.qllx,
         //设置那个表单选中
         tabName: "",
-      isEdit:true,
+        isEdit: true,
         // 弹框显示
         dialogVisible: true,
         //表单集合
@@ -127,15 +123,14 @@ export default {
         treedata: {},
         tabdata: [],
         defaultNode: {},
-      bsmRepair:""
       };
     },
-  mounted() {
+    mounted () {
       // this.getleftMenubl()
     },
 
     methods: {
-    stepForm(qllx) {
+      stepForm (qllx) {
         this.oneSelectProps.qllx = qllx;
         if (this.$refs.Menu.supplementarylist.length) {
           getStepFormInfo(this.oneSelectProps).then((res) => {
@@ -153,7 +148,7 @@ export default {
       //     this.supplementarylist = res.result;
       //    })
       // },
-    getQllxByBdcdyid() {
+      getQllxByBdcdyid () {
         if (this.currentSelectProps.bdcdyid) {
           getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
             (res) => {
@@ -166,10 +161,7 @@ export default {
         }
       },
       // 获取右侧选项卡
-    getCurrentSelectProps(val) {
-      if(val.bsmRepair){
-         this.bsmRepair=val.bsmRepair
-      }
+      getCurrentSelectProps (val) {
         if (val.bdcdyid) {
           this.oneSelectProps = val;
         }
@@ -185,7 +177,7 @@ export default {
         }
       },
       // 获取渲染登记簿列表
-    getdjblist() {
+      getdjblist () {
         getBdcqljqtsx({
           bdcdyid: this.currentSelectProps.bdcdyid,
           bdcdyh: this.currentSelectProps.bdcdyh,
@@ -214,21 +206,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,
@@ -265,9 +257,21 @@ export default {
           })
           .catch((res) => {
             console.log("错", res);
-        });
-    },
+          })
       },
-};
+      openDialog () {
+        this.$store.dispatch('user/refreshPage', false)
+        let data = JSON.parse(localStorage.getItem('ywbl'))
+        let title
+        if (data?.sqywmc) {
+          title = "申请业务：" + data?.sqywmc
+        } else {
+          title = "申请业务：" + data?.djywmc
+        }
+
+        this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
+      }
+    }
+  };
 </script>
 <style scoped lang="scss"></style>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-04 16:23:54
+ * @LastEditTime: 2023-07-10 15:16:48
 -->
 <template>
   <!-- 受理信息 -->
@@ -130,16 +130,6 @@
               <el-input v-model="ruleForm.tdsyq.mjdw"></el-input>
             </el-form-item>
           </el-col>
-
-          <!-- <el-col :span="8">
-            <el-form-item label="下拉表格测试：">
-              <select-table v-model="value2" :table-width="600" :props="props" @change="change">
-                <el-table-column prop="id" label="ID" width="180"></el-table-column>
-                <el-table-column prop="user" label="姓名"></el-table-column>
-              </select-table>
-            </el-form-item>
-          </el-col> -->
-
         </el-row>
         <div class="slxx_title title-block">
           土地用途
@@ -147,8 +137,7 @@
         </div>
         <tdytTable
           :tableData="ruleForm.tdytqxList"
-          @upDateTdytxxList="upDateTdytxxList"
-        />
+          @upDateTdytxxList="upDateTdytxxList" />
         <div class="slxx_title title-block">
           权利人信息
           <div class="triangle"></div>
@@ -220,9 +209,8 @@
   import { Init, saveData } from "@/api/workflow/tdsyqFlow.js"
   import tdytTable from "@/views/workflow/components/tdytTable";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
-  import selectTable from '@/components/selectTable/index.vue'
   export default {
-    components: { qlrCommonTable, selectTable,tdytTable },
+    components: { qlrCommonTable, tdytTable },
     mounted () {
       this.ableOperation = this.$parent.currentSelectTab.ableOperation
       this.propsParam = this.$attrs;
@@ -271,7 +259,7 @@
     },
     methods: {
       // 更新土地用途信息
-    upDateTdytxxList(val) {
+      upDateTdytxxList (val) {
         console.log("VAL", val);
         this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
         this.key++;