a8214033 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 8bf2d8f2 52fa86ea
......@@ -145,7 +145,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="面积:">
<el-input disabled v-model="ruleForm.ztQlxx.mj"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -46,7 +46,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"
......@@ -142,7 +142,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="面积:">
<el-input disabled v-model="ruleForm.ztQlxx.mj"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -263,23 +263,25 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="抵押面积:">
<div style="display: flex">
<div class="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">
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.diyaq.jedw"
:disabled="!ableOperation"
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>
</el-col>
<el-col :span="8">
<el-form-item
label="债务履行起始时间:"
......@@ -553,6 +555,7 @@ export default {
},
data() {
return {
mjdw:"1",
props: {
label: "bdcqzh",
value: "bdcdyid",
......@@ -608,6 +611,9 @@ export default {
ztQlxxList: [],
ableOperation: false,
rules: {
ztQlxxrules: [
{ required: true, message: "抵押不动产信息", trigger: "change" },
],
bdcqzhrules: [
{ required: true, message: "不动产登记证明号", trigger: "blur" },
],
......@@ -626,10 +632,10 @@ export default {
zxdbrrules: [
{ required: true, message: "注销登簿人", trigger: "blur" },
],
djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }],
djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
},
};
},
......
......@@ -198,7 +198,7 @@
<el-input
v-model="ruleForm.tdsyq.cdmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
</el-form-item>
</el-col>
......
......@@ -55,8 +55,11 @@ export function getForm(tabName) {
case "slxxdyaq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/dyaq.vue");
break;
case "slxxygdj":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/ygdj.vue");
case "slxxygdydj":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/ygdydj.vue");
break;
case "slxxygmmdj":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/ygmmdj.vue");
break;
case "slxxyydj":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/yydj.vue");
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 09:52:37
-->
<template>
<div class="djxxTable">
<div class="tableBox">
<div class="title">
{{ title }}
<div class="checkbox">
<el-radio-group v-model="radio" :change="checkChange()">
<el-radio :label="1">所有数据</el-radio>
<el-radio :label="2">只展示变化数据</el-radio>
</el-radio-group>
</div>
</div>
<div class="xxTableBox rollTable">
<table class="xxTable">
<tr v-for="(item, colindex) in columns" :key="colindex">
<td>
{{ item.label }}
</td>
<td></td>
<td v-for="count in emptycolNum" :key="~count"></td>
</tr>
</table>
</div>
</div>
</div>
</template>
<script>
import { datas } from "./qlxxFormData.js";
import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
import { getDiyiqList } from "@/api/djbDetail.js";
export default {
props: {
formData: {
type: Object,
default: {},
},
},
data() {
return {
radio: 1,
title: "变化情况对比",
//列表数据
tableData: [],
//空列值个数
emptycolNum: 1,
//列名称对象
columns: datas.columns().DYIQ,
};
},
created() {
console.log("this.formData", this.formData);
},
methods: {
/**
* @description: checkChange
* @author: renchao
*/
checkChange() {
console.log("ssss",this.radio);
},
},
};
</script>
<style lang="scss" scoped>
@import "./qlxxCommon.scss";
</style>
......@@ -79,6 +79,7 @@
ywly: ""
}
if (this.queryForm) {
this.$startLoading();
searchTaskToDo({
...this.queryForm,
}).then((res) => {
......@@ -86,6 +87,7 @@
let { records } = res.result;
this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid);
this.$endLoading();
}
});
}
......
......@@ -94,7 +94,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="面积:">
<el-input disabled v-model="ruleForm.ztQlxx.mj"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......
0<!--
0
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-25 08:59:49
......@@ -6,8 +7,14 @@
<template>
<!-- 受理信息 -->
<div class="slxx loadingtext">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''"
:inline="flag" label-width="120px">
<el-form
:model="ruleForm"
:rules="rules"
ref="ruleForm"
:label-position="flag ? 'top' : ''"
:inline="flag"
label-width="120px"
>
<div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
<div class="slxx_title title-block">
受理信息
......@@ -47,7 +54,10 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block flex" style="justify-content: space-between;">
<div
class="slxx_title title-block flex"
style="justify-content: space-between"
>
不动产单元情况
<el-button @click="compare">变化情况对比+</el-button>
</div>
......@@ -88,11 +98,20 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="取得价格:">
<div style="display:flex">
<el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value=value.replace(/[^\d.]/g,'')"
disabled></el-input>
<div style="display: flex">
<el-input
v-model="ruleForm.jsydsyq.qdjg"
style="width: 500%"
oninput="value=value.replace(/[^\d.]/g,'')"
disabled
></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw" disabled>
<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>
......@@ -121,7 +140,11 @@
<el-row :gutter="10">
<el-col>
<el-form-item label="附记:" prop="fj">
<el-input type="textarea" v-model="ruleForm.jsydsyq.fj" :disabled="!ableOperation"></el-input>
<el-input
type="textarea"
v-model="ruleForm.jsydsyq.fj"
:disabled="!ableOperation"
></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -132,7 +155,8 @@
<tdytTable
:tableData="ruleForm.tdytqxList"
:ableOperation="ableOperation"
@upDateTdytxxList="upDateTdytxxList" />
@upDateTdytxxList="upDateTdytxxList"
/>
<div class="slxx_title title-block">
权利人信息
<div class="triangle"></div>
......@@ -143,7 +167,10 @@
<el-row :gutter="10">
<el-col :span="14">
<el-form-item label="共有方式:">
<el-radio-group :disabled="!ableOperation" v-model="ruleForm.sldy.gyfs">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs"
>
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -153,7 +180,10 @@
</el-col>
<el-col :span="5" v-show="ruleForm.gyfs == '2'">
<el-form-item label="是否分别持证:">
<el-radio-group v-model="ruleForm.sldy.sqfbcz" :disabled="!ableOperation">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
:disabled="!ableOperation"
>
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
......@@ -161,14 +191,28 @@
</el-col>
<el-col :span="5" v-show="ruleForm.gyfs == '2'">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!ableOperation">
<el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="ruleForm.czr"
placeholder="持证人"
:disabled="!ableOperation"
>
<el-option
v-for="item in czrOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<qlrCommonTable :tableData="ruleForm.qlrList" :disabled="!ableOperation" @upDateQlrxxList='upDateQlrxxList' :gyfs="ruleForm.sldy.gyfs" />
<qlrCommonTable
:tableData="ruleForm.qlrList"
:disabled="!ableOperation"
@upDateQlrxxList="upDateQlrxxList"
:gyfs="ruleForm.sldy.gyfs"
/>
<div class="slxx_title title-block">
登记原因
<div class="triangle"></div>
......@@ -176,8 +220,12 @@
<el-row :gutter="10">
<el-col>
<el-form-item label="登记原因:" prop="djyy">
<el-input class="textArea" type="textarea" :disabled="!ableOperation"
v-model="ruleForm.jsydsyq.djyy">
<el-input
class="textArea"
type="textarea"
:disabled="!ableOperation"
v-model="ruleForm.jsydsyq.djyy"
>
</el-input>
</el-form-item>
</el-col>
......@@ -192,13 +240,13 @@
</div>
</template>
<script>
import { mapGetters } from "vuex";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
export default {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
import { mapGetters } from "vuex";
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
export default {
mounted() {
this.ableOperation = this.$parent.currentSelectTab.ableOperation;
this.propsParam = this.$attrs;
var formdata = new FormData();
this.$startLoading();
......@@ -214,9 +262,9 @@
},
components: { qlrCommonTable, tdytTable },
computed: {
...mapGetters(["dictData", "flag"])
...mapGetters(["dictData", "flag"]),
},
data () {
data() {
return {
//表单是否可操作
ableOperation: true,
......@@ -226,7 +274,7 @@
slywxx: {},
qlxx: {},
zdjbxx: {},
jsydsyq: {}
jsydsyq: {},
},
//传递参数
propsParam: {},
......@@ -240,7 +288,7 @@
* @param {*} val
* @author: renchao
*/
upDateTdytxxList (val) {
upDateTdytxxList(val) {
this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
this.key++;
},
......@@ -250,22 +298,22 @@
* @param {*} val
* @author: renchao
*/
upDateQlrxxList (val) {
upDateQlrxxList(val) {
this.ruleForm.qlrList = _.cloneDeep(val);
},
/**
* @description: onSubmit
* @author: renchao
*/
onSubmit () {
onSubmit() {
saveData(this.ruleForm).then((res) => {
if (res.code === 200) {
this.$message({
showClose: true,
message: "保存成功!",
type: "success",
})
this.$store.dispatch('user/refreshPage', true);
});
this.$store.dispatch("user/refreshPage", true);
} else {
this.$message({
showClose: true,
......@@ -279,29 +327,19 @@
* @description: compare
* @author: renchao
*/
compare () {
this.$popup({
titleStyle: "left",
title: "土地变化情况比对", // 弹窗标题
editItem: "registerBook/jsydsyq", // 弹窗内容
formData: this.propsParam,
width: "1220px",
height: "790px",
// cancelText: '取消摆烂', // 右边按钮文本
// confirmText: '确定点击', //左边按钮文本
cancel: () => {
console.log("取消回调");
},
confirm: () => {
console.log("确认回调");
compare() {
this.$popupDialog(
"国有建设用地使用权",
"registerBook/comparison",
{ propsParam: this.propsParam },
"80%",
true
);
},
});
}
},
};
};
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
</style>
......
......@@ -100,7 +100,7 @@
<el-input
v-model="ruleForm.tdsyq.nydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="mjdw"
:disabled="!ableOperation"
......@@ -121,7 +121,7 @@
<el-input
v-model="ruleForm.tdsyq.gdmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="mjdw"
:disabled="!ableOperation"
......@@ -142,7 +142,7 @@
<el-input
v-model="ruleForm.tdsyq.ldmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="mjdw"
:disabled="!ableOperation"
......@@ -165,7 +165,7 @@
<el-input
v-model="ruleForm.tdsyq.cdmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="mjdw"
:disabled="!ableOperation"
......@@ -186,7 +186,7 @@
<el-input
v-model="ruleForm.tdsyq.qtnydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="mjdw"
:disabled="!ableOperation"
......@@ -207,7 +207,7 @@
<el-input
v-model="ruleForm.tdsyq.jsydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="mjdw"
:disabled="!ableOperation"
......@@ -230,7 +230,7 @@
<el-input
v-model="ruleForm.tdsyq.wlydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="mjdw"
:disabled="!ableOperation"
......
......@@ -148,7 +148,7 @@
flex: 1;
width: 100%;
padding: 3px;
font-size: 16px;
}
p:nth-child(2) {
......