Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 16:49:33
+ * @LastEditTime: 2023-10-17 13:18:17
 -->
 <template>
   <dialogBox
@@ -93,7 +93,25 @@
               oninput="value=value.replace(/[^\d]/g,'')"></el-input>
           </el-form-item>
         </el-col>
-
+        <el-col :span="8">
+          <el-form-item label="性别">
+            <el-select
+              clearable
+              v-model="ruleForm.xb"
+              :disabled="!showButton"
+              class="width100"
+              placeholder="请选择">
+              <el-option
+                v-for="item in dictData['A43']"
+                :key="item.dcode"
+                :label="item.dname"
+                :value="item.dcode">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="权利比例">
             <el-input
@@ -102,8 +120,6 @@
               :disabled="!showButton || this.ruleForm.gyfs == 1"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
           <el-form-item label="法人名称" prop="frmc">
             <el-input
@@ -120,6 +136,8 @@
               :disabled="!showButton"></el-input>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="户籍所在省市">
             <el-input
@@ -128,10 +146,7 @@
               :disabled="!showButton"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="24">
+        <el-col :span="16">
           <el-form-item label="地址">
             <el-input
               v-model="ruleForm.dz"
@@ -190,15 +205,6 @@
 
       <el-row>
         <el-col :span="8">
-          <el-form-item label="代理人电话">
-            <el-input
-              v-model="ruleForm.dlrdhhm"
-              :disabled="!showButton"
-              maxlength="11"
-              oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="代理人姓名">
             <el-input
               v-model="ruleForm.dlrxm"
@@ -223,31 +229,23 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
-          <el-form-item label="性别">
-            <el-select
-              clearable
-              v-model="ruleForm.xb"
+          <el-form-item label="代理人证件号">
+            <el-input
+              v-model="ruleForm.dlrzjh"
               :disabled="!showButton"
-              class="width100"
-              placeholder="请选择">
-              <el-option
-                v-for="item in dictData['A43']"
-                :key="item.dcode"
-                :label="item.dname"
-                :value="item.dcode">
-              </el-option>
-            </el-select>
+              maxlength="18"></el-input>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
-          <el-form-item label="代理人证件号">
+          <el-form-item label="代理人电话">
             <el-input
-              v-model="ruleForm.dlrzjh"
+              v-model="ruleForm.dlrdhhm"
               :disabled="!showButton"
-              maxlength="18"></el-input>
+              maxlength="11"
+              oninput="value=value.replace(/[^\d]/g,'')"></el-input>
           </el-form-item>
         </el-col>
       </el-row>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 15:40:49
+ * @LastEditTime: 2023-10-17 13:20:04
 -->
 <template>
   <dialogBox
@@ -91,6 +91,25 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
+          <el-form-item label="性别" prop="xb">
+            <el-select
+              clearable
+              v-model="ruleForm.xb"
+              :disabled="!showButton"
+              class="width100"
+              placeholder="请选择">
+              <el-option
+                v-for="item in dictData['A43']"
+                :key="item.dcode"
+                :label="item.dname"
+                :value="item.dcode">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
           <el-form-item label="权利比例" prop="qlbl">
             <el-input
               v-model="ruleForm.qlbl"
@@ -98,8 +117,6 @@
               :disabled="!showButton || this.ruleForm.gyfs == 1"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
           <el-form-item label="法人名称" prop="frmc">
             <el-input
@@ -116,6 +133,8 @@
               :disabled="!showButton"></el-input>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="户籍所在省市" prop="hjszss">
             <el-input
@@ -124,10 +143,7 @@
               :disabled="!showButton"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="24">
+        <el-col :span="16">
           <el-form-item label="地址" prop="txdz">
             <el-input
               v-model="ruleForm.txdz"
@@ -186,15 +202,6 @@
 
       <el-row>
         <el-col :span="8">
-          <el-form-item label="代理人电话" prop="dlrdh">
-            <el-input
-              v-model="ruleForm.dlrdh"
-              :disabled="!showButton"
-              maxlength="11"
-              oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="代理人姓名" prop="dlrmc">
             <el-input
               v-model="ruleForm.dlrmc"
@@ -219,25 +226,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="性别" prop="xb">
-            <el-select
-              clearable
-              v-model="ruleForm.xb"
-              :disabled="!showButton"
-              class="width100"
-              placeholder="请选择">
-              <el-option
-                v-for="item in dictData['A43']"
-                :key="item.dcode"
-                :label="item.dname"
-                :value="item.dcode">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="代理人证件号" prop="dlrzjh">
             <el-input
@@ -248,6 +236,17 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="代理人电话" prop="dlrdh">
+            <el-input
+              v-model="ruleForm.dlrdh"
+              :disabled="!showButton"
+              maxlength="11"
+              oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <div v-if="activeName==2" class="padding10">

