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

@@ -86,7 +86,7 @@ export default {
           label: "联系电话"
           label: "联系电话"
         },
         },
         {
         {
-          label: '修改',
+          label: '操作',
           render: (h, scope) => {
           render: (h, scope) => {
             return (
             return (
               <div>
               <div>
@@ -98,6 +98,7 @@ export default {
                       icon="el-icon-edit-outline"
                       icon="el-icon-edit-outline"
                       type="text"
                       type="text"
                       onClick={() => { this.editClick(scope.$index, scope.row) }}>编辑</el-button>
                       onClick={() => { this.editClick(scope.$index, scope.row) }}>编辑</el-button>
+                      
                 }
                 }
               </div>
               </div>
             )
             )
@@ -131,7 +132,9 @@ export default {
       handler (newVal, oldValue) {
       handler (newVal, oldValue) {
         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)
+          this.column = _.cloneDeep(dataList)
+
         } else if ((newVal == '1' || newVal == '3')) {
         } else if ((newVal == '1' || newVal == '3')) {
           this.column = dataList
           this.column = dataList
         } else {
         } else {
@@ -148,7 +151,6 @@ export default {
   },
   },
   methods: {
   methods: {
     handleupdateDetail (value) {
     handleupdateDetail (value) {
-      debugger
       if(this.isaddupdate){
       if(this.isaddupdate){
         if (!_.isEqual(value, this.tableData)) {
         if (!_.isEqual(value, this.tableData)) {
           this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
           this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
@@ -170,7 +172,14 @@ export default {
 
 
     // 删除
     // 删除
     deleClick (index, row) {
     deleClick (index, row) {
-      this.tableData.splice(index, 1)
+      this.$confirm('确定要删除吗, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.tableData.splice(index, 1)
+      }).catch(() => {
+      });
     },
     },
 
 
     // 身份证读取
     // 身份证读取

@@ -225,6 +225,16 @@ export default {
       this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val))
       this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val))
     },
     },
     onSubmit () {
     onSubmit () {
+      if(this.ruleForm.slywxx.gyfs=="0"){
+        if(this.ruleForm.qlrList.length>1){
+          this.$message({
+            showClose: true,
+            message: "共有方式：单独所有，权利人只能是一个人",
+            type: "error",
+          });
+          return false;
+        }        
+      }
       saveData(this.ruleForm).then((res) => {
       saveData(this.ruleForm).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.$message({
           this.$message({