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

renchao@pashanhoo.com
Showing 5 changed files with 66 additions and 31 deletions
src/api/bdcqz.js
src/views/workflow/components/dialog/zslq.vue
src/views/ywbl/ywsq/components/selectYbbgSplitMerge.vue
src/views/ywbl/ywsq/javascript/selecBdcql.js
src/views/ywbl/ywsq/javascript/slectBdcdata.js
--- a/src/api/bdcqz.js
View file @5e8cee3
+++ b/src/api/bdcqz.js
View file @5e8cee3
 /*
 * @Description: 不动产权证
 * @Autor: renchao
- * @LastEditTime: 2023-09-05 13:24:14
+ * @LastEditTime: 2023-09-13 16:06:55
 */
 import request from '@/utils/request';
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -146,3 +146,17 @@ export function getBdcqzDetail (bsmBdcqz) {
        }
    })
 }
+/**
+ * @description: 根据bsmBdcqz获取权利人信息
+ * @param {*} bsmBdcqz
+ * @author: renchao
+ */
+export function getBdcqzQlr (bsmBdcqz) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/bdcqz/getBdcqzQlr',
+        method: 'get',
+        params: {
+            bsmBdcqz: bsmBdcqz
+        }
+    })
+}
--- a/src/views/workflow/components/dialog/zslq.vue
View file @5e8cee3
+++ b/src/views/workflow/components/dialog/zslq.vue
View file @5e8cee3
          <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-28 12:53:50
+ * @LastEditTime: 2023-09-13 16:13:54
 -->
 <template>
  <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
@@ -22,7 +22,6 @@
        </el-form-item>
      </el-col>
    </el-row>
    <lb-table :column="tableData.columns" @row-dblclick="handleRowClick" ref="table" @selection-change="handleSelectionChange"
      :data="tableData.data"
      :pagination="false"
@@ -30,26 +29,26 @@
    </lb-table>
    <el-row>
      <el-col :span="6">
-        <el-form-item label="领证人" prop="lzrxm">
+        <el-form-item label="领证人" prop="qlrmc">
-          <el-input v-model="ruleForm.lzrxm"></el-input>
+          <el-input v-model="ruleForm.qlrmc"></el-input>
        </el-form-item>
      </el-col>
      <el-col :span="6">
-        <el-form-item label="证件类型" prop="lzrzjlb">
+        <el-form-item label="证件类型" prop="zjzl">
-          <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
+          <el-select v-model="ruleForm.zjzl" filterable clearable placeholder="请选择">
            <el-option v-for="item in zjzlData" :key="item.dcode" :label="item.dname" :value="item.dcode">
            </el-option>
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="6">
-        <el-form-item label="证件号" prop="lzrzjh">
+        <el-form-item label="证件号" prop="zjh">
-          <el-input v-model="ruleForm.lzrzjh"></el-input>
+          <el-input v-model="ruleForm.zjh"></el-input>
        </el-form-item>
      </el-col>
      <el-col :span="6">
-        <el-form-item label="领证人电话" prop="lzrdh">
+        <el-form-item label="领证人电话" prop="dh">
-          <el-input v-model="ruleForm.lzrdh"></el-input>
+          <el-input v-model="ruleForm.dh"></el-input>
        </el-form-item>
      </el-col>
    </el-row>
@@ -63,7 +62,7 @@
  import Vue from 'vue'
  import store from '@/store/index.js'
  import table from "@/utils/mixin/table";
