f2988725 by xiaomiao

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

2 parents 9a28e7ca 19c01a8d
......@@ -70,8 +70,10 @@
watch: {
previewImg: {
handler (newValue, oldValue) {
if (newValue.imgList.length > 0) {
this.allLi = _.cloneDeep(newValue.imgList).map(item => item.fjurl)
this.thumbnailImages = newValue.imgList
}
},
deep: true
}
......
......@@ -16,34 +16,34 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="业务号:">
<el-input disabled v-model="ruleForm.slywxx.ywh"></el-input>
<el-input disabled v-model="ruleForm.slsq.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="受理人员:">
<el-input disabled v-model="ruleForm.slywxx.slry"></el-input>
<el-input disabled v-model="ruleForm.slsq.slry"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="受理时间:">
<el-input disabled v-model="ruleForm.slywxx.slsj"></el-input>
<el-input disabled v-model="ruleForm.slsq.slsj"></el-input>
</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.slywxx.qllxmc"></el-input>
<el-input disabled v-model="ruleForm.slsq.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记类型:">
<el-input disabled v-model="ruleForm.slywxx.djlxmc"></el-input>
<el-input disabled v-model="ruleForm.slsq.djlxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记情形:">
<el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input>
<el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -132,7 +132,7 @@
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="共有方式:">
<el-radio-group :disabled="$route.query.viewtype == 0" v-model="ruleForm.slywxx.gyfs">
<el-radio-group :disabled="$route.query.viewtype == 0" v-model="ruleForm.sldy.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -140,15 +140,15 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.slywxx.gyfs == '1'">
<el-col :span="6" v-show="ruleForm.sldy.gyfs == '1'">
<el-form-item label="是否分别持证:">
<el-radio-group v-model="ruleForm.slywxx.sqfbcz">
<el-radio-group v-model="ruleForm.sldy.sqfbcz">
<el-radio :label=1></el-radio>
<el-radio :label=0></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.slywxx.sqfbcz == '0'&&ruleForm.slywxx.gyfs == '1'">
<el-col :span="6" v-show="ruleForm.sldy.sqfbcz == '0'&&ruleForm.sldy.gyfs == '1'">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人">
<el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
......@@ -158,7 +158,7 @@
</el-col>
</el-row>
<qlrCommonTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList" :key="key"
:viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
:viewtype="$route.query.viewtype" :gyfs="ruleForm.sldy.gyfs" />
<div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0">
<div class="slxx_title title-block">
......
......@@ -16,34 +16,34 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="业务号:">
<el-input disabled v-model="ruleForm.slywxx.ywh"></el-input>
<el-input disabled v-model="ruleForm.slsq.ywh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="受理人员:">
<el-input disabled v-model="ruleForm.slywxx.slry"></el-input>
<el-input disabled v-model="ruleForm.slsq.slry"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="受理时间:">
<el-input disabled v-model="ruleForm.slywxx.slsj"></el-input>
<el-input disabled v-model="ruleForm.slsq.slsj"></el-input>
</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.slywxx.qllxmc"></el-input>
<el-input disabled v-model="ruleForm.slsq.qllxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记类型:">
<el-input disabled v-model="ruleForm.slywxx.djlxmc"></el-input>
<el-input disabled v-model="ruleForm.slsq.djlxmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="登记情形:">
<el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input>
<el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -56,7 +56,7 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="原不动产权证号:">
<el-input disabled v-model="ruleForm.slywxx.ybdcqzsh"></el-input>
<el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -137,7 +137,7 @@
<el-row :gutter="10">
<el-col :span="14">
<el-form-item label="共有方式:">
<el-radio-group :disabled="$route.query.viewtype=='1'" v-model="ruleForm.slywxx.gyfs">
<el-radio-group :disabled="$route.query.viewtype=='1'" v-model="ruleForm.sldy.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -147,7 +147,7 @@
</el-col>
<el-col :span="5" v-show="ruleForm.gyfs == '2'">
<el-form-item label="是否分别持证:">
<el-radio-group v-model="ruleForm.slywxx.sqfbcz">
<el-radio-group v-model="ruleForm.sldy.sqfbcz">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
......@@ -163,7 +163,7 @@
</el-col>
</el-row>
<qlrCommonTable :tableData="ruleForm.qlrList" @upDateQlrxxList='upDateQlrxxList'
:viewtype="$route.query.viewtype=='1'" :gyfs="ruleForm.slywxx.gyfs" />
:viewtype="$route.query.viewtype=='1'" :gyfs="ruleForm.sldy.gyfs" />
<div class="slxx_title title-block">
登记原因
<div class="triangle"></div>
......