8ac1f5a5 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 2a9faf27 80b42bf9
......@@ -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>
......
......@@ -58,7 +58,7 @@
import { ywPopupDialog } from "@/utils/popup.js";
import { datas, sendThis } from "../javascript/selectH.js";
import { defaultParameters } from "../javascript/publicDefaultPar.js";
// import { selectHQjdc } from "@/api/ywsq.js";
import { selectHQjdc } from "@/api/ywsq.js";
import { startTogetherFlow, againAddSldy } from "@/api/workFlow.js";
export default {
mixins: [ywsqTable, jump],
......@@ -89,14 +89,14 @@
queryClick () {
this.$startLoading();
this.queryForm.sqywbm = this.sqywInfo.djywbm;
// selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
// this.$endLoading();
// if (res.code === 200) {
// let { total, records } = res.result;
// this.tableData.total = total;
// this.tableData.data = records;
// }
// });
selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
this.$endLoading();
if (res.code === 200) {
let { total, records } = res.result;
this.tableData.total = total;
this.tableData.data = records;
}
});
},
/**
* @description: submitForm
......
export function queueDjywmc (djywbm, djqxbm) {
console.log(djywbm);
// 土地分割
if (djqxbm == "A0320099" || djqxbm == "A0330099") {
return "selectJsydsyqSplitMerge";
......@@ -116,7 +117,6 @@ export function queueDjywmc (djywbm, djqxbm) {
vm = "selectFwsyq";
break;
case "C04372": //一并国有房屋变更
// vm = "selectYbgybg";
vm = "selectFwbjDybgSplitMerge"
break;
case "A11100"://林地使用权首次
......