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

@@ -196,18 +196,6 @@ export default {
       this.$refs["ruleForm"].resetFields();
       this.$refs["ruleForm"].resetFields();
     },
     },
     submitForm () {
     submitForm () {
-      // this.$refs['ruleForm'].validate((valid) => {
-      //   if (valid) {
-      //     this.$message({
-      //       message: '修改成功!',
-      //       type: 'success'
-      //     })
-
-      //   } else {
-      //     this.$message.error('请完善必填项');
-      //   }
-      // })
-
       this.$refs.ruleForm.validate((valid) => {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
         if (valid) {
           this.$emit("input", false);
           this.$emit("input", false);

 <template>
 <template>
   <div>
   <div>
-    <lb-table :column="column" border :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableDataList">
+    <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableDataList">
     </lb-table>
     </lb-table>
-    <addQlr v-model="dialog" :details="details" @updateDetail="updateDetail" />
+    <addQlr v-model="dialog" :details="details" @updateDetail="handleupdateDetail" />
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -67,12 +67,11 @@ export default {
         },
         },
         {
         {
           prop: "zjzl",
           prop: "zjzl",
-          label: "证件种类2",
+          label: "证件种类",
           render: (h, scope) => {
           render: (h, scope) => {
-            this.dictData['A30'].forEach(item => {
-              if (item.dcode == scope.row.zjzl) {
-                var varName =item.dname
-                return <div>varName</div>
+            return this.dictData['A30'].map(option => {
+              if (option.dcode == scope.row.zjzl) {
+                return <span>{option.dname}</span>
               }
               }
             })
             })
           }
           }
@@ -104,13 +103,14 @@ export default {
           }
           }
         }
         }
       ],
       ],
-      column: this.InformationTable
+      column: []
     }
     }
   },
   },
   watch: {
   watch: {
     tableData: {
     tableData: {
       handler: function (val, oldVal) {
       handler: function (val, oldVal) {
         let that = this
         let that = this
+        this.$nextTick(() => {
           if (val.length == 0 || !val) {
           if (val.length == 0 || !val) {
             that.tableDataList = _.cloneDeep([{
             that.tableDataList = _.cloneDeep([{
               sqrmc: '',
               sqrmc: '',
@@ -121,8 +121,9 @@ export default {
           } else {
           } else {
             that.tableDataList = _.cloneDeep(val)
             that.tableDataList = _.cloneDeep(val)
           }
           }
+          this.column = this.InformationTable
+        })
       },
       },
-      immediate: true,
       deep: true
       deep: true
     },
     },
     gyfs: {
     gyfs: {
@@ -130,7 +131,7 @@ export default {
         let dataList = _.cloneDeep(this.InformationTable)
         let dataList = _.cloneDeep(this.InformationTable)
         if (newVal == '0') {
         if (newVal == '0') {
           this.column = _.cloneDeep(dataList).slice(1, dataList.length)
           this.column = _.cloneDeep(dataList).slice(1, dataList.length)
-        } else if ((newVal == '1'||newVal == '3')) {
+        } else if ((newVal == '1' || newVal == '3')) {
           this.column = dataList
           this.column = dataList
         } else {
         } else {
           this.column = _.cloneDeep(dataList)
           this.column = _.cloneDeep(dataList)
@@ -145,11 +146,12 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
-    updateDetail (value) {
+    handleupdateDetail (value) {
+      if (!_.isEqual(value, this.tableData)) {
         this.tableDataList[this.dataIndex] = _.cloneDeep(value);
         this.tableDataList[this.dataIndex] = _.cloneDeep(value);
-      console.log(this.tableDataList);
-      //
-      this.$emit('upDateQlrxxList', _.cloneDeep(this.tableDataList))
+        // this.key++
+        this.$emit('upDateQlrxxList', this.tableDataList)
+      }
     },
     },
 
 
     // 新增
     // 新增

@@ -20,6 +20,7 @@ export default {
     },
     },
     //切换选项卡内容组件
     //切换选项卡内容组件
     getFromRouter (tabname) {
     getFromRouter (tabname) {
+      console.log(tabname);
       this.componentTag = getForm(tabname, this.$route.query.sqywbm);
       this.componentTag = getForm(tabname, this.$route.query.sqywbm);
     }
     }
   }
   }

@@ -155,7 +155,8 @@
         <el-row>
         <el-row>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="担保范围：">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="担保范围：">
-              <el-input v-model="ruleForm.diyaq.dbfw" :disabled="$route.query.viewtype == 1||ruleForm.slywxx.djlx=='300'"></el-input>
+              <el-input v-model="ruleForm.diyaq.dbfw"
+                :disabled="$route.query.viewtype == 1 || ruleForm.slywxx.djlx == '300'"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -212,7 +213,7 @@
           抵押人信息
           抵押人信息
           <div class="triangle"></div>
           <div class="triangle"></div>
         </div>
         </div>
-        <qlrCommonTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList"
+        <InformationTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList"
           :viewtype="$route.query.viewtype" />
           :viewtype="$route.query.viewtype" />
 
 
         <div class="slxx_title title-block">
         <div class="slxx_title title-block">
@@ -221,7 +222,8 @@
         </div>
         </div>
         <el-row :gutter="10">
         <el-row :gutter="10">
           <el-col>
           <el-col>
-            <el-form-item v-if="ruleForm.slywxx.djlx=='400'" :class="flag ? 'marginBot0' : ''" label="注销抵押原因：" prop="djyy">
+            <el-form-item v-if="ruleForm.slywxx.djlx == '400'" :class="flag ? 'marginBot0' : ''" label="注销抵押原因："
+              prop="djyy">
               <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
               <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
                 v-model="ruleForm.diyaq.zxdyyy">
                 v-model="ruleForm.diyaq.zxdyyy">
               </el-input>
               </el-input>
@@ -259,7 +261,7 @@ export default {
         this.ruleForm = res.result;
         this.ruleForm = res.result;
         this.ruleForm.diyaq.sfczjzhxz = "0";
         this.ruleForm.diyaq.sfczjzhxz = "0";
       }
       }
-    });
+    })
   },
   },
   components: { qlrCommonTable },
   components: { qlrCommonTable },
   computed: {
   computed: {
@@ -301,13 +303,17 @@ export default {
 
 
     // 更新权利人信息
     // 更新权利人信息
     upDateQlrxxList (val) {
     upDateQlrxxList (val) {
+      if (!_.isEqual(val, this.ruleForm.qlrList)) {
         this.ruleForm.qlrList = _.cloneDeep(val);
         this.ruleForm.qlrList = _.cloneDeep(val);
+      }
     },
     },
     // 更新义务人信息
     // 更新义务人信息
     upDateYwrxxList (val) {
     upDateYwrxxList (val) {
+      if (!_.isEqual(val, this.ruleForm.ywrList)) {
         this.ruleForm.ywrList = _.cloneDeep(val);
         this.ruleForm.ywrList = _.cloneDeep(val);
-    },
-  },
+      }
+    }
+  }
 };
 };
 </script>
 </script>
 <style scoped lang='scss'>
 <style scoped lang='scss'>