Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/views/major/todoDetail.vue

@@ -1040,7 +1040,7 @@
         </el-table>
       </el-tab-pane>
     </el-tabs>
-    <el-dialog :visible.sync="landDialogVisible" custom-class="doWarehouseClass">
+    <el-dialog :visible.sync="landDialogVisible" custom-class="doWarehouseClass" @closed="closeLandTarget">
       <div>
         <el-form ref="landFrom" :model="landTarget" style="margin-top:20px" :rules="rules">
           <el-divider content-position="left">【土地】基本信息</el-divider>
@@ -1226,7 +1226,7 @@
         </el-form>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="houseDialogVisible" custom-class="doWarehouseClass">
+    <el-dialog :visible.sync="houseDialogVisible" custom-class="doWarehouseClass" @closed="closeLandTarget">
       <div>
         <el-form ref="houseFrom" :model="landTarget" style="margin-top:20px" :rules="rules">
           <el-divider content-position="left">【房地产】基本信息</el-divider>
@@ -2111,7 +2111,7 @@ export default {
       } else {
         this.houseDialogVisible = true;
       }
-      this.landTarget = row;
+      this.landTarget = Object.assign({}, row);
       this.landTarget.sites = JSON.parse(this.landTarget.siteIds);
       this.eMethods = [];
       if (JSON.parse(this.landTarget.evaluateMethods)) {
@@ -2214,6 +2214,8 @@ export default {
       if (this.currentNode.nodeCode === 'REVIEW_QUOTATION' && !this.landTarget.checkValue) {
         this.landTarget.checkValue = this.landTarget.evaluateValue;
       }
+      this.landTarget.housePurpose = JSON.stringify(this.houseToUse);
+      this.landTarget.evaluateMethods = JSON.stringify(this.eMethods);
       this.taskRecordDTO.recordId = this.currentNode.tasks[0].recordId;
       this.taskRecordDTO.taskData = this.landTarget;
       this.$api.majorTarget.edit(this.taskRecordDTO).then(res => {
@@ -3301,6 +3303,12 @@ export default {
     },
     cleanSecondCheck() {
       this.secondCheckUserId = null;
+    },
+    closeLandTarget(){
+      this.houseToUse = [];
+      for (let k in this.landTarget){
+          this.landTarget[k] = null;
+      }
     }
   },
 }