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

@@ -618,7 +618,7 @@ class data extends filter {
           label: "权属状态",
         },
         {
-          prop: "cflx",
+          prop: "cflxmc",
           label: "查封类型",
         },
         {
@@ -646,15 +646,15 @@ class data extends filter {
           label: "查封机关",
         },
         {
-          prop: "bdcqlr",
+          prop: "qlrmc",
           label: "不动产权利人",
         },
         {
-          prop: "zjzl",
+          prop: "qlrzjzl",
           label: "证件种类",
         },
         {
-          prop: "zjh",
+          prop: "qlrzjhm",
           label: "证件号",
         },        
         

@@ -20,8 +20,11 @@ export function getForm(tabName, djywbm) {
         case "fwsyqslxx300":
             form = require("@/views/ywbl/fdcq2/slxx300.vue");
             break;
-        case "slxxCfdj":
-            form = require("@/views/ywbl/cfdj/slxx.vue");
+        case "tdslxxCfdj":
+            form = require("@/views/ywbl/cfdj/tdslxx.vue");
+            break;
+        case "fwslxxCfdj":
+            form = require("@/views/ywbl/cfdj/fwslxx.vue");
             break;    
         case "clxx":
             form = require("@/views/workflow/components/clxx.vue");
@@ -32,6 +35,9 @@ export function getForm(tabName, djywbm) {
         case "zdjbxx":
             form = require("@/views/registerBook/zdjbxx.vue");
             break;
+        case "cfdjxx":
+            form = require("@/views/registerBook/cfdj.vue");
+            break;    
         case "qlxx":
             form = require("@/views/registerBook/jsydsyq.vue");
             break;

@@ -99,7 +99,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型：" prop="cfdj.cflx">
-              <el-select v-model="ruleForm.cfdj.cflx" class="width100" filterable clearable placeholder="请选择查封类型："  :disabled="$route.query.viewtype">
+              <el-select v-model="ruleForm.cfdj.cflx" class="width100" filterable clearable placeholder="请选择查封类型：" 
+               :disabled="$route.query.viewtype" @change="changeCflx">
                 <el-option v-for="item in dictData['A32']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
               </el-select>
@@ -176,7 +177,7 @@ export default {
       //传递参数
       propsParam: {},
       //页面数据
-      ruleForm: {}
+      ruleForm: {},
 
     };
   },
@@ -225,6 +226,13 @@ export default {
         }
       });
     },
+    changeCflx(e){
+      let cflxItem = {}
+      cflxItem = this.dictData['A32'].find((item) => {
+        return item.dcode == e
+      })
+      this.ruleForm.cfdj.cflxmc = cflxItem.dname;
+    }
   },
 };
 </script>

@@ -48,7 +48,7 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号：" prop="qlxx.bdcqzh">
-              <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -58,7 +58,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="权利人：" prop="qlxx.qlrmc">
-              <el-input disabled v-model="ruleForm.qlxx.qlrmc"></el-input>
+              <el-input disabled v-model="ruleForm.qlxx.ywrmc"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -94,67 +94,70 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封机关：" prop="cfdj.cfjg">
-              <el-input v-model="ruleForm.cfdj.cfjg"></el-input>
+              <el-input v-model="ruleForm.cfdj.cfjg" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型：" prop="ytmc">
-              <el-select v-model="ruleForm.cfdj.cflx" class="width100" filterable clearable placeholder="请选择查封类型：">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="查封类型：" prop="cfdj.cflx">
+              <el-select v-model="ruleForm.cfdj.cflx" class="width100" filterable clearable placeholder="请选择查封类型：" 
+               :disabled="$route.query.viewtype" @change="changeCflx">
                 <el-option v-for="item in dictData['A32']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件：" prop="ytmc">
-              <el-input v-model="ruleForm.cfdj.cfwj"></el-input>
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文件：" prop="cfdj.cfwj">
+              <el-input v-model="ruleForm.cfdj.cfwj" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号：" prop="mj">
-              <el-input v-model="ruleForm.cfdj.cfwh"></el-input>
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="查封文号：" prop="cfdj.cfwh">
+              <el-input v-model="ruleForm.cfdj.cfwh" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
-              <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期"></el-date-picker>
+              <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100"  :disabled="$route.query.viewtype"
+              type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封结束时间：" prop="cfdj.cfjssj">
-              <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100" type="date" placeholder="选择日期"></el-date-picker>
+              <el-date-picker v-model="ruleForm.cfdj.cfjssj" class="width100"  :disabled="$route.query.viewtype"
+              type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="24">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围：" prop="mj">
-              <el-input v-model="ruleForm.cfdj.cffw"></el-input>
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="查封范围：" prop="cfdj.cffw">
+              <el-input v-model="ruleForm.cfdj.cffw" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="24">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="mj">
-              <el-input v-model="ruleForm.cfdj.fj"></el-input>
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="附记：" prop="cfdj.fj">
+              <el-input v-model="ruleForm.cfdj.fj" type="textarea" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <div class="slxx_title">不动产权利人信息</div>
-        <sqrViewTable :tableData="ruleForm.qlrxx" />
+        <sqrViewTable :tableData="ruleForm.ywrList" />
         <div class="slxx_title">登记原因</div>
         <el-row :gutter="10">
           <el-col>
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="djyy">
-              <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy"></el-input>
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="登记原因：" prop="cfdj.djyy">
+              <el-input class="textArea" type="textarea" v-model="ruleForm.cfdj.djyy" :disabled="$route.query.viewtype"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </div>
       <el-row>
-        <el-form-item :class="flag ? 'marginBot0' : ''" class="btn">
+        <el-form-item :class="flag ? 'marginBot0' : ''" class="btn" v-if="!$route.query.viewtype">
           <el-button type="primary" @click="onSubmit">保存</el-button>
         </el-form-item>
       </el-row>
@@ -162,8 +165,8 @@
   </div>
 </template>
 <script>
-import sqrViewTable from "@/views/workflow/components/sqrViewTable.vue";
-import { cfInit, fristReg } from "@/api/cfdjFlow.js";
+import sqrViewTable from "@/views/workflow/components/sqrViewTable";
+import { cfInit, sealUpReg } from "@/api/cfdjFlow.js";
 import { mapGetters } from "vuex";
 export default {
   data () {
@@ -174,7 +177,7 @@ export default {
       //传递参数
       propsParam: {},
       //页面数据
-      ruleForm: {}
+      ruleForm: {},
 
     };
   },
@@ -217,12 +220,19 @@ export default {
       });
     },
     onSubmit () {
-      fristReg().then((res) => {
+      sealUpReg(this.ruleForm).then((res) => {
         if (res.code === 200 && res.result) {
-          console.log(res);
+          this.$message.success('保存成功');
         }
       });
     },
+    changeCflx(e){
+      let cflxItem = {}
+      cflxItem = this.dictData['A32'].find((item) => {
+        return item.dcode == e
+      })
+      this.ruleForm.cfdj.cflxmc = cflxItem.dname;
+    }
   },
 };
 </script>