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

+<template>
+  <div>
+    <div>自来水信息</div>
+    <div>天然气信息</div>
+    <div>电力信息</div>
+  </div>
+</template>
\ No newline at end of file

+<template>
+  <div>
+    <div>不动产信息</div>
+    <div>收费明细</div>
+    <div>缴费票据</div>
+  </div>
+</template>
\ No newline at end of file

+<template>
+   <div>
+    <div>不动产信息</div>
+    <div>买方信息</div>
+    <div>卖方信息</div>
+    <div>合同信息</div>
+     <div>缴税信息</div>
+  </div>
+</template>
\ No newline at end of file

@@ -66,6 +66,15 @@ export function getForm(tabName, djywbm) {
     case "spyj":
       form = require("@/views/workflow/components/spyj.vue");
       break;
+    case "swxx":
+      form = require("@/views/workflow/components/swxx.vue");
+      break;
+    case "sfxx":
+      form = require("@/views/workflow/components/sfxx.vue");
+      break;
+      case "sdqxx":
+      form = require("@/views/workflow/components/sdqxx.vue");
+      break;
     case "zdjbxx":
       form = require("@/views/registerBook/zdjbxx.vue");
       break;

@@ -369,7 +369,7 @@
           :disabled="viewEdit"
           :gyfs="ruleForm.sldy.gyfs" />
 
-        <div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
+        <div v-if="ruleForm.qlxx.djlx == '200'">
           <div class="slxx_title title-block">
             义务人信息
             <div class="triangle"></div>
@@ -379,7 +379,7 @@
             @upDateQlrxxList="upDateYwrxxList"
             :tableData="ruleForm.ywrList"
             :disabled="viewEdit"
-            :gyfs="ruleForm.sldy.gyfs" />
+             />
         </div>
         <div class="slxx_title title-block">
           登记原因

@@ -253,7 +253,17 @@
         </div>
         <el-row :gutter="10">
           <el-col>
-            <el-form-item label="登记原因：" prop="djyy">
+            <el-form-item v-if="ruleForm.sldy.djlx=='400'" label="注销登记原因：" prop="djyy">
+              <el-input
+                class="textArea"
+                type="textarea"
+                maxlength="500"
+                show-word-limit
+                :disabled="!viewEdit"
+                v-model="ruleForm.ygdj.zxyy">
+              </el-input>
+            </el-form-item>
+            <el-form-item v-else label="登记原因：" prop="djyy">
               <el-input
                 class="textArea"
                 type="textarea"

@@ -268,14 +268,25 @@
         </div>
         <el-row :gutter="10">
           <el-col>
-            <el-form-item label="登记原因：" prop="djyy">
+            <el-form-item v-if="ruleForm.sldy.djlx=='400'" label="注销登记原因：" prop="djyy">
               <el-input
                 class="textArea"
                 type="textarea"
                 maxlength="500"
                 show-word-limit
                 :disabled="!viewEdit"
-                v-model="ruleForm.ygdj.djyy"></el-input>
+                v-model="ruleForm.ygdj.zxyy">
+              </el-input>
+            </el-form-item>
+            <el-form-item v-else label="登记原因：" prop="djyy">
+              <el-input
+                class="textArea"
+                type="textarea"
+                maxlength="500"
+                show-word-limit
+                :disabled="!viewEdit"
+                v-model="ruleForm.ygdj.djyy">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>