ad8f6c39 by yangwei

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

2 parents e5a2afea ca383e9f
1 <template>
2 <div>
3 <div>自来水信息</div>
4 <div>天然气信息</div>
5 <div>电力信息</div>
6 </div>
7 </template>
...\ No newline at end of file ...\ No newline at end of file
1 <template>
2 <div>
3 <div>不动产信息</div>
4 <div>收费明细</div>
5 <div>缴费票据</div>
6 </div>
7 </template>
...\ No newline at end of file ...\ No newline at end of file
1 <template>
2 <div>
3 <div>不动产信息</div>
4 <div>买方信息</div>
5 <div>卖方信息</div>
6 <div>合同信息</div>
7 <div>缴税信息</div>
8 </div>
9 </template>
...\ No newline at end of file ...\ No newline at end of file
...@@ -66,6 +66,15 @@ export function getForm(tabName, djywbm) { ...@@ -66,6 +66,15 @@ export function getForm(tabName, djywbm) {
66 case "spyj": 66 case "spyj":
67 form = require("@/views/workflow/components/spyj.vue"); 67 form = require("@/views/workflow/components/spyj.vue");
68 break; 68 break;
69 case "swxx":
70 form = require("@/views/workflow/components/swxx.vue");
71 break;
72 case "sfxx":
73 form = require("@/views/workflow/components/sfxx.vue");
74 break;
75 case "sdqxx":
76 form = require("@/views/workflow/components/sdqxx.vue");
77 break;
69 case "zdjbxx": 78 case "zdjbxx":
70 form = require("@/views/registerBook/zdjbxx.vue"); 79 form = require("@/views/registerBook/zdjbxx.vue");
71 break; 80 break;
......
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
369 :disabled="viewEdit" 369 :disabled="viewEdit"
370 :gyfs="ruleForm.sldy.gyfs" /> 370 :gyfs="ruleForm.sldy.gyfs" />
371 371
372 <div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'"> 372 <div v-if="ruleForm.qlxx.djlx == '200'">
373 <div class="slxx_title title-block"> 373 <div class="slxx_title title-block">
374 义务人信息 374 义务人信息
375 <div class="triangle"></div> 375 <div class="triangle"></div>
...@@ -379,7 +379,7 @@ ...@@ -379,7 +379,7 @@
379 @upDateQlrxxList="upDateYwrxxList" 379 @upDateQlrxxList="upDateYwrxxList"
380 :tableData="ruleForm.ywrList" 380 :tableData="ruleForm.ywrList"
381 :disabled="viewEdit" 381 :disabled="viewEdit"
382 :gyfs="ruleForm.sldy.gyfs" /> 382 />
383 </div> 383 </div>
384 <div class="slxx_title title-block"> 384 <div class="slxx_title title-block">
385 登记原因 385 登记原因
......
...@@ -253,7 +253,17 @@ ...@@ -253,7 +253,17 @@
253 </div> 253 </div>
254 <el-row :gutter="10"> 254 <el-row :gutter="10">
255 <el-col> 255 <el-col>
256 <el-form-item label="登记原因:" prop="djyy"> 256 <el-form-item v-if="ruleForm.sldy.djlx=='400'" label="注销登记原因:" prop="djyy">
257 <el-input
258 class="textArea"
259 type="textarea"
260 maxlength="500"
261 show-word-limit
262 :disabled="!viewEdit"
263 v-model="ruleForm.ygdj.zxyy">
264 </el-input>
265 </el-form-item>
266 <el-form-item v-else label="登记原因:" prop="djyy">
257 <el-input 267 <el-input
258 class="textArea" 268 class="textArea"
259 type="textarea" 269 type="textarea"
......
...@@ -268,14 +268,25 @@ ...@@ -268,14 +268,25 @@
268 </div> 268 </div>
269 <el-row :gutter="10"> 269 <el-row :gutter="10">
270 <el-col> 270 <el-col>
271 <el-form-item label="登记原因:" prop="djyy"> 271 <el-form-item v-if="ruleForm.sldy.djlx=='400'" label="注销登记原因:" prop="djyy">
272 <el-input 272 <el-input
273 class="textArea" 273 class="textArea"
274 type="textarea" 274 type="textarea"
275 maxlength="500" 275 maxlength="500"
276 show-word-limit 276 show-word-limit
277 :disabled="!viewEdit" 277 :disabled="!viewEdit"
278 v-model="ruleForm.ygdj.djyy"></el-input> 278 v-model="ruleForm.ygdj.zxyy">
279 </el-input>
280 </el-form-item>
281 <el-form-item v-else label="登记原因:" prop="djyy">
282 <el-input
283 class="textArea"
284 type="textarea"
285 maxlength="500"
286 show-word-limit
287 :disabled="!viewEdit"
288 v-model="ruleForm.ygdj.djyy">
289 </el-input>
279 </el-form-item> 290 </el-form-item>
280 </el-col> 291 </el-col>
281 </el-row> 292 </el-row>
......