110459d1 by renchao@pashanhoo.com

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

2 parents e81f9295 c88a4847
......@@ -12,8 +12,12 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap
* @author: renchao
*/
export function Init (data) {
let apiUrl = "/rest/ywbl/zjgcdy/init";
if (data.get("djlx") == "400") {
apiUrl = "/rest/ywbl/zjgcdy/logoutInit";
}
return request({
url: SERVER.SERVERAPI + "/rest/ywbl/zjgcdy/init",
url: SERVER.SERVERAPI + apiUrl,
method: 'post',
data
})
......
......@@ -59,7 +59,7 @@
<div class="slxx_title title-block" v-if="ruleForm.slsq.djywbm.includes('100')">
<el-row>
<el-col :span="19">
<p>房屋信息列表</p>
<p>房屋信息列表{{ ruleForm.hlist.length }} 户)</p>
</el-col>
<el-col :span="5">
<el-form-item label="发证方式:" :disabled="!viewEdit">
......
......@@ -54,8 +54,9 @@
v-if="ruleForm.hlist && ruleForm.hlist.length > 0">
抵押户信息列表信息({{ ruleForm.hlist.length }} 户)
<div class="triangle"></div>
</div>
<qjhTable :tableData="ruleForm.hlist" />
</div>
<cfBdcdyTable :tableData="ruleForm.qlxxList" v-if="ruleForm.slsq.djywbm.includes('400')"/>
<qjhTable v-else :tableData="ruleForm.hlist" />
<div class="slxx_title title-block">
抵押信息
<div class="triangle"></div>
......@@ -293,6 +294,7 @@
</template>
<script>
import qjhTable from "@/views/workflow/components/qjhTable";
import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import { bacthInit, saveBatchData } from "@/api/workflow/zjgcdyFlow.js";
import { mapGetters } from "vuex";
......@@ -333,7 +335,7 @@
this.loading = false
})
},
components: { qlrCommonTable, qjhTable },
components: { qlrCommonTable, qjhTable,cfBdcdyTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......