Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
2cc94fa0 by renchao@pashanhoo.com
Options

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

2 parents 77a91b9e f98a06e1
Inline Side-by-side
Showing 22 changed files with 779 additions and 394 deletions
......@@ -205,3 +205,16 @@ export function getNydsyqList (data) {
data
})
}
/**
* @description: 获取当前权力信息和上手权力信息
* @param {*} data
* @author: renchao
*/
export function getDjbQlxxDiff (data) {
return request({
url: SERVER.SERVERAPI + '/rest/djbDetail/getDjbQlxxDiff?bsmQlxx=' + data,
method: 'post',
})
}
......
......@@ -417,7 +417,7 @@ aside {
height: 0;
border-width: 0px 0px 55px 55px;
border-style: none solid solid;
border-color: transparent transparent #fe9400;
border-color: transparent transparent #ff5100;
position: absolute;
top: 0;
right: 0;
......
......@@ -20,6 +20,7 @@
此环节为流程最后环节，转出后流程将结束
</el-form-item>
</el-form>
<div v-if="this.formData.showidea">
<div class="invalid-reson">审批意见：</div>
<el-input
class="opinion"
......@@ -28,6 +29,8 @@
type="textarea"
:rows="4"
></el-input>
</div>
<!-- <el-button class="opinion_btn" @click="commonOpinion">常用意见</el-button> -->
<el-button style="float: right" @click="cancelBack">取消转出</el-button>
<el-button type="primary" @click="submitForm" style="float: right"
......
......@@ -16,7 +16,7 @@
label-width="145px"
inline-message
:show-message="false"
:class="{readonly: editDisabled }"
:class="{ readonly: editDisabled }"
class="loadingtext"
>
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
......@@ -47,7 +47,7 @@
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="查封不动产权信息：">
<el-form-item label="查封不动产权信息：" prop="ztQlxx.bdcqzh" :rules="rules.ztQlxxrules">
<select-table
v-model="ruleForm.ztQlxx"
:table-width="550"
......@@ -243,12 +243,26 @@
</el-col>
<el-col :span="8">
<el-form-item label="查封起始时间：">
<el-input v-model="ruleForm.cfdj.cfqssj"></el-input>
<el-date-picker
v-model="ruleForm.cfdj.cfqssj"
class="width100"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="查封结束时间：">
<el-input v-model="ruleForm.cfdj.cfjssj"></el-input>
<el-date-picker
v-model="ruleForm.cfdj.cfjssj"
class="width100"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -299,6 +313,7 @@
v-model="ruleForm.qlxx.djsj"
type="date"
placeholder="选择日期"
class="width100"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
>
......@@ -339,7 +354,15 @@
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="解封登记时间：">
<el-input v-model="ruleForm.cfdj.jfdjsj"></el-input>
<el-date-picker
v-model="ruleForm.cfdj.jfdjsj"
class="width100"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
......@@ -438,14 +461,17 @@ export default {
dname: "是",
},
],
ableOperation:false,
ableOperation: false,
//传递参数\
ssQlxxList: [],
ztQlxxList: [],
rules: {
ztQlxxrules: [
{ required: true, message: "抵押不动产信息", trigger: "change" },
],
bdcqzhrules: [
{ required: true, message: "不动产权证号：", trigger: "blur" },
{ required: true, message: "不动产登记证明号", trigger: "blur" },
],
qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
......@@ -458,7 +484,7 @@ export default {
this.loadData();
},
mounted() {
this.ableOperation=this.$parent.ableOperation
this.ableOperation = this.$parent.ableOperation;
},
methods: {
/**
......@@ -610,13 +636,6 @@ export default {
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
</style>
......
......@@ -358,7 +358,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否限制转移约定">
<el-form-item label="是否限制转移约定：">
<el-select v-model="ruleForm.diyaq.sfczjzhxz">
<el-option
v-for="item in dictData['A6']"
......
......@@ -9,7 +9,7 @@
<el-form
:model="ruleForm"
:rules="rules"
:class="{readonly: editDisabled }"
:class="{ readonly: editDisabled }"
class="loadingtext"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
......@@ -40,11 +40,42 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
地役权信息
地役权不动产情况
<div class="triangle"></div>
</div>
<el-row :gutter="10" class="ssqlxx">
<el-col :span="24" v-if="ssqlxxshow">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item
label="抵押不动产信息："
prop="ztQlxx.bdcqzh"
:rules="rules.ztQlxxrules"
>
<select-table
v-model="ruleForm.ztQlxx"
:table-width="550"
:tableData="ztQlxxList"
:props="props"
@change="ztQlxxchange"
>
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"
></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"
></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ssqlxxshow">
<el-form-item label="上手权利信息：">
<select-table
v-model="ruleForm.ssQlxx"
......@@ -71,6 +102,62 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="权利人：">
<el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="证件种类：">
<el-input disabled v-model="ruleForm.ztQlxx.qlrzjzl"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="证件号：">
<el-input disabled v-model="ruleForm.ztQlxx.qlrzjhm"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="权利类型：">
<el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产权证号：">
<el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="坐落：">
<el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="不动产单元号：">
<el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="面积：">
<el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用途：">
<el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
地役权信息
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="不动产单元号：">
......@@ -100,7 +187,11 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记类型： " prop="qlxx.djlx" :rules="rules.djlxrules">
<el-form-item
label="登记类型： "
prop="qlxx.djlx"
:rules="rules.djlxrules"
>
<el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
<el-option
v-for="item in djlxlist"
......@@ -118,7 +209,11 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产权证号：" prop="qlxx.bdcqzh" :rules="rules.bdcqzhrules">
<el-form-item
label="不动产权证号："
prop="qlxx.bdcqzh"
:rules="rules.bdcqzhrules"
>
<el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
......@@ -128,20 +223,33 @@
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
<el-form-item
label="登记机构："
prop="qlxx.djjg"
:rules="rules.djjgrules"
>
<el-input v-model="ruleForm.qlxx.djjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登簿人：" prop="qlxx.dbr" :rules="rules.dbrrules">
<el-form-item
label="登簿人："
prop="qlxx.dbr"
:rules="rules.dbrrules"
>
<el-input v-model="ruleForm.qlxx.dbr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
<el-form-item
label="登记时间："
prop="qlxx.djsj"
:rules="rules.djsjrules"
>
<el-date-picker
v-model="ruleForm.qlxx.djsj"
type="date"
class="width100"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
......@@ -174,7 +282,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供役地权利人证件种类">
<el-form-item label="供役地权利人证件种类：">
<el-select v-model="ruleForm.qlxx.gydqlrzjzl">
<el-option
v-for="item in dictData['A30']"
......@@ -186,22 +294,22 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供役地权利人证件号">
<el-form-item label="供役地权利人证件号：">
<el-input v-model="ruleForm.qlxx.gydqlrzjh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="需役地不动产单元号">
<el-form-item label="需役地不动产单元号：">
<el-input v-model="ruleForm.qlxx.xydbdcdyh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="需役地坐落">
<el-form-item label="需役地坐落：">
<el-input v-model="ruleForm.qlxx.yxdzl"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="需役地权利人">
<el-form-item label="需役地权利人：">
<el-input v-model="ruleForm.qlxx.xydqlr"></el-input>
</el-form-item>
</el-col>
......@@ -233,17 +341,33 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权利起始时间">
<el-input v-model="ruleForm.qlxx.qlqssj"></el-input>
<el-form-item label="权利起始时间：">
<el-date-picker
v-model="ruleForm.qlxx.qlqssj"
class="width100"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权利结束时间">
<el-input v-model="ruleForm.qlxx.qljssj"></el-input>
<el-form-item label="权利结束时间：">
<el-date-picker
v-model="ruleForm.qlxx.qljssj"
class="width100"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权利期限">
<el-form-item label="权利期限：">
<el-input v-model="ruleForm.qlxx.qlqx"></el-input>
</el-form-item>
</el-col>
......@@ -304,13 +428,13 @@
</template>
<script>
import { mapGetters } from "vuex";
import { init,getSsQlxx, save } from "@/api/djbRepair.js";
import { init, getSsQlxx, getZtQlxx, save } from "@/api/djbRepair.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import selectTable from "@/components/selectTable/index.vue";
export default {
components: { qlrCommonTable, ywrCommonTable, tdytTable ,selectTable },
components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable },
computed: {
...mapGetters(["dictData", "flag"]),
// 根据流程判断表单是否为只读
......@@ -324,7 +448,7 @@ export default {
},
data() {
return {
ssqlxxshow:true,
ssqlxxshow: true,
props: {
label: "bdcqzh",
value: "bdcdyid",
......@@ -336,6 +460,7 @@ export default {
disabled: true,
czrOptions: [],
ssQlxxList: [],
ztQlxxList: [],
ruleForm: {},
// 登记类型
djlxlist: [
......@@ -376,13 +501,15 @@ export default {
dname: "历史",
},
],
ableOperation:false,
ableOperation: false,
//传递参数\
rules: {
bdcqzhrules:[
ztQlxxrules: [
{ required: true, message: "抵押不动产信息", trigger: "change" },
],
bdcqzhrules: [
{ required: true, message: "不动产登记证明号", trigger: "blur" },
],
qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
......@@ -390,15 +517,21 @@ export default {
},
};
},
created() {
},
created() {},
mounted() {
this.loadData();
this.ableOperation=this.$parent.ableOperation
this.ableOperation = this.$parent.ableOperation;
},
methods: {
/**
* @description: ztQlxxchange
* @param {*} val
* @author: renchao
*/
ztQlxxchange(val) {
this.ruleForm.ztQlxx = val;
},
/**
* @description: ssQlxxchange
* @param {*} val
* @author: renchao
......@@ -413,7 +546,7 @@ export default {
* @author: renchao
*/
djlxchange(val) {
console.log("val",val);
console.log("val", val);
if (val == null || val == 100) {
this.ssqlxxshow = false;
} else {
......@@ -447,6 +580,12 @@ export default {
this.ssQlxxList = res.result;
}
});
//获取上手信息
getZtQlxx({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
if (res.code == 200) {
this.ztQlxxList = res.result;
}
});
},
// 更新土地用途信息
/**
......
......@@ -240,7 +240,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="竣工时间：">
<el-input v-model="ruleForm.fdcq2.jgsj"></el-input>
<el-date-picker
v-model="ruleForm.fdcq2.jgsj"
class="width100"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
......@@ -285,6 +293,7 @@
<el-date-picker
v-model="ruleForm.qlxx.djsj"
type="date"
class="width100"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd">
......
......@@ -194,6 +194,7 @@
<el-date-picker
v-model="ruleForm.qlxx.djsj"
type="date"
class="width100"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
......
......@@ -387,7 +387,6 @@ export default {
dname: "历史",
},
],
tdxz: null,
isShow: false,
disabled: true,
czrOptions: [],
......@@ -462,11 +461,11 @@ export default {
this.ssqlxxshow = false;
}
this.$endLoading();
if (this.ruleForm.tdytqxList.length > 0) {
this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
} else {
this.tdxz = null;
}
// if (this.ruleForm.tdytqxList.length > 0) {
// this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
// } else {
// this.tdxz = null;
// }
this.isShow = true;
}
});
......
......@@ -227,6 +227,7 @@
<el-date-picker
v-model="ruleForm.qlxx.djsj"
type="date"
class="width100"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
......@@ -249,7 +250,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="预告登记种类" prop="ygdj.ygdjlx" :rules="rules.ygdjlxrules">
<el-form-item label="预告登记种类：" prop="ygdj.ygdjlx" :rules="rules.ygdjlxrules">
<el-select v-model="ruleForm.ygdj.ygdjlx">
<el-option
v-for="item in dictData['A29']"
......@@ -262,12 +263,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地使用权人">
<el-form-item label="土地使用权人：">
<el-input v-model="ruleForm.ygdj.tdsyqr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规划用途">
<el-form-item label="规划用途：">
<el-select v-model="ruleForm.ygdj.ghyt">
<el-option
v-for="item in dictData['A17']"
......@@ -280,12 +281,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用途名称">
<el-form-item label="用途名称：">
<el-input v-model="ruleForm.ygdj.ytmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质">
<el-form-item label="房屋性质：">
<el-select v-model="ruleForm.ygdj.fwxz">
<el-option
v-for="item in dictData['A19']"
......@@ -298,12 +299,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质名称">
<el-form-item label="房屋性质名称：">
<el-input v-model="ruleForm.ygdj.fwxzmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋结构">
<el-form-item label="房屋结构：">
<el-select v-model="ruleForm.ygdj.fwjg">
<el-option
v-for="item in dictData['A46']"
......@@ -316,57 +317,65 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在层">
<el-form-item label="所在层：">
<el-input v-model="ruleForm.ygdj.szc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总层数">
<el-form-item label="总层数：">
<el-input v-model="ruleForm.ygdj.zcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积">
<el-form-item label="建筑面积：">
<el-input v-model="ruleForm.ygdj.jzmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销预告业务号">
<el-form-item label="注销预告业务号：">
<el-input v-model="ruleForm.ygdj.zxygywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销预告原因">
<el-form-item label="注销预告原因：">
<el-input v-model="ruleForm.ygdj.zxygyy"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销时间">
<el-input v-model="ruleForm.ygdj.zxsj"></el-input>
<el-form-item label="注销时间：">
<el-date-picker
v-model="ruleForm.ygdj.zxsj"
type="date"
class="width100"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="取得价格/被担保主债权数额">
<el-form-item label="取得价格/被担保主债权数额：">
<el-input v-model="ruleForm.ygdj.qdjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="金额单位">
<el-form-item label="金额单位：">
<el-input v-model="ruleForm.ygdj.jedw"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="担保范围">
<el-form-item label="担保范围：">
<el-input v-model="ruleForm.ygdj.dbfw"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否存在禁止或限制转让抵押不动产的约定">
<el-form-item label="是否存在禁止或限制转让抵押不动产的约定：">
<el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产登记证明号">
<el-form-item label="不动产登记证明号：">
<el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input>
</el-form-item>
</el-col>
......@@ -502,8 +511,11 @@ export default {
],
//传递参数\
rules: {
bdcqzhrules:[
{ required: true, message: "不动产权证号：", trigger: "blur" },
ztQlxxrules: [
{ required: true, message: "抵押不动产信息", trigger: "change" },
],
bdcqzhrules: [
{ required: true, message: "不动产登记证明号", trigger: "blur" },
],
// qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
......
......@@ -45,8 +45,8 @@
预告登记信息
<div class="triangle"></div>
</div>
<el-row :gutter="10" class="ssqlxx">
<el-col :span="24" v-if="ssqlxxshow">
<el-row :gutter="10">
<el-col :span="8" v-if="ssqlxxshow">
<el-form-item label="上手权利信息：">
<select-table
v-model="ruleForm.ssQlxx"
......@@ -72,8 +72,6 @@
</select-table>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="不动产单元号：">
<el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
......@@ -89,8 +87,6 @@
<el-input disabled v-model="ruleForm.qlxx.ssywh"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="权利类型：">
<el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
......@@ -143,6 +139,7 @@
<el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
<el-date-picker
v-model="ruleForm.qlxx.djsj"
class="width100"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
......@@ -166,7 +163,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="预告登记种类" prop="ygdj.ygdjlx" :rules="rules.ygdjlxrules">
<el-form-item label="预告登记种类：" prop="ygdj.ygdjlx" :rules="rules.ygdjlxrules">
<el-select v-model="ruleForm.ygdj.ygdjlx">
<el-option
v-for="item in dictData['A29']"
......@@ -179,12 +176,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="土地使用权人">
<el-form-item label="土地使用权人：">
<el-input v-model="ruleForm.ygdj.tdsyqr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规划用途">
<el-form-item label="规划用途：">
<el-select v-model="ruleForm.ygdj.ghyt">
<el-option
v-for="item in dictData['A17']"
......@@ -197,12 +194,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用途名称">
<el-form-item label="用途名称：">
<el-input v-model="ruleForm.ygdj.ytmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质">
<el-form-item label="房屋性质：">
<el-select v-model="ruleForm.ygdj.fwxz">
<el-option
v-for="item in dictData['A19']"
......@@ -215,12 +212,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋性质名称">
<el-form-item label="房屋性质名称：">
<el-input v-model="ruleForm.ygdj.fwxzmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋结构">
<el-form-item label="房屋结构：">
<el-select v-model="ruleForm.ygdj.fwjg">
<el-option
v-for="item in dictData['A46']"
......@@ -233,57 +230,65 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在层">
<el-form-item label="所在层：">
<el-input v-model="ruleForm.ygdj.szc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总层数">
<el-form-item label="总层数：">
<el-input v-model="ruleForm.ygdj.zcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积">
<el-form-item label="建筑面积：">
<el-input v-model="ruleForm.ygdj.jzmj"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销预告业务号">
<el-form-item label="注销预告业务号：">
<el-input v-model="ruleForm.ygdj.zxygywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销预告原因">
<el-form-item label="注销预告原因：">
<el-input v-model="ruleForm.ygdj.zxygyy"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销时间">
<el-input v-model="ruleForm.ygdj.zxsj"></el-input>
<el-form-item label="注销时间：">
<el-date-picker
v-model="ruleForm.ygdj.zxsj"
class="width100"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="取得价格/被担保主债权数额">
<el-form-item label="取得价格/被担保主债权数额：">
<el-input v-model="ruleForm.ygdj.qdjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="金额单位">
<el-form-item label="金额单位：">
<el-input v-model="ruleForm.ygdj.jedw"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="担保范围">
<el-form-item label="担保范围：">
<el-input v-model="ruleForm.ygdj.dbfw"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否存在禁止或限制转让抵押不动产的约定">
<el-form-item label="是否存在禁止或限制转让抵押不动产的约定：">
<el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产登记证明号">
<el-form-item label="不动产登记证明号：">
<el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input>
</el-form-item>
</el-col>
......
......@@ -9,7 +9,7 @@
<el-form
:model="ruleForm"
:rules="rules"
:class="{readonly: editDisabled }"
:class="{ readonly: editDisabled }"
class="loadingtext"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
......@@ -41,6 +41,121 @@
</el-col>
</el-row>
<div class="slxx_title title-block">
异议登记不动产情况
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item
label="抵押不动产信息："
prop="ztQlxx.bdcqzh"
:rules="rules.ztQlxxrules"
>
<select-table
v-model="ruleForm.ztQlxx"
:table-width="550"
:tableData="ztQlxxList"
:props="props"
@change="ztQlxxchange"
>
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"
></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"
></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ssqlxxshow">
<el-form-item label="上手权利信息：">
<select-table
v-model="ruleForm.ssQlxx"
:table-width="550"
:tableData="ssQlxxList"
:props="props"
@change="ssQlxxchange"
>
<el-table-column
prop="qllxmc"
width="130"
label="权利类型"
></el-table-column>
<el-table-column
prop="bdcqzh"
width="160"
label="不动产权证书"
></el-table-column>
<el-table-column prop="qlrmc" label="权利人"></el-table-column>
<el-table-column prop="mjmc" label="面积"></el-table-column>
<el-table-column prop="ytmc" label="用途"></el-table-column>
<el-table-column prop="zl" label="坐落"></el-table-column>
</select-table>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="权利人：">
<el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="证件种类：">
<el-input disabled v-model="ruleForm.ztQlxx.qlrzjzl"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="证件号：">
<el-input disabled v-model="ruleForm.ztQlxx.qlrzjhm"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="权利类型：">
<el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产权证号：">
<el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="坐落：">
<el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
<el-col :span="8">
<el-form-item label="不动产单元号：">
<el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="面积：">
<el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用途：">
<el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
异议登记信息
<div class="triangle"></div>
</div>
......@@ -73,8 +188,12 @@
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="登记类型：">
<el-select v-model="ruleForm.qlxx.djlx">
<el-form-item
label="登记类型："
prop="qlxx.djlx"
:rules="rules.djlxrules"
>
<el-select v-model="ruleForm.qlxx.djlx" @change="djlxchange">
<el-option
v-for="item in djlxlist"
:key="item.dcode"
......@@ -91,7 +210,11 @@
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="不动产权证号：" prop="qlxx.bdcqzh" :rules="rules.bdcqzhrules">
<el-form-item
label="不动产权证号："
prop="qlxx.bdcqzh"
:rules="rules.bdcqzhrules"
>
<el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
</el-form-item>
</el-col>
......@@ -101,19 +224,32 @@
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
<el-form-item
label="登记机构："
prop="qlxx.djjg"
:rules="rules.djjgrules"
>
<el-input v-model="ruleForm.qlxx.djjg"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登簿人：" prop="qlxx.dbr" :rules="rules.dbrrules">
<el-form-item
label="登簿人："
prop="qlxx.dbr"
:rules="rules.dbrrules"
>
<el-input v-model="ruleForm.qlxx.dbr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
<el-form-item
label="登记时间："
prop="qlxx.djsj"
:rules="rules.djsjrules"
>
<el-date-picker
v-model="ruleForm.qlxx.djsj"
class="width100"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
......@@ -137,12 +273,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="异议事项">
<el-form-item label="异议事项：">
<el-input v-model="ruleForm.yydj.yysx"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产登记证明号">
<el-form-item label="不动产登记证明号：">
<el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input>
</el-form-item>
</el-col>
......@@ -157,24 +293,25 @@
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销异议业务号">
<el-form-item label="注销异议业务号：">
<el-input v-model="ruleForm.yydj.zxyyywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销异议原因">
<el-form-item label="注销异议原因：">
<el-input v-model="ruleForm.yydj.zxyyyy"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销异议登簿人">
<el-form-item label="注销异议登簿人：">
<el-input v-model="ruleForm.yydj.zxyydbr"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
<el-form-item label="注销异议登记时间">
<el-form-item label="注销异议登记时间：">
<el-date-picker
v-model="ruleForm.yydj.zxyydjsj"
class="width100"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
......@@ -234,12 +371,13 @@
</template>
<script>
import { mapGetters } from "vuex";
import { init, save } from "@/api/djbRepair.js";
import { init, getSsQlxx, getZtQlxx, save } from "@/api/djbRepair.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import selectTable from "@/components/selectTable/index.vue";
export default {
components: { qlrCommonTable, ywrCommonTable, tdytTable },
components: { qlrCommonTable, ywrCommonTable, tdytTable,selectTable},
computed: {
...mapGetters(["dictData", "flag"]),
// 根据流程判断表单是否为只读
......@@ -253,12 +391,19 @@ export default {
},
data() {
return {
ssqlxxshow: true,
props: {
label: "bdcqzh",
value: "bdcdyid",
},
//表单是否可操作
propsParam: this.$attrs,
key: 0,
isShow: false,
disabled: true,
czrOptions: [],
ssQlxxList: [],
ztQlxxList: [],
ruleForm: {},
// 登记类型
djlxlist: [
......@@ -301,38 +446,91 @@ export default {
],
//传递参数\
rules: {
bdcqzhrules:[
{ required: true, message: "不动产权证号：", trigger: "change" },
ztQlxxrules: [
{ required: true, message: "抵押不动产信息", trigger: "change" },
],
bdcqzhrules: [
{ required: true, message: "不动产登记证明号", trigger: "blur" },
],
// qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }],
},
ableOperation:false
ableOperation: false,
};
},
created() {
this.loadData();
},
mounted() {
this.ableOperation =this.$parent.ableOperation
this.ableOperation = this.$parent.ableOperation;
},
methods: {
/**
* @description: ztQlxxchange
* @param {*} val
* @author: renchao
*/
ztQlxxchange(val) {
this.ruleForm.ztQlxx = val;
},
/**
* @description: ssQlxxchange
* @param {*} val
* @author: renchao
*/
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
},
/**
* @description: djlxchange
* @param {*} val
* @author: renchao
*/
djlxchange(val) {
console.log("val", val);
if (val == null || val == 100) {
this.ssqlxxshow = false;
} else {
this.ssqlxxshow = true;
}
},
/**
* @description: loadData
* @author: renchao
*/
loadData() {
this.$startLoading();
this.propsParam.isEdit=this.$parent.isEdit
this.propsParam.isEdit = this.$parent.isEdit;
init(this.propsParam).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
let djlx = this.ruleForm.qlxx.djlx;
if (djlx == null || djlx == 100) {
this.ssqlxxshow = false;
}
this.$endLoading();
this.isShow = true;
}
});
//获取主体信息
getSsQlxx({
bdcdyid: this.propsParam.bdcdyid,
qllx: this.propsParam.qllx,
}).then((res) => {
if (res.code == 200) {
this.ssQlxxList = res.result;
}
});
//获取上手信息
getZtQlxx({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
if (res.code == 200) {
this.ztQlxxList = res.result;
}
});
},
// 更新土地用途信息
/**
......
.djxxTable {
width: 100%;
height: 100%;
background: #fff;
color: #333;
.tableBox {
margin: 0 auto;
display: flex;
flex-wrap: wrap;
.title {
width: 100%;
font-weight: 700;
font-size: 16px;
text-align: center;
background: #e9e9e9;
height: 62px;
line-height: 62px;
position: relative;
margin: 0 3px;
.checkbox {
position: absolute;
right: 20px;
bottom: -16px;
height: 62px;
}
}
.xxTableBox {
overflow: scroll;
width: 100%;
}
.xxTable>tr:first-child th {
width: 140px;
}
.xxTable {
//border-spacing: 1px;
width: 100%;
// table-layout: fixed;
tr {
box-sizing: border-box;
}
tr>th {
border: 1px solid #ccc;
background: #F2F2F2;
color: #333333;
font-size: 16px;
height: 40px;
}
tr:nth-child(1) {
position: sticky;
top: 0px;
z-index: 3;
margin-top: -2px;
}
tr:nth-child(2) {
position: sticky;
top: 40px;
z-index: 3;
}
tr:nth-child(3) {
position: sticky;
top: 80px;
z-index: 3;
box-shadow: 0px 15px 10px -15px #409EFF;
}
tr td:first-child {
position: sticky;
left: 0;
z-index: 2;
margin-left: -2px;
}
th.linshi,
th.xianshi {
background: #464c5b;
}
th.lishi {
background: rgba(70, 76, 91, 0.8);
}
.one th {
height: 25px;
font-size: 14px;
}
th.linshi {
color: #fe9400;
}
.two th {
height: 45px;
p:nth-child(2) {
font-size: 14px;
}
}
tr {
display: flex;
}
tr td {
border: 1px solid rgb(227, 226, 226);
text-align: center;
height: 40px;
font-size: 13px;
width: 140px;
flex: 1;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
min-width: 280px;
z-index: 1;
}
>tr:nth-child(odd) td {
background: #f2f2f2;
}
>tr:nth-child(even) td {
background: #f9f9f9;
}
td.linshi {
color: #fe9400;
}
tr>td.lishi {
color: #7f7f7f;
}
}
.rollTable {
margin-top: -2px;
display: block;
height: calc(100vh - 185px);
overflow-y: scroll;
margin-left: 2px;
}
}
}
\ No newline at end of file
......@@ -19,7 +19,7 @@ import {
} from "@/api/workFlow.js";
import { mapGetters } from 'vuex'
export default {
data () {
data() {
return {
//是否开启材料分屏
splitScreen: false,
......@@ -35,10 +35,12 @@ export default {
batchButtonName: '',
// 受理申请信息
slsq: {},
ableOperation: true
ableOperation: true,
showidea: false
}
},
mounted () {
mounted() {
this.flowInitParam();
},
methods: {
......@@ -47,7 +49,7 @@ export default {
* @description: 加载流程初始参数
* @author: renchao
*/
flowInitParam () {
flowInitParam() {
var formdata = new FormData();
formdata.append("bsmSlsq", this.bsmSlsq);
......@@ -58,6 +60,10 @@ export default {
stepExpandInfo(formdata).then((res) => {
if (res.code === 200) {
this.leftButtonList = res.result.button;
if (res.result.properties.length) {
this.showidea = res.result.properties[0].value
}
this.rightButtonList = res.result.operation;
let arr = this.rightButtonList.filter((item) => {
return item.name == "删除"
......@@ -79,7 +85,7 @@ export default {
* @param {*} item
* @author: renchao
*/
operation (item) {
operation(item) {
//按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书 B7:证书领取 B8:楼盘表 B9:登簿
//操作按钮 登簿：record 转件：transfer 退回：back 退出：signout
let that = this;
......@@ -289,7 +295,7 @@ export default {
* @description: del
* @author: renchao
*/
del () {
del() {
let formdata = new FormData();
formdata.append("bsmSlsq", this.bsmSlsq);
this.$confirm("确定要删除吗, 是否继续?", "提示", {
......@@ -324,24 +330,27 @@ export default {
* @param {*} obj
* @author: renchao
*/
sendToNext (obj) {
sendToNext(obj) {
this.$popupDialog("转出", "djbworkflow/components/zc", {
obj:obj,
obj: obj,
bsmSlsq: this.bsmSlsq,
tabList: this.tabList
}, '800px', true)
tabList: this.tabList,
tshowidea: this.showidea
}, '600px', true)
},
//转出最后一个流程
/**
* @description: 转出最后一个流程
* @author: renchao
*/
sendToEnd () {
sendToEnd() {
this.$popupDialog("转出", "djbworkflow/components/zc", {
obj:"",
obj: "",
bsmSlsq: this.bsmSlsq,
tabList: this.tabList
}, '800px', true)
tabList: this.tabList,
showidea: this.showidea
}, '600px', true)
},
//批量操作
......@@ -349,7 +358,7 @@ export default {
* @description: 批量操作
* @author: renchao
*/
handleBatchDel () {
handleBatchDel() {
this.$popupDialog("批量删除", "workflow/components/batchDel", {
width: "50%",
btnShow: false,
......@@ -363,7 +372,7 @@ export default {
* @param {*} file
* @author: renchao
*/
handleChange (file) {
handleChange(file) {
var formdata = new FormData();
formdata.append("file", file.raw);
formdata.append("bsmSldy", this.currentSelectProps.bsmSldy);
......@@ -382,7 +391,7 @@ export default {
* @param {*} file
* @author: renchao
*/
beforeUpload (file) {
beforeUpload(file) {
return true;
}
}
......
......@@ -16,13 +16,24 @@
</div>
</div>
<div class="xxTableBox rollTable">
<!-- 固定前三个 -->
<table class="xxTable">
<tr v-for="(item, colindex) in columns" :key="colindex">
<tr v-for="(item, colindex) in columnsall" :key="colindex">
<td>
{{ item.label }}
</td>
<td></td>
<td v-for="count in emptycolNum" :key="~count"></td>
<td v-for="(row, index) in tableData" :key="index" >
<div class="setbut" v-if="item.prop == 'bhqk'">
{{ index?"变化前": "变化后"}}
</div>
<div
v-if="item.prop == 'cz' && row.sjlx != '系统数据'"
></div>
<span v-if="item.prop == 'qszt'" :class="item.bt">
{{ getQsztName(row[item.prop]) }}
</span>
<span v-else :class="item.bt"> {{ row[item.prop] }}</span>
</td>
</tr>
</table>
</div>
......@@ -32,8 +43,8 @@
<script>
import { datas } from "./qlxxFormData.js";
import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
import { getDiyiqList } from "@/api/djbDetail.js";
import { getSjlx } from "@/utils/dictionary.js";
import { getDjbQlxxDiff } from "@/api/djbDetail.js";
export default {
props: {
formData: {
......@@ -45,24 +56,111 @@ export default {
return {
radio: 1,
title: "变化情况对比",
qsztList: datas.columns().qsztList,
//列表数据
tableData: [],
//空列值个数
emptycolNum: 1,
//列名称对象
columns: datas.columns().DYIQ,
columns: [],
columnsall:[],
columnsum:[]
};
},
created() {
console.log("this.formData", this.formData);
switch (this.formData.dqqllx) {
case "JSYDSYQ":
this.columns = datas.columns().JSYDSYQ;
break;
case "FDCQ2":
this.columns = datas.columns().FDCQ2;
break;
case "NYDSYQ":
this.columns = datas.columns().NYDSYQ;
break;
case "DYAQ":
this.columns = datas.columns().DYAQ;
break;
case "DYIQ":
this.columns = datas.columns().DYIQ;
break;
case "YGDJ":
this.columns = datas.columns().YGDJ;
break;
case "CFDJ":
this.columns = datas.columns().CFDJ;
break;
case "YYDJ":
this.columns = datas.columns().YYDJ;
break;
}
this.getdata();
},
methods: {
getArrDifference: function(arr1, arr2){
return arr1.concat(arr2).filter(function(value, i, arr){
return arr.indexOf(value) === arr.lastIndexOf(value);
})
},
/**
* @description: checkChange
* @author: renchao
*/
getdata() {
getDjbQlxxDiff(this.formData.bsmQlxx).then((res) => {
if (res.code === 200) {
this.tableData.push(res.result.currentQlxx)
this.tableData.push(res.result.ssQlxx)
this.tableData.map((item) => {
item.sjlx = getSjlx(item.sjlx);
});
for (let key in this.tableData[0]) {
this.columnsum=this.columns.filter((item,index) => {
if(this.tableData[1][key]!==this.tableData[0][key]&&this.columns[index].prop==key){
this.columns[index].bt="red"
}
return this.columns[index].bt=="red"
})
}
this.columns.unshift({
prop: "bhqk",
label: "变化情况"
})
this.columnsum.unshift({
prop: "bhqk",
label: "变化情况"
})
this.columnsall= this.columns
}
});
}
/**
* @description: getQsztName
* @param {*} code
* @author: renchao
*/,
getQsztName(code) {
let name = "";
for (let item of this.qsztList) {
if (item.value == code) {
name = item.label;
break;
}
}
return name;
},
checkChange() {
console.log("ssss",this.radio);
if(this.radio==2){
this.columnsall=this.columnsum
}else{
this.columnsall=this.columns
}
},
},
};
......@@ -70,4 +168,14 @@ export default {
<style lang="scss" scoped>
@import "./qlxxCommon.scss";
.red{
color: #ff0202;
}
.black{
color: #000000;
}
.setbut{
font-weight: 600;
color: #ff0202;
}
</style>
......
......@@ -96,7 +96,7 @@
}
th.linshi {
color: #fe9400;
color: #ff5100;
}
.two th {
......@@ -128,7 +128,7 @@
height: 0;
border-width: 0px 0px 55px 55px;
border-style: none solid solid;
border-color: transparent transparent #fe9400;
border-color: transparent transparent #ff5100;
position: absolute;
top: 0;
right: 0;
......@@ -193,7 +193,7 @@
}
td.linshi {
color: #fe9400;
color: #ff5100;
}
tr>td.lishi {
......
......@@ -14,31 +14,34 @@
:heightNumSetting="true"
:minHeight="150"
height="150"
style="width: 100%">
style="width: 100%"
>
<el-table-column prop="index" width="50" :render-header="renderHeader">
<template slot-scope="scope">
<i
class="el-icon-minus pointer"
@click="deleClick(scope.$index, scope.row)"
v-if="ableOperation"></i>
v-if="ableOperation"
></i>
<div style="text-align: center" v-else>
{{ scope.$index + 1 }}
</div>
</template>
</el-table-column>
<el-table-column prop="tdyt" label="土地用途" min-width="100">
<el-table-column prop="yt" label="土地用途" min-width="100">
<template slot-scope="scope">
<treeselect
v-model="tdyt"
v-model="scope.row.yt"
:disabled="!ableOperation"
noOptionsText="暂无数据"
placeholder=''
placeholder=""
:show-count="true"
:options="dictData['tdyt']"
:normalizer="normalizer"
:appendToBody="true"
z-index="9999"
@input="addrow(scope.row)" />
@input="addrow(scope.$index)"
/>
</template>
</el-table-column>
<el-table-column prop="qssj" label="土地使用起始时间" min-width="100">
......@@ -51,7 +54,8 @@
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
@input="startTime(scope.$index)">
@input="startTime(scope.$index)"
>
</el-date-picker>
</template>
</el-table-column>
......@@ -65,7 +69,8 @@
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
@input="endTime(scope.$index)">
@input="endTime(scope.$index)"
>
</el-date-picker>
</template>
</el-table-column>
......@@ -74,18 +79,21 @@
<el-input
class="item"
:disabled="!ableOperation"
v-model="scope.row.syqx"
v-model="scope.row.tdsyqx"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
placeholder="请输入内容"
@input="sumTime(scope.$index,scope.row.syqx)">
></el-input>
@input="sumTime(scope.$index, scope.row.tdsyqx)"
>
></el-input
>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
import { mapGetters } from "vuex";
export default {
import { mapGetters } from "vuex";
export default {
computed: {
...mapGetters(["dictData"]),
},
......@@ -101,64 +109,50 @@
default: true,
},
},
data () {
data() {
return {
// 键名转换，方法默认是label和children进行树状渲染
tdyt: null,
key: 0,
newdata: {
yt: "",
yt: null,
qssj: "",
jssj: "",
syqx: "",
tdsyqx: "",
},
tableDataList: [],
// 起始时间选择范围
pickerStart: {},
pickerEnd: {},
normalizer (node) {
normalizer(node) {
if (node.children == null || node.children == "null") {
delete node.children;
}
return {
id: node.dcode,
label: node.dname,
children: node.children,
};
},
};
},
mounted () {
},
mounted() {},
watch: {
tableData: {
handler: function (val, oldVal) {
let that = this;
this.$nextTick(() => {
if (val.length == 0 || !val) {
console.log("进了");
that.tableDataList = _.cloneDeep([
{
yt: "",
yt: null,
qssj: "",
jssj: "",
syqx: "",
tdsyqx: "",
},
]);
if (that.tableDataList.length > 0) {
this.tdyt = that.tableDataList[0].yt
? that.tableDataList[0].yt
: null;
} else {
this.tdyt = null;
}
} else {
that.tableDataList = _.cloneDeep(val);
if (that.tableDataList.length > 0) {
this.tdyt = that.tableDataList[0].yt
? that.tableDataList[0].yt
: null;
} else {
this.tdyt = null;
}
}
});
},
......@@ -171,7 +165,7 @@
* @description: renderHeader
* @author: renchao
*/
renderHeader () {
renderHeader() {
return (
<div>
{" "}
......@@ -193,21 +187,23 @@
* @description: 修改事件
* @author: renchao
*/
addrow () {
this.tableDataList = this.tableDataList.map((item) => {
return {
...item,
yt: this.tdyt,
};
});
this.$emit("upDateTdytxxList", this.tableDataList);
addrow(a) {
console.log(a);
// this.tableDataList = this.tableDataList.map((item) => {
// return {
// ...item,
// yt: this.tdyt,
// };
// });
// this.$emit("upDateTdytxxList", this.tableDataList);
},
/**
* @description: startTime
* @param {*} index
* @author: renchao
*/
startTime (index) {
startTime(index) {
console.log("index", index);
// let startTime = this.tableDataList[index].tdsyqssj;
let endTime = this.tableDataList[index].jssj;
let startTime = this.tableDataList[index].qssj;
......@@ -220,21 +216,19 @@
}
},
};
if (
Object.keys(startTime).length > 0 &&
Object.keys(endTime).length > 0
) {
if (startTime && endTime) {
let startYear = new Date(startTime).getFullYear();
let endYear = new Date(endTime).getFullYear();
this.tableDataList[index].syqx = endYear - startYear;
this.tableDataList[index].tdsyqx = endYear - startYear;
}
this.$emit("upDateTdytxxList", this.tableDataList);
},
/**
* @description: endTime
* @param {*} index
* @author: renchao
*/
endTime (index) {
endTime(index) {
// let startTime = this.tableDataList[index].tdsyqssj;
let startTime = this.tableDataList[index].qssj;
let endTime = this.tableDataList[index].jssj;
......@@ -247,36 +241,33 @@
}
},
};
if (
Object.keys(startTime).length > 0 &&
Object.keys(endTime).length > 0
) {
if (startTime && endTime) {
let startYear = new Date(startTime).getFullYear();
let endYear = new Date(endTime).getFullYear();
this.tableDataList[index].syqx = endYear - startYear;
this.tableDataList[index].tdsyqx = endYear - startYear;
}
this.$emit("upDateTdytxxList", this.tableDataList);
},
/**
* @description: sumTime
* @param {*} index
* @param {*} syqx
* @param {*} tdsyqx
* @author: renchao
*/
sumTime (index, syqx) {
sumTime(index, tdsyqx) {
let startTime = this.tableDataList[index].qssj;
this.tableDataList[index].jssj =
Number(startTime.substring(0, 4)) +
Number(syqx) +
Number(tdsyqx) +
startTime.slice(4, 19);
this.$emit("upDateTdytxxList", this.tableDataList);
},
// 新增
/**
* @description: 新增
* @author: renchao
*/
addClick () {
addClick() {
this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
this.$emit("upDateTdytxxList", this.tableDataList);
......@@ -289,7 +280,7 @@
* @param {*} row
* @author: renchao
*/
deleClick (index, row) {
deleClick(index, row) {
this.$confirm("确定要删除吗, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -298,22 +289,23 @@
.then(() => {
this.tableData.splice(index, 1);
})
.catch(() => { });
.catch(() => {});
this.$emit("upDateTdytxxList", this.tableDataList);
},
},
};
};
</script>
<style scoped lang="scss">
.el-input {
.el-input {
border: none !important;
}
/deep/.el-table__row {
}
/deep/.el-table__row {
border: none !important;
}
.el-date-editor.el-input {
}
.el-date-editor.el-input {
width: 100%;
}
/deep/.el-table th {
}
/deep/.el-table th {
height: 30px !important;
}
}
</style>
......
......@@ -46,13 +46,13 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
<div
class="slxx_title title-block flex"
style="justify-content: space-between"
>
不动产单元情况
<div class="triangle"></div>
<el-button @click="compare">变化情况对比+</el-button>
</div>
<el-button type="primary" style="float: right;margin-right: 20px; " @click="dataSelectClick">数据查看</el-button>
<el-row :gutter="10" v-if="ruleForm.qlxx">
<el-col :span="8">
<el-form-item label="不动产单元号：">
......@@ -354,12 +354,27 @@
}
});
},
/**
* @description: compare
* @author: renchao
*/
compare() {
this.$popupDialog(
"国有建设用地使用权",
"registerBook/comparison",
{ bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: 'FDCQ2',
},
"80%",
true
);
},
},
};
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
/deep/.el-form {
display: flex;
flex-direction: column;
......
......@@ -331,7 +331,9 @@ export default {
this.$popupDialog(
"国有建设用地使用权",
"registerBook/comparison",
{ propsParam: this.propsParam },
{ bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: 'JSYDSYQ',
},
"80%",
true
)
......
......@@ -42,13 +42,13 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">
不动产情况
<div class="triangle"></div>
<div
class="slxx_title title-block flex"
style="justify-content: space-between"
>
不动产单元情况
<el-button @click="compare">变化情况对比+</el-button>
</div>
<!-- <el-button type="primary" style="float: right;margin-right: 20px; " @click="onClick">数据查看</el-button>-->
<el-row :gutter="10" v-if="ruleForm.qlxx">
<el-col :span="8">
<el-form-item label="不动产单元号：">
......@@ -244,9 +244,24 @@
});
}
});
}
}
}
},
/**
* @description: compare
* @author: renchao
*/
compare() {
this.$popupDialog(
"国有建设用地使用权",
"registerBook/comparison",
{ bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
dqqllx: 'YGDJ',
},
"80%",
true
);
},
},
};
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
......
......@@ -54,7 +54,7 @@ class data extends filter {
},
"0": {
text: '临时',
color: '#FE9400'
color: '#ff5100'
}
}
let textName = obj[scope.row.qszt]?.text || ''
......
......@@ -50,7 +50,7 @@ class data extends filter {
},
"0": {
text: '临时',
color: '#FE9400'
color: '#ff5100'
}
}
let textName = obj[scope.row.qszt]?.text || ''
......