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 @@ ...@@ -70,8 +70,10 @@
70 watch: { 70 watch: {
71 previewImg: { 71 previewImg: {
72 handler (newValue, oldValue) { 72 handler (newValue, oldValue) {
73 this.allLi = _.cloneDeep(newValue.imgList).map(item => item.fjurl) 73 if (newValue.imgList.length > 0) {
74 this.thumbnailImages = newValue.imgList 74 this.allLi = _.cloneDeep(newValue.imgList).map(item => item.fjurl)
75 this.thumbnailImages = newValue.imgList
76 }
75 }, 77 },
76 deep: true 78 deep: true
77 } 79 }
......
...@@ -16,34 +16,34 @@ ...@@ -16,34 +16,34 @@
16 <el-row :gutter="10"> 16 <el-row :gutter="10">
17 <el-col :span="8"> 17 <el-col :span="8">
18 <el-form-item label="业务号:"> 18 <el-form-item label="业务号:">
19 <el-input disabled v-model="ruleForm.slywxx.ywh"></el-input> 19 <el-input disabled v-model="ruleForm.slsq.ywh"></el-input>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
22 <el-col :span="8"> 22 <el-col :span="8">
23 <el-form-item label="受理人员:"> 23 <el-form-item label="受理人员:">
24 <el-input disabled v-model="ruleForm.slywxx.slry"></el-input> 24 <el-input disabled v-model="ruleForm.slsq.slry"></el-input>
25 </el-form-item> 25 </el-form-item>
26 </el-col> 26 </el-col>
27 <el-col :span="8"> 27 <el-col :span="8">
28 <el-form-item label="受理时间:"> 28 <el-form-item label="受理时间:">
29 <el-input disabled v-model="ruleForm.slywxx.slsj"></el-input> 29 <el-input disabled v-model="ruleForm.slsq.slsj"></el-input>
30 </el-form-item> 30 </el-form-item>
31 </el-col> 31 </el-col>
32 </el-row> 32 </el-row>
33 <el-row :gutter="10"> 33 <el-row :gutter="10">
34 <el-col :span="8"> 34 <el-col :span="8">
35 <el-form-item label="权利类型:"> 35 <el-form-item label="权利类型:">
36 <el-input disabled v-model="ruleForm.slywxx.qllxmc"></el-input> 36 <el-input disabled v-model="ruleForm.slsq.qllxmc"></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">
40 <el-form-item label="登记类型:"> 40 <el-form-item label="登记类型:">
41 <el-input disabled v-model="ruleForm.slywxx.djlxmc"></el-input> 41 <el-input disabled v-model="ruleForm.slsq.djlxmc"></el-input>
42 </el-form-item> 42 </el-form-item>
43 </el-col> 43 </el-col>
44 <el-col :span="8"> 44 <el-col :span="8">
45 <el-form-item label="登记情形:"> 45 <el-form-item label="登记情形:">
46 <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input> 46 <el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 </el-row> 49 </el-row>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
132 <el-row :gutter="10"> 132 <el-row :gutter="10">
133 <el-col :span="12"> 133 <el-col :span="12">
134 <el-form-item label="共有方式:"> 134 <el-form-item label="共有方式:">
135 <el-radio-group :disabled="$route.query.viewtype == 0" v-model="ruleForm.slywxx.gyfs"> 135 <el-radio-group :disabled="$route.query.viewtype == 0" v-model="ruleForm.sldy.gyfs">
136 <el-radio label="0">单独所有</el-radio> 136 <el-radio label="0">单独所有</el-radio>
137 <el-radio label="1">共同共有</el-radio> 137 <el-radio label="1">共同共有</el-radio>
138 <el-radio label="2">按份所有</el-radio> 138 <el-radio label="2">按份所有</el-radio>
...@@ -140,15 +140,15 @@ ...@@ -140,15 +140,15 @@
140 </el-radio-group> 140 </el-radio-group>
141 </el-form-item> 141 </el-form-item>
142 </el-col> 142 </el-col>
143 <el-col :span="6" v-show="ruleForm.slywxx.gyfs == '1'"> 143 <el-col :span="6" v-show="ruleForm.sldy.gyfs == '1'">
144 <el-form-item label="是否分别持证:"> 144 <el-form-item label="是否分别持证:">
145 <el-radio-group v-model="ruleForm.slywxx.sqfbcz"> 145 <el-radio-group v-model="ruleForm.sldy.sqfbcz">
146 <el-radio :label=1></el-radio> 146 <el-radio :label=1></el-radio>
147 <el-radio :label=0></el-radio> 147 <el-radio :label=0></el-radio>
148 </el-radio-group> 148 </el-radio-group>
149 </el-form-item> 149 </el-form-item>
150 </el-col> 150 </el-col>
151 <el-col :span="6" v-show="ruleForm.slywxx.sqfbcz == '0'&&ruleForm.slywxx.gyfs == '1'"> 151 <el-col :span="6" v-show="ruleForm.sldy.sqfbcz == '0'&&ruleForm.sldy.gyfs == '1'">
152 <el-form-item label="持证人:"> 152 <el-form-item label="持证人:">
153 <el-select v-model="ruleForm.czr" placeholder="持证人"> 153 <el-select v-model="ruleForm.czr" placeholder="持证人">
154 <el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh"> 154 <el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
158 </el-col> 158 </el-col>
159 </el-row> 159 </el-row>
160 <qlrCommonTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList" :key="key" 160 <qlrCommonTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList" :key="key"
161 :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" /> 161 :viewtype="$route.query.viewtype" :gyfs="ruleForm.sldy.gyfs" />
162 162
163 <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0"> 163 <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0">
164 <div class="slxx_title title-block"> 164 <div class="slxx_title title-block">
......
...@@ -16,34 +16,34 @@ ...@@ -16,34 +16,34 @@
16 <el-row :gutter="10"> 16 <el-row :gutter="10">
17 <el-col :span="8"> 17 <el-col :span="8">
18 <el-form-item label="业务号:"> 18 <el-form-item label="业务号:">
19 <el-input disabled v-model="ruleForm.slywxx.ywh"></el-input> 19 <el-input disabled v-model="ruleForm.slsq.ywh"></el-input>
20 </el-form-item> 20 </el-form-item>
21 </el-col> 21 </el-col>
22 <el-col :span="8"> 22 <el-col :span="8">
23 <el-form-item label="受理人员:"> 23 <el-form-item label="受理人员:">
24 <el-input disabled v-model="ruleForm.slywxx.slry"></el-input> 24 <el-input disabled v-model="ruleForm.slsq.slry"></el-input>
25 </el-form-item> 25 </el-form-item>
26 </el-col> 26 </el-col>
27 <el-col :span="8"> 27 <el-col :span="8">
28 <el-form-item label="受理时间:"> 28 <el-form-item label="受理时间:">
29 <el-input disabled v-model="ruleForm.slywxx.slsj"></el-input> 29 <el-input disabled v-model="ruleForm.slsq.slsj"></el-input>
30 </el-form-item> 30 </el-form-item>
31 </el-col> 31 </el-col>
32 </el-row> 32 </el-row>
33 <el-row :gutter="10"> 33 <el-row :gutter="10">
34 <el-col :span="8"> 34 <el-col :span="8">
35 <el-form-item label="权利类型:"> 35 <el-form-item label="权利类型:">
36 <el-input disabled v-model="ruleForm.slywxx.qllxmc"></el-input> 36 <el-input disabled v-model="ruleForm.slsq.qllxmc"></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">
40 <el-form-item label="登记类型:"> 40 <el-form-item label="登记类型:">
41 <el-input disabled v-model="ruleForm.slywxx.djlxmc"></el-input> 41 <el-input disabled v-model="ruleForm.slsq.djlxmc"></el-input>
42 </el-form-item> 42 </el-form-item>
43 </el-col> 43 </el-col>
44 <el-col :span="8"> 44 <el-col :span="8">
45 <el-form-item label="登记情形:"> 45 <el-form-item label="登记情形:">
46 <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input> 46 <el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 </el-row> 49 </el-row>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 <el-row :gutter="10"> 56 <el-row :gutter="10">
57 <el-col :span="8"> 57 <el-col :span="8">
58 <el-form-item label="原不动产权证号:"> 58 <el-form-item label="原不动产权证号:">
59 <el-input disabled v-model="ruleForm.slywxx.ybdcqzsh"></el-input> 59 <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input>
60 </el-form-item> 60 </el-form-item>
61 </el-col> 61 </el-col>
62 <el-col :span="8"> 62 <el-col :span="8">
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
137 <el-row :gutter="10"> 137 <el-row :gutter="10">
138 <el-col :span="14"> 138 <el-col :span="14">
139 <el-form-item label="共有方式:"> 139 <el-form-item label="共有方式:">
140 <el-radio-group :disabled="$route.query.viewtype=='1'" v-model="ruleForm.slywxx.gyfs"> 140 <el-radio-group :disabled="$route.query.viewtype=='1'" v-model="ruleForm.sldy.gyfs">
141 <el-radio label="0">单独所有</el-radio> 141 <el-radio label="0">单独所有</el-radio>
142 <el-radio label="1">共同共有</el-radio> 142 <el-radio label="1">共同共有</el-radio>
143 <el-radio label="2">按份所有</el-radio> 143 <el-radio label="2">按份所有</el-radio>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
147 </el-col> 147 </el-col>
148 <el-col :span="5" v-show="ruleForm.gyfs == '2'"> 148 <el-col :span="5" v-show="ruleForm.gyfs == '2'">
149 <el-form-item label="是否分别持证:"> 149 <el-form-item label="是否分别持证:">
150 <el-radio-group v-model="ruleForm.slywxx.sqfbcz"> 150 <el-radio-group v-model="ruleForm.sldy.sqfbcz">
151 <el-radio label="1"></el-radio> 151 <el-radio label="1"></el-radio>
152 <el-radio label="0"></el-radio> 152 <el-radio label="0"></el-radio>
153 </el-radio-group> 153 </el-radio-group>
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
163 </el-col> 163 </el-col>
164 </el-row> 164 </el-row>
165 <qlrCommonTable :tableData="ruleForm.qlrList" @upDateQlrxxList='upDateQlrxxList' 165 <qlrCommonTable :tableData="ruleForm.qlrList" @upDateQlrxxList='upDateQlrxxList'
166 :viewtype="$route.query.viewtype=='1'" :gyfs="ruleForm.slywxx.gyfs" /> 166 :viewtype="$route.query.viewtype=='1'" :gyfs="ruleForm.sldy.gyfs" />
167 <div class="slxx_title title-block"> 167 <div class="slxx_title title-block">
168 登记原因 168 登记原因
169 <div class="triangle"></div> 169 <div class="triangle"></div>
......