8d6360b1 by xiaomiao

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

2 parents e2a01a9e 8721ac47
...@@ -985,37 +985,41 @@ class data extends filter { ...@@ -985,37 +985,41 @@ class data extends filter {
985 label: "证件号", 985 label: "证件号",
986 }, 986 },
987 { 987 {
988 prop: "fwxz", 988 prop: "fwxzmc",
989 label: "房屋性质", 989 label: "房屋性质",
990 }, 990 },
991 { 991 {
992 prop: "ghyt", 992 prop: "fwjgmc",
993 label: "规划用途", 993 label: "房屋结构",
994 }, 994 },
995 { 995 {
996 prop: "fwzcs", 996 prop: "ytmc",
997 label: "房屋总层数", 997 label: "房屋用途",
998 },
999 {
1000 prop: "szc",
1001 label: "所在层",
998 }, 1002 },
999 { 1003 {
1000 prop: "fwszc", 1004 prop: "zcs",
1001 label: "房屋所在层", 1005 label: "总层数",
1002 }, 1006 },
1003 { 1007 {
1004 prop: "jzmj", 1008 prop: "jzmj",
1005 label: "建筑面积", 1009 label: "建筑面积/抵押面积(㎡)",
1006 }, 1010 },
1007 { 1011 {
1008 prop: "djyy", 1012 prop: "djyy",
1009 label: "登记原因", 1013 label: "登记原因",
1010 }, 1014 },
1011 { 1015 {
1012 prop: "qdjg", 1016 prop: "fj",
1013 label: "取得价格/被担保主债权数额", 1017 label: "附记",
1014 }, 1018 },
1015 { 1019 {
1016 prop: "jedw", 1020 prop: "qdjgmc",
1017 label: "金额单位", 1021 label: "取得价格/被担保主债权数额",
1018 }, 1022 },
1019 { 1023 {
1020 prop: "dbfw", 1024 prop: "dbfw",
1021 label: "担保范围", 1025 label: "担保范围",
......
...@@ -47,12 +47,17 @@ ...@@ -47,12 +47,17 @@
47 <div class="triangle"></div> 47 <div class="triangle"></div>
48 </div> 48 </div>
49 <el-row :gutter="10" v-if="ruleForm.qlxx"> 49 <el-row :gutter="10" v-if="ruleForm.qlxx">
50 <el-col :span="8">
51 <el-form-item label="原不动产登记证明号:">
52 <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
53 </el-form-item>
54 </el-col>
50 <el-col :span="8"> 55 <el-col :span="8">
51 <el-form-item label="不动产单元号:"> 56 <el-form-item label="不动产单元号:">
52 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input> 57 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
53 </el-form-item> 58 </el-form-item>
54 </el-col> 59 </el-col>
55 <el-col :span="16"> 60 <el-col :span="8">
56 <el-form-item label="坐落:"> 61 <el-form-item label="坐落:">
57 <el-input disabled v-model="ruleForm.sldy.zl"></el-input> 62 <el-input disabled v-model="ruleForm.sldy.zl"></el-input>
58 </el-form-item> 63 </el-form-item>
...@@ -65,10 +70,15 @@ ...@@ -65,10 +70,15 @@
65 </el-form-item> 70 </el-form-item>
66 </el-col> 71 </el-col>
67 <el-col :span="8"> 72 <el-col :span="8">
68 <el-form-item label="规划用途:"> 73 <el-form-item label="土地使用权人:">
69 <el-select v-model="ruleForm.ygdj.ghyt"> 74 <el-input disabled v-model="ruleForm.ygdj.tdsyqr"></el-input>
75 </el-form-item>
76 </el-col>
77 <el-col :span="8">
78 <el-form-item label="房屋性质:">
79 <el-select v-model="ruleForm.ygdj.fwxz">
70 <el-option 80 <el-option
71 v-for="item in dictData['A17']" 81 v-for="item in dictData['A19']"
72 :key="item.dcode" 82 :key="item.dcode"
73 :label="item.dname" 83 :label="item.dname"
74 :value="item.dcode"> 84 :value="item.dcode">
...@@ -76,11 +86,13 @@ ...@@ -76,11 +86,13 @@
76 </el-select> 86 </el-select>
77 </el-form-item> 87 </el-form-item>
78 </el-col> 88 </el-col>
79 <el-col :span="8"> 89 </el-row>
80 <el-form-item label="房屋性质:"> 90 <el-row :gutter="10" v-if="ruleForm.qlxx">
81 <el-select v-model="ruleForm.ygdj.fwxz"> 91 <el-col :span="8">
92 <el-form-item label="房屋用途:">
93 <el-select v-model="ruleForm.ygdj.ghyt">
82 <el-option 94 <el-option
83 v-for="item in dictData['A19']" 95 v-for="item in dictData['A17']"
84 :key="item.dcode" 96 :key="item.dcode"
85 :label="item.dname" 97 :label="item.dname"
86 :value="item.dcode"> 98 :value="item.dcode">
...@@ -88,6 +100,16 @@ ...@@ -88,6 +100,16 @@
88 </el-select> 100 </el-select>
89 </el-form-item> 101 </el-form-item>
90 </el-col> 102 </el-col>
103 <el-col :span="8">
104 <el-form-item label="所在层:">
105 <el-input v-model="ruleForm.ygdj.szc"></el-input>
106 </el-form-item>
107 </el-col>
108 <el-col :span="8">
109 <el-form-item label="总层数:">
110 <el-input v-model.number="ruleForm.ygdj.zcs" oninput="value=value.replace(/[^0-9]/g,'')"></el-input>
111 </el-form-item>
112 </el-col>
91 </el-row> 113 </el-row>
92 <el-row :gutter="10" v-if="ruleForm.qlxx"> 114 <el-row :gutter="10" v-if="ruleForm.qlxx">
93 <el-col :span="8"> 115 <el-col :span="8">
...@@ -102,11 +124,26 @@ ...@@ -102,11 +124,26 @@
102 </el-select> 124 </el-select>
103 </el-form-item> 125 </el-form-item>
104 </el-col> 126 </el-col>
105 <el-col :span="8"> 127
128 <el-col :span="8">
106 <el-form-item label="建筑面积:"> 129 <el-form-item label="建筑面积:">
107 <el-input v-model="ruleForm.ygdj.jzmj"></el-input> 130 <div class="flex">
131 <el-input v-model="ruleForm.ygdj.jzmj" :disabled="!viewEdit"
132 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
133 <el-select
134 disabled
135 v-model="mjdw"
136 style="width: 68px">
137 <el-option
138 v-for="item in dictData['A7']"
139 :key="item.dcode"
140 :label="item.dname"
141 :value="item.dcode">
142 </el-option>
143 </el-select>
144 </div>
108 </el-form-item> 145 </el-form-item>
109 </el-col> 146 </el-col>
110 <el-col :span="8"> 147 <el-col :span="8">
111 <el-form-item label="取得价格:"> 148 <el-form-item label="取得价格:">
112 <div class="flex"> 149 <div class="flex">
...@@ -126,15 +163,10 @@ ...@@ -126,15 +163,10 @@
126 </el-form-item> 163 </el-form-item>
127 </el-col> 164 </el-col>
128 </el-row> 165 </el-row>
129 <el-row :gutter="10"> 166 <el-row :gutter="10">
130 <el-col :span="8"> 167 <el-col :span="24">
131 <el-form-item label="所在层:"> 168 <el-form-item label="附记:">
132 <el-input v-model="ruleForm.ygdj.szc"></el-input> 169 <el-input v-model="ruleForm.ygdj.fj" ></el-input>
133 </el-form-item>
134 </el-col>
135 <el-col :span="8">
136 <el-form-item label="总层数:">
137 <el-input v-model.number="ruleForm.ygdj.zcs" oninput="value=value.replace(/[^0-9]/g,'')"></el-input>
138 </el-form-item> 170 </el-form-item>
139 </el-col> 171 </el-col>
140 </el-row> 172 </el-row>
...@@ -240,6 +272,7 @@ ...@@ -240,6 +272,7 @@
240 }, 272 },
241 data () { 273 data () {
242 return { 274 return {
275 mjdw: "1",
243 //表单是否可操作 276 //表单是否可操作
244 viewEdit: true, 277 viewEdit: true,
245 disabled: true, 278 disabled: true,
......