Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
c583cad6 by renchao@pashanhoo.com
Options

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

2 parents 29c9e685 41e669de
Expand all
Inline Side-by-side
Showing 18 changed files with 229 additions and 31 deletions
...@@ -407,6 +407,7 @@ ...@@ -407,6 +407,7 @@
407 <el-date-picker 407 <el-date-picker
408 v-model="ruleForm.qlxx.djsj" 408 v-model="ruleForm.qlxx.djsj"
409 type="date" 409 type="date"
410 class="width100"
410 placeholder="选择日期" 411 placeholder="选择日期"
411 value-format="yyyy-MM-dd HH:mm:ss" 412 value-format="yyyy-MM-dd HH:mm:ss"
412 format="yyyy-MM-dd" 413 format="yyyy-MM-dd"
......
...@@ -115,12 +115,40 @@ ...@@ -115,12 +115,40 @@
115 </el-col> 115 </el-col>
116 <el-col :span="8"> 116 <el-col :span="8">
117 <el-form-item label="独用土地面积："> 117 <el-form-item label="独用土地面积：">
118 <el-input v-model="ruleForm.fdcq2.dytdmj"></el-input> 118 <div class="flex">
119 <el-input v-model="ruleForm.fdcq2.dytdmj"
120 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
121 <el-select
122 v-model="ruleForm.fdcq2.mjdw"
123 :disabled="!ableOperation"
124 style="width: 20%">
125 <el-option
126 v-for="item in dictData['A7']"
127 :key="item.dcode"
128 :label="item.dname"
129 :value="item.dcode">
130 </el-option>
131 </el-select>
132 </div>
119 </el-form-item> 133 </el-form-item>
120 </el-col> 134 </el-col>
121 <el-col :span="8"> 135 <el-col :span="8">
122 <el-form-item label="分摊土地面积："> 136 <el-form-item label="分摊土地面积：">
123 <el-input v-model="ruleForm.fdcq2.fttdmj"></el-input> 137 <div class="flex">
138 <el-input v-model="ruleForm.fdcq2.fttdmj"
139 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
140 <el-select
141 v-model="ruleForm.fdcq2.mjdw"
142 :disabled="!ableOperation"
143 style="width: 20%">
144 <el-option
145 v-for="item in dictData['A7']"
146 :key="item.dcode"
147 :label="item.dname"
148 :value="item.dcode">
149 </el-option>
150 </el-select>
151 </div>
124 </el-form-item> 152 </el-form-item>
125 </el-col> 153 </el-col>
126 <el-col :span="8"> 154 <el-col :span="8">
...@@ -137,10 +165,12 @@ ...@@ -137,10 +165,12 @@
137 </el-col> 165 </el-col>
138 <el-col :span="8"> 166 <el-col :span="8">
139 <el-form-item label="房地产交易价格："> 167 <el-form-item label="房地产交易价格：">
140 <div style="display: flex"> 168 <div class="flex">
141 <el-input 169 <el-input
142 v-model="ruleForm.fdcq2.qjjg" 170 v-model="ruleForm.fdcq2.qjjg"
143 style="width: 500%"></el-input> 171 style="width: 500%"
172 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
173 ></el-input>
144 <el-select v-model="ruleForm.fdcq2.jedw"> 174 <el-select v-model="ruleForm.fdcq2.jedw">
145 <el-option 175 <el-option
146 v-for="item in dictData['A57']" 176 v-for="item in dictData['A57']"
...@@ -225,17 +255,59 @@ ...@@ -225,17 +255,59 @@
225 </el-col> 255 </el-col>
226 <el-col :span="8"> 256 <el-col :span="8">
227 <el-form-item label="建筑面积："> 257 <el-form-item label="建筑面积：">
228 <el-input v-model="ruleForm.fdcq2.jzmj"></el-input> 258 <div class="flex">
259 <el-input v-model="ruleForm.fdcq2.jzmj"
260 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
261 <el-select
262 v-model="ruleForm.fdcq2.mjdw"
263 :disabled="!ableOperation"
264 style="width: 20%">
265 <el-option
266 v-for="item in dictData['A7']"
267 :key="item.dcode"
268 :label="item.dname"
269 :value="item.dcode">
270 </el-option>
271 </el-select>
272 </div>
229 </el-form-item> 273 </el-form-item>
230 </el-col> 274 </el-col>
231 <el-col :span="8"> 275 <el-col :span="8">
232 <el-form-item label="专有建筑面积："> 276 <el-form-item label="专有建筑面积：">
233 <el-input v-model="ruleForm.fdcq2.zyjzmj"></el-input> 277 <div class="flex">
278 <el-input v-model="ruleForm.fdcq2.zyjzmj"
279 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
280 <el-select
281 v-model="ruleForm.fdcq2.mjdw"
282 :disabled="!ableOperation"
283 style="width: 20%">
284 <el-option
285 v-for="item in dictData['A7']"
286 :key="item.dcode"
287 :label="item.dname"
288 :value="item.dcode">
289 </el-option>
290 </el-select>
291 </div>
234 </el-form-item> 292 </el-form-item>
235 </el-col> 293 </el-col>
236 <el-col :span="8"> 294 <el-col :span="8">
237 <el-form-item label="分摊建筑面积："> 295 <el-form-item label="分摊建筑面积：">
238 <el-input v-model="ruleForm.fdcq2.ftjzmj"></el-input> 296 <div class="flex">
297 <el-input v-model="ruleForm.fdcq2.ftjzmj"
298 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
299 <el-select
300 v-model="ruleForm.fdcq2.mjdw"
301 :disabled="!ableOperation"
302 style="width: 20%">
303 <el-option
304 v-for="item in dictData['A7']"
305 :key="item.dcode"
306 :label="item.dname"
307 :value="item.dcode">
308 </el-option>
309 </el-select>
310 </div>
239 </el-form-item> 311 </el-form-item>
240 </el-col> 312 </el-col>
241 <el-col :span="8"> 313 <el-col :span="8">
...@@ -647,4 +719,10 @@ ...@@ -647,4 +719,10 @@
647 <style scoped lang="scss"> 719 <style scoped lang="scss">
648 @import "~@/styles/public.scss"; 720 @import "~@/styles/public.scss";
649 @import "~@/styles/slxx/slxx.scss"; 721 @import "~@/styles/slxx/slxx.scss";
722 .el-date-editor.el-input {
723 width: 100%;
724 }
725 .el-table__row {
726 height: 30px !important;
727 }
650 </style> 728 </style>
......
...@@ -45,6 +45,32 @@ ...@@ -45,6 +45,32 @@
45 <div class="triangle"></div> 45 <div class="triangle"></div>
46 </div> 46 </div>
47 <el-row :gutter="10"> 47 <el-row :gutter="10">
48 <el-col :span="8" v-if="ssqlxxshow">
49 <el-form-item label="上手权利信息：">
50 <select-table
51 v-model="ruleForm.ssQlxx"
52 :table-width="550"
53 :tableData="ssQlxxList"
54 :props="props"
55 @change="ssQlxxchange"
56 >
57 <el-table-column
58 prop="qllxmc"
59 width="130"
60 label="权利类型"
61 ></el-table-column>
62 <el-table-column
63 prop="bdcqzh"
64 width="160"
65 label="不动产权证书"
66 ></el-table-column>
67 <el-table-column prop="qlrmc" label="权利人"></el-table-column>
68 <el-table-column prop="mjmc" label="面积"></el-table-column>
69 <el-table-column prop="ytmc" label="用途"></el-table-column>
70 <el-table-column prop="zl" label="坐落"></el-table-column>
71 </select-table>
72 </el-form-item>
73 </el-col>
48 <el-col :span="8"> 74 <el-col :span="8">
49 <el-form-item label="不动产单元号："> 75 <el-form-item label="不动产单元号：">
50 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input> 76 <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
......
...@@ -328,7 +328,24 @@ ...@@ -328,7 +328,24 @@
328 </el-col> 328 </el-col>
329 <el-col :span="8"> 329 <el-col :span="8">
330 <el-form-item label="建筑面积："> 330 <el-form-item label="建筑面积：">
331 <el-input v-model="ruleForm.ygdj.jzmj"></el-input> 331 <div class="flex">
332 <el-input v-model="ruleForm.ygdj.jzmj"
333 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
334 ></el-input>
335 <el-select
336 v-model="ruleForm.ygdj.mjdw"
337 :disabled="!ableOperation"
338 style="width: 20%"
339 >
340 <el-option
341 v-for="item in dictData['A7']"
342 :key="item.dcode"
343 :label="item.dname"
344 :value="item.dcode"
345 >
346 </el-option>
347 </el-select>
348 </div>
332 </el-form-item> 349 </el-form-item>
333 </el-col> 350 </el-col>
334 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 351 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
...@@ -356,7 +373,21 @@ ...@@ -356,7 +373,21 @@
356 </el-col> 373 </el-col>
357 <el-col :span="8"> 374 <el-col :span="8">
358 <el-form-item label="取得价格/被担保主债权数额："> 375 <el-form-item label="取得价格/被担保主债权数额：">
359 <el-input v-model="ruleForm.ygdj.qdjg"></el-input> 376 <div class="flex">
377 <el-input v-model="ruleForm.ygdj.qdjg"
378 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
379 <el-select
380 v-model="ruleForm.ygdj.jedw"
381 :disabled="!ableOperation"
382 style="width: 20%">
383 <el-option
384 v-for="item in dictData['A7']"
385 :key="item.dcode"
386 :label="item.dname"
387 :value="item.dcode">
388 </el-option>
389 </el-select>
390 </div>
360 </el-form-item> 391 </el-form-item>
361 </el-col> 392 </el-col>
362 <el-col :span="8"> 393 <el-col :span="8">
......
...@@ -240,8 +240,25 @@ ...@@ -240,8 +240,25 @@
240 </el-form-item> 240 </el-form-item>
241 </el-col> 241 </el-col>
242 <el-col :span="8"> 242 <el-col :span="8">
243 <el-form-item label="建筑面积："> 243 <el-form-item label="建筑面积：">
244 <el-input v-model="ruleForm.ygdj.jzmj"></el-input> 244 <div class="flex">
245 <el-input v-model="ruleForm.ygdj.jzmj"
246 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
247 ></el-input>
248 <el-select
249 v-model="ruleForm.ygdj.mjdw"
250 :disabled="!ableOperation"
251 style="width: 20%"
252 >
253 <el-option
254 v-for="item in dictData['A7']"
255 :key="item.dcode"
256 :label="item.dname"
257 :value="item.dcode"
258 >
259 </el-option>
260 </el-select>
261 </div>
245 </el-form-item> 262 </el-form-item>
246 </el-col> 263 </el-col>
247 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'"> 264 <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
...@@ -268,8 +285,22 @@ ...@@ -268,8 +285,22 @@
268 </el-form-item> 285 </el-form-item>
269 </el-col> 286 </el-col>
270 <el-col :span="8"> 287 <el-col :span="8">
271 <el-form-item label="取得价格/被担保主债权数额："> 288 <el-form-item label="取得价格/被担保主债权数额：">
272 <el-input v-model="ruleForm.ygdj.qdjg"></el-input> 289 <div class="flex">
290 <el-input v-model="ruleForm.ygdj.qdjg"
291 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
292 <el-select
293 v-model="ruleForm.ygdj.jedw"
294 :disabled="!ableOperation"
295 style="width: 20%">
296 <el-option
297 v-for="item in dictData['A7']"
298 :key="item.dcode"
299 :label="item.dname"
300 :value="item.dcode">
301 </el-option>
302 </el-select>
303 </div>
273 </el-form-item> 304 </el-form-item>
274 </el-col> 305 </el-col>
275 <el-col :span="8"> 306 <el-col :span="8">
......
...@@ -282,11 +282,6 @@ ...@@ -282,11 +282,6 @@
282 <el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input> 282 <el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input>
283 </el-form-item> 283 </el-form-item>
284 </el-col> 284 </el-col>
285 <el-col :span="8">
286 <el-form-item label="登记时间：">
287 <el-input v-model="ruleForm.yydj.djsj"></el-input>
288 </el-form-item>
289 </el-col>
290 <el-col :span="24"> 285 <el-col :span="24">
291 <el-form-item label="附记："> 286 <el-form-item label="附记：">
292 <el-input v-model="ruleForm.yydj.fj"></el-input> 287 <el-input v-model="ruleForm.yydj.fj"></el-input>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 :normalizer="normalizer" 40 :normalizer="normalizer"
41 :appendToBody="true" 41 :appendToBody="true"
42 z-index="9999" 42 z-index="9999"
43 @input="addrow(scope.$index)" 43 @input="addrow(scope.row)"
44 /> 44 />
45 </template> 45 </template>
46 </el-table-column> 46 </el-table-column>
...@@ -192,10 +192,10 @@ export default { ...@@ -192,10 +192,10 @@ export default {
192 // this.tableDataList = this.tableDataList.map((item) => { 192 // this.tableDataList = this.tableDataList.map((item) => {
193 // return { 193 // return {
194 // ...item, 194 // ...item,
195 // yt: this.tdyt, 195 // yt: a.yt,
196 // }; 196 // };
197 // }); 197 // });
198 // this.$emit("upDateTdytxxList", this.tableDataList); 198 this.$emit("upDateTdytxxList", this.tableDataList);
199 }, 199 },
200 /** 200 /**
201 * @description: startTime 201 * @description: startTime
......
...@@ -35,6 +35,10 @@ ...@@ -35,6 +35,10 @@
35 </div> 35 </div>
36 <!-- 表单内容区域 --> 36 <!-- 表单内容区域 -->
37 <div class="rightContainer"> 37 <div class="rightContainer">
38 <div class="count">
39 当前流程所在环节:
40 <span>{{ this.zbhj }}</span>
41 </div>
38 <el-tabs v-model="tabName" :before-leave="beforeLeave"> 42 <el-tabs v-model="tabName" :before-leave="beforeLeave">
39 <el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value"> 43 <el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value">
40 </el-tab-pane> 44 </el-tab-pane>
...@@ -84,6 +88,8 @@ ...@@ -84,6 +88,8 @@
84 bsmSlsq: this.$route.query.bsmSlsq, 88 bsmSlsq: this.$route.query.bsmSlsq,
85 //当前流程所在环节 89 //当前流程所在环节
86 bestepid: this.$route.query.bestepid, 90 bestepid: this.$route.query.bestepid,
91 //当前流程所在环节
92 zbhj: this.$route.query.zbhj,
87 //设置那个表单选中 93 //设置那个表单选中
88 tabName: "", 94 tabName: "",
89 //设置那个表单选择 95 //设置那个表单选择
...@@ -201,4 +207,19 @@ ...@@ -201,4 +207,19 @@
201 } 207 }
202 } 208 }
203 </script> 209 </script>
204 210 <style scoped lang="scss">
211 .rightContainer {
212 position: relative;
213 }
214 .count {
215 font-size: 14px;
216 position: absolute;
217 right: 25px;
218 top: 12px;
219 height: 30px;
220 span {
221 font-weight: 600;
222 color: #3498db;
223 }
224 }
225 </style>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 <el-row :gutter="10"> 32 <el-row :gutter="10">
33 <el-col :span="8"> 33 <el-col :span="8">
34 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：" prop="slsq.qllx"> 34 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：" prop="slsq.qllx">
35 <el-select disabled v-model="ruleForm.sldy.qllx" filterable clearable placeholder="请选择权利类型"> 35 <el-select disabled v-model="ruleForm.sldyList[0].qllx" filterable clearable placeholder="请选择权利类型">
36 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 36 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
37 </el-option> 37 </el-option>
38 </el-select> 38 </el-select>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 </el-col> 40 </el-col>
41 <el-col :span="8"> 41 <el-col :span="8">
42 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型：" prop="slsq.djlx"> 42 <el-form-item :class="flag ? 'marginBot0' : ''" label="登记类型：" prop="slsq.djlx">
43 <el-select disabled v-model="ruleForm.sldy.djlx" filterable clearable placeholder="请选择登记类型"> 43 <el-select disabled v-model="ruleForm.sldyList[0].djlx" filterable clearable placeholder="请选择登记类型">
44 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 44 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode">
45 </el-option> 45 </el-option>
46 </el-select> 46 </el-select>
......
...@@ -72,7 +72,21 @@ ...@@ -72,7 +72,21 @@
72 <el-row :gutter="10"> 72 <el-row :gutter="10">
73 <el-col :span="8"> 73 <el-col :span="8">
74 <el-form-item label="宗地面积："> 74 <el-form-item label="宗地面积：">
75 <el-input v-model="ruleForm.zdjbxx.zdmj"></el-input> 75 <div class="flex">
76 <el-input v-model="ruleForm.zdjbxx.zdmj"
77 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
78 <el-select
79 v-model="ruleForm.fdcq2.mjdw"
80 :disabled="!ableOperation"
81 style="width: 20%">
82 <el-option
83 v-for="item in dictData['A7']"
84 :key="item.dcode"
85 :label="item.dname"
86 :value="item.dcode">
87 </el-option>
88 </el-select>
89 </div>
76 </el-form-item> 90 </el-form-item>
77 </el-col> 91 </el-col>
78 <!-- <el-col :span="8"> 92 <!-- <el-col :span="8">
...@@ -88,7 +102,7 @@ ...@@ -88,7 +102,7 @@
88 <el-col :span="8"> 102 <el-col :span="8">
89 <el-form-item label="取得价格："> 103 <el-form-item label="取得价格：">
90 <div style="display:flex"> 104 <div style="display:flex">
91 <el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value=value.replace(/[^\d.]/g,'')"></el-input> 105 <el-input v-model="ruleForm.jsydsyq.qdjg" style="width:500%" oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
92 <el-select v-model="ruleForm.jsydsyq.jedw"> 106 <el-select v-model="ruleForm.jsydsyq.jedw">
93 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 107 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
94 </el-option> 108 </el-option>
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 <el-input 102 <el-input
103 v-model="ruleForm.jsydsyq.qdjg" 103 v-model="ruleForm.jsydsyq.qdjg"
104 style="width: 500%" 104 style="width: 500%"
105 oninput="value=value.replace(/[^\d.]/g,'')" 105 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
106 disabled 106 disabled
107 ></el-input> 107 ></el-input>
108 <el-select v-model="ruleForm.jsydsyq.jedw" disabled> 108 <el-select v-model="ruleForm.jsydsyq.jedw" disabled>
......
...@@ -242,7 +242,8 @@ ...@@ -242,7 +242,8 @@
242 if (!this.isJump) { 242 if (!this.isJump) {
243 startBusinessFlow({ 243 startBusinessFlow({
244 bsmSqyw: this.bsmSqyw, 244 bsmSqyw: this.bsmSqyw,
245 sjlx: 'zrz', 245 //sjlx: 'zrz',
246 sjlx: this.activeName,
246 bdcdysz: this.bdcdysz, 247 bdcdysz: this.bdcdysz,
247 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "", 248 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
248 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "", 249 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
......
...@@ -28,7 +28,7 @@ export default { ...@@ -28,7 +28,7 @@ export default {
28 "/workFrame?bsmSlsq=" + 28 "/workFrame?bsmSlsq=" +
29 data.bsmSlsq + 29 data.bsmSlsq +
30 "&bestepid=" + 30 "&bestepid=" +
31 data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type 31 data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type+"&zbhj=受理"
32 ); 32 );
33 window.open(href, "_blank"); 33 window.open(href, "_blank");
34 this.$popupCacel() 34 this.$popupCacel()
......
...@@ -122,7 +122,7 @@ class data extends filter { ...@@ -122,7 +122,7 @@ class data extends filter {
122 minWidth: '130' 122 minWidth: '130'
123 }, 123 },
124 { 124 {
125 label: '操作111', 125 label: '操作',
126 width: '160', 126 width: '160',
127 align: 'center', 127 align: 'center',
128 fixed: 'right', 128 fixed: 'right',
......
...@@ -103,7 +103,7 @@ class data extends filter { ...@@ -103,7 +103,7 @@ class data extends filter {
103 minWidth: '130' 103 minWidth: '130'
104 }, 104 },
105 { 105 {
106 label: '操作111', 106 label: '操作',
107 width: '160', 107 width: '160',
108 align: 'center', 108 align: 'center',
109 fixed: 'right', 109 fixed: 'right',
......