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

@@ -21,6 +21,7 @@
     <div class="containerFrame">
       <!-- 左侧菜单栏 -->
       <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
+        <div class="title" @click="unitClick(-1)" v-if="showBatch">{{batchButtonName}}</div>
         <div v-if="this.isShowdrawer">
           <div class="title">
             申请单元列表({{ unitData.length }})
@@ -103,6 +104,10 @@ export default {
       bsmSlsq: this.$route.query.bsmSlsq,
       //当前流程所在环节
       bestepid: this.$route.query.bestepid,
+      //是否展示批量按钮
+      showBatch: false,
+      //批量按钮名称
+      batchButtonName: '',
       //顶部左侧按钮集合
       leftButtonList: [],
       //顶部右侧按钮集合
@@ -393,16 +398,30 @@ export default {
       formdata.append("bestepid", this.bestepid);
       leftMenu(formdata).then((res) => {
         if (res.code === 200) {
-          this.unitData = res.result;
-          this.currentSelectProps = res.result[0];
-          this.unitClick(0);
+          if(res.result){
+            this.unitData = res.result;
+            this.currentSelectProps = res.result[0];
+            this.judgeBatchShow();
+            if(this.showBatch){
+              //满足批量查封/批量抵押按钮出现 即先展示批量表单
+              this.unitClick(-1);
+            }else{
+              //默认选择单元列表第一个
+              this.unitClick(0);
+            }
+          }
         }
       });
     },
     //申请单元点击事件
     unitClick (index) {
-      this.currentSelectProps = this.unitData[index];
-      getStepFormInfo(this.unitData[index]).then((res) => {
+      if(index >= 0){
+        this.currentSelectProps = this.unitData[index];
+        this.currentSelectProps.batchOperation = false;
+      }else{
+        this.currentSelectProps.batchOperation = true;
+      }
+      getStepFormInfo(this.currentSelectProps).then((res) => {
         if (res.code === 200) {
           //获取单元对应的所有表单信息
           this.tabList = res.result;
@@ -424,6 +443,23 @@ export default {
       //   this.fresh += 1;
       // }
     },
+    //批量按钮判断
+    judgeBatchShow() {
+      this.showBatch = false;
+      let qllx = this.$route.query.sqywbm.substring(0,3);
+      if(this.unitData.length > 1){
+        switch(qllx){
+          case 'B39':
+            this.showBatch = true;
+            this.batchButtonName = '批量查封';
+            break;
+          case 'A37':
+            this.showBatch = true;
+            this.batchButtonName = '批量抵押';
+            break;  
+        }
+      }
+    },
     //表单选项卡事件
     beforeLeave (activeName, oldActiveName) {
       if (!_.isEqual(this.oldDetail, this.newDetail)) {

@@ -54,7 +54,7 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号：" prop="qlxx.bdcqzh">
-              <el-input disabled v-model="ruleForm.qlxx.bdcqzh"></el-input>
+              <el-input disabled v-model="ruleForm.slywxx.ybdcqzsh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -62,28 +62,11 @@
               <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利人：" prop="qlxx.qlrmc">
-              <el-input disabled v-model="ruleForm.qlxx.ywrmc"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="宗地代码：">
-              <el-input disabled v-model="ruleForm.zdjbxx.zddm"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
+                   <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="宗地面积：">
               <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质：">
-              <el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
@@ -91,24 +74,33 @@
               <el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利设定方式：">
-              <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
+          <el-col :span="16">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落：">
+              <el-input disabled v-model="ruleForm.zdjbxx.zl"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="10">
            <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="取得价格：">
-              <el-input disabled v-model="ruleForm.zdjbxx.qdjg"></el-input>
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="权利人：" prop="qlxx.qlrmc">
+              <el-input disabled v-model="ruleForm.qlxx.ywrmc"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="16">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落：">
-              <el-input disabled v-model="ruleForm.zdjbxx.zl"></el-input>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="证件号：">
+              <el-input disabled v-model="ruleForm.qlxx.ywrzjhm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类：">
+              <el-input disabled v-model="ruleForm.qlxx.ywrzjzl"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
+        <div class="slxx_title title-block">
+          查封信息
+          <div class="triangle"></div>
+        </div>
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关：" prop="cfdj.cfjg">
@@ -163,15 +155,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title title-block">
-          不动产权利人信息
-          <div class="triangle"></div>
-        </div>
-        <sqrViewTable :tableData="ruleForm.ywrList" />
-        <div class="slxx_title title-block">
-          登记原因
-          <div class="triangle"></div>
-        </div>
         <el-row :gutter="10">
           <el-col>
             <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="cfdj.djyy">
@@ -240,7 +223,7 @@ export default {
     },
     onSubmit () {
       saveData(this.ruleForm).then((res) => {
-        if (res.code === 200 && res.result) {
+        if (res.code === 200) {
           this.$message.success('保存成功');
         }
       });

@@ -58,7 +58,7 @@ import { datas, sendThis } from "../javascript/bdcql.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import jump from "../components/mixin/jump";
-import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
+import { selectQlxx, startBusinessFlow, choiceBdcdy } from "@/api/ywbl.js";
 export default {
   mixins: [table, jump],
   props: {
@@ -86,7 +86,7 @@ export default {
       this.$emit("closeDialog")
     },
     fetchData () {
-      this.queryForm.sqywbm = this.djywbm;
+      this.queryForm.sqywbm = this.djywbm;      
       selectQlxx({ ...this.queryForm, ...this.pageData })
         .then((res) => {
           if (res.code === 200) {
@@ -102,31 +102,48 @@ export default {
         return;
       }
       this.saveloding = true;
-      startBusinessFlow({
-        bsmSqyw: Cookies.get("bsmSqyw"),
-        bdcdysz: this.bdcdysz,
-        djqxbm: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxbm : '',
-        djqxmc: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxmc : '',
-      }).then((res) => {
-        this.saveloding = false;
-        if (res.code == 200) {
-          this.$message({
-            showClose: true,
-            message: '发起申请成功',
-            type: 'success'
-          })
-          if (!this.isJump) {
+      if (!this.isJump) {
+        startBusinessFlow({
+          bsmSqyw: Cookies.get("bsmSqyw"),
+          bdcdysz: this.bdcdysz,
+          djqxbm: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxbm : '',
+          djqxmc: Cookies.get("djqxObj") ? JSON.parse(Cookies.get("djqxObj"))?.djqxmc : '',
+        }).then((res) => {
+          this.saveloding = false;
+          if (res.code == 200) {
+            this.$message({
+              showClose: true,
+              message: '发起申请成功',
+              type: 'success'
+            })
             this.jump(res.result, this.djywbm)
           } else {
+            this.$message.error(res.message);
+          }
+        })
+      } else {
+        choiceBdcdy({
+          bsmSlsq: this.$route.query.bsmSlsq,
+          bdcdysz: this.bdcdysz
+        }).then(res => {
+          this.saveloding = false;
+          if (res.code == 200) {
+            this.$message({
+              showClose: true,
+              message: '发起申请成功',
+              type: 'success'
+            })
             this.$emit('updateDialog', true)
+          } else {
+            this.$message.error(res.message);
           }
-        } else {
-          this.$message.error(res.message);
-        }
-      });
+        })
+      }
     },
     handleSelectionChange (val) {
       val.forEach((item, index) => {
+        item.bsmSsql = item.bsmQlxx
+        item.ybdcqzsh = item.bdcqzh
         item.yqllx = item.qllx
         item.ydjlx = item.djlx
       })