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">
<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>
</el-select>
</div>
<div class="flex">
<el-input
v-model="ruleForm.diyaq.dymj"
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>
</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>
......
......@@ -45,7 +45,7 @@
预告登记信息
<div class="triangle"></div>
</div>
<el-row :gutter="10" class="ssqlxx">
<el-row :gutter="10" class="ssqlxx">
<el-col :span="24" v-if="ssqlxxshow">
<el-form-item label="上手权利信息:">
<select-table
......
......@@ -16,9 +16,9 @@ export function getForm(tabName) {
case "jsydsyq":
form = require("@/views/registerBook/jsydsyq.vue");
break;
case "tdsyq":
form = require("@/views/registerBook/tdsyq.vue");
break;
case "tdsyq":
form = require("@/views/registerBook/tdsyq.vue");
break;
case "nydsyq":
form = require("@/views/registerBook/nydsyq.vue");
break;
......@@ -46,17 +46,20 @@ export function getForm(tabName) {
case "slxxjsydsyq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue");
break;
case "slxxtdsyq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue");
break;
case "slxxtdsyq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue");
break;
case "slxxfdcq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue");
break;
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">
......
......@@ -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) {
......