Skip to content

bdc / bdcdj-web

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

Merge branch 'dev'

2 parents c57b1d5b d1a1eecf
Inline Side-by-side
Showing 16 changed files with 379 additions and 228 deletions
......@@ -147,9 +147,11 @@ div:focus {
.pl-5 {
padding-left: 5px;
}
.pt-10 {
padding-top: 10px;
}
.block {
display: block;
}
......@@ -383,7 +385,65 @@ aside {
transition: 0.5s;
margin-left: -1px;
border-top: 0;
.el-checkbox__label {
font-size: 16px;
}
}
.linshiIcon {
position: relative;
.icon {
position: absolute;
top: 12px;
right: -5px;
transform: rotate(45deg);
color: #fff;
font-size: 12px;
z-index: 10;
}
}
.linshiIcon::after {
content: "";
display: block;
width: 0;
height: 0;
border-width: 0px 0px 55px 55px;
border-style: none solid solid;
border-color: transparent transparent #fe9400;
position: absolute;
top: 0;
right: 0;
transform: rotate(-90deg);
}
.xianshiIcon {
position: relative;
.icon {
position: absolute;
top: 9px;
right: 5px;
transform: rotate(45deg);
color: #fff;
font-size: 12px;
z-index: 10;
}
}
.xianshiIcon::after {
content: "";
display: block;
width: 0;
height: 0;
border-width: 0px 0px 55px 55px;
border-style: none solid solid;
border-color: transparent transparent #67C23A;
position: absolute;
top: 0;
right: 0;
transform: rotate(-90deg);
}
\ No newline at end of file
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-03 08:59:06
*/
import store from '@/store'
export function getSjlx (level) {
const resultMap = {
1: '系统数据',
......@@ -6,3 +12,15 @@ export function getSjlx (level) {
}
return resultMap[level] || resultMap.default;
}
export function getDictLeabel (level, code) {
const resultMap = store.getters.dictData[code]
const desiredObject = resultMap.find(obj => obj.dcode === level);
if (desiredObject) {
const desiredName = desiredObject.dname;
return desiredName
} else {
return ''
}
}
\ No newline at end of file
......
......@@ -13,7 +13,8 @@
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="145px">
label-width="145px"
>
<div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
补录信息
......@@ -66,7 +67,12 @@
<el-col :span="8">
<el-form-item label="登记类型：">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-option
v-for="item in djlxlist"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
......@@ -125,7 +131,12 @@
</el-form-item> -->
<el-form-item label="抵押不动产类型：">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option v-for="item in dictData['A27']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-option
v-for="item in dictData['A27']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
......@@ -158,7 +169,12 @@
<el-col :span="8">
<el-form-item label="是否预告登记：">
<el-select v-model="ruleForm.qlxx.djlx">
<el-option v-for="item in dictData['A6']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-option
v-for="item in dictData['A6']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</el-form-item>
......@@ -175,40 +191,64 @@
</el-col>
<el-col :span="8">
<el-form-item label="抵押面积：">
<div style="display:flex">
<el-input v-model="ruleForm.diyaq.dymj" style="width:500%"
oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
<div style="display: flex">
<el-input
v-model="ruleForm.diyaq.dymj"
style="width: 500%"
oninput="value=value.replace(/[^\d.]/g,'')"
></el-input>
<el-select v-model="ruleForm.diyaq.mjdw">
<el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col >
</el-col>
<el-col :span="8">
<el-form-item label="最高债权额">
<div style="display:flex">
<el-input v-model="ruleForm.diyaq.zgzqse" style="width:500%"
oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
<div style="display: flex">
<el-input
v-model="ruleForm.diyaq.zgzqse"
style="width: 500%"
oninput="value=value.replace(/[^\d.]/g,'')"
></el-input>
<el-select v-model="ruleForm.diyaq.jedw">
<el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col >
</el-col>
<el-col :span="8">
<el-form-item label="被担保主债权数额">
<div style="display:flex">
<el-input v-model="ruleForm.diyaq.bdbzzqse" style="width:500%"
oninput="value=value.replace(/[^\d.]/g,'')"></el-input>
<div style="display: flex">
<el-input
v-model="ruleForm.diyaq.bdbzzqse"
style="width: 500%"
oninput="value=value.replace(/[^\d.]/g,'')"
></el-input>
<el-select v-model="ruleForm.diyaq.jedw">
<el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
>
</el-option>
</el-select>
</div>
</el-form-item>
</el-col >
</el-col>
<el-col :span="8">
<el-form-item label="币种">
<el-input v-model="ruleForm.qlxx.djsj"></el-input>
......@@ -312,8 +352,7 @@
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="共有方式：">
<el-radio-group
v-model="ruleForm.qlxx.gyqk">
<el-radio-group v-model="ruleForm.qlxx.gyqk">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -326,7 +365,8 @@
:tableData="ruleForm.qlrData"
@upDateQlrxxList="upDateQlrxxList"
:key="key"
:gyfs="ruleForm.qlxx.gyfs" />
:gyfs="ruleForm.qlxx.gyfs"
/>
<div>
<div class="slxx_title title-block">
......@@ -337,7 +377,8 @@
v-if="ruleForm.ywrData"
:tableData="ruleForm.ywrData"
:key="key"
@upDateQlrxxList="upDateYwrxxList" />
@upDateQlrxxList="upDateYwrxxList"
/>
</div>
</div>
<el-row class="btn">
......@@ -350,13 +391,13 @@
</template>
<script>
import { mapGetters } from "vuex";
import { init,save } from "@/api/djbbl.js";
import { init, save } from "@/api/djbbl.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable,ywrCommonTable,tdytTable },
components: { qlrCommonTable, ywrCommonTable, tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
},
......@@ -371,6 +412,7 @@ export default {
ruleForm: {},
//传递参数\
rules: {},
// 权属状态
qsztlist: [
{
dcode: "1",
......@@ -381,6 +423,35 @@ export default {
dname: "历史",
},
],
// 登记类型
djlxlist: [
{
dcode: "100",
dname: "首次登记",
},
{
dcode: "200",
dname: "转移登记",
},
{
dcode: "300",
dname: "变更登记",
},
{
dcode: "500",
dname: "更正登记",
},
{
dcode: "901",
dname: "补证",
},
{
dcode: "902",
dname: "换证",
},
],
};
},
created() {
......@@ -389,26 +460,26 @@ export default {
mounted() {},
methods: {
loadData() {
console.log("预告登记",this.propsParam);
console.log("预告登记", this.propsParam);
init(this.propsParam.bsmRepair).then((res) => {
if (res.code == 200) {
this.ruleForm = res.result;
console.log("this.ruleForm",this.ruleForm);
console.log("this.ruleForm", this.ruleForm);
this.isShow = true;
}
});
},
// 更新土地用途信息
upDateTdytxxList(val) {
console.log("VAL",val);
console.log("VAL", val);
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
// 更新权利人信息
upDateQlrxxList(val) {
console.log("val",val);
console.log("val", val);
this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
console.log("this.ruleForm.qlrData",this.ruleForm.qlrData);
console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
this.czrOptions = this.ruleForm.qlrData;
this.key++;
},
......@@ -418,7 +489,7 @@ export default {
this.key++;
},
onSubmit() {
console.log("this.ruleForm大信息",this.ruleForm);
console.log("this.ruleForm大信息", this.ruleForm);
if (this.ruleForm.qlrData.length == 0) {
this.$message({
showClose: true,
......
......@@ -107,64 +107,6 @@
}
}
.linshiIcon {
position: relative;
.icon {
position: absolute;
top: 12px;
right: -5px;
transform: rotate(45deg);
color: #fff;
font-size: 12px;
z-index: 10;
}
}
.linshiIcon::after {
content: "";
display: block;
width: 0;
height: 0;
border-width: 0px 0px 55px 55px;
border-style: none solid solid;
border-color: transparent transparent #fe9400;
position: absolute;
top: 0;
right: 0;
transform: rotate(-90deg);
}
.xianshiIcon {
position: relative;
.icon {
position: absolute;
top: 9px;
right: 5px;
transform: rotate(45deg);
color: #fff;
font-size: 12px;
z-index: 10;
}
}
.xianshiIcon::after {
content: "";
display: block;
width: 0;
height: 0;
border-width: 0px 0px 55px 55px;
border-style: none solid solid;
border-color: transparent transparent #67C23A;
position: absolute;
top: 0;
right: 0;
transform: rotate(-90deg);
}
tr {
display: flex;
}
......
......@@ -4,7 +4,7 @@ class data extends filter {
constructor() {
super()
}
columns() {
columns () {
return {
//空列值个数
emptycolNum: 3,
......@@ -26,8 +26,9 @@ class data extends filter {
],
JSYDSYQ: [
{ prop:"cz",
label:"操作",
{
prop: "cz",
label: "操作",
render: (h, scope) => {
return (
<div>
......@@ -144,8 +145,9 @@ class data extends filter {
],
FDCQ2: [
{ prop:"cz",
label:"操作"
{
prop: "cz",
label: "操作"
},
{
prop: "qszt",
......@@ -283,8 +285,9 @@ class data extends filter {
],
NYDSYQ: [
{ prop:"cz",
label:"操作"
{
prop: "cz",
label: "操作"
},
{
prop: "qszt",
......@@ -412,9 +415,9 @@ class data extends filter {
},
],
DYAQ: [
{ prop:"cz",
label:"操作"
{
prop: "cz",
label: "操作"
},
{
prop: "qszt",
......@@ -423,6 +426,19 @@ class data extends filter {
{
prop: "dybdclx",
label: "抵押不动产类型",
render: (h, scope) => {
return (
<div>
<span v-show={scope.row.dybdclx == '1'}>土地</span>
<span v-show={scope.row.dybdclx == '2'}>土地和房屋</span>
<span v-show={scope.row.dybdclx == '3'}>林地和林木</span>
<span v-show={scope.row.dybdclx == '4'}>土地和在建建筑物</span>
<span v-show={scope.row.dybdclx == '5'}>海域</span>
<span v-show={scope.row.dybdclx == '6'}>海域和构筑物</span>
<span v-show={scope.row.dybdclx == '7'}>其它</span>
</div>
)
}
},
{
prop: "djlxmc",
......@@ -572,8 +588,9 @@ class data extends filter {
],
DYIQ: [
{ prop:"cz",
label:"操作"
{
prop: "cz",
label: "操作"
},
{
prop: "qszt",
......@@ -666,8 +683,9 @@ class data extends filter {
],
YGDJ: [
{ prop:"cz",
label:"操作"
{
prop: "cz",
label: "操作"
},
{
prop: "qszt",
......@@ -792,8 +810,9 @@ class data extends filter {
],
CFDJ: [
{ prop:"cz",
label:"操作"
{
prop: "cz",
label: "操作"
},
{
prop: "qszt",
......@@ -903,8 +922,9 @@ class data extends filter {
],
YYDJ: [
{ prop:"cz",
label:"操作"
{
prop: "cz",
label: "操作"
},
{
prop: "qszt",
......
......@@ -22,13 +22,19 @@
:class="[
row.qszt == '2' ? 'lishi' : '',
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))">正在办理</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
有效
</div>
<span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
<span v-else>{{ row[item.prop] }}</span>
......@@ -114,7 +120,7 @@
return name;
},
// 新增一条补录信息
editDialog(row, del) {
editDialog (row, del) {
this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......
......@@ -8,9 +8,7 @@
<el-checkbox
v-for="item in qsztList"
:key="item.value"
:label="item.value"
>{{ item.label }}</el-checkbox
>
:label="item.value">{{ item.label }}</el-checkbox>
</el-checkbox-group>
</div>
</div>
......@@ -27,25 +25,24 @@
row.qszt == '2' ? 'lishi' : '',
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]"
>
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
<el-button
type="text"
icon="el-icon-edit-outline"
@click="editDialog(row)"
>编辑</el-button
>
@click="editDialog(row)">编辑</el-button>
<el-button
type="text"
icon="el-icon-edit-outline"
@click="editDialog(row, 'D')"
>删除</el-button
>
@click="editDialog(row, 'D')">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
有效
</div>
<span v-if="item.prop == 'qszt'">
{{ getQsztName(row[item.prop]) }}
</span>
......@@ -61,11 +58,11 @@
</template>
<script>
import { datas } from "./qlxxFormData.js";
import { getSjlx } from "@/utils/dictionary.js";
import { getDiyaqList } from "@/api/registerBook.js";
export default {
data() {
import { datas } from "./qlxxFormData.js";
import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
import { getDiyaqList } from "@/api/registerBook.js";
export default {
data () {
return {
title: "抵押权登记信息",
qsztList: datas.columns().qsztList,
......@@ -80,11 +77,11 @@ export default {
columns: datas.columns().DYAQ,
};
},
created() {
created () {
this.loadData();
},
methods: {
loadData() {
loadData () {
if (this.$parent.addRepairRecord) {
this.columns.unshift({ prop: "cz", label: "操作" });
}
......@@ -97,6 +94,7 @@ export default {
this.tableData = res.result;
this.tableData.forEach((item) => {
item.sjlx = getSjlx(item.sjlx);
item.dybdclx = getDictLeabel(item.dybdclx, 'A27')
});
if (this.tableData.length < datas.columns().emptycolNum) {
this.emptycolNum =
......@@ -107,7 +105,7 @@ export default {
}
});
},
checkChange() {
checkChange () {
if (this.checkList.length === 0) {
this.tableData = [];
this.emptycolNum = datas.columns().emptycolNum;
......@@ -115,7 +113,7 @@ export default {
this.loadData();
}
},
getQsztName(code) {
getQsztName (code) {
let name = "";
for (let item of this.qsztList) {
if (item.value == code) {
......@@ -126,7 +124,7 @@ export default {
return name;
},
// 新增一条补录信息
editDialog(row, del) {
editDialog (row, del) {
this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -134,7 +132,6 @@ export default {
})
.then(() => {
this.$parent.addRepairRecord(row, del);
this.$message({
type: "success",
message: "补录成功!",
......@@ -148,9 +145,9 @@ export default {
});
},
},
};
};
</script>
<style lang="scss" scoped>
@import "./qlxxCommon.scss";
@import "./qlxxCommon.scss";
</style>
......
......@@ -8,9 +8,7 @@
<el-checkbox
v-for="item in qsztList"
:key="item.value"
:label="item.value"
>{{ item.label }}</el-checkbox
>
:label="item.value">{{ item.label }}</el-checkbox>
</el-checkbox-group>
</div>
</div>
......@@ -27,8 +25,8 @@
row.qszt == '2' ? 'lishi' : '',
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]"
>
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
......@@ -36,6 +34,9 @@
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
有效
</div>
<span v-if="item.prop == 'qszt'">
{{ getQsztName(row[item.prop]) }}
</span>
......@@ -51,11 +52,11 @@
</template>
<script>
import { datas } from "./qlxxFormData.js";
import { getSjlx } from "@/utils/dictionary.js";
import { getDiyiqList } from "@/api/registerBook.js";
export default {
data() {
import { datas } from "./qlxxFormData.js";
import { getSjlx } from "@/utils/dictionary.js";
import { getDiyiqList } from "@/api/registerBook.js";
export default {
data () {
return {
title: "地役权登记信息",
qsztList: datas.columns().qsztList,
......@@ -70,11 +71,11 @@ export default {
columns: datas.columns().DYIQ,
};
},
created() {
created () {
this.loadData();
},
methods: {
loadData() {
loadData () {
if (this.$parent.addRepairRecord) {
this.columns.unshift({ prop: "cz", label: "操作" });
}
......@@ -97,7 +98,7 @@ export default {
}
});
},
checkChange() {
checkChange () {
if (this.checkList.length === 0) {
this.tableData = [];
this.emptycolNum = datas.columns().emptycolNum;
......@@ -105,7 +106,7 @@ export default {
this.loadData();
}
},
getQsztName(code) {
getQsztName (code) {
let name = "";
for (let item of this.qsztList) {
if (item.value == code) {
......@@ -116,7 +117,7 @@ export default {
return name;
},
// 新增一条补录信息
editDialog(row, del) {
editDialog (row, del) {
this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -138,9 +139,9 @@ export default {
});
},
},
};
};
</script>
<style lang="scss" scoped>
@import "./qlxxCommon.scss";
@import "./qlxxCommon.scss";
</style>
......
......@@ -11,9 +11,9 @@
</div>
</template>
<script>
import { getBdcqljqtsx } from "@/api/registerBook.js";
import { loadTreeData, getNode } from "./djbFrameData.js";
export default {
import { getBdcqljqtsx } from "@/api/registerBook.js";
import { loadTreeData, getNode } from "./djbFrameData.js";
export default {
data () {
return {
//接收参数
......@@ -65,18 +65,19 @@ export default {
this.loadComponent(data.form);
},
loadComponent (form) {
console.log(form, 'formformformform');
this.componentTag = (r) =>
require.ensure([], () => r(require("@/views/registerBook/" + form)));
},
},
};
};
</script>
<style scoped lang="scss">
/deep/.rollTable {
/deep/.rollTable {
height: calc(100vh - 240px) !important;
}
}
.content {
.content {
width: 100%;
height: 100%;
display: flex;
......@@ -97,31 +98,31 @@ export default {
background-color: #f5f5f5;
border: 1px solid rgb(228, 228, 228);
}
}
}
/deep/ .expanded.el-tree-node__expand-icon,
/deep/ .el-tree-node__expand-icon {
/deep/ .expanded.el-tree-node__expand-icon,
/deep/ .el-tree-node__expand-icon {
visibility: hidden;
}
}
/deep/ .el-tree-node__content {
/deep/ .el-tree-node__content {
border: 1px solid rgb(228, 228, 228);
height: 45px;
}
}
/deep/ .el-tree-node:focus>.el-tree-node__content {
/deep/ .el-tree-node:focus > .el-tree-node__content {
background-color: #f5f5f5;
color: #0079fe;
border-right: 4px solid #0079fe;
}
}
/deep/.el-tree-node {
/deep/.el-tree-node {
white-space: pre-wrap;
}
}
/deep/ .is-current>.el-tree-node__content {
/deep/ .is-current > .el-tree-node__content {
background-color: #f5f5f5;
color: #0079fe;
border-right: 4px solid #0079fe;
}
}
</style>
......
......@@ -8,9 +8,7 @@
<el-checkbox
v-for="item in qsztList"
:key="item.value"
:label="item.value"
>{{ item.label }}</el-checkbox
>
:label="item.value">{{ item.label }}</el-checkbox>
</el-checkbox-group>
</div>
</div>
......@@ -27,25 +25,24 @@
row.qszt == '2' ? 'lishi' : '',
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
]"
>
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
<el-button
type="text"
icon="el-icon-edit-outline"
@click="editDialog(row)"
>编辑</el-button
>
@click="editDialog(row)">编辑</el-button>
<el-button
type="text"
icon="el-icon-edit-outline"
@click="editDialog(row, 'D')"
>删除</el-button
>
@click="editDialog(row, 'D')">删除</el-button>
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
有效
</div>
<span v-if="item.prop == 'qszt'">
{{ getQsztName(row[item.prop]) }}
</span>
......@@ -61,11 +58,11 @@
</template>
<script>
import { datas } from "./qlxxFormData.js";
import { getSjlx } from "@/utils/dictionary.js";
import { getFdcq2List } from "@/api/registerBook.js";
export default {
data() {
import { datas } from "./qlxxFormData.js";
import { getSjlx } from "@/utils/dictionary.js";
import { getFdcq2List } from "@/api/registerBook.js";
export default {
data () {
return {
title: "房地产权登记信息（独幢、层、套、间房屋）",
qsztList: datas.columns().qsztList,
......@@ -80,11 +77,11 @@ export default {
columns: datas.columns().FDCQ2,
};
},
created() {
created () {
this.loadData();
},
methods: {
loadData() {
loadData () {
if (this.$parent.addRepairRecord) {
this.columns.unshift({ prop: "cz", label: "操作" });
}
......@@ -107,7 +104,7 @@ export default {
}
});
},
checkChange() {
checkChange () {
if (this.checkList.length === 0) {
this.tableData = [];
this.emptycolNum = datas.columns().emptycolNum;
......@@ -115,7 +112,7 @@ export default {
this.loadData();
}
},
getQsztName(code) {
getQsztName (code) {
let name = "";
for (let item of this.qsztList) {
if (item.value == code) {
......@@ -126,7 +123,7 @@ export default {
return name;
},
// 新增一条补录信息
editDialog(row, del) {
editDialog (row, del) {
this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -143,9 +140,9 @@ export default {
});
},
},
};
};
</script>
<style lang="scss" scoped>
@import "./qlxxCommon.scss";
@import "./qlxxCommon.scss";
</style>
......
......@@ -51,10 +51,14 @@
row.qszt == '2' ? 'lishi' : '',
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
有效
</div>
<span v-if="item.prop == 'qszt'">
{{ getQsztName(row[item.prop]) }}
</span>
......@@ -100,9 +104,10 @@
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
if (this.$parent.addRepairRecord) {
this.columns.unshift({
prop: "cz",
label: "操作"
})
}
getNydsyqList({
......@@ -143,13 +148,13 @@
return name;
},
// 新增一条补录信息
editDialog(row,del){
editDialog (row, del) {
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.addRepairRecord(row,del)
this.$parent.addRepairRecord(row, del)
this.$message({
type: 'success',
......
......@@ -19,6 +19,7 @@
row.qszt == '2' ? 'lishi' : '',
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
......@@ -27,6 +28,9 @@
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
有效
</div>
<span v-if="item.prop == 'qszt'">
{{ getQsztName(row[item.prop]) }}
</span>
......@@ -42,9 +46,9 @@
</template>
<script>
import { getYgdjList } from "@/api/registerBook.js";
import { datas } from "./qlxxFormData.js";
export default {
import { getYgdjList } from "@/api/registerBook.js";
import { datas } from "./qlxxFormData.js";
export default {
data () {
return {
title: "预告登记信息",
......@@ -66,9 +70,10 @@ export default {
methods: {
loadData () {
// 判断是否在登记簿补录调的子页面
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
if (this.$parent.addRepairRecord) {
this.columns.unshift({
prop: "cz",
label: "操作"
})
}
getYgdjList({
......@@ -106,13 +111,13 @@ export default {
return name;
},
// 新增一条补录信息
editDialog(row,del){
editDialog (row, del) {
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.addRepairRecord(row,del)
this.$parent.addRepairRecord(row, del)
this.$message({
type: 'success',
......@@ -127,9 +132,9 @@ export default {
},
},
};
};
</script>
<style lang="scss" scoped>
@import "./qlxxCommon.scss";
@import "./qlxxCommon.scss";
</style>
......
......@@ -19,6 +19,7 @@
row.qszt == '2' ? 'lishi' : '',
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="setbut" v-if="item.prop == 'cz'">
<el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
......@@ -27,6 +28,9 @@
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
有效
</div>
<span v-if="item.prop == 'qszt'">
{{ getQsztName(row[item.prop]) }}
</span>
......@@ -42,9 +46,9 @@
</template>
<script>
import { getYydjList } from "@/api/registerBook.js";
import { datas } from "./qlxxFormData.js";
export default {
import { getYydjList } from "@/api/registerBook.js";
import { datas } from "./qlxxFormData.js";
export default {
data () {
return {
title: "异议登记信息",
......@@ -65,9 +69,10 @@ export default {
},
methods: {
loadData () {
if(this.$parent.addRepairRecord){
this.columns.unshift({prop:"cz",
label:"操作"
if (this.$parent.addRepairRecord) {
this.columns.unshift({
prop: "cz",
label: "操作"
})
}
getYydjList({
......@@ -105,13 +110,13 @@ export default {
return name;
},
// 新增一条补录信息
editDialog(row,del){
editDialog (row, del) {
this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.addRepairRecord(row,del)
this.$parent.addRepairRecord(row, del)
this.$message({
type: 'success',
......@@ -126,9 +131,9 @@ export default {
},
},
};
};
</script>
<style lang="scss" scoped>
@import "./qlxxCommon.scss";
@import "./qlxxCommon.scss";
</style>
......
......@@ -59,16 +59,16 @@
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
<el-table-column label="流程状态" header-align="center" align="center">
<template slot-scope="scope">
<div v-if="scope.row.finishTime == null">正在办理</div>
<div v-else>已完结</div>
<div v-if="scope.row.endTime">已完结</div>
<div v-else>正在办理</div>
</template>
</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="finishTime" width="160" align="center" />
<el-table-column label="操作方式" align="center">
</el-table-column>
<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="idea" align="center"/>
</el-table>
</div>
</div>
......@@ -237,13 +237,31 @@
// 获取流程记录
getCommentList() {
this.formData.allCommentList.forEach(async (item,index) => {
item.comments.forEach(element => {
if(element.type=="COMPLETE"){
this.formData.allCommentList[index].idea=element.message
}
});
this.formData.allCommentList[index].agent=item.assignee.name
})
setTimeout(() => {
this.taskList =this.formData.allCommentList;
this.formData.handlinglist.forEach(async (item,index) => {
if(item.assignee.name){
this.formData.handlinglist[index].agent=item.assignee.name
}else{
let str=""
item.countersign.forEach((item) => {
str+=item.name+","
})
str=str.slice(0, -1);
this.formData.allCommentList[index].agent=str
}
})
this.taskList =[...this.formData.allCommentList,...this.formData.handlinglist];
// this.taskList =this.formData.allCommentList;
// 处理数据之后赋值
this.taskCommentList=this.taskList
}, 100)
},
// 设置流程图元素状态
......
......@@ -76,6 +76,7 @@ export default {
rejectedTaskSet: {},
finishedSequenceFlowSet: result.finishedSequenceFlowIds
},
handlinglist:result.runningTasks,
allCommentList: result.finishedTasks
}, '80%', true)
})
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:43:41
* @LastEditTime: 2023-06-30 17:09:35
-->
<template>
<div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }"
......@@ -28,10 +28,14 @@
row.qszt == '2' ? 'lishi' : '',
row.qszt == '0' ? 'linshi' : '',
item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
]">
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
正在办理
</div>
<div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
有效
</div>
<span v-if="item.prop == 'qszt'">
{{ getQsztName(row[item.prop]) }}
</span>
......