From 62fc26e19765bb67a24d98132f11bc1a74f7446e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 22 Feb 2023 01:42:11 +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/router/routes_xm.js                       |  2 +-
 src/views/xm/core/crowd/XmTaskCrowdMng.vue    |  8 ++--
 .../xmIteration/XmIterationForLinkComplex.vue |  4 +-
 src/views/xm/core/xmMenu/XmEpicFeatures.vue   |  2 +-
 .../xmProduct/XmProductForLinkComplex.vue     |  4 +-
 .../xmProject/XmProjectForLinkComplex.vue     |  4 +-
 src/views/xm/core/xmTask/XmPhase.vue          | 48 ++-----------------
 .../xmTaskExecuser/XmTaskExecuserForMy.vue    |  6 +--
 .../xmTaskExecuser/XmTaskExecuserForTask.vue  |  2 +-
 .../core/xmTaskExecuser/XmTaskExecuserMng.vue | 16 +++----
 .../xmTaskExecuser/XmTaskExecuserSelect.vue   | 16 +++----
 11 files changed, 35 insertions(+), 77 deletions(-)

diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index 130079e8..e33ed482 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -679,7 +679,7 @@ export default {
       },
       //leaf: true,//只有一个节点
       children: [
-        { path: 'project/cost', component: _import('xm/core/xmProject/XmProjectCost'), name: 'XmProjectCost', meta: { title: '应付款',roles:["user"]}},
+        { path: 'branch/cost', component: _import('xm/core/xmProject/XmProjectCost'), name: 'XmProjectCost', meta: { title: '应付款',roles:["user"]}},
 
         { path: 'task/sbill', component: _import('xm/core/xmTaskSbill/XmTaskSbillMng'), name: 'XmTaskSbilllMng', meta: { title: '任务结算单',roles:["user"]}},
          { path: 'workload/day/me', component: _import('xm/core/xmWorkload/WorkloadSetDayListMy'), name: 'WorkloadSetDayListMy', meta: { title: '工时日报(我)',roles:["user"]}},
diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
index cdf7b18a..1933ef06 100644
--- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue
+++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
@@ -71,7 +71,7 @@
             @close="skillTagClear(skill)"
             >{{ skill.skillName }}</el-tag
           >
-          <el-button
+          <el-button 
             style="margin-top: 10px;"
             v-if="!filters.tags || filters.tags.length == 0"
             @click.native="$refs.tagDialog.open()"
@@ -87,14 +87,14 @@
             }})个</el-tag
           >
           <el-input
-            style="width: 150px"
+            style="width: 10em"
             v-model="filters.key"
             placeholder="计划/任务名称"
           > 
           </el-input>
           
-        <el-input v-model="filters.projectId" style="width: 150px;" placeholder="项目编号" clearable></el-input> 
-        <el-input v-model="filters.cbranchId" style="width: 150px;" placeholder="项目归属公司编号" clearable></el-input> 
+        <el-input v-model="filters.projectId" style="width: 10em;" placeholder="项目编号" clearable></el-input> 
+        <el-input class="hidden-md-and-down" v-model="filters.cbranchId" style="width: 10em;" placeholder="项目公司编号" clearable></el-input> 
           <el-button
             @click="searchXmTasks"
             type="primary"
diff --git a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
index 5b4600f2..f2e07181 100644
--- a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
@@ -4,7 +4,7 @@
 			<el-col :xl="4" :lg="4" :md="5" :sm="5" :xs="5" class="padding">
 				<div class="border">
 				 <el-row >
- 						<xm-iteration-select  ref="xmIterationSelect" :auto-select="true" :link-project-id="projectInfo?projectInfo.id:null" :product-id="xmProduct?xmProduct.id:null"  @row-click="onIterationRowClick" @clear="onIterationClearSelect">
+ 						<xm-iteration-select  ref="xmIterationSelect" :auto-select="false" :link-project-id="projectInfo?projectInfo.id:null" :product-id="xmProduct?xmProduct.id:null"  @row-click="onIterationRowClick" @clear="onIterationClearSelect">
 							<template v-slot:title="{iteration}">
 								<h4 href="#"><div style="max-width:15vw;" class="res-text hidden-md-and-down"><i style="font-size:16px;" class="el-icon-sort"></i> {{iteration&&iteration.id?iteration.iterationName:'请选择一个迭代'}}</div></h4> 
 								<h4 href="#"><div style="max-width:19vw;" class="res-text hidden-lg-and-up"><i style="font-size:16px;" class="el-icon-sort"></i> {{iteration&&iteration.id?iteration.iterationName:'请选择一个迭代'}}</div></h4> 
@@ -236,7 +236,7 @@
 					</div>		 
 			</el-col>
 			<el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19">
