Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev
Showing
7 changed files
with
24 additions
and
14 deletions
... | @@ -33,7 +33,7 @@ | ... | @@ -33,7 +33,7 @@ |
33 | <el-row> | 33 | <el-row> |
34 | <el-col :span="8"> | 34 | <el-col :span="8"> |
35 | <el-form-item label="证件号" prop="zjh"> | 35 | <el-form-item label="证件号" prop="zjh"> |
36 | <el-input v-model="ruleForm.zjh" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input> | 36 | <el-input v-model="ruleForm.zjh" maxlength="15" oninput="value=value.replace(/[^\X0-9]/g,'')"></el-input> |
37 | </el-form-item> | 37 | </el-form-item> |
38 | </el-col> | 38 | </el-col> |
39 | <el-col :span="8"> | 39 | <el-col :span="8"> | ... | ... |
... | @@ -314,6 +314,7 @@ export default { | ... | @@ -314,6 +314,7 @@ export default { |
314 | async created() { | 314 | async created() { |
315 | this.propsParam = this.$attrs; | 315 | this.propsParam = this.$attrs; |
316 | this.ableEdit = this.$parent.showBatch; | 316 | this.ableEdit = this.$parent.showBatch; |
317 | this.ableOperation = this.$parent.currentSelectTab.ableOperation | ||
317 | if (this.propsParam.djlx == "400") { | 318 | if (this.propsParam.djlx == "400") { |
318 | this.isJfOperation = true; | 319 | this.isJfOperation = true; |
319 | } | 320 | } | ... | ... |
... | @@ -191,7 +191,7 @@ | ... | @@ -191,7 +191,7 @@ |
191 | <el-col> | 191 | <el-col> |
192 | <el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="djyy"> | 192 | <el-form-item v-if="ruleForm.sldy" label="登记原因:" prop="djyy"> |
193 | <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1" | 193 | <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1" |
194 | v-model="ruleForm.sldy.djyy"> | 194 | v-model="ruleForm.fdcq2.djyy"> |
195 | </el-input> | 195 | </el-input> |
196 | </el-form-item> | 196 | </el-form-item> |
197 | </el-col> | 197 | </el-col> | ... | ... |
... | @@ -111,7 +111,7 @@ | ... | @@ -111,7 +111,7 @@ |
111 | <el-row :gutter="10"> | 111 | <el-row :gutter="10"> |
112 | <el-col :span="14" v-if="ruleForm.qlxx"> | 112 | <el-col :span="14" v-if="ruleForm.qlxx"> |
113 | <el-form-item label="共有方式:"> | 113 | <el-form-item label="共有方式:"> |
114 | <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs"> | 114 | <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs"> |
115 | <el-radio label="0">单独所有</el-radio> | 115 | <el-radio label="0">单独所有</el-radio> |
116 | <el-radio label="1">共同共有</el-radio> | 116 | <el-radio label="1">共同共有</el-radio> |
117 | <el-radio label="2">按份所有</el-radio> | 117 | <el-radio label="2">按份所有</el-radio> |
... | @@ -155,8 +155,9 @@ | ... | @@ -155,8 +155,9 @@ |
155 | import { Init, saveData } from "@/api/workflow/ygdjFlow.js"; | 155 | import { Init, saveData } from "@/api/workflow/ygdjFlow.js"; |
156 | import { mapGetters } from "vuex"; | 156 | import { mapGetters } from "vuex"; |
157 | export default { | 157 | export default { |
158 | mounted () { | 158 | created () { |
159 | this.ableOperation = this.$parent.currentSelectTab.ableOperation | 159 | this.ableOperation = this.$parent.currentSelectTab.ableOperation |
160 | this.propsParam = this.$attrs; | ||
160 | this.$startLoading(); | 161 | this.$startLoading(); |
161 | var formdata = new FormData(); | 162 | var formdata = new FormData(); |
162 | formdata.append("bsmSldy", this.propsParam.bsmSldy); | 163 | formdata.append("bsmSldy", this.propsParam.bsmSldy); |
... | @@ -164,8 +165,9 @@ | ... | @@ -164,8 +165,9 @@ |
164 | formdata.append("isEdit", this.ableOperation); | 165 | formdata.append("isEdit", this.ableOperation); |
165 | Init(formdata).then(res => { | 166 | Init(formdata).then(res => { |
166 | if (res.code === 200 && res.result) { | 167 | if (res.code === 200 && res.result) { |
167 | this.$endLoading(); | 168 | console.log(res.result.ygdj.ygdjzlmc); |
168 | this.ruleForm = res.result; | 169 | this.ruleForm = res.result; |
170 | this.$endLoading(); | ||
169 | } | 171 | } |
170 | }) | 172 | }) |
171 | }, | 173 | }, |
... | @@ -180,7 +182,13 @@ | ... | @@ -180,7 +182,13 @@ |
180 | disabled: true, | 182 | disabled: true, |
181 | tdytOption: [], | 183 | tdytOption: [], |
182 | czrOptions: [], | 184 | czrOptions: [], |
183 | ruleForm: {}, | 185 | ruleForm: { |
186 | qlxx:{} | ||
187 | ,sldy:{} | ||
188 | ,slsq:{} | ||
189 | ,ygdj:{} | ||
190 | ,zdjbxx:{} | ||
191 | }, | ||
184 | //传递参数 | 192 | //传递参数 |
185 | propsParam: this.$attrs, | 193 | propsParam: this.$attrs, |
186 | rules: {}, | 194 | rules: {}, | ... | ... |
... | @@ -114,7 +114,7 @@ | ... | @@ -114,7 +114,7 @@ |
114 | <el-row :gutter="10"> | 114 | <el-row :gutter="10"> |
115 | <el-col :span="14" v-if="ruleForm.qlxx"> | 115 | <el-col :span="14" v-if="ruleForm.qlxx"> |
116 | <el-form-item label="共有方式:"> | 116 | <el-form-item label="共有方式:"> |
117 | <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs"> | 117 | <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs"> |
118 | <el-radio label="0">单独所有</el-radio> | 118 | <el-radio label="0">单独所有</el-radio> |
119 | <el-radio label="1">共同共有</el-radio> | 119 | <el-radio label="1">共同共有</el-radio> |
120 | <el-radio label="2">按份所有</el-radio> | 120 | <el-radio label="2">按份所有</el-radio> | ... | ... |
... | @@ -54,12 +54,12 @@ | ... | @@ -54,12 +54,12 @@ |
54 | </el-col> | 54 | </el-col> |
55 | <el-col :span="8"> | 55 | <el-col :span="8"> |
56 | <el-form-item label="不动产权证号:"> | 56 | <el-form-item label="不动产权证号:"> |
57 | <el-input disabled v-model="ruleForm.qlxxold.bdcqzh"></el-input> | 57 | <el-input disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input> |
58 | </el-form-item> | 58 | </el-form-item> |
59 | </el-col> | 59 | </el-col> |
60 | <el-col :span="8"> | 60 | <el-col :span="8"> |
61 | <el-form-item label="不动产单元号:"> | 61 | <el-form-item label="不动产单元号:"> |
62 | <el-input disabled v-model="ruleForm.qlxxold.bdcdyh"></el-input> | 62 | <el-input disabled v-model="ruleForm.ssQlxx.bdcdyh"></el-input> |
63 | </el-form-item> | 63 | </el-form-item> |
64 | </el-col> | 64 | </el-col> |
65 | </el-row> | 65 | </el-row> |
... | @@ -132,10 +132,10 @@ | ... | @@ -132,10 +132,10 @@ |
132 | </el-form-item> | 132 | </el-form-item> |
133 | </el-col> | 133 | </el-col> |
134 | </el-row> | 134 | </el-row> |
135 | <el-row> | 135 | <el-row :gutter="10"> |
136 | <el-col :span="8"> | 136 | <el-col :span="16"> |
137 | <el-form-item label="是否存在禁止或限制转让抵押不动产的约定:"> | 137 | <el-form-item label="是否存在禁止或限制转让抵押不动产的约定:"> |
138 | <el-input v-model="ruleForm.ygdj.dbfw" | 138 | <el-input v-model="ruleForm.ygdj.sfczjzhxz" |
139 | :disabled="$route.query.viewtype == 1 || ruleForm.slsq.djlx == '300'"></el-input> | 139 | :disabled="$route.query.viewtype == 1 || ruleForm.slsq.djlx == '300'"></el-input> |
140 | </el-form-item> | 140 | </el-form-item> |
141 | </el-col> | 141 | </el-col> |
... | @@ -161,7 +161,7 @@ | ... | @@ -161,7 +161,7 @@ |
161 | <el-row :gutter="10"> | 161 | <el-row :gutter="10"> |
162 | <el-col :span="14" v-if="ruleForm.qlxx"> | 162 | <el-col :span="14" v-if="ruleForm.qlxx"> |
163 | <el-form-item label="共有方式:"> | 163 | <el-form-item label="共有方式:"> |
164 | <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.slywxx.gyfs"> | 164 | <el-radio-group :disabled="$route.query.viewtype == 1" v-model="ruleForm.qlxx.gyfs"> |
165 | <el-radio label="0">单独所有</el-radio> | 165 | <el-radio label="0">单独所有</el-radio> |
166 | <el-radio label="1">共同共有</el-radio> | 166 | <el-radio label="1">共同共有</el-radio> |
167 | <el-radio label="2">按份所有</el-radio> | 167 | <el-radio label="2">按份所有</el-radio> | ... | ... |
-
Please register or sign in to post a comment