-  import { getUnclaimedBdcqz, issueCertificate } from "@/api/bdcqz.js";
+  import { getUnclaimedBdcqz, issueCertificate,getBdcqzQlr } from "@/api/bdcqz.js";
  import { datas } from "../../javascript/fzxxdata";
  export default {
    props: {
@@ -83,22 +82,22 @@
          fzsj: '',
          fzsl: '',
          bdcqzList: [],
-          lzrxm: '',
+          qlrmc: '',
-          lzrzjlb: '',
+          zjzl: '',
-          lzrzjh: '',
+          zjh: '',
-          lzrdh: ''
+          dh: ''
        },
        rules: {
-          lzrxm: [
+          qlrmc: [
            { required: true, message: '请输入领证人', trigger: 'blur' }
          ],
-          lzrzjlb: [
+          zjzl: [
            { required: true, message: '请选择证件类型', trigger: 'change' }
          ],
-          lzrzjh: [
+          zjh: [
            { required: true, message: '请输入证件号', trigger: 'blur' }
          ],
-          lzrdh: [
+          dh: [
            { required: true, message: '请输入电话号码', trigger: 'blur' }
          ]
        },
@@ -133,6 +132,18 @@
            this.ruleForm.fzsj = res.result.fzsj
            this.ruleForm.fzsl = res.result.fzsl
            this.ruleForm.bdcqzList = res.result.list;
+            res.result.list.length && this.getQlr(res.result.list[0].bsmBdcqz)
+          }
+        })
+      },
+      /**
+       * @description: 获取权利人信息
+       * @author: renchao
+       */
+      getQlr (bsmBdcqz) {
+        getBdcqzQlr(bsmBdcqz).then(res => {
+          if (res.code === 200) {
+            this.ruleForm = {...this.ruleForm,...res.result} 
          }
        })
      },
--- a/src/views/ywbl/ywsq/components/selectYbbgSplitMerge.vue
View file @5e8cee3
+++ b/src/views/ywbl/ywsq/components/selectYbbgSplitMerge.vue
View file @5e8cee3
@@ -37,7 +37,7 @@
    </div>
    <!-- 表格 -->
    <div class="from-clues-content loadingtext">
-      国有房屋变更信息
+      预告买卖登记信息
      <el-table
        :data="tableData.data"
        height="210"
@@ -168,7 +168,7 @@
        @current-change="handleCurrentChange"></el-pagination>
    </div>
    <div class="from-clues-content loadingtext">
-      抵押变更信息
+      预告抵押信息
      <lb-table ref="table" :pagination="false" :calcHeight="500" :column="tableData.columns"
        :data="tableData.dataList">
      </lb-table>
@@ -185,10 +185,10 @@
  import store from '@/store/index.js'
  import table from "@/utils/mixin/table";
  import { ywPopupDialog } from "@/utils/popup.js";
-  import { datas, sendThis } from "../javascript/selectFwbjDybgSplitMerge.js";
+  import { datas, sendThis } from "../javascript/selectYgdy.js";
  import { defaultParameters } from "../javascript/publicDefaultPar.js";
-  import { selectYgdj200, selectDiyaq } from "@/api/ywsq.js";
+  import { selectYgdj200, selectYgdy } from "@/api/ywsq.js";
-  import { startBusinessFlow } from "@/api/workFlow.js";
+  import { startTogetherFlow } from "@/api/workFlow.js";
  export default {
    mixins: [table, jump],
    props: {
@@ -266,7 +266,7 @@
      getCurrentRow (row) {
        this.radioVal = row.bdcdyh;
        this.bdcdysz = [row]
-        selectDiyaq({ bdcdyh: this.radioVal, currentPage: 1, pageSize: 10 }).then((res) => {
+        selectYgdy({ bdcdyh: this.radioVal, currentPage: 1, pageSize: 10 }).then((res) => {
          if (res.code === 200) {
            this.tableData.dataList = res.result.records
            this.bdcdysz = [this.bdcdysz[0], ...this.tableData.dataList]
@@ -305,7 +305,7 @@
       */
      submitForm () {
        this.loading = true
-        startBusinessFlow({
+        startTogetherFlow({
          bsmSqyw: this.sqywInfo.bsmSqyw,
          bdcdysz: this.bdcdysz,
        }).then((res) => {
--- a/src/views/ywbl/ywsq/javascript/selecBdcql.js
View file @5e8cee3
+++ b/src/views/ywbl/ywsq/javascript/selecBdcql.js
View file @5e8cee3
@@ -45,6 +45,17 @@ class data extends filter {
        }
      },
      {
+        label: "业务号",
+        width: '120',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.ywh} placement="top" popper-class="tooltip-width">
+              <span class="ellipsis-table"> {scope.row.ywh}</span>
+            </el-tooltip>
+          )
+        }
+      },
+      {
        label: "权利类型",
        width: '120',
        render: (h, scope) => {
--- a/src/views/ywbl/ywsq/javascript/slectBdcdata.js
View file @5e8cee3
+++ b/src/views/ywbl/ywsq/javascript/slectBdcdata.js
View file @5e8cee3
@@ -89,12 +89,11 @@ export function queueDjywmc (djywbm, djqxbm) {
        case "B41400": //预告抵押注销
            vm = "selectYgdy";
            break;
-        case "C40100": //一并申请首次
+        case "C40100": //预告买卖抵押首次一并申请
            vm = "selectYbsc";
            break;
-        case "C40300": //一并申请变更
+        case "C40300": //预告买卖变更+预告抵押变更一并申请
-        case "C40400": //一并申请注销
+        case "C40400": //预告买卖注销+预告抵押注销一并申请
-            // vm = "selectYbbg";
            vm = "selectYbbgSplitMerge"
            break;
        case "C04371": //一并国有房屋转移