41e669de by xiaomiao

--no commit message

1 parent dcc1b26c
......@@ -407,6 +407,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"
......
......@@ -115,12 +115,40 @@
</el-col>
<el-col :span="8">
<el-form-item label="独用土地面积:">
<el-input v-model="ruleForm.fdcq2.dytdmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.fdcq2.dytdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
: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="分摊土地面积:">
<el-input v-model="ruleForm.fdcq2.fttdmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.fdcq2.fttdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
: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">
......@@ -137,10 +165,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="房地产交易价格:">
<div style="display: flex">
<div class="flex">
<el-input
v-model="ruleForm.fdcq2.qjjg"
style="width: 500%"></el-input>
style="width: 500%"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select v-model="ruleForm.fdcq2.jedw">
<el-option
v-for="item in dictData['A57']"
......@@ -225,17 +255,59 @@
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积:">
<el-input v-model="ruleForm.fdcq2.jzmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.fdcq2.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
: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="专有建筑面积:">
<el-input v-model="ruleForm.fdcq2.zyjzmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.fdcq2.zyjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
: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="分摊建筑面积:">
<el-input v-model="ruleForm.fdcq2.ftjzmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.fdcq2.ftjzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
: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">
......@@ -647,4 +719,10 @@
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/slxx/slxx.scss";
.el-date-editor.el-input {
width: 100%;
}
.el-table__row {
height: 30px !important;
}
</style>
......
......@@ -45,6 +45,32 @@
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<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-col :span="8">
<el-form-item label="不动产单元号:">
<el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
......
......@@ -10,7 +10,7 @@
:model="ruleForm"
:rules="rules"
ref="ruleForm"
:class="{readonly: editDisabled }"
:class="{ readonly: editDisabled }"
class="loadingtext"
:show-message="false"
:label-position="flag ? 'top' : ''"
......@@ -43,8 +43,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"
......@@ -70,8 +70,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>
......@@ -95,7 +93,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"
......@@ -166,77 +168,174 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="农用地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.nydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
: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="耕地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.gdmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
: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="林地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.ldmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
: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-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="草地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.cdmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
: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="其他农用地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.qtnydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
: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="建筑使用面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.jsydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.tdsyq.mjdw"
: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-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="未利用地面积:">
<div class="flex">
<el-input
v-model="ruleForm.tdsyq.wlydmj"
:disabled="!ableOperation"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="面积单位:">
<el-input
<el-select
v-model="ruleForm.tdsyq.mjdw"
:disabled="!ableOperation"
></el-input>
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">
......@@ -248,6 +347,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"
......@@ -310,12 +410,12 @@
<script>
import store from "@/store/index.js";
import { mapGetters } from "vuex";
import { init,getSsQlxx, save } from "@/api/djbRepair.js";
import { init, getSsQlxx, save } from "@/api/djbRepair.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import selectTable from "@/components/selectTable/index.vue";
import tdytTable from "@/views/workflow/components/tdytTable";
export default {
components: { qlrCommonTable, tdytTable ,selectTable},
components: { qlrCommonTable, tdytTable, selectTable },
computed: {
...mapGetters(["dictData", "flag"]),
// 根据流程判断表单是否为只读
......@@ -329,7 +429,7 @@ export default {
},
data() {
return {
ssqlxxshow:true,
ssqlxxshow: true,
props: {
label: "bdcqzh",
value: "bdcdyid",
......@@ -392,7 +492,7 @@ export default {
czrOptions: [],
ssQlxxList: [],
ruleForm: {},
ableOperation:false,
ableOperation: false,
//传递参数\
rules: {
bdcqzhrules: [
......@@ -406,12 +506,10 @@ export default {
},
};
},
created() {
},
created() {},
mounted() {
this.loadData();
this.ableOperation=this.$parent.ableOperation
this.ableOperation = this.$parent.ableOperation;
},
methods: {
/**
......@@ -429,7 +527,7 @@ export default {
* @author: renchao
*/
djlxchange(val) {
console.log("val",val);
console.log("val", val);
if (val == null || val == 100) {
this.ssqlxxshow = false;
} else {
......@@ -646,5 +744,4 @@ export default {
/deep/.el-form-item__label {
padding-bottom: 0px;
}
</style>
......
......@@ -328,7 +328,24 @@
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积:">
<el-input v-model="ruleForm.ygdj.jzmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.ygdj.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.ygdj.mjdw"
: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" v-if="ruleForm.qlxx.qszt == '2'">
......@@ -356,7 +373,21 @@
</el-col>
<el-col :span="8">
<el-form-item label="取得价格/被担保主债权数额:">
<el-input v-model="ruleForm.ygdj.qdjg"></el-input>
<div class="flex">
<el-input v-model="ruleForm.ygdj.qdjg"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.ygdj.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">
......
......@@ -241,7 +241,24 @@
</el-col>
<el-col :span="8">
<el-form-item label="建筑面积:">
<el-input v-model="ruleForm.ygdj.jzmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.ygdj.jzmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
></el-input>
<el-select
v-model="ruleForm.ygdj.mjdw"
: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" v-if="ruleForm.qlxx.qszt == '2'">
......@@ -269,7 +286,21 @@
</el-col>
<el-col :span="8">
<el-form-item label="取得价格/被担保主债权数额:">
<el-input v-model="ruleForm.ygdj.qdjg"></el-input>
<div class="flex">
<el-input v-model="ruleForm.ygdj.qdjg"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.ygdj.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">
......
......@@ -282,11 +282,6 @@
<el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记时间:">
<el-input v-model="ruleForm.yydj.djsj"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附记:">
<el-input v-model="ruleForm.yydj.fj"></el-input>
......
......@@ -72,7 +72,21 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="宗地面积:">
<el-input v-model="ruleForm.zdjbxx.zdmj"></el-input>
<div class="flex">
<el-input v-model="ruleForm.zdjbxx.zdmj"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select
v-model="ruleForm.fdcq2.mjdw"
: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">
......@@ -88,7 +102,7 @@
<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,'')"></el-input>
<el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw">
<el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
</el-option>
......
......@@ -102,7 +102,7 @@
<el-input
v-model="ruleForm.jsydsyq.qdjg"
style="width: 500%"
oninput="value=value.replace(/[^\d.]/g,'')"
oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
disabled
></el-input>
<el-select v-model="ruleForm.jsydsyq.jedw" disabled>
......