From 48509ed5116e803b650ddb60d9fdc5ecb688a402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 18 Feb 2022 12:10:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmProjectPhase/XmProjectPhaseSelect.vue     | 17 ++++-------------
 src/views/xm/core/xmTask/XmTaskMng.vue          |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
index d3da2fec..a91350f6 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
@@ -3,7 +3,7 @@
 		<el-row>
 		<el-table  lazy :load="loadXmProjectPhaseLazy" :height="tableHeight" ref="selectPhaseTable" :data="projectPhaseTreeData"    :show-summary="false"  row-key="id" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  			<el-table-column prop="phaseName" label="计划名称" min-width="160" show-overflow-tooltip> 
-				 <template slot="header">
+				 <template slot="header" slot-scope="scope">
 					<div>计划  <el-tag  v-if="editForm.id" closable @close="clearSelectPhase()"> {{editForm.phaseName}}</el-tag></div>
 				</template>
 				<template slot-scope="scope">  
@@ -32,18 +32,9 @@
 		      'userInfo','roles'
 			]),
       projectPhaseTreeData() {
-        let xmProjectPhases = JSON.parse(JSON.stringify(this.xmProjectPhases || []));
-        if (this.valueChangeRows && this.valueChangeRows.length) {
-          this.valueChangeRows.forEach(c => {
-            var index = xmProjectPhases.findIndex(i=>i.id==c.id);
-            const oldRow = JSON.parse(JSON.stringify(xmProjectPhases[index]));
-            xmProjectPhases.splice(index,1);
-            c.parentPhaseId = oldRow.parentPhaseId;
-            xmProjectPhases.push(c);
-          })
-        }
+        let xmProjectPhases =  this.xmProjectPhases  
         
-        const projectPhaseTreeData = this.translateDataToTree(xmProjectPhases); 
+        var projectPhaseTreeData = this.translateDataToTree(xmProjectPhases); 
 
 				 return projectPhaseTreeData;
       },
@@ -207,7 +198,6 @@
 			},
 			//获取列表 XmProjectPhase xm_project_phase
 			getXmProjectPhases() {
-				this.valueChangeRows=[]
 				let params = {
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
@@ -246,6 +236,7 @@
 				this.$emit('clear-select',null );//  @row-click="rowClick"
 			},
 			rowClick: function(row, event, column){
+				debugger;
 				var myrow=JSON.parse(JSON.stringify(row))
 				myrow.children=[];
 				this.parentProjectPhase=myrow
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index cbc1a4ac..6c5b7f63 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -2601,7 +2601,7 @@ export default {
         return 0 + "元";
       } else {
         if (amount > 10000) {
-          return parseFloat(scope.row.budgetCost / 10000).toFixed(0) + "万元";
+          return parseFloat(amount / 10000).toFixed(0) + "万元";
         } else {
           return amount + "元";
         }