@@ -207,15 +207,6 @@
 
       <el-row>
         <el-col :span="8">
-          <el-form-item label="代理人电话" prop="dlrdh">
-            <el-input
-              v-model="ruleForm.dlrdh"
-              :disabled="!showButton"
-              maxlength="11"
-              oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="代理人姓名" prop="dlrmc">
             <el-input
               v-model="ruleForm.dlrmc"
@@ -240,9 +231,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-
         <el-col :span="8">
           <el-form-item label="代理人证件号" prop="dlrzjh">
             <el-input
@@ -252,6 +240,18 @@
               oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input>
           </el-form-item>
         </el-col>
+
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="代理人电话" prop="dlrdh">
+            <el-input
+              v-model="ruleForm.dlrdh"
+              :disabled="!showButton"
+              maxlength="11"
+              oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <div v-if="activeName==2" class="padding10">

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-10-13 10:52:12
+ * @LastEditTime: 2023-10-17 09:54:06
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -15,7 +15,7 @@
         申请单元列表({{ unitData.length }})
         <el-button type="text" class="batchDel" @click="handleBatchDel" v-if="unitData.length > 1">批量删除</el-button>
       </div>
-      <el-menu v-model="activeIndex" :default-active="activeIndex" @select="unitClick">
+      <el-menu v-model="activeIndex" :default-active="activeIndex" :key="key" @select="unitClick">
         <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
           <p class="dot" v-if="item.issave == '0'"></p>
           <div class="menu-con">
