From 602cfdcd9e262b00148ba951eae685364e05e25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 24 Jul 2022 00:17:32 +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

---
 src/components/DictField/index.vue            | 57 +++----------------
 .../xm/core/xmIteration/XmIterationEdit.vue   |  4 +-
 .../xm/core/xmIteration/XmIterationMng.vue    | 20 ++-----
 .../xmProject/XmProjectForLinkComplex.vue     |  2 +-
 .../xm/core/xmProject/XmProjectOverview.vue   | 11 +++-
 5 files changed, 26 insertions(+), 68 deletions(-)

diff --git a/src/components/DictField/index.vue b/src/components/DictField/index.vue
index 63d30539..a72f38ef 100644
--- a/src/components/DictField/index.vue
+++ b/src/components/DictField/index.vue
@@ -1,7 +1,7 @@
 <template>    
     
 						<div class="field-box" @click="showSelect">  
-							<el-avatar class="avater" :class="{dashedCircle:avaterCpd.isNull}" :icon="avaterCpd.icon" :style="{backgroundColor:avaterCpd.color}">{{avaterCpd.innerText}}</el-avatar> 
+							<el-avatar class="avater" :class="{'dashed-circle':avaterCpd.isNull}" :icon="avaterCpd.icon" :style="{backgroundColor:avaterCpd.color}">{{avaterCpd.innerText}}</el-avatar> 
 							
               <div class="field-info" > 
 								<span class="field-value" v-if="!avaterCpd.isNull">{{avaterCpd.innerText}} </span> 
@@ -27,13 +27,13 @@ import util from '@/common/js/util'
             return null;
         }
        },
-      avaterCpd(){
+      avaterCpd(){ 
         var currentItem = null
         if(this.dict){
           currentItem= this.dict.find(k=>k.id==this.myVal) 
-        }  
+        }   
         var isEmpty=this.isEmpty(this.myVal)
-        var obj={isNull:isEmpty,icon:'el-icon-full-screen',color:'#FFFFFF',innerText:''} 
+        var obj={isNull:isEmpty,icon:'el-icon-full-screen',color:'#E4E7ED',innerText:''} 
           if(this.getColor||this.color){
             if(this.getColor){
                obj.color= this.getColor(this.myVal,currentItem,this.dict)
@@ -131,50 +131,7 @@ import util from '@/common/js/util'
     methods: { 
       showSelect(){
         this.$refs["selectRef"].$refs["selectRef"].toggleMenu();
-      },
-        getMyAvaterInfo(item){
-          if(!item){
-            return ""
-          }else{
-            return item.icon?"":item.name
-          }
-        },
-        getMyColor(item){ 
-          if(item){
-           
-            if(this.getColor){
-                return this.getColor(item.id)
-            }
-            if(item.color){
-                return item.color
-            }
-            return ""
-            
-          }else{
-            if(this.getColor){
-                return this.getColor(this.myVal)
-            }else{
-              return ""
-            }
-          }
-        },
-        getMyIcon(item){
-          if(item){ 
-            if(this.getIcon){
-                return this.getIcon(item.id)
-            }
-            if(item.icon){
-                return item.icon
-            }
-            return "";
-          }else{
-            if(this.getIcon){
-                return this.getIcon(this.myVal)
-            }else{
-              return ""
-            }
-          }
-        },
+      }, 
         initData(){
              this.myVal=this.value
             
@@ -260,13 +217,13 @@ import util from '@/common/js/util'
     margin-left: 5px; 
     display: inline;
 }
-.dashedCircle{ 
+.dashed-circle{ 
 	width:40px;
 	height:40px;
 	border:2px dashed #000000;
 	border-radius:40px/40px;
 }
-.field-box:hover .dashedCircle{
+.field-box:hover .dashed-circle{
   
 	border:2px dashed #409EFF;
 }
diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue
index d084047d..b0ef1c4c 100644
--- a/src/views/xm/core/xmIteration/XmIterationEdit.vue
+++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue
@@ -134,10 +134,10 @@
 				},
 				//新增界面数据 迭代定义,
 				editForm: {
-					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',seqNo:'',istatus:'',cuserid:'',cusername:'',remark:'',iphase:'',isTpl:'',productId:''
+					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',seqNo:'',istatus:'',cuserid:'',cusername:'',remark:'',iphase:'',isTpl:'',productId:'',productName:''
 				},
 				editFormBak: {
-					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',seqNo:'',istatus:'',cuserid:'',cusername:'',remark:'',iphase:'',isTpl:'',productId:''
+					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',seqNo:'',istatus:'',cuserid:'',cusername:'',remark:'',iphase:'',isTpl:'',productId:'',productName:''
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				userSelectVisible:false,
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index ae489e8b..e5e870bb 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -387,6 +387,7 @@ export default {
         iphase: "",
         isTpl: "",
         productId: "",
+        productName:''
       },
 
       editFormVisible: false, //编辑界面是否显示
@@ -412,6 +413,7 @@ export default {
         iphase: "",
         isTpl: "",
         productId: "",
+        productName:''
       },
       editFormInit: {
         id: "",
@@ -434,6 +436,7 @@ export default {
         iphase: "",
         isTpl: "",
         productId: "",
+        productName:''
       },
 
       /**begin 自定义属性请在下面加 请加备注**/
@@ -569,24 +572,13 @@ export default {
       this.editForm = Object.assign({}, row);
     },
     //显示新增界面 XmIteration 迭代定义
-    showAdd: function () {
-      if (!this.roles.some((i) => i.roleid == "iterationAdmin")) {
-        this.$notify({
-          position: "bottom-left",
-          showClose: true,
-          message: "只有迭代管理员可以新增迭代",
-          type: "error",
-        });
-        return;
-      }
+    showAdd: function () { 
       this.parentIteration = null;
-      this.addFormVisible = true;
-      //this.addForm=Object.assign({}, this.editForm);
+      this.addFormVisible = true; 
     },
     showSubAdd: function (row) {
       this.parentIteration = row;
-      this.addFormVisible = true;
-      //this.addForm=Object.assign({}, this.editForm);
+      this.addFormVisible = true; 
     },
     afterAddSubmit(xmIteration) {
       this.addFormVisible = false;
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index 2aeddd80..4ad94145 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -134,7 +134,7 @@
             <xm-project-detail
               v-if="showPanel == 'detail'"
               :sel-project="selProject"
-              @submit="afterEditSubmit"
+              @submit="onEditFields"
 			  ref="detail"
 			  @edit-fields="onEditFields"
             ></xm-project-detail>
diff --git a/src/views/xm/core/xmProject/XmProjectOverview.vue b/src/views/xm/core/xmProject/XmProjectOverview.vue
index 68a83ce8..3fb335ee 100644
--- a/src/views/xm/core/xmProject/XmProjectOverview.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverview.vue
@@ -264,7 +264,7 @@ export default {
       return this.selProject.taskCnt;
     },
     taskProgress: function (){
-      return this.selProject.finishRate;
+      return this.selProject.finishRate?parseInt(selProject.finishRate):0;
     },
     taskStartTime: function (){
       return this.selProject.startTime?this.selProject.startTime.substring(0,10):'';
@@ -276,6 +276,9 @@ export default {
       return this.selProject.createUsername;
     },
     workloadProgress:function (){
+      if(!this.selProject.actWorkload||!this.selProject.budgetWorkload){
+        return 0;
+      }
       return Math.round(this.selProject.actWorkload/this.selProject.budgetWorkload*100);
     },
     deviation:function (){
@@ -290,9 +293,15 @@ export default {
       return this.selProject.budgetWorkload - this.selProject.actWorkload;
     },
     planProgress:function (){
+      if(!this.selProject.estimateWorkload||!this.selProject.budgetWorkload){
+        return 0;
+      }
         return Math.round(this.selProject.estimateWorkload/this.selProject.budgetWorkload*100);
     },
     realProgress:function (){
+      if(!this.selProject.actWorkload||!this.selProject.budgetWorkload){
+        return 0;
+      }
       if(this.selProject.actWorkload < this.selProject.budgetWorkload){
         return Math.round(this.selProject.actWorkload/this.selProject.budgetWorkload*100)
       }else{