Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
10 changed files
with
111 additions
and
44 deletions
... | @@ -131,7 +131,7 @@ export default { | ... | @@ -131,7 +131,7 @@ export default { |
131 | .ls-title { | 131 | .ls-title { |
132 | padding: 16px; | 132 | padding: 16px; |
133 | color: #ffffff; | 133 | color: #ffffff; |
134 | background: linear-gradient(-2deg, #409EFF, transparent; background: linear-gradient(3deg, #409EFF, transparent)); | 134 | background: linear-gradient(3deg, #409EFF, transparent); |
135 | } | 135 | } |
136 | 136 | ||
137 | .ls-title .svg-icon { | 137 | .ls-title .svg-icon { | ... | ... |
... | @@ -105,3 +105,27 @@ | ... | @@ -105,3 +105,27 @@ |
105 | box-sizing: border-box; | 105 | box-sizing: border-box; |
106 | text-align: right; | 106 | text-align: right; |
107 | } | 107 | } |
108 | |||
109 | .title-block { | ||
110 | display: inline-block; | ||
111 | position: relative; | ||
112 | background: #3498db; | ||
113 | color: #fff !important; | ||
114 | text-align: center; | ||
115 | padding: 0px 20px; | ||
116 | height: 30px; | ||
117 | line-height: 30px; | ||
118 | border-radius: 5px 5px 5px 0px; | ||
119 | letter-spacing: 2px; | ||
120 | } | ||
121 | |||
122 | .title-block .triangle { | ||
123 | width: 0px; | ||
124 | height: 0px; | ||
125 | position: absolute; | ||
126 | border: 5px solid transparent; | ||
127 | border-top: 5px solid #3498db; | ||
128 | border-right: 5px solid #3498db; | ||
129 | left: 0px; | ||
130 | bottom: -10px; | ||
131 | } | ||
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -87,33 +87,19 @@ export default { | ... | @@ -87,33 +87,19 @@ export default { |
87 | }, | 87 | }, |
88 | methods: { | 88 | methods: { |
89 | prev () { | 89 | prev () { |
90 | if (this.isFirst) { | ||
91 | if (this.previewImg.selectedIndex - 1 >= 0) { | ||
92 | this.$parent.previewImg.index = 1 | ||
93 | } | ||
94 | return | ||
95 | } | ||
96 | let len = this.previewImg.imgList.length | 90 | let len = this.previewImg.imgList.length |
91 | if (this.isFirst || len == 0) { | ||
92 | this.$emit('prevPriview') | ||
93 | } else { | ||
97 | this.$parent.previewImg.index = (this.$parent.previewImg.index - 1 + len) % len | 94 | this.$parent.previewImg.index = (this.$parent.previewImg.index - 1 + len) % len |
98 | this.reset() | 95 | } |
99 | }, | 96 | }, |
100 | next () { | 97 | next () { |
101 | if (this.isLast) { | ||
102 | if (this.previewImg.selectedIndex + 1 < this.previewImg.attachmentList.length) { | ||
103 | this.$parent.previewImg.index = 0 | ||
104 | } | ||
105 | return | ||
106 | } else { | ||
107 | console.log(this.$parent.previewImg.selectedIndex); | ||
108 | } | ||
109 | let len = this.previewImg.imgList.length | 98 | let len = this.previewImg.imgList.length |
99 | if (this.isLast || len == 0) { | ||
100 | this.$emit('nextPriview') | ||
101 | } else { | ||
110 | this.$parent.previewImg.index = (this.$parent.previewImg.index + 1) % len | 102 | this.$parent.previewImg.index = (this.$parent.previewImg.index + 1) % len |
111 | this.reset() | ||
112 | }, | ||
113 | reset () { | ||
114 | this.transform = { | ||
115 | scale: 1, | ||
116 | degree: 0 | ||
117 | } | 103 | } |
118 | }, | 104 | }, |
119 | showCurrent (index) { | 105 | showCurrent (index) { | ... | ... |
... | @@ -72,6 +72,10 @@ export default { | ... | @@ -72,6 +72,10 @@ export default { |
72 | icon="el-icon-edit-outline" | 72 | icon="el-icon-edit-outline" |
73 | type="text" | 73 | type="text" |
74 | onClick={() => { this.handleEdit(scope.$index, scope.row) }}>编辑</el-button> | 74 | onClick={() => { this.handleEdit(scope.$index, scope.row) }}>编辑</el-button> |
75 | <el-button | ||
76 | icon="el-icon-view" | ||
77 | type="text" | ||
78 | onClick={() => { this.handleView(scope.$index, scope.row) }}>查看</el-button> | ||
75 | </div> | 79 | </div> |
76 | ) | 80 | ) |
77 | } | 81 | } |
... | @@ -121,6 +125,9 @@ export default { | ... | @@ -121,6 +125,9 @@ export default { |
121 | handleEdit () { | 125 | handleEdit () { |
122 | this.dialog = true | 126 | this.dialog = true |
123 | }, | 127 | }, |
128 | handleView () { | ||
129 | this.dialog = true | ||
130 | } | ||
124 | } | 131 | } |
125 | } | 132 | } |
126 | </script> | 133 | </script> | ... | ... |
... | @@ -19,8 +19,8 @@ | ... | @@ -19,8 +19,8 @@ |
19 | <div class="item"> | 19 | <div class="item"> |
20 | 材料目录({{tableData.length}}) | 20 | 材料目录({{tableData.length}}) |
21 | <div> | 21 | <div> |
22 | <div v-for="item in tableData" :key="item.bsmSj" | 22 | <div v-for="(item,index) in tableData" :key="item.bsmSj" |
23 | :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']" @click="treeClick(item)"> | 23 | :class="['child', treeCheckId == item.bsmSj ? 'checked' : '']" @click="treeClick(item,index)"> |
24 | <span v-if="item.isrequired==1" class="required">必选</span> | 24 | <span v-if="item.isrequired==1" class="required">必选</span> |
25 | {{ item.sjmc }} | 25 | {{ item.sjmc }} |
26 | <span class="cl_number">({{item.children.length}})</span> | 26 | <span class="cl_number">({{item.children.length}})</span> |
... | @@ -28,7 +28,8 @@ | ... | @@ -28,7 +28,8 @@ |
28 | </div> | 28 | </div> |
29 | </div> | 29 | </div> |
30 | </div> | 30 | </div> |
31 | <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" /> | 31 | <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview" |
32 | @prevPriview="prevPriview" /> | ||
32 | </div> | 33 | </div> |
33 | </div> | 34 | </div> |
34 | <clxxAddDialog v-model="isDialog" /> | 35 | <clxxAddDialog v-model="isDialog" /> |
... | @@ -56,6 +57,7 @@ export default { | ... | @@ -56,6 +57,7 @@ export default { |
56 | ], | 57 | ], |
57 | iclass: "", | 58 | iclass: "", |
58 | // 材料目录选中 | 59 | // 材料目录选中 |
60 | treeCheckIndex: 0, | ||
59 | treeCheckId: "", | 61 | treeCheckId: "", |
60 | checkedId: "1", | 62 | checkedId: "1", |
61 | column: [ | 63 | column: [ |
... | @@ -205,6 +207,25 @@ export default { | ... | @@ -205,6 +207,25 @@ export default { |
205 | this.clmlInitList() | 207 | this.clmlInitList() |
206 | }, | 208 | }, |
207 | methods: { | 209 | methods: { |
210 | // 自动预览 | ||
211 | nextPriview () { | ||
212 | if (this.treeCheckIndex < this.tableData.length) { | ||
213 | this.treeCheckIndex++ | ||
214 | this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj | ||
215 | this.previewImg.index = 0 | ||
216 | this.previewImg.imgList = this.tableData[this.treeCheckIndex].children | ||
217 | this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj | ||
218 | } | ||
219 | }, | ||
220 | prevPriview () { | ||
221 | if (this.treeCheckIndex >= 1) { | ||
222 | this.treeCheckIndex-- | ||
223 | this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj | ||
224 | this.previewImg.index = this.previewImg.imgList.length | ||
225 | this.previewImg.imgList = this.tableData[this.treeCheckIndex].children | ||
226 | this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj | ||
227 | } | ||
228 | }, | ||
208 | // 材料目录明细初始化 | 229 | // 材料目录明细初始化 |
209 | clmlInitList () { | 230 | clmlInitList () { |
210 | return new Promise(resolve => { | 231 | return new Promise(resolve => { |
... | @@ -228,6 +249,7 @@ export default { | ... | @@ -228,6 +249,7 @@ export default { |
228 | }) | 249 | }) |
229 | }, | 250 | }, |
230 | updateList (val) { | 251 | updateList (val) { |
252 | let that = this | ||
231 | if (val != null) { //删除最后一张图片时 val=null | 253 | if (val != null) { //删除最后一张图片时 val=null |
232 | this.tableData.forEach(item => { | 254 | this.tableData.forEach(item => { |
233 | if (item.bsmSj === val.bsmSj) { | 255 | if (item.bsmSj === val.bsmSj) { |
... | @@ -240,9 +262,10 @@ export default { | ... | @@ -240,9 +262,10 @@ export default { |
240 | } | 262 | } |
241 | } else { | 263 | } else { |
242 | this.previewImg.imgList = [] | 264 | this.previewImg.imgList = [] |
243 | this.tableData.forEach(item => { | 265 | this.tableData.forEach((item, index) => { |
244 | if (this.treeCheckId == item.bsmSj) { | 266 | if (this.treeCheckId == item.bsmSj) { |
245 | item.children = [] | 267 | item.children = [] |
268 | that.treeCheckIndex = index | ||
246 | } | 269 | } |
247 | }) | 270 | }) |
248 | } | 271 | } |
... | @@ -343,9 +366,10 @@ export default { | ... | @@ -343,9 +366,10 @@ export default { |
343 | }) | 366 | }) |
344 | }, | 367 | }, |
345 | // 材料目录点击选中 | 368 | // 材料目录点击选中 |
346 | treeClick (item) { | 369 | treeClick (item, index) { |
347 | this.previewImg.index = 0 | 370 | this.previewImg.index = 0 |
348 | this.treeCheckId = item.bsmSj | 371 | this.treeCheckId = item?.bsmSj |
372 | this.treeCheckIndex = index | ||
349 | this.previewImg.imgList = item?.children | 373 | this.previewImg.imgList = item?.children |
350 | this.previewImg.bsmSj = item?.bsmSj | 374 | this.previewImg.bsmSj = item?.bsmSj |
351 | }, | 375 | }, |
... | @@ -469,8 +493,9 @@ export default { | ... | @@ -469,8 +493,9 @@ export default { |
469 | cursor: pointer; | 493 | cursor: pointer; |
470 | box-sizing: border-box; | 494 | box-sizing: border-box; |
471 | border-radius: 6px; | 495 | border-radius: 6px; |
472 | line-height: 24px; | 496 | line-height: 20px; |
473 | transition: all 0.3s; | 497 | transition: all 0.3s; |
498 | padding: 8px 0; | ||
474 | } | 499 | } |
475 | 500 | ||
476 | .child:hover { | 501 | .child:hover { | ... | ... |
... | @@ -171,7 +171,7 @@ export default { | ... | @@ -171,7 +171,7 @@ export default { |
171 | }) | 171 | }) |
172 | }, | 172 | }, |
173 | ywhClick (item) { | 173 | ywhClick (item) { |
174 | const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&viewtype=1' + '&sqywbm=' + item.djywbm); | 174 | const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm); |
175 | window.open(href, '_blank'); | 175 | window.open(href, '_blank'); |
176 | } | 176 | } |
177 | } | 177 | } | ... | ... |
... | @@ -170,7 +170,7 @@ | ... | @@ -170,7 +170,7 @@ |
170 | </el-col> | 170 | </el-col> |
171 | </el-row> | 171 | </el-row> |
172 | <InformationTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" /> | 172 | <InformationTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" /> |
173 | <div class="slxx_title">登记原因{{flag}}</div> | 173 | <div class="slxx_title">登记原因</div> |
174 | <el-row :gutter="10"> | 174 | <el-row :gutter="10"> |
175 | <el-col> | 175 | <el-col> |
176 | <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="djyy"> | 176 | <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="djyy"> |
... | @@ -179,7 +179,7 @@ | ... | @@ -179,7 +179,7 @@ |
179 | </el-col> | 179 | </el-col> |
180 | </el-row> | 180 | </el-row> |
181 | </div> | 181 | </div> |
182 | <el-row class="btn"> | 182 | <el-row class="btn" v-if="!$route.query.viewtype"> |
183 | <el-form-item :class="flag ? 'marginBot0' : ''"> | 183 | <el-form-item :class="flag ? 'marginBot0' : ''"> |
184 | <el-button type="primary" @click="onSubmit">保存</el-button> | 184 | <el-button type="primary" @click="onSubmit">保存</el-button> |
185 | </el-form-item> | 185 | </el-form-item> | ... | ... |
... | @@ -4,7 +4,10 @@ | ... | @@ -4,7 +4,10 @@ |
4 | <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag" | 4 | <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag" |
5 | label-width="120px"> | 5 | label-width="120px"> |
6 | <div class="slxx_con"> | 6 | <div class="slxx_con"> |
7 | <div class="slxx_title">受理信息</div> | 7 | <div class="slxx_title title-block"> |
8 | 受理信息 | ||
9 | <div class="triangle"></div> | ||
10 | </div> | ||
8 | <el-row :gutter="10"> | 11 | <el-row :gutter="10"> |
9 | <el-col :span="8"> | 12 | <el-col :span="8"> |
10 | <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号:" prop="ywh"> | 13 | <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号:" prop="ywh"> |
... | @@ -45,7 +48,10 @@ | ... | @@ -45,7 +48,10 @@ |
45 | </el-form-item> | 48 | </el-form-item> |
46 | </el-col> | 49 | </el-col> |
47 | </el-row> | 50 | </el-row> |
48 | <div class="slxx_title">不动产单元情况</div> | 51 | <div class="slxx_title title-block"> |
52 | 不动产单元情况 | ||
53 | <div class="triangle"></div> | ||
54 | </div> | ||
49 | <el-row :gutter="10"> | 55 | <el-row :gutter="10"> |
50 | <el-col :span="8"> | 56 | <el-col :span="8"> |
51 | <el-form-item :class="flag ? 'marginBot0' : ''" label="宗地代码:" prop="zddm"> | 57 | <el-form-item :class="flag ? 'marginBot0' : ''" label="宗地代码:" prop="zddm"> |
... | @@ -113,7 +119,10 @@ | ... | @@ -113,7 +119,10 @@ |
113 | </el-form-item> | 119 | </el-form-item> |
114 | </el-col> | 120 | </el-col> |
115 | </el-row> | 121 | </el-row> |
116 | <div class="slxx_title">权利人信息</div> | 122 | <div class="slxx_title title-block"> |
123 | 权利人信息 | ||
124 | <div class="triangle"></div> | ||
125 | </div> | ||
117 | <el-row :gutter="10"> | 126 | <el-row :gutter="10"> |
118 | <el-col :span="14"> | 127 | <el-col :span="14"> |
119 | <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式:"> | 128 | <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式:"> |
... | @@ -142,7 +151,10 @@ | ... | @@ -142,7 +151,10 @@ |
142 | </el-col> | 151 | </el-col> |
143 | </el-row> | 152 | </el-row> |
144 | <InformationTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" /> | 153 | <InformationTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" /> |
145 | <div class="slxx_title">登记原因{{flag}}</div> | 154 | <div class="slxx_title title-block"> |
155 | 登记原因 | ||
156 | <div class="triangle"></div> | ||
157 | </div> | ||
146 | <el-row :gutter="10"> | 158 | <el-row :gutter="10"> |
147 | <el-col> | 159 | <el-col> |
148 | <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="djyy"> | 160 | <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="djyy"> | ... | ... |
... | @@ -4,7 +4,10 @@ | ... | @@ -4,7 +4,10 @@ |
4 | <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag" | 4 | <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag" |
5 | label-width="120px"> | 5 | label-width="120px"> |
6 | <div class="slxx_con"> | 6 | <div class="slxx_con"> |
7 | <div class="slxx_title">受理信息</div> | 7 | <div class="slxx_title title-block"> |
8 | 受理信息 | ||
9 | <div class="triangle"></div> | ||
10 | </div> | ||
8 | <el-row :gutter="10"> | 11 | <el-row :gutter="10"> |
9 | <el-col :span="8"> | 12 | <el-col :span="8"> |
10 | <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号:" prop="ywh"> | 13 | <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号:" prop="ywh"> |
... | @@ -45,7 +48,10 @@ | ... | @@ -45,7 +48,10 @@ |
45 | </el-form-item> | 48 | </el-form-item> |
46 | </el-col> | 49 | </el-col> |
47 | </el-row> | 50 | </el-row> |
48 | <div class="slxx_title">不动产单元情况</div> | 51 | <div class="slxx_title title-block"> |
52 | 不动产单元情况 | ||
53 | <div class="triangle"></div> | ||
54 | </div> | ||
49 | <el-row :gutter="10"> | 55 | <el-row :gutter="10"> |
50 | <el-col :span="8"> | 56 | <el-col :span="8"> |
51 | <el-form-item :class="flag ? 'marginBot0' : ''" label="宗地代码:" prop="zddm"> | 57 | <el-form-item :class="flag ? 'marginBot0' : ''" label="宗地代码:" prop="zddm"> |
... | @@ -113,7 +119,10 @@ | ... | @@ -113,7 +119,10 @@ |
113 | </el-form-item> | 119 | </el-form-item> |
114 | </el-col> | 120 | </el-col> |
115 | </el-row> | 121 | </el-row> |
116 | <div class="slxx_title">权利人信息</div> | 122 | <div class="slxx_title title-block"> |
123 | 权利人信息 | ||
124 | <div class="triangle"></div> | ||
125 | </div> | ||
117 | <el-row :gutter="10"> | 126 | <el-row :gutter="10"> |
118 | <el-col :span="14"> | 127 | <el-col :span="14"> |
119 | <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式:"> | 128 | <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式:"> |
... | @@ -142,16 +151,20 @@ | ... | @@ -142,16 +151,20 @@ |
142 | </el-col> | 151 | </el-col> |
143 | </el-row> | 152 | </el-row> |
144 | <InformationTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" /> | 153 | <InformationTable :tableData="ruleForm.qlrxx" :gyfs="ruleForm.gyfs" /> |
145 | <div class="slxx_title">登记原因{{flag}}</div> | 154 | <div class="slxx_title title-block"> |
155 | 登记原因 | ||
156 | <div class="triangle"></div> | ||
157 | </div> | ||
146 | <el-row :gutter="10"> | 158 | <el-row :gutter="10"> |
147 | <el-col> | 159 | <el-col> |
148 | <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="djyy"> | 160 | <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="djyy"> |
149 | <el-input class="textArea" type="textarea" v-model="ruleForm.djyy"></el-input> | 161 | <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype" v-model="ruleForm.djyy"> |
162 | </el-input> | ||
150 | </el-form-item> | 163 | </el-form-item> |
151 | </el-col> | 164 | </el-col> |
152 | </el-row> | 165 | </el-row> |
153 | </div> | 166 | </div> |
154 | <el-row class="btn"> | 167 | <el-row class="btn" v-if="!$route.query.viewtype"> |
155 | <el-form-item :class="flag ? 'marginBot0' : ''"> | 168 | <el-form-item :class="flag ? 'marginBot0' : ''"> |
156 | <el-button type="primary" @click="onSubmit">保存</el-button> | 169 | <el-button type="primary" @click="onSubmit">保存</el-button> |
157 | </el-form-item> | 170 | </el-form-item> | ... | ... |
... | @@ -50,7 +50,8 @@ | ... | @@ -50,7 +50,8 @@ |
50 | <i class="el-icon-circle-close" @click="handelItem(index)"></i> | 50 | <i class="el-icon-circle-close" @click="handelItem(index)"></i> |
51 | </li> | 51 | </li> |
52 | </ul> | 52 | </ul> |
53 | <el-button class="clean-btn" type="text" v-if="searchList.length>0" @click.native="hanldeCleanAll">清除全部</el-button> | 53 | <el-button class="clean-btn" type="text" v-if="searchList.length>0" @click.native="hanldeCleanAll">清除全部 |
54 | </el-button> | ||
54 | </el-row> | 55 | </el-row> |
55 | </el-form> | 56 | </el-form> |
56 | </div> | 57 | </div> |
... | @@ -83,7 +84,6 @@ export default { | ... | @@ -83,7 +84,6 @@ export default { |
83 | }, | 84 | }, |
84 | data () { | 85 | data () { |
85 | return { | 86 | return { |
86 | |||
87 | queryForm: { | 87 | queryForm: { |
88 | ywly: "", | 88 | ywly: "", |
89 | qllx: "", | 89 | qllx: "", | ... | ... |
-
Please register or sign in to post a comment