@@ -47,10 +47,12 @@
   export default {
     data () {
       return {
+        key: 0,
         //受理申请标识码
         bsmSlsq: this.$route.query.bsmSlsq,
         bestepid: this.$route.query.bestepid,
         bsmBusiness: this.$route.query.bsmBusiness,
+        type: this.$route.query.type,
         // 默认选中
         activeIndex: '0',
         // 折叠
@@ -172,6 +174,7 @@
        * @author: renchao
        */
       handleDel (item) {
+        let that = this
         this.$confirm("确定要删除吗, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -182,12 +185,16 @@
             formdata.append("bsmSldyList", item.bsmSldy.split(","));
             deleteSlbdcdy(formdata).then((res) => {
               if (res.code == 200) {
-                this.$message.success("删除成功");
-                this.loadBdcdylist()
+                that.$message.success("删除成功");
+                that.loadBdcdylist()
+                if (that.activeIndex != '-1') {
+                  that.activeIndex = '0'
+                  sessionStorage.setItem('keyPath', '0');
+                }
               } else {
                 this.$message.error(res.message);
               }
-            });
+            })
           })
           .catch(() => {
             this.$message({
@@ -229,6 +236,7 @@
         this.currentSelectProps.batchOperation = false;
         this.activeIndex = index.toString();
         sessionStorage.setItem('keyPath', this.activeIndex);
+        this.key++
         //选中表单传递数据
         this.$emit('getCurrentSelectProps', this.currentSelectProps);
         this.$parent.stepForm(index);

 <!--
  * @Description: workFrame左侧菜单列表-分割
  * @Autor: renchao
- * @LastEditTime: 2023-10-13 11:24:29
+ * @LastEditTime: 2023-10-17 10:54:39
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
-    <el-menu :default-active="activeIndex" @select="batchUnitClick" class="title-batch" v-if="showBatch">
+    <el-menu :default-active="activeBatchIndex" @select="batchUnitClick" class="title-batch" v-if="showBatch">
       <el-menu-item index="-1" key="-1" class="menus">
         <div>{{ batchButtonName }}</div>
       </el-menu-item>
     </el-menu>
     <div v-if="this.isShowdrawer">
       <!-- 变更前单元 -->
-      <div class="title">
+      <div class="title" v-if="aroundShow">
         <b>变更前单元</b>/申请单元列表({{ aroundUnitData.length }})
       </div>
       <el-menu :default-active="activeIndex" @select="unitClick">
@@ -23,11 +23,11 @@
               <p class="title-detail">{{ item.zl }}</p>
             </el-tooltip>
           </div>
-          <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item)"></i>
+          <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item,'around')"></i>
         </el-menu-item>
       </el-menu>
       <!-- 变更后单元 -->
-      <div class="title">
+      <div class="title" v-if="afterShow">
         <b>变更后单元</b>/申请单元列表({{ afterUnitData.length }})
       </div>
       <el-menu :default-active="activeHIndex" @select="handleAfterunitClick">
@@ -39,7 +39,7 @@
               <p class="title-detail">{{ item.zl }}</p>
             </el-tooltip>
           </div>
-          <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item)"></i>
+          <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item, 'after')"></i>
         </el-menu-item>
       </el-menu>
     </div>
@@ -61,9 +61,14 @@
   export default {
     data () {
       return {
+        aroundShow: false,
+        afterShow: false,
         bsmSlsq: this.$route.query.bsmSlsq,
         bsmBusiness: this.$route.query.bsmBusiness,
         bestepid: this.$route.query.bestepid,
+        type: this.$route.query.type,
+        // 批量操作
+        activeBatchIndex: '0',
         // 变更前单元默认选中
         activeIndex: '0',
         // 变更后单元默认选中
@@ -112,15 +117,33 @@
           jdcxLeftMenu(formdata).then((res) => {
             if (res.code === 200 && res.result) {
               this.aroundUnitData = res.result.filter(item => item.bglx == '1')
+              if (this.aroundUnitData.length > 0) {
+                this.aroundShow = true
+              } else {
+                this.aroundShow = false
+              }
               this.afterUnitData = res.result.filter(item => item.bglx == '2')
+              if (this.afterUnitData.length > 0) {
+                this.afterShow = true
+              } else {
+                this.afterShow = false
+              }
               this.currentSelectProps = res.result[0];
               this.$emit('getCurrentSelectProps', this.currentSelectProps);
               this.judgeBatchShow();
               if (!status) {
                 if (sessionStorage.getItem('keyPath')) {
+                  if (this.aroundShow) {
                     that.unitClick(sessionStorage.getItem('keyPath') - 0)
                   } else {
+                    that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0)
+                  }
+                } else {
+                  if (this.aroundShow) {
                     that.unitClick(0)
+                  } else {
+                    that.handleAfterunitClick(0)
+                  }
                   if (that.showBatch) {
                     //满足批量查封/批量抵押按钮出现 即先展示批量表单
                     that.batchUnitClick();
@@ -133,15 +156,33 @@
           leftMenu(formdata).then((res) => {
             if (res.code === 200 && res.result) {
               this.aroundUnitData = res.result.filter(item => item.bglx == '1')
+              if (this.aroundUnitData.length > 0) {
+                this.aroundShow = true
+              } else {
+                this.aroundShow = false
+              }
               this.afterUnitData = res.result.filter(item => item.bglx == '2')
+              if (this.afterUnitData.length > 0) {
+                this.afterShow = true
+              } else {
+                this.afterShow = false
+              }
               this.currentSelectProps = res.result[0];
               this.$emit('getCurrentSelectProps', this.currentSelectProps);
               this.judgeBatchShow();
               if (!status) {
                 if (sessionStorage.getItem('keyPath')) {
+                  if (this.aroundShow) {
                     that.unitClick(sessionStorage.getItem('keyPath') - 0)
                   } else {
+                    that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0)
+                  }
+                } else {
+                  if (this.aroundShow) {
                     that.unitClick(0)
+                  } else {
+                    that.handleAfterunitClick(0)
+                  }
                   if (that.showBatch) {
                     //满足批量查封/批量抵押按钮出现 即先展示批量表单
                     that.batchUnitClick();
@@ -175,11 +216,12 @@
         }
       },
       /**
-       * @description: 删除左侧列表
+       * @description: 删除左侧列表-变更前
        * @param {*} item
        * @author: renchao
        */
-      handleDel (item) {
+      handleDel (item, type) {
+        let that = this
         this.$confirm("确定要删除吗, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -191,8 +233,15 @@
             formdata.append("bsmSlsq", this.bsmSlsq);
             deleteFlow(formdata).then((res) => {
               if (res.code == 200) {
-                this.$message.success("删除成功");
-                this.$parent.updateDialog();
+                that.$message.success("删除成功");
+                that.loadBdcdylist()
+                if (type == 'around') {
+                  that.activeIndex = '0'
+                  sessionStorage.setItem('keyPath', '0');
+                } else {
+                  that.activeIndex = '0'
+                  sessionStorage.setItem('keyPath', '0');
+                }
               } else {
                 this.$message.error(res.message);
               }
@@ -211,16 +260,19 @@
        */
       batchUnitClick () {
         window.currentSelect = {}
-        this.currentSelectProps.batchOperation = true;
-        // this.activeIndex = "-1";
-        this.$parent.stepForm(0);
+        this.currentSelectProps.batchOperation = true
+        this.activeIndex = "-1"
+        this.activeHIndex = "-1"
+        this.activeBatchIndex = "0"
+        this.$parent.stepForm(0)
       },
       /**
-       * @description: 申请单元点击事件
+       * @description: 申请单元点击事件-变更前
        * @param {*} index
        * @author: renchao
        */
       unitClick (index) {
+        this.activeBatchIndex = "-1"
         window.currentSelect = this.aroundUnitData[index]
         this.activeHIndex = '-1'
         this.currentSelectProps = this.aroundUnitData[index];
@@ -238,11 +290,13 @@
        * @author: renchao
        */
       handleAfterunitClick (index) {
+        this.activeBatchIndex = "-1"
         window.currentSelect = this.afterUnitData[index]
         this.activeIndex = '-1'
         this.currentSelectProps = this.afterUnitData[index];
         this.currentSelectProps.batchOperation = false;
         this.activeHIndex = index.toString();
+        sessionStorage.setItem('keyPath', this.activeHIndex);
         //选中表单传递数据
         this.$emit('getCurrentSelectProps', this.currentSelectProps);
         this.$parent.stepForm(index);

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:56:41
+ * @LastEditTime: 2023-10-17 13:29:39
 -->
 <template>
   <div class="from-clues">
@@ -59,7 +59,7 @@
           label="选择"
           width="50">
           <template slot-scope="scope">
-            <el-radio v-model="radioVal" :label="scope.row.bhqkbsm">{{''}}</el-radio>
+            <el-radio v-model="radioVal" @change="handleSelect" @click.native.stop :label="scope.row.bdcdyh">{{''}}</el-radio>
           </template>
         </el-table-column>
         <el-table-column
@@ -142,7 +142,7 @@
   import store from '@/store/index.js'
   import table from "@/utils/mixin/table";
   import { ywPopupDialog } from "@/utils/popup.js";
-  import { datas, datastwo, sendThis } from "../javascript/selectJsydsyqhbfg.js";
+  import { datastwo, sendThis } from "../javascript/selectJsydsyqhbfg.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { selectJsydQlxxSplitMergeBefore, selectZdjbxxSplitMergeLast } from "@/api/ywsq.js";
   import { startBusinessFlow } from "@/api/workFlow.js";
@@ -158,19 +158,6 @@
         queryForm: defaultParameters.defaultParameters(),
         // 表格数据
         tableData: {
-          columns: [{
-            label: '选择',
-            width: '50px',
-            render: (h, scope) => {
-              return (
-                <div class="orgColumn">
-                  <el-radio v-model={this.radioVal} label={scope.row.bhqkbsm}>
-                    &ensp;
-                  </el-radio>
-                </div>
-              )
-            }
-          }].concat(datas.columns()),
           data: [],
           columns1: datastwo.columns1(),
           datastwo: []
@@ -179,31 +166,22 @@
         radioVal: ""
       }
     },
-    watch: {
-      radioVal: {
-        deep: true,
-        handler (newVal, oldVal) {
-          this.close()
-        }
-      }
-    },
     mounted () {
       sendThis(this)
     },
     methods: {
-      // 单选事件
       /**
        * @description: 单选事件
        * @author: renchao
        */
-      close () {
+      handleSelect () {
         this.tableData.data.forEach(item => {
-          if (this.radioVal == item.bhqkbsm) {
+          if (this.radioVal == item.bdcdyh) {
             item.bglx = '1'
             this.bdcdysz[0] = item
+            this.queryForm.bhqkbsm = item.bhqkbsm
           }
         })
-        this.queryForm.bhqkbsm = this.radioVal
         selectZdjbxxSplitMergeLast({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {
@@ -302,29 +280,20 @@
        * @author: renchao
        */
       handleRowClick (row) {
-        // 如果状态是1，那就是单选
-        if (this.sqywInfo.sqywdylx == "1") {
-          const bdcdysz = this.bdcdysz
-          this.$refs.table.clearSelection()
-          if (bdcdysz.length == 1) {
-            bdcdysz.forEach(item => {
-              // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
-              if (item == row) {
-                this.$refs.table.toggleRowSelection(row, false);
-              }
-              // 不然就让当前的一行勾选
-              else {
-                this.$refs.table.toggleRowSelection(row, true);
-              }
+        this.queryForm.bhqkbsm = row.bhqkbsm
+        this.radioVal = row.bdcdyh
+        selectZdjbxxSplitMergeLast({ ...this.queryForm }).then((res) => {
+          this.$endLoading();
+          if (res.code === 200) {
+            this.tableData.datastwo = res.result
+            this.tableData.datastwo.forEach(item => {
+              item.bsm = item.zdbsm;
+              item.bglx = '2'
             })
+            this.bdcdysz = [row, ...this.tableData.datastwo]
           }
-          else {
-            this.$refs.table.toggleRowSelection(row, true);
-          }
-        } else {
-          this.$refs.table.toggleRowSelection(row);
+        })
       }
-      },
     }
   }
 </script>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-21 10:35:34
+ * @LastEditTime: 2023-10-17 09:29:06
 -->
 <template>
   <div class="from-clues">
@@ -161,7 +161,7 @@
             "/workFrameView?bsmSlsq=" +
             item.bsmSlsq +
             "&bsmBusiness=" +
-            item.bsmBusiness
+            item.bsmBusiness + '&type=jdcx'
           );
           window.open(href, `workFrameView${item.bsmSlsq}`)
         }