Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
4eca31ef by renchao@pashanhoo.com
Options

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

2 parents 764328bc 249c8a6b
Expand all
Inline Side-by-side
Showing 15 changed files with 122 additions and 74 deletions
......@@ -49,7 +49,7 @@ export function deleteRepairRecord (params) {
*/
export function init (params) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/init?bsmRepair='+params,
url: SERVER.SERVERAPI + '/rest/djbRepair/init?bsmRepair='+params.bsmRepair+'&isEdit='+params.isEdit,
method: 'get',
})
}
......
......@@ -175,8 +175,9 @@ export default {
mounted() {},
methods: {
loadData() {
console.log("预告登记",this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
console.log("查封登记",this.propsParam);
this.propsParam.isEdit=this.$parent.isEdit
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleForm",this.ruleForm);
......
......@@ -303,8 +303,9 @@
mounted () { },
methods: {
loadData () {
console.log("预告登记", this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
console.log("地役权", this.propsParam);
this.propsParam.isEdit=this.$parent.isEdit
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleForm", this.ruleForm);
......
......@@ -392,7 +392,9 @@ export default {
mounted() {},
methods: {
loadData() {
init(this.propsParam.bsmRepair).then((res) => {
console.log("房屋", this.propsParam);
this.propsParam.isEdit=this.$parent.isEdit
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
if( this.ruleForm.tdytqxList.length>0){
......
......@@ -90,17 +90,43 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记原因：">
<el-input v-model="ruleForm.jsydsyq.djyy"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="房地坐落：">
<el-input v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item label="使用权面积：">
<el-input v-model="ruleForm.jsydsyq.syqmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="使用权起始时间">
<el-input v-model="ruleForm.jsydsyq.syqqssj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="使用权结束时间">
<el-input v-model="ruleForm.jsydsyq.syqjssj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地使用期限">
<el-input v-model="ruleForm.jsydsyq.tdsyqx"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地用途">
<el-input v-model="ruleForm.jsydsyq.yt"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="取得价格：">
<div style="display: flex">
<el-input
......@@ -292,7 +318,8 @@ export default {
return store.getters.dictData[val];
},
loadData() {
init(this.propsParam.bsmRepair).then((res) => {
this.propsParam.isEdit=this.$parent.isEdit
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
if( this.ruleForm.tdytqxList.length>0){
......
......@@ -66,7 +66,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="登记原因：">
<el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
<el-input disabled v-model="ruleForm.ygdj.djyy"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -128,7 +128,7 @@
<el-col :span="8">
<el-form-item label="预告登记种类">
<el-select v-model="ruleForm.qlxx.djlx">
<el-select v-model="ruleForm.ygdj.ygdjlx">
<el-option
v-for="item in dictData['A29']"
:key="item.dcode"
......@@ -141,12 +141,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="土地使用权人">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.tdsyqr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规划用途">
<el-select v-model="ruleForm.qlxx.djlx">
<el-select v-model="ruleForm.ygdj.ghyt">
<el-option
v-for="item in dictData['A17']"
:key="item.dcode"
......@@ -159,12 +159,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="用途名称">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.ytmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质">
<el-select v-model="ruleForm.qlxx.djlx">
<el-select v-model="ruleForm.ygdj.fwxz">
<el-option
v-for="item in dictData['A19']"
:key="item.dcode"
......@@ -177,12 +177,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质名称">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.fwxzmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋结构">
<el-select v-model="ruleForm.qlxx.djlx">
<el-select v-model="ruleForm.ygdj.fwjg">
<el-option
v-for="item in dictData['A46']"
:key="item.dcode"
......@@ -195,62 +195,62 @@
</el-col>
<el-col :span="8">
<el-form-item label="所在层">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.szc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总层数">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.zcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.jzmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注销预告业务号">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.zxygywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注销预告原因">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.zxygyy"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="注销时间">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.zxsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="取得价格/被担保主债权数额">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.qdjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="金额单位">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.jedw"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="担保范围">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.dbfw"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否存在禁止或限制转让抵押不动产的约定">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产登记证明号">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附记：">
<el-input v-model="ruleForm.qlxx.fj"></el-input>
<el-input v-model="ruleForm.ygdj.fj"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -340,7 +340,8 @@ export default {
methods: {
loadData() {
console.log("预告登记", this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
this.propsParam.isEdit=this.$parent.isEdit
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleForm", this.ruleForm);
......
......@@ -59,17 +59,17 @@
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="权利类型：">
<el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="登记原因：">
<el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="登记类型：">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option
......@@ -81,17 +81,17 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="不动产坐落：">
<el-input v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="不动产权证号：">
<el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item label="区县代码：">
<el-input v-model="ruleForm.qlxx.qxdm"></el-input>
......@@ -128,42 +128,42 @@
<el-col :span="8">
<el-form-item label="异议事项">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.yydj.yysx"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产登记证明号">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-form-item label="注销异议业务号">
<el-input v-model="ruleForm.yydj.zxyyywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-form-item label="注销异议原因">
<el-input v-model="ruleForm.yydj.zxyyyy"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-form-item label="注销异议登簿人">
<el-input v-model="ruleForm.yydj.zxyydbr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-form-item label="注销异议登记时间">
<el-input v-model="ruleForm.yydj.zxyydjsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
<el-input v-model="ruleForm.yydj.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附记：">
<el-input v-model="ruleForm.qlxx.fj"></el-input>
<el-input v-model="ruleForm.yydj.fj"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -252,8 +252,9 @@ export default {
mounted() {},
methods: {
loadData() {
console.log("预告登记", this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
console.log("异议登记", this.propsParam);
this.propsParam.isEdit=this.$parent.isEdit
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleForm", this.ruleForm);
......
......@@ -109,6 +109,7 @@ export default {
qllx: this.$route.query.qllx,
//设置那个表单选中
tabName: "",
isEdit:true,
// 弹框显示
dialogVisible: true,
//表单集合
......@@ -214,7 +215,7 @@ export default {
},
//切换选项卡内容组件
getFromRouter(tabname) {
console.log("tabnameeeeeeeeeeeeeeeeee", tabname,this.tabList);
console.log("切换选项卡内容组件", tabname,this.tabList);
this.componentTag = getForm(tabname);
},
closefp() {
......
......@@ -111,6 +111,7 @@ export default {
tabName: "",
// 弹框显示
dialogVisible: true,
isEdit:false,
//表单集合
tabList: [],
type: "READ_ONLY",
......@@ -216,11 +217,9 @@ export default {
},
//切换选项卡内容组件
getFromRouter(tabname) {
console.log("tabnameeeeeeeeeeeeeeeeee", tabname,this.tabList);
this.componentTag = getForm(tabname);
},
closefp() {
console.log("点击分屏");
this.splitScreen = this.splitScreen ? false : true;
this.$store.dispatch("app/set1tScreen", this.splitScreen);
this.getFromRouter(this.tabList[0].value);
......
......@@ -83,6 +83,9 @@
qszt: this.checkList,
}).then((res) => {
if (res.code === 200) {
res.result.length && res.result.forEach(i => {
i.ytmc == 'null' ? i.ytmc = "" : i.ytmc = i.ytmc;
});
this.tableData = res.result;
this.tableData.forEach(item => {
item.sjlx = getSjlx(item.sjlx)
......
......@@ -65,9 +65,10 @@
</el-table-column>
<el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
<el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
<el-table-column label="创建时间" prop="createTime" width="160" align="center" />
<el-table-column label="办结时间" prop="endTime" width="160" align="center" />
<el-table-column label="操作方式" prop="businessName" align="center"/>
<el-table-column label="转入时间" prop="createTime" :formatter="formatDate" width="160" align="center" />
<el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
<el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
<el-table-column label="操作方式" prop="controls" align="center"/>
<el-table-column label="意见" prop="idea" align="center"/>
</el-table>
</div>
......@@ -118,6 +119,14 @@
this.clearViewer()
},
methods: {
formatDate(row, column) {
let data = row[column.property]
if(data == null) {
return null
}
let dt = new Date(data)
return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds()
},
processReZoom () {
this.defaultZoom = 1
this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
......@@ -240,6 +249,7 @@
item.comments.forEach(element => {
if(element.type=="COMPLETE"){
this.formData.allCommentList[index].idea=element.message
this.formData.allCommentList[index].controls="完成"
}
});
this.formData.allCommentList[index].agent=item.assignee.name
......
......@@ -86,64 +86,64 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：">
<el-input disabled v-model="ruleForm.ssQlxx.qllxmc"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号：" prop="qlxx.bdcqzh">
<el-input disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="共有情况：">
<el-input disabled v-model="ruleForm.ssQlxx.gyqk"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.gyqk"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="被执行人：" prop="qlxx.qlrmc">
<el-input disabled v-model="ruleForm.ssQlxx.qlrmc"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类：">
<el-input disabled v-model="ruleForm.ssQlxx.qlrzjzl"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.qlrzjzl"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="证件号：">
<el-input disabled v-model="ruleForm.ssQlxx.qlrzjhm"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.qlrzjhm"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号：" prop="qlxx.bdcdyh">
<el-input disabled v-model="ruleForm.ssQlxx.bdcdyh"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item :class="flag ? 'marginBot0' : ''" label="坐落：">
<el-input disabled v-model="ruleForm.ssQlxx.zl"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.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.ssQlxx.qlxzmc"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="用途：">
<el-input disabled v-model="ruleForm.ssQlxx.ytmc"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="面积：">
<el-input disabled v-model="ruleForm.ssQlxx.mjmc"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -198,10 +198,9 @@
"/djbworkFrameview?bsmSlsq=" +
item.bsmSlsq +
"&bestepid=" +
item.bestepid +
"&bsmBusiness=" +
"&sqywbm=" +
item.djywbm
item.bestepid+
"&isEdit=" +
true
);
window.open(href, `urlname${item.bsmSlsq}`);
}else{
......
......@@ -95,6 +95,9 @@ export default {
this.$endLoading()
if (res.code === 200) {
let { total, records } = res.result;
records.length && records.forEach(i => {
i.ytmc == 'null' ? i.ytmc = "" : i.ytmc = i.ytmc;
});
this.tableData.data = records;
this.tableData.total = total;
}
......