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

蔡俊立
Showing 4 changed files with 36 additions and 19 deletions
src/views/workflow/components/InformationTable.vue
src/views/workflow/components/addQlr.vue
src/views/ywbl/fdcq2/slxx200.vue
src/views/ywbl/jsydsyq/slxx200.vue
--- a/src/views/workflow/components/InformationTable.vue
View file @0ff0feb
+++ b/src/views/workflow/components/InformationTable.vue
View file @0ff0feb
@@ -66,16 +66,16 @@ export default {
          label: "姓名/名称"
        },
        {
-          prop: "dlrzjlx",
+          prop: "zjzl",
          label: "证件种类"
        },
        {
-          prop: "dlrzjh",
+          prop: "zjh",
          label: "证件号"
        },
        {
-          prop: "fr",
+          prop: "dh",
-          label: "法人"
+          label: "联系电话"
        },
        {
          label: '修改',
--- a/src/views/workflow/components/addQlr.vue
View file @0ff0feb
+++ b/src/views/workflow/components/addQlr.vue
View file @0ff0feb
@@ -32,7 +32,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="8">
-          <el-form-item label="联系电话" prop="dh" :rules="$rules.common.phone">
+          <el-form-item label="联系电话" prop="dh">
            <el-input v-model="ruleForm.dh" maxlength="11"></el-input>
          </el-form-item>
        </el-col>
--- a/src/views/ywbl/fdcq2/slxx200.vue
View file @0ff0feb
+++ b/src/views/ywbl/fdcq2/slxx200.vue
View file @0ff0feb
@@ -133,7 +133,7 @@
        <el-row :gutter="10">
          <el-col :span="14" v-if="ruleForm.qlxx">
            <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
-              <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.qlxx.gyfs">
+              <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs">
                <el-radio label="1">单独所有</el-radio>
                <el-radio label="2">共同共有</el-radio>
                <el-radio label="3">按份所有</el-radio>
@@ -160,6 +160,12 @@
        <InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
          :gyfs="ruleForm.qlxx.gyfs" />
        <div class="slxx_title title-block">
+          义务人信息
+          <div class="triangle"></div>
+        </div>
+        <InformationTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateYwrxxList" :tableData="ruleForm.ywrList"
+                          :gyfs="ruleForm.qlxx.gyfs" />
+        <div class="slxx_title title-block">
          登记原因
          <div class="triangle"></div>
        </div>
@@ -221,7 +227,11 @@ export default {
  methods: {
    // 更新权利人信息
    upDateQlrxxList (val) {
-      this.ruleForm.qlrxx = val
+      this.ruleForm.qlrList =  _.cloneDeep(val);
+    },
+     // 更新权利人信息
+    upDateYwrxxList (val) {
+      this.ruleForm.ywrList = _.cloneDeep(val);
    },
    list (bsmSldy) {
      var formdata = new FormData();
--- a/src/views/ywbl/jsydsyq/slxx200.vue
View file @0ff0feb
+++ b/src/views/ywbl/jsydsyq/slxx200.vue
View file @0ff0feb
@@ -147,6 +147,11 @@
        <InformationTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList"
          :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
          <div class="slxx_title title-block">
+          义务人信息
+          <div class="triangle"></div> </div>
+           <InformationTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList"
+          :viewtype="$route.query.viewtype" />
+        <div class="slxx_title title-block">
          登记原因
          <div class="triangle"></div>
        </div>
@@ -169,22 +174,17 @@
 </template>
 <script>
 import InformationTable from "@/views/workflow/components/InformationTable";
-import { Init, fristReg } from "@/api/jsydsyqFlow.js";
+import { Init, saveData } from "@/api/jsydsyqFlow.js";
 import { mapGetters } from "vuex";
 export default {
-  async created () {
+  async created() {
    this.propsParam = this.$attrs;
    var formdata = new FormData();
    formdata.append("bsmSldy", this.propsParam.bsmSldy);
    formdata.append("djlx", this.propsParam.djlx);
    Init(formdata).then((res) => {
      if (res.code === 200 && res.result) {
-        this.ruleForm = {
+        this.ruleForm = res.result;
-          ...res.result,
-          ...res.result.zdjbxxdatas,
-          ...res.result.qlxxdatas,
-          ...res.result.jsydsyqdatas,
-        };
      }
    });
  },
@@ -192,7 +192,7 @@ export default {
  computed: {
    ...mapGetters(["dictData", "flag"]),
  },
-  data () {
+  data() {
    return {
      disabled: true,
      czrOptions: [],
@@ -228,7 +228,14 @@ export default {
    };
  },
  methods: {
-    list (bsmSldy) {
+     // 更新权利人信息
+    upDateQlrxxList (val) {
+      this.ruleForm.qlrList = _.cloneDeep(val);
+    }, // 更新权利人信息
+    upDateYwrxxList (val) {
+      this.ruleForm.ywrList = _.cloneDeep(val);
+    },
+    list(bsmSldy) {
      var formdata = new FormData();
      formdata.append("bsmSldy", bsmSldy);
      Init(formdata).then((res) => {
@@ -242,8 +249,8 @@ export default {
        }
      });
    },
-    onSubmit () {
+    onSubmit() {
-      fristReg(this.ruleForm).then((res) => {
+      saveData(this.ruleForm).then((res) => {        
        if (res.code === 200 && res.result) {
          console.log(res);
          //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }