8ba70ca6 by tianhaohao@pashanhoo.com

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

2 parents f7530ab4 59941756
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-22 16:27:35
* @LastEditTime: 2023-08-30 15:52:11
-->
<template>
<!-- 受理信息 -->
......@@ -10,7 +10,6 @@
:model="ruleForm"
:rules="rules"
:class="{ readonly: editDisabled }"
class="loadingtext"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
......@@ -313,20 +312,6 @@
<el-input v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="不动产登记证明号:" prop="bdcqzh">
<el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item
label="区县代码:"
prop="qlxx.qxdm"
:rules="rules.qxdmrules"
>
<el-input v-model="ruleForm.qlxx.qxdm"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="在建建筑物抵押范围:">
<el-input v-model="ruleForm.diyaq.zjjzwdyfw"></el-input>
......@@ -401,24 +386,6 @@
</el-date-picker>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="是否预告登记:">
<el-select v-model="ruleForm.diyaq.sfygdj">
<el-option
v-for="item in dictData['A6']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"></el-option>
</el-select>
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="在建建筑物坐落:">
<el-input v-model="ruleForm.diyaq.zjzzwzl"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-form-item label="登记原因:">
<el-input v-model="ruleForm.diyaq.djyy"></el-input>
......
/*
* @Description:workFramezu.vue组件的方法 头部按钮弹框方法
* @Autor: miaofang
* @LastEditTime: 2023-08-10 13:41:26
* @LastEditTime: 2023-08-30 15:52:01
*/
import { getPrintTemplateByCode } from "@/api/print";
import { getQllxByBdcdyid } from "@/api/djbDetail.js";
......@@ -44,7 +44,6 @@ export default {
this.flowInitParam();
},
methods: {
//加载流程初始参数
/**
* @description: 加载流程初始参数
* @author: renchao
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-30 10:33:52
* @LastEditTime: 2023-08-30 17:07:26
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -13,8 +13,8 @@
</el-tabs>
<el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty>
<div style="width:1180px;">
<canvas ref="zs" width="1000" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx==1" height="700"></canvas>
<canvas ref="zm" width="1180" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx!=1" height="780"></canvas>
<canvas ref="zs" width="1000" v-show="this.bdcqz.bdcqzlx==1" height="700"></canvas>
<canvas ref="zm" width="1180" v-show="this.bdcqz.bdcqzlx==2" height="780"></canvas>
</div>
</div>
</template>
......@@ -93,7 +93,7 @@
this.activeName = res.result[0].bsmBdcqz
this.bdcqz = res.result[0]
this.headTabBdcqz = res.result
if (res.result[0].bdcqzlx == 1) {
if (this.bdcqz.bdcqzlx == 1) {
this.drawTextOnImage()
} else {
this.drawTextzmImage()
......@@ -108,9 +108,8 @@
* @param {*} e
* @author: renchao
*/
handleClick (e) {
this.bdcqz = this.headTabBdcqz[e.index - 0]
this.activeName = this.headTabBdcqz.bsmBdcqz
handleClick (tab, event) {
this.bdcqz = this.headTabBdcqz[tab.index]
if (this.bdcqz.bdcqzlx == 1) {
this.drawTextOnImage()
} else {
......@@ -461,19 +460,20 @@
arr.push(currentLine);
if (i > 0) {
arr.forEach((line, index) => {
context.fillText(line, 770, 438 + (23 * (i - 1)) + 5 * num + (index * 18)); // 调整行高
context.fillText(line, 770, 428 + (23 * (i - 1)) + 5 * num + (index * 14)); // 调整行高
})
} else {
arr.forEach((line, index) => {
context.fillText(line, 770, 438 + (23 * (i - 1)) + (index * 18)); // 调整行高
context.fillText(line, 770, 428 + (23 * (i - 1)) + (index * 14)); // 调整行高
})
}
} else {
if (i > 0) {
context.fillText(lines[i] ? lines[i] : '', 770, 450 + 5 * num + (23 * (i - 1)));
} else {
context.fillText(lines[i] ? lines[i] : '', 770, 450 + (23 * (i - 1)));
}
context.fillText(lines[i] ? lines[i] : '', 770, 440 + 4 * num + (22 * (i - 1)));
// if (i > 0) {
// context.fillText(lines[i] ? lines[i] : '', 770, 440 + 5 * num + (23 * (i - 1)));
// } else {
// context.fillText(lines[i] ? lines[i] : '', 770, 440 + (23 * (i - 1)));
// }
}
}
// fj
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-25 09:53:27
* @LastEditTime: 2023-08-30 16:03:09
-->
<template>
<div>
......@@ -66,13 +66,13 @@
)
}
},
{
label: '身份证读卡器',
align: 'center',
render: (h, scope) => {
return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button>
}
},
// {
// label: '身份证读卡器',
// align: 'center',
// render: (h, scope) => {
// return <el-button type="text" icon="el-icon-tickets" disabled={!this.disabled} onClick={() => { this.readClick(scope.row) }}>读取</el-button>
// }
// },
{
prop: "sqrmc",
label: "姓名/名称"
......@@ -124,12 +124,12 @@
let that = this
this.$nextTick(() => {
if (val.length == 0 || !val) {
that.tableDataList = _.cloneDeep([{
sqrmc: '',
dlrzjlx: '',
dlrzjh: '',
fr: ''
}])
// that.tableDataList = _.cloneDeep([{
// sqrmc: '',
// dlrzjlx: '',
// dlrzjh: '',
// fr: ''
// }])
} else {
that.tableDataList = _.cloneDeep(val)
}
......@@ -174,7 +174,7 @@
this.$message.error('证件号不能重复');
}
} else {
if (!arr.includes(value.zjh)||this.tableData[this.dataIndex].zjh==value.zjh) {
if (!arr.includes(value.zjh) || this.tableData[this.dataIndex].zjh == value.zjh) {
this.tableDataList[this.dataIndex] = _.cloneDeep(value);
this.$emit('upDateQlrxxList', this.tableDataList)
} else {
......@@ -207,7 +207,6 @@
deleClick (index, row) {
this.tableData.splice(index, 1)
},
/**
* @description: 身份证读取
* @param {*} row
......@@ -244,7 +243,7 @@
*/
editClick (index, row) {
this.details = row
this.details.gyfs=this.gyfs
this.details.gyfs = this.gyfs
this.dataIndex = index
this.dialog = true
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-29 10:03:25
* @LastEditTime: 2023-08-30 16:54:26
-->
<template>
<div class="szxx">
......@@ -136,7 +136,7 @@
store.dispatch('user/reWorkFresh', false)
if (type == 1) {
//证书预览
this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
this.$popupDialog("证书证明预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
} else {
this.$popupDialog("证书证明打印", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "76%", true);
}
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-22 16:27:16
* @LastEditTime: 2023-08-30 15:47:48
-->
<template>
<div class="slxx">
......@@ -11,8 +11,8 @@
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="120px"
>
v-Loading="loading"
label-width="120px">
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
申请业务信息
......@@ -81,14 +81,12 @@
<el-select
disabled
v-model="ruleForm.zdjbxx.mjdw"
style="width: 20%"
>
style="width: 20%">
<el-option
v-for="item in dictData['A7']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
></el-option>
:value="item.dcode"></el-option>
</el-select>
</div>
</el-form-item>
......@@ -124,15 +122,13 @@
:disabled="!viewEdit"
v-model="ruleForm.fdcq1.fdcjyjg"
style="width: 500%"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select :disabled="!viewEdit" v-model="ruleForm.fdcq1.jedw">
<el-option
v-for="item in dictData['A57']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"
></el-option>
:value="item.dcode"></el-option>
</el-select>
</div>
</el-form-item>
......@@ -146,8 +142,7 @@
v-model="ruleForm.fdcq1.fj"
type="textarea"
maxlength="500"
show-word-limit
></el-input>
show-word-limit></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -157,8 +152,7 @@
<fdcqxmTable
:ableOperation="viewEdit"
:tableData="ruleForm.fdcqxm"
@updateFdcwxmList="updateFdcwxmList"
/>
@updateFdcwxmList="updateFdcwxmList" />
<div class="slxx_title title-block">
土地用途
<div class="triangle"></div>
......@@ -166,8 +160,7 @@
<tdytTable
:ableOperation="viewEdit"
:tableData="ruleForm.tdytqxList"
@upDateTdytxxList="upDateTdytxxList"
/>
@upDateTdytxxList="upDateTdytxxList" />
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -177,8 +170,7 @@
<el-form-item label="共有方式:">
<el-radio-group
:disabled="!viewEdit"
v-model="ruleForm.sldy.gyfs"
>
v-model="ruleForm.sldy.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -191,8 +183,7 @@
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
:disabled="!viewEdit"
@input="updaterow()"
>
@input="updaterow()">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
......@@ -200,20 +191,17 @@
</el-col>
<el-col
:span="5"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'"
>
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人1:">
<el-select
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit"
>
:disabled="!viewEdit">
<el-option
v-for="item in czrOptions"
:key="item.zjh"
:label="item.sqrmc"
:value="item.zjh"
></el-option>
:value="item.zjh"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -222,8 +210,7 @@
@upDateQlrxxList="upDateQlrxxList"
:disabled="viewEdit"
:tableData="ruleForm.qlrList"
:gyfs="ruleForm.sldy.gyfs"
/>
:gyfs="ruleForm.sldy.gyfs" />
<div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
<div class="slxx_title title-block">
......@@ -235,8 +222,7 @@
:disabled="viewEdit"
@upDateQlrxxList="upDateYwrxxList"
:tableData="ruleForm.ywrList"
:gyfs="ruleForm.qlxx.gyfs"
/>
:gyfs="ruleForm.qlxx.gyfs" />
</div>
<div class="slxx_title title-block">
登记原因
......@@ -251,8 +237,7 @@
maxlength="500"
show-word-limit
:disabled="!viewEdit"
v-model="ruleForm.fdcq1.djyy"
></el-input>
v-model="ruleForm.fdcq1.djyy"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -267,15 +252,16 @@
</div>
</template>
<script>
import ywmix from "@/views/ywbl/mixin/index";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import fdcqxmTable from "@/views/workflow/components/fdcqxmTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/fwsyq1Flow.js";
import { mapGetters } from "vuex";
export default {
import ywmix from "@/views/ywbl/mixin/index";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import fdcqxmTable from "@/views/workflow/components/fdcqxmTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/fwsyq1Flow.js";
import { mapGetters } from "vuex";
export default {
mixins: [ywmix],
mounted() {
mounted () {
this.loading = true
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
var formdata = new FormData();
......@@ -293,6 +279,9 @@ export default {
this.czr = item.sqrmc;
}
});
setTimeout(() => {
this.loading = false
}, 200)
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null
? (this.ruleForm.slsq.fzfs = "1")
......@@ -305,8 +294,9 @@ export default {
computed: {
...mapGetters(["dictData", "flag"]),
},
data() {
data () {
return {
loading: false,
disabled: true,
tdytOption: [],
czrOptions: [],
......@@ -338,7 +328,7 @@ export default {
};
},
methods: {
updateFdcwxmList(val) {
updateFdcwxmList (val) {
this.ruleForm.fdcqxm && (this.ruleForm.fdcqxm = _.cloneDeep(val));
this.key++;
},
......@@ -347,7 +337,7 @@ export default {
* @param {*} val
* @author: renchao
*/
upDateTdytxxList(val) {
upDateTdytxxList (val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
......@@ -356,7 +346,7 @@ export default {
* @param {*} val
* @author: renchao
*/
upDateQlrxxList(val) {
upDateQlrxxList (val) {
this.ruleForm.qlrList = _.cloneDeep(val);
this.czrOptions = this.ruleForm.qlrList;
this.key++;
......@@ -368,7 +358,7 @@ export default {
* @param {*} val
* @author: renchao
*/
updaterow() {
updaterow () {
this.czr = "";
},
// 更新权利人信息
......@@ -377,14 +367,14 @@ export default {
* @param {*} val
* @author: renchao
*/
upDateYwrxxList(val) {
upDateYwrxxList (val) {
this.ruleForm.ywrList = _.cloneDeep(val);
},
/**
* @description: onSubmit
* @author: renchao
*/
onSubmit() {
onSubmit () {
let that = this;
let arr = this.ruleForm.tdytqxList.filter((item) => !item.yt);
if (arr.length > 0) {
......@@ -466,55 +456,55 @@ export default {
});
},
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
/deep/.el-form {
/deep/.el-form {
display: flex;
flex-direction: column;
height: calc(100vh - 130px);
}
}
/deep/.el-form-item__label {
/deep/.el-form-item__label {
padding: 0;
}
}
/deep/.el-radio {
/deep/.el-radio {
margin-right: 10px;
}
}
/deep/.el-select {
/deep/.el-select {
width: 100%;
}
}
/deep/.el-form-item {
/deep/.el-form-item {
margin-bottom: 8px;
}
}
.marginBot0 {
.marginBot0 {
margin-bottom: 0 !important;
}
}
.slxx {
.slxx {
box-sizing: border-box;
}
}
.slxx_con {
.slxx_con {
flex: 1;
height: 100%;
background-color: #ffffff;
overflow-y: auto;
padding-right: 3px;
overflow-x: hidden;
}
}
.submit_btn {
.submit_btn {
height: 50px;
}
}
.slxx_title {
.slxx_title {
border-bottom: 1px solid $borderColor;
padding-left: 10px;
padding-bottom: 5px;
......@@ -523,23 +513,23 @@ export default {
font-size: 16px;
font-weight: 500;
color: #4a4a4a;
}
}
.btn {
.btn {
text-align: center;
padding-top: 10px;
height: 36px;
background-color: #ffffff;
padding: 5px 0;
}
}
.textArea {
.textArea {
/deep/.el-textarea__inner {
min-height: 90px !important;
}
}
}
/deep/.el-form-item__label {
/deep/.el-form-item__label {
padding-bottom: 0px;
}
}
</style>
......
<!--
* @Description: 房屋多幢受理信息
* @Autor: ssq
* @LastEditTime: 2023-08-30 14:57:39
* @LastEditTime: 2023-08-30 15:53:18
-->
<template>
<div class="slxx">
<el-form
:model="ruleForm"
:rules="rules"
v-Loading="loading"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
......@@ -285,6 +286,7 @@
export default {
mixins: [ywmix],
mounted () {
this.loading = true
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
var formdata = new FormData();
......@@ -307,15 +309,19 @@
? (this.ruleForm.slsq.fzfs = "1")
: this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
setTimeout(() => {
this.loading = false
}, 200)
}
});
})
},
components: { qlrCommonTable, tdytTable },
computed: {
...mapGetters(["dictData", "flag"]),
...mapGetters(["dictData", "flag"])
},
data () {
return {
loading: false,
disabled: true,
tdytOption: [],
czrOptions: [],
......
......@@ -4,7 +4,7 @@
<el-form
:model="ruleForm"
:rules="rules"
class="loadingtext"
v-Loading="loading"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
......@@ -284,7 +284,7 @@
mounted () {
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
this.$startLoading();
this.loading = true
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
formdata.append("djlx", this.propsParam.djlx);
......@@ -293,12 +293,14 @@
if (res.code === 200 && res.result) {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.$endLoading();
this.ruleForm.qlrList.forEach((item) => {
if (item.sfczr == 1) {
this.czr = item.sqrmc
}
})
setTimeout(() => {
this.loading = false
}, 200)
}
})
},
......@@ -308,6 +310,7 @@
},
data () {
return {
loading: false,
mjdw: "1",
//表单是否可操作
viewEdit: true,
......
......@@ -286,7 +286,7 @@
import { mapGetters } from "vuex";
export default {
mixins: [ywmix],
created () {
mounted () {
this.viewEdit = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
var formdata = new FormData();
......@@ -298,7 +298,6 @@
formdata.append("isEdit", this.viewEdit);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
console.log(res.result, 'res.result');
that.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
......@@ -306,7 +305,9 @@
this.czr = item.sqrmc;
}
});
that.loading = false
setTimeout(() => {
this.loading = false
}, 200)
}
})
},
......