8ac1f5a5 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 2a9faf27 80b42bf9
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
168 @current-change="handleCurrentChange"></el-pagination> 168 @current-change="handleCurrentChange"></el-pagination>
169 </div> 169 </div>
170 <div class="from-clues-content loadingtext"> 170 <div class="from-clues-content loadingtext">
171 预告抵押信息 171 预告抵押登记信息
172 <lb-table ref="table" :pagination="false" :calcHeight="500" :column="tableData.columns" 172 <lb-table ref="table" :pagination="false" :calcHeight="500" :column="tableData.columns"
173 :data="tableData.dataList"> 173 :data="tableData.dataList">
174 </lb-table> 174 </lb-table>
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 import { ywPopupDialog } from "@/utils/popup.js"; 58 import { ywPopupDialog } from "@/utils/popup.js";
59 import { datas, sendThis } from "../javascript/selectH.js"; 59 import { datas, sendThis } from "../javascript/selectH.js";
60 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 60 import { defaultParameters } from "../javascript/publicDefaultPar.js";
61 // import { selectHQjdc } from "@/api/ywsq.js"; 61 import { selectHQjdc } from "@/api/ywsq.js";
62 import { startTogetherFlow, againAddSldy } from "@/api/workFlow.js"; 62 import { startTogetherFlow, againAddSldy } from "@/api/workFlow.js";
63 export default { 63 export default {
64 mixins: [ywsqTable, jump], 64 mixins: [ywsqTable, jump],
...@@ -89,14 +89,14 @@ ...@@ -89,14 +89,14 @@
89 queryClick () { 89 queryClick () {
90 this.$startLoading(); 90 this.$startLoading();
91 this.queryForm.sqywbm = this.sqywInfo.djywbm; 91 this.queryForm.sqywbm = this.sqywInfo.djywbm;
92 // selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => { 92 selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
93 // this.$endLoading(); 93 this.$endLoading();
94 // if (res.code === 200) { 94 if (res.code === 200) {
95 // let { total, records } = res.result; 95 let { total, records } = res.result;
96 // this.tableData.total = total; 96 this.tableData.total = total;
97 // this.tableData.data = records; 97 this.tableData.data = records;
98 // } 98 }
99 // }); 99 });
100 }, 100 },
101 /** 101 /**
102 * @description: submitForm 102 * @description: submitForm
......
1 export function queueDjywmc (djywbm, djqxbm) { 1 export function queueDjywmc (djywbm, djqxbm) {
2 console.log(djywbm);
2 // 土地分割 3 // 土地分割
3 if (djqxbm == "A0320099" || djqxbm == "A0330099") { 4 if (djqxbm == "A0320099" || djqxbm == "A0330099") {
4 return "selectJsydsyqSplitMerge"; 5 return "selectJsydsyqSplitMerge";
...@@ -116,7 +117,6 @@ export function queueDjywmc (djywbm, djqxbm) { ...@@ -116,7 +117,6 @@ export function queueDjywmc (djywbm, djqxbm) {
116 vm = "selectFwsyq"; 117 vm = "selectFwsyq";
117 break; 118 break;
118 case "C04372": //一并国有房屋变更 119 case "C04372": //一并国有房屋变更
119 // vm = "selectYbgybg";
120 vm = "selectFwbjDybgSplitMerge" 120 vm = "selectFwbjDybgSplitMerge"
121 break; 121 break;
122 case "A11100"://林地使用权首次 122 case "A11100"://林地使用权首次
......