From 141ada8138ddab31245a0d981d64e8865b5dace0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 18 Jun 2022 10:52:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=90=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmMenuWorkItem/XmSubBugList.vue   |  4 +-
 .../xm/core/xmMenuWorkItem/XmSubMenuList.vue  |  6 +--
 .../xm/core/xmMenuWorkItem/XmSubTaskList.vue  | 16 +++++--
 .../xm/core/xmTaskWorkItem/XmSubTaskList.vue  | 44 +++++++++----------
 4 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
index 028d227b..881ca059 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
@@ -13,7 +13,7 @@
 						 {{scope.row.name}}
 					</span>
 					<span class="my-cell-bar" >
-							  <el-input title="名称" placeholder="名称" v-model="scope.row.name"  style="width:100%;"  @change="editXmQuestionSomeFields(scope.row,'name',$event)"></el-input> 
+							  <el-input title="名称" placeholder="名称" v-model="scope.row.name"  style="width:98%;"  @change="editXmQuestionSomeFields(scope.row,'name',$event)"></el-input> 
 					</span> 
 			  </template>
             </el-table-column> 
@@ -418,7 +418,7 @@ export default {
 .el-table__row td:hover{
 	.my-cell-bar{
     width:90%;
-    padding-right:1px;
+    padding-right:0px;
 		display: inline-block;  
 	}
   .my-cell-text{
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
index b180a3eb..2b647b67 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
@@ -21,7 +21,7 @@
 						{{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}}
 					</span>
 					<span class="my-cell-bar">
-							<el-input title="序号" style="width:20%;"  v-model="scope.row.seqNo" placeholder="序号"  @change="editXmMenuSomeFields(scope.row,'seqNo',$event)"></el-input><el-input title="名称" placeholder="名称" v-model="scope.row.menuName"  style="width:80%;"  @change="editXmMenuSomeFields(scope.row,'menuName',$event)"></el-input> 
+							<el-input title="序号" style="width:18%;"  v-model="scope.row.seqNo" placeholder="序号"  @change="editXmMenuSomeFields(scope.row,'seqNo',$event)"></el-input><el-input title="名称" placeholder="名称" v-model="scope.row.menuName"  style="width:80%;"  @change="editXmMenuSomeFields(scope.row,'menuName',$event)"></el-input> 
 					</span> 
 			  </template>
 		  </el-table-column>
@@ -420,8 +420,8 @@ export default {
 .el-table__row td:hover{
 	.my-cell-bar{
     width:90%;
-    padding-right:1px;
-		display: inline-block;  
+    padding-right:0px;
+	display: inline-block;  
 	}
   .my-cell-text{
     display:none;
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
index e528b98d..4cd29c7b 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
@@ -3,7 +3,7 @@
       <el-row>
         <el-table :data="xmTasks"  :max-height="400" v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
           <el-table-column type="selection" label="全选"></el-table-column>
-          <el-table-column prop="name" label="名称"  show-overflow-tooltip>
+          <el-table-column prop="name" label="名称">
                 <template slot-scope="scope">
                   <div    class="icon" :style="{backgroundColor:  scope.row.ntype==='1'?'#E6A23C':'#1CC7EA'}">
 									<i :class="scope.row.ntype==='1'?'el-icon-odometer':'el-icon-s-operation'" ></i>
@@ -12,7 +12,7 @@
 										 {{scope.row.sortLevel}}&nbsp;{{scope.row.name}}
 									</span>
 									<span class="my-cell-bar">
-									  	<el-input title="序号" style="width:20%;"  v-model="scope.row.sortLevel" placeholder="序号"  @change="editXmTaskSomeFields(scope.row,'sortLevel',$event)"></el-input><el-input title="名称" placeholder="名称" v-model="scope.row.name" @change="editXmTaskSomeFields(scope.row,'name',$event)"></el-input> 
+									  	<el-input title="序号" style="width:18%;"  v-model="scope.row.sortLevel" placeholder="序号"  @change="editXmTaskSomeFields(scope.row,'sortLevel',$event)"></el-input><el-input title="名称" placeholder="名称" style="width:80%;" v-model="scope.row.name" @change="editXmTaskSomeFields(scope.row,'name',$event)"></el-input> 
 									</span>
                 </template>
               </el-table-column>
@@ -43,8 +43,16 @@
                         <el-button @click="workloadRecord(scope.row)">登记工时</el-button>
                     </span> 
               </template>
+            </el-table-column> 
+            <el-table-column prop="rate" label="进度"  width="100">
+              <template slot-scope="scope">    
+                  <el-tag 
+                    :type="scope.row.rate >= 100 ? 'success' : 'warning'" 
+                  >
+                    {{ (scope.row.rate != null ? scope.row.rate : 0) + "%" }}
+                  </el-tag>  
+              </template>
             </el-table-column>
-              
               <el-table-column
                 label="优先级"
                 type="level"
@@ -426,7 +434,7 @@ export default {
 
 .el-table__row td:hover{
 	.my-cell-bar{
-    width:80%;
+    width:90%;
     padding-right:0px;
 		display: inline-block;  
 	}
diff --git a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
index 820adcab..5a3ddf31 100644
--- a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
@@ -5,26 +5,16 @@
           <el-table-column type="selection" label="全选"></el-table-column>
           <el-table-column prop="name" label="名称"> 
                 <template slot-scope="scope"> 
-
-									<span class="my-cell-text">  
-                     <div    class="icon" :style="{backgroundColor:  scope.row.ntype==='1'?'#E6A23C':'#1CC7EA'}">
-                        <i :class="scope.row.ntype==='1'?'el-icon-odometer':'el-icon-s-operation'" ></i>
-                      </div>   
+                  <div    class="icon" :style="{backgroundColor:  scope.row.ntype==='1'?'#E6A23C':'#1CC7EA'}">
+                    <i :class="scope.row.ntype==='1'?'el-icon-odometer':'el-icon-s-operation'" ></i>
+                  </div>   
+									<span class="my-cell-text">   
 										 {{scope.row.sortLevel}}&nbsp;{{scope.row.name}}
 									</span> 
-                    <el-row class="my-cell-bar">  
-                      <el-col :span="1">
-                        <div    class="icon" :style="{backgroundColor:  scope.row.ntype==='1'?'#E6A23C':'#1CC7EA'}">
-                          <i :class="scope.row.ntype==='1'?'el-icon-odometer':'el-icon-s-operation'" ></i>
-                        </div>  
-                      </el-col>
-                      <el-col :span="5">
-                        	<el-input title="序号"  v-model="scope.row.sortLevel" placeholder="序号"  @change="editXmTaskSomeFields(scope.row,'sortLevel',$event)"></el-input>
-                      </el-col>
-                      <el-col :span="18">
-                        <el-input title="名称"  placeholder="名称" v-model="scope.row.name" @change="editXmTaskSomeFields(scope.row,'name',$event)"></el-input> 
-                      </el-col>
-                    </el-row> 
+                    <span class="my-cell-bar">      
+                        <el-input title="序号" style="width:18%;" v-model="scope.row.sortLevel" placeholder="序号"  @change="editXmTaskSomeFields(scope.row,'sortLevel',$event)"></el-input> <el-input title="名称"  style="width:80%;" placeholder="名称" v-model="scope.row.name" @change="editXmTaskSomeFields(scope.row,'name',$event)"></el-input> 
+                      
+                    </span> 
                 </template>
               </el-table-column> 
               <el-table-column
@@ -55,6 +45,16 @@
                     </span> 
               </template>
             </el-table-column>
+					
+            <el-table-column prop="rate" label="进度"  width="100">
+              <template slot-scope="scope">    
+                  <el-tag 
+                    :type="scope.row.rate >= 100 ? 'success' : 'warning'" 
+                  >
+                    {{ (scope.row.rate != null ? scope.row.rate : 0) + "%" }}
+                  </el-tag>  
+              </template>
+            </el-table-column>
               
               <el-table-column
                 label="优先级"
@@ -432,13 +432,13 @@ export default {
   }
 
 .el-table__row td:hover{
-	.my-cell-bar{  
-    width:100%;
-    padding-right: 0px;
+	.my-cell-bar{
+    width:90%;
+    padding-right:0px;
 		display: inline-block;  
 	}
   .my-cell-text{
     display:none;
   }
-} 
+}
 </style>