-				<el-tabs :value="showPanel" @tab-click="tabClick">  
+				<el-tabs :value="showPanel" @tab-click="tabClick" v-if="xmIteration && xmIteration.id">  
 					<el-tab-pane label="迭代概览"  name="iterationOverview" > 
 						 
 						<xm-iteration-overview v-if="xmIteration && showPanel=='iterationOverview'"  :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-iteration-overview>
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index 68e718b8..79708035 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -124,7 +124,7 @@
 						<i class="el-icon-document"></i>
 						</div>
 						<span class="hidden-md-and-down">{{scope.row.seqNo}}</span>
-						<span>{{scope.row.menuName}} </span>
+						<span style="font-size:14px;">{{scope.row.menuName}} </span>
 							<el-popover class="hidden-bar" v-if="!disabledMng"  @click.stop
 								placement="top"
 								width="100"  
diff --git a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
index 1bbc47fb..5afc7f94 100644
--- a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
@@ -6,7 +6,7 @@
         <el-row>
             <xm-product-select
               ref="xmProductSelect"
-              :auto-select="true"
+              :auto-select="false"
               :link-project-id="projectInfo ? projectInfo.id : null"
               :iterationId="xmIteration ? xmIteration.id : null"
               @row-click="onProductRowClick"
@@ -134,7 +134,7 @@
         </div>
       </el-col>
       <el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19" class="padding-left padding-right">
-        <el-tabs :value="showPanel" @tab-click="tabClick"> 
+        <el-tabs :value="showPanel" @tab-click="tabClick" v-if="xmProduct && xmProduct.id"> 
           <el-tab-pane
             label="产品概览"
             name="productOverview"
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index 1522be89..983d0d27 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -6,7 +6,7 @@
           <el-row v-if="    (xmProduct&&xmProduct.id) || (xmIteration && xmIteration.id)"> 
               <xm-project-select
                 ref="xmProjectSelect"
-                :auto-select="true"
+                :auto-select="false "
                 :link-iteration-id="xmIteration ? xmIteration.id : null"
                 :link-product-id="xmProduct ? xmProduct.id : null"
                 @row-click="onProjectRowClick"
@@ -144,7 +144,7 @@
         </div>
       </el-col>
       <el-col :xl="20" :lg="20" :md="19" :sm="19" :xs="19" class="padding-left padding-right">
-        <el-tabs :value="showPanel" @tab-click="tabClick">
+        <el-tabs :value="showPanel" @tab-click="tabClick" v-if="selProject && selProject.id">
           <el-tab-pane
             label="项目概览"
             name="projectOverview" 
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index ea46a359..40270866 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -116,7 +116,7 @@
                   > 更换上级</el-button>     
         </el-row>
         <el-row class="padding-top"> 
-            <el-table class="task-table" :row-style="{height:'46px'}"
+            <el-table
              element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
               :data="tasksTreeData"
               @sort-change="sortChange"
@@ -145,7 +145,6 @@
 
               <el-table-column 
                 prop="name"
-                class-name="title" 
                 label="计划名称" 
               > 
               <template slot="header" slot-scope="scope"> 
@@ -167,7 +166,7 @@
                   <span class="hidden-md-and-down">
                     {{ scope.row.sortLevel }}&nbsp;
                   </span>
-                  <span> {{ scope.row.name }}
+                  <span style="font-size:14px;"> {{ scope.row.name }}
                     </span> 
                         <el-popover class="hidden-bar" @click.stop
                           placement="top-start"
@@ -1128,45 +1127,6 @@ export default {
   },
 };
 </script>
-
-<style scoped> 
-.align-right {
-  float: right;
-}
-</style>
-<style lang="scss" scoped>
-.extra {
-  border-bottom: 1px solid #dedede;
-  padding: 8px;
-}
-.field-label {
-  display: inline-block;
-  width: 60px;
-  font-size: 12px;
-  font-weight: bold;
-}
-.task-header {
-  border-top: 1px solid #dedede;
-}
-.title {
-  font-size: 18px;
-  font-weight: bold;
-  line-height: 36px;
-}
-.compact {
-  font-size: 12px;
-  color: #8c92a4;
-}
-.compact > span {
-  color: #00b2f3;
-}
-.remarks {
-  margin-top: 10px;
-  font-size: 16px;
-  overflow-x: auto;
-  overflow-y: hidden;
-}
-.tool-bar.left{  
-  margin-right: 9em;
-}
+ 
+<style lang="scss" scoped>  
 </style>
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForMy.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForMy.vue
index c7c3ea27..55441d73 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForMy.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForMy.vue
@@ -1,8 +1,6 @@
 <template>
-	<section>
-		<el-row class="xm-task">
-			 <xm-task-execuser-mng :is-my="1"></xm-task-execuser-mng>
-		</el-row>
+	<section> 
+			 <xm-task-execuser-mng :is-my="1"></xm-task-execuser-mng> 
 	</section>
 </template>
 
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
index 410d1443..2d632971 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserForTask.vue
@@ -7,7 +7,7 @@
 			<el-button type="primary"  @click="showAdd">邀请他人加入</el-button>
 			<!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>  -->
 		</el-row>
-		<el-row>
+		<el-row class="padding-top">
 			<!--列表 XmTaskExecuser xm_task_execuser-->
 			<el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				 <el-table-column type="expand">
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index 9b48c012..d83ba725 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -1,21 +1,21 @@
 <template>
 	<section class="padding">
 		<el-row>
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="任务名称、用户姓名模糊查询" clearable></el-input>
-			<el-input v-model="filters.taskId" style="width:150px;" placeholder="任务编号查询" clearable></el-input>
-			<el-input v-model="filters.projectId" style="width: 150px;" placeholder="项目编号" clearable></el-input>
- 			<el-input v-model="filters.execUserBranchId" style="width: 150px;" placeholder="用户公司编号" clearable></el-input> 
- 			<el-input v-model="filters.branchId" style="width: 150px;" placeholder="项目公司编号" clearable></el-input> 
- 			<el-select v-model="filters.status"   placeholder="候选状态" clearable>
+			<el-input v-model="filters.key" style="width: 10em;" placeholder="任务名称" clearable></el-input>
+			<el-input v-model="filters.taskId" style="width:10em;;" placeholder="任务编号" clearable></el-input>
+			<el-input v-model="filters.projectId" style="width: 10em;;" placeholder="项目编号" clearable></el-input>
+ 			<el-input v-model="filters.execUserBranchId" style="width: 10em;;" placeholder="用户公司编号" clearable></el-input> 
+ 			<el-input v-model="filters.branchId" style="width: 10em;;" placeholder="项目公司编号" clearable></el-input> 
+ 			<el-select v-model="filters.status" style="width:6em;"  placeholder="候选状态" clearable>
 				 <el-option v-for="(item,index) in dicts.projectTaskExecuserStatus" :value="item.id" :label="item.name" :key="index"></el-option>
 			 </el-select>
- 			<el-select v-model="filters.taskState"   placeholder="任务状态" clearable>
+ 			<el-select v-model="filters.taskState" style="width:6em;"  placeholder="任务状态" clearable>
 				 <el-option v-for="(item,index) in dicts.taskState" :value="item.id" :label="item.name" :key="index"></el-option>
 			 </el-select>
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskExecusers">查询</el-button> 
 			<!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>  -->
 		</el-row>
-		<el-row class="page-main ">
+		<el-row class="padding-top">
 			<!--列表 XmTaskExecuser xm_task_execuser-->
 			<el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				 <el-table-column  label="序号" type="index" width="60"  fixed="left"> 
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue
index 8c5b2eec..9d02d1a1 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserSelect.vue
@@ -1,17 +1,17 @@
 <template>
 	<section class="padding">
 		<el-row>
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="任务名称、用户姓名模糊查询" clearable></el-input>
-			<el-input v-model="filters.taskId" style="width:150px;" placeholder="任务编号查询" clearable></el-input>
+			<el-input v-model="filters.key" style="width: 10em;" placeholder="任务名称" clearable></el-input>
+			<el-input v-model="filters.taskId" style="width:10em;" placeholder="任务编号" clearable></el-input>
 			<span v-if="!selProject || !selProject.id">
-				<el-input  v-model="filters.projectId" style="width: 150px;" placeholder="项目编号" clearable></el-input>
-				<el-input v-model="filters.branchId" style="width: 150px;" placeholder="项目公司编号" clearable></el-input> 
+				<el-input  v-model="filters.projectId" style="width: 10em;" placeholder="项目编号" clearable></el-input>
+				<el-input v-model="filters.branchId" style="width: 10em;" placeholder="项目公司编号" clearable></el-input> 
 			</span>
-			<el-input v-model="filters.execUserBranchId" style="width: 150px;" placeholder="用户公司编号" clearable></el-input>  
- 			<el-select v-model="filters.status"   placeholder="候选状态" clearable>
+			<el-input v-model="filters.execUserBranchId" style="width: 10em;" placeholder="用户公司编号" clearable></el-input>  
+ 			<el-select v-model="filters.status" style="width:6em;"  placeholder="候选状态" clearable>
 				 <el-option v-for="(item,index) in dicts.projectTaskExecuserStatus" :value="item.id" :label="item.name" :key="index"></el-option>
 			 </el-select>
- 			<el-select v-model="filters.taskState"   placeholder="任务状态" clearable>
+ 			<el-select v-model="filters.taskState" style="width:6em;"  placeholder="任务状态" clearable>
 				 <el-option v-for="(item,index) in dicts.taskState" :value="item.id" :label="item.name" :key="index"></el-option>
 			 </el-select>
 			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmTaskExecusers">查询</el-button> 
@@ -20,7 +20,7 @@
 			</span>
 			<!-- <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button>  -->
 		</el-row>
-		<el-row class="page-main ">
+		<el-row class="padding-top">
 			<!--列表 XmTaskExecuser xm_task_execuser-->
 			<el-table ref="table" :height="tableHeight" :data="xmTaskExecusers" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">