From 480508d9a1d86aaa645d00930368f5a6975d3fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 16 Jun 2022 22:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=8C=96=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dateRange/index.vue            |  2 +-
 src/views/xm/core/xmMenu/XmMenuEdit.vue       | 36 ++++++-------
 .../xm/core/xmMenuWorkItem/XmSubBugList.vue   | 21 ++++++--
 .../xm/core/xmMenuWorkItem/XmSubMenuList.vue  | 23 +++++++--
 .../xm/core/xmMenuWorkItem/XmSubTaskList.vue  |  2 +
 src/views/xm/core/xmTask/XmTaskEdit.vue       | 12 ++---
 .../xm/core/xmTaskWorkItem/XmSubTaskList.vue  | 50 +++++++++++++------
 .../xmTaskWorkload/XmTaskWorkloadEdit.vue     |  3 ++
 8 files changed, 94 insertions(+), 55 deletions(-)

diff --git a/src/components/dateRange/index.vue b/src/components/dateRange/index.vue
index cd4cec74..eef95eaf 100644
--- a/src/components/dateRange/index.vue
+++ b/src/components/dateRange/index.vue
@@ -1,6 +1,6 @@
 <template>   
   <el-date-picker :type="type" :style="styleObj"  v-model="dateRange" :value-format="valueFormat" :format="format" 
-       unlink-panels
+       unlink-panels 
       :range-separator="rangeSepaSrator"
       :start-placeholder="startPlaceholder"
       :end-placeholder="endPlaceholder"
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 6f0d8e9a..36094cb7 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -58,16 +58,13 @@
 									</el-select>
 								</el-form-item>
 							</el-col>
-							<el-col :span="8">
-								<el-form-item label="进度" prop="finishRate"> 
-									{{editForm.finishRate?editForm.finishRate:0}}%
-								</el-form-item>
-							</el-col>
-							<el-col :span="8">
-								<el-form-item label="截止时间" prop="startTime" >
-									 <date-range type="daterange" :auto-default="false"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="editForm" start-key="startTime" end-key="endTime"  @change="editXmMenuSomeFields(editForm,'startTime',editForm)"></date-range>
+							<el-col :span="16">  
+								<el-form-item label="时间进度" prop="startTime" >
+										<date-range type="daterange" :auto-default="false" :style-object="{display:'inline'}"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="editForm" start-key="startTime" end-key="endTime"  @change="editXmMenuSomeFields(editForm,'startTime',editForm)"></date-range>
+										{{editForm.finishRate?editForm.finishRate:0}}% 
 
-								</el-form-item>
+								</el-form-item>    
+									
 							</el-col>
 						</el-row>
 					<el-tabs  v-model="activateTabPaneName" >
@@ -109,14 +106,14 @@
 										<el-option v-for="i in this.dicts.demandLvl" :label="i.name" :key="i.id" :value="i.id"></el-option>
 									</el-select>
 								</el-form-item>
-							</el-col>
-							<el-col :span="12">
-							<el-form-item  label="优先级" prop="priority" >
-								<el-select v-model="editForm.priority" @change="editXmMenuSomeFields(editForm,'priority',$event)">
-										<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
-								</el-select>
-							</el-form-item>
-							</el-col>
+							</el-col> 
+							<el-col :span="12"> 
+								<el-form-item  label="优先级" prop="priority" >
+									<el-select v-model="editForm.priority" @change="editXmMenuSomeFields(editForm,'priority',$event)">
+											<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option>
+									</el-select>
+								</el-form-item>
+							</el-col> 
 						</el-row>
 					</el-tab-pane >
 						<el-tab-pane label="概述" name="4">
@@ -128,10 +125,7 @@
 							 <xm-sub-work-item v-if="this.activateTabPaneName=='6'" :parent-xm-menu="editForm" :link-project-id="selProject?selProject.id:null" @sub-work-item-num="setSubWorkItemNum" @add-sub-menu="onAddSubMenu"></xm-sub-work-item>
 						</el-tab-pane>
 						<el-tab-pane :label="'工时('+editForm.actWorkload+' h)'" name="2">
-							 
-							<el-form-item label="工时进度" prop="finishRate" >
-								<el-progress style="width:60%;" :text-inside="true" :stroke-width="15" :percentage="editForm.finishRate?editForm.finishRate:0"></el-progress>
- 							</el-form-item>
+							
 							<el-form-item label="预估工期" prop="budgetHours">
 								<el-input-number :disabled="editForm.calcType!=='2'  " style="width:200px;"  v-model="editForm.budgetHours"  :precision="2" :step="8" :min="0" placeholder="预计工期(小时)"></el-input-number> &nbsp;h
 							</el-form-item>
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
index 0fc93bf3..06e4c75b 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
@@ -9,10 +9,10 @@
 					<i class="el-icon-warning"></i>
 					</div>
 					
-					<span class="cell-text">
+					<span class="my-cell-text">
 						 {{scope.row.name}}
 					</span>
-					<span class="cell-bar" >
+					<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> 
 					</span> 
 			  </template>
@@ -407,6 +407,19 @@ export default {
 };
 </script>
 
-<style scoped> 
-  
+<style lang="less" scoped> 
+    .my-cell-bar{
+    display: none; 
+  }
+
+.el-table__row td:hover{
+	.my-cell-bar{
+    width:90%;
+    padding-right:1px;
+		display: inline-block;  
+	}
+  .my-cell-text{
+    display:none;
+  }
+}
 </style>
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
index 5b8b654f..1def64c8 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
@@ -17,11 +17,11 @@
 				<i class="el-icon-document"></i>
 				</div>
 				  </span>  
-					<span class="cell-text">
+					<span class="my-cell-text">
 						{{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}}
 					</span>
-					<span class="cell-bar">
-							<el-input title="序号" style="width:30%;"  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:60%;"  @change="editXmMenuSomeFields(scope.row,'menuName',$event)"></el-input> 
+					<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> 
 					</span> 
 			  </template>
 		  </el-table-column>
@@ -409,6 +409,19 @@ export default {
 };
 </script>
 
-<style scoped> 
-  
+<style lang="less" scoped> 
+    .my-cell-bar{
+    display: none; 
+  }
+
+.el-table__row td:hover{
+	.my-cell-bar{
+    width:90%;
+    padding-right:1px;
+		display: inline-block;  
+	}
+  .my-cell-text{
+    display:none;
+  }
+}
 </style>
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
index 75d0ea11..85622b5d 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
@@ -423,6 +423,8 @@ export default {
 
 .el-table__row td:hover{
 	.my-cell-bar{
+    width:80%;
+    padding-right:0px;
 		display: inline-block;  
 	}
   .my-cell-text{
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index c76f596e..450fde65 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -62,14 +62,9 @@
 											<el-option v-for="i in dicts.taskState" :label="i.name" :key="i.id" :value="i.id"></el-option> 
 									</el-select>    
 								</el-form-item> 
-							</el-col>
-							<el-col :span="8"> 
-								<el-form-item label="当前进度" prop="rate"> 
-									{{editForm.rate?editForm.rate:0}}%
-								</el-form-item>  
-							</el-col>  
-							<el-col :span="8"> 
-								<el-form-item label="预计时间">  
+							</el-col> 
+							<el-col :span="16"> 
+								<el-form-item label="时间进度">  
 										<date-range 
 											v-model="editForm"
 											start-key="startTime"
@@ -85,6 +80,7 @@
 											:default-time="['00:00:00','23:59:59']"
 											:picker-options="pickerOptions"
 										></date-range>
+										{{editForm.rate?editForm.rate:0}}%
 								</el-form-item>  
 							</el-col> 
 
diff --git a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
index fd66a856..73426dc4 100644
--- a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
@@ -1,21 +1,32 @@
 <template>
     <el-row  v-show="xmTasks.length>0">
       <el-row>
-        <el-table :data="xmTasks"  :max-height="400" v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
+        <el-table :data="xmTasks"  :row-style="{height:'60px'}" :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="名称"> 
                 <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>
-									</div>    
-									<span class="my-cell-text">
+
+									<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>   
 										 {{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="名称" style="width:78%;" placeholder="名称" v-model="scope.row.name" @change="editXmTaskSomeFields(scope.row,'name',$event)"></el-input> 
 									</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> 
                 </template>
-          </el-table-column>
+              </el-table-column> 
               <el-table-column
                 label="状态"
                 type="taskState"
@@ -80,8 +91,8 @@
         </el-table> 
       </el-row>
       <el-dialog :title="ntype==='0'?'新增任务':'新增计划'" :visible.sync="addFormVisible" append-to-body modal-append-to-body>
-          <el-form :model="editForm" :rules="addFormRules">
-            <el-form-item label="任务名称">
+          <el-form :model="addForm" :rules="addFormRules" ref="addForm">
+            <el-form-item label="任务名称" prop="name">
               
                 <template slot="label">
                   <div    class="icon" :style="{backgroundColor:   ntype==='1'?'#E6A23C':'#409EFF'}">
@@ -145,11 +156,12 @@ export default {
     return{
       load:{edit:false,list:false,add:false,del:false,}, 
       xmTasks:[],
-      editForm:{},
+      editForm:{name:''},
       addForm:{name:''},
       addFormRules:{
 					name: [
-						{ required: true, message: '任务名称不能为空', trigger: 'change' }
+						{ required: true, message: '名称不能为空', trigger: 'change' },
+						{ min: 2, max: 150, message: '名称长度在 0 到 150 个字符', trigger: 'change' },//长度
 					],
       },
       sels:[],
@@ -199,7 +211,8 @@ export default {
         this.getXmTasks();
     }, 
     addXmTask(){ 
-       var task={...this.parentXmTask,name:this.addForm.name,id:null,parentTaskid:this.parentXmTask.id,parentTaskname:this.parentXmTask.name}
+      this.$refs.addForm.validate().then(res=>{
+        var task={...this.parentXmTask,name:this.addForm.name,id:null,parentTaskid:this.parentXmTask.id,parentTaskname:this.parentXmTask.name}
              task.priority='3'
              task.verNum=this.parentXmTask.sinceVersion;
              task.pverNum=this.parentXmTask.sinceVersion;
@@ -219,9 +232,12 @@ export default {
 								}
 								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
 							}).catch( err  => this.load.edit=false);
+      })
+       
     },  
       showAdd(ntype) {
         this.ntype=ntype; 
+        this.addForm.name=this.parentXmTask.name+"-请修改"
         this.addFormVisible=true;
         
     },
@@ -416,11 +432,13 @@ export default {
   }
 
 .el-table__row td:hover{
-	.my-cell-bar{
+	.my-cell-bar{  
+    width:100%;
+    padding-right: 0px;
 		display: inline-block;  
 	}
   .my-cell-text{
     display:none;
   }
-}
+} 
 </style>
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
index d46c5357..7ba31fdf 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
@@ -170,6 +170,9 @@
 					],
 					workload:[
 						{ required: true, message: '上班时长不能为空', trigger: 'change' }
+					],
+					remark:[ 
+						{ min: 0, max: 250, message: '工作描述长度在 0 到 250 个字符', trigger: 'change' },//长度
 					]
 				},
 				editForm: {