优化

3 years ago · 5950798a5a
22 changed files with 38 additions and 36 deletions
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@ -2,7 +2,7 @@
 	<section>  
 		<el-popover style="display:inline;"
 			placement="bottom"
-			width="400"
+			width="600"
 			v-model="iterationVisible"
 			trigger="manual" >  
 			<el-row>
@ -23,7 +23,7 @@
 					placement="top-start"
 					title="更多条件、操作"
 					v-model="moreVisible"
-					width="400"
+					width="600"
 					trigger="manual" >
 					<el-button  type="text" style="float:right;margin-top:-40px;"  @click="moreVisible=false" icon="el-icon-close">关闭</el-button>
 					<el-row>   
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@ -2,7 +2,7 @@
  <section>
    <el-popover
      placement="bottom"
-      width="400"
+      width="600"
      trigger="manual"
      v-model="productVisible"
    >
@ -30,7 +30,7 @@
        <el-popover
          placement="top-start"
          title="更多条件、操作"
-          width="400"
+          width="600"
          v-model="moreVisible"
          trigger="manual"
        >
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@ -2,7 +2,7 @@
  <section>
    <el-popover
      placement="bottom"
-      width="400"
+      width="600"
      trigger="manual"
      v-model="projectVisible"
    >
@ -30,7 +30,7 @@
                <el-popover
                  placement="top-start"
                  title="更多条件、操作"
-                  width="400"
+                  width="600"
                  v-model="moreVisible"
                  trigger="manual"
                >
--- a/src/views/xm/core/crowd/XmTaskCrowdMng.vue
+++ b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
@ -106,7 +106,7 @@
          <el-popover
            placement="top-start"
            title=""
-            width="400"
+            width="600"
            trigger="click"
          >
            <el-row>  
@ -170,7 +170,7 @@
          <el-popover
            placement="top-start"
            title="选择展示方式"
-            width="400"
+            width="600"
            trigger="hover"
          >
            <el-row>
--- a/src/views/xm/core/wiki/archive/WikiList.vue
+++ b/src/views/xm/core/wiki/archive/WikiList.vue
@ -18,7 +18,7 @@
 							<el-popover
 								placement="top-start"
 								title=""
-								width="400"
+								width="600"
 								v-model="moreVisible"
 								trigger="manual" >
 								<el-row> 
--- a/src/views/xm/core/xmGroup/XmGroupMng.vue
+++ b/src/views/xm/core/xmGroup/XmGroupMng.vue
@ -13,7 +13,7 @@
 				
 			<el-popover
 				placement="bottom"
-				width="400"
+				width="600"
 				trigger="click"> 
 				 	<el-button   type="plain" @click="xmRecordVisible=true" icon="el-icon-document">变化日志</el-button>
 					<el-button   type="plain" @click="doSearchImGroupsByProjectId" icon="el-icon-document">绑定即聊情况</el-button>
--- a/src/views/xm/core/xmIteration/XmIterationBox.vue
+++ b/src/views/xm/core/xmIteration/XmIterationBox.vue
@ -13,7 +13,7 @@
 			<el-popover
 				placement="top-start"
 				title=""
-				width="400"
+				width="600"
 				trigger="click" >
 				<el-divider content-position="left"><strong>查询条件</strong></el-divider>
 				<el-row>
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@ -42,7 +42,7 @@
        v-on:click="searchXmIterations"
        icon="el-icon-search"
      ></el-button>
-      <el-popover placement="top-start" title="" width="400" trigger="click">
+      <el-popover placement="top-start" title="" width="600" trigger="click">
        <el-divider content-position="left"
          ><strong>查询条件</strong></el-divider
        >
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@ -42,7 +42,7 @@
 						<el-popover
 							placement="top-start"
 							title="更多操作"
-							width="400"
+							width="600"
 							trigger="manual"
 							v-model="moreVisible"
 						>
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@ -18,7 +18,7 @@
 						<el-popover
 							placement="top-start"
 							title="更多查询条件或者操作"
-							width="400"
+							width="600"
 							v-model="moreVisible"
 							trigger="manual" >
 							
@ -30,6 +30,12 @@
 									>关闭</el-button
 									> 
 							</el-row> 
+							
+								<el-row> 
+									<el-button    @click="handleExport" icon="el-icon-download">导出</el-button>
+									<el-button   v-if="  disabledMng!==false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">汇总进度</el-button>
+ 								</el-row>
+								 <el-divider></el-divider>
 							<el-row>
 								<el-row>
 									<font class="more-label-font">标签条件:</font>
@ -54,7 +60,7 @@
 								</el-row>
 								<el-row>
 									<font class="more-label-font">
-										需求是否已加入迭代:
+										是否加入迭代:
 									</font>
 									<el-select   v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable   >
 										<el-option   value="not-join-any-iteration"  label="未加入过迭代"></el-option>
@ -65,7 +71,7 @@
 								</el-row>
 								<el-row>
 									<font class="more-label-font">
-										需求是否已分配了任务:
+										是否分配任务:
 									</font>
 									<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable >
 										<el-option   value="not-join-any-project"  label="未分配过任务的需求"></el-option>
@ -162,12 +168,8 @@
 									></mdp-date-range>
 								</el-row> 
 								<el-row>
-									<span style="float:right;">
-									<el-button    @click="handleExport" icon="el-icon-download">导出</el-button>
-									<el-button   v-if="  disabledMng!==false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">汇总进度</el-button>
-									<el-button type="primary" style="float:right;" @click="searchXmMenus" icon="el-icon-search">查询</el-button> 
-									</span>
-								</el-row>
+  									<el-button type="primary" style="float:right;" @click="searchXmMenus" icon="el-icon-search">查询</el-button> 
+ 								</el-row>
 							</el-row>
 								<el-button  slot="reference" icon="el-icon-more" @click="moreVisible=!moreVisible"></el-button>
 						</el-popover>
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@ -33,7 +33,7 @@
 					<el-popover
 						placement="top-start"
 						title=""
-						width="400"
+						width="600"
 						trigger="click" >
 						<el-row>  
 							<el-col  :span="24"  style="padding-top:5px;" >
--- a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
+++ b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
@ -4,7 +4,7 @@
 				<el-row>   
 					<el-popover
 						placement="bottom"
-						width="400"
+						width="600"
 						trigger="click"> 
 						<xm-product-tpl-mng :auto-select="true" :isSelect="true"  showType="simple"  @row-click="onProductRowClick" @clear="onProductClearSelect"></xm-product-tpl-mng>
 							<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品模板'}}</font></el-link> 
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@ -25,7 +25,7 @@
 						<el-popover
 							placement="top-start"
 							title="更多条件、操作"
-							width="400"
+							width="600"
 							trigger="click" >
 							<el-row>  
 								<el-row>   
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@ -77,7 +77,7 @@
          <el-popover
            placement="top-start"
            title="更多条件、操作"
-            width="400"
+            width="600"
            trigger="manual"
            v-model="moreVisible"
          >
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@ -5,7 +5,7 @@
 					<el-row class="page-main padding-left">  
 						<el-popover
 							placement="bottom"
-							width="400"
+							width="600"
 							trigger="click"> 
 							<xm-project-select v-if="ptype!=='1' && (!selProject||!selProject.id)" :auto-select="true"  :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear="onProjectClear"></xm-project-select>
 								<el-link type="warning" slot="reference" v-if="ptype!=='1' && (!selProject||!selProject.id)"  icon="el-icon-search"><font style="font-size:14px;">{{filters.selProject?filters.selProject.name:'选择项目'}}</font></el-link> 
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@ -73,7 +73,7 @@
          <el-popover
            placement="top-start"
            title="更多查询条件或者操作"
-            width="400"
+            width="600"
            trigger="manual"
            v-model="moreVisible"
          >
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@ -27,7 +27,7 @@
 					<el-table-column prop="status" label="候选状态"  width="100" sortable fixed="left"> 
 						<template slot-scope="scope">
 						<el-popover trigger="hover"
-							width="400" >
+							width="600" >
 							<el-row>
  									<!--结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算--> 
 									<el-button type="primary" v-if="scope.row.status=='7' " @click="becomeCandidate(scope.row)">成为候选人</el-button>
--- a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
+++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
@ -23,7 +23,7 @@
 			<el-input v-model="filters.key" clearable style="width: 20%;" placeholder="模糊查询:编号/标题/项目名称"></el-input>
 			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTaskSbills" icon="el-icon-search">查询</el-button>
 <!--			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button>-->
-      <el-popover placement="top-start" title="更多查询条件" width="400" v-model="moreVisible" trigger="manual" >
+      <el-popover placement="top-start" title="更多查询条件" width="600" v-model="moreVisible" trigger="manual" >
        <el-row>
          <el-col :span="24"  style="padding-top:5px;">
            <span class="more-label-font">创建时间:</span>
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
@ -3,7 +3,7 @@
 				<el-row> 
 					<el-popover
 						placement="bottom"
-						width="400"
+						width="600"
 						trigger="click"> 
 						<xm-project-tpl-mng :auto-select="true" :isSelect="true" showType="simple"  @row-click="onProjectRowClick" @clear="onProjectClearSelect"></xm-project-tpl-mng>
 							<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{filters.project?filters.project.name:'选择项目模板'}}</font></el-link> 
@ -11,7 +11,7 @@
 					
 					<el-popover
 						placement="bottom"
-						width="400"
+						width="600"
 						trigger="click"> 
 						<xm-product-tpl-mng :auto-select="true" :isSelect="true"  showType="simple"  @row-click="onProductRowClick" @clear="onProductClearSelect"></xm-product-tpl-mng>
 							<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品模板'}}</font></el-link> 
--- a/src/views/xm/core/xmWorkload/XmTaskSbillSelect.vue
+++ b/src/views/xm/core/xmWorkload/XmTaskSbillSelect.vue
@ -2,7 +2,7 @@
  <section>
    <el-popover
      placement="bottom"
-      width="400"
+      width="600"
      trigger="manual"
      v-model="sbillVisible">

@ -18,7 +18,7 @@
 												<el-popover
                          placement="top-start"
                          title=""
-                          width="400"
+                          width="600"
                          v-model="moreVisible"
                          trigger="manual" >
 													<el-row>
--- a/src/views/xm/core/xmWorkload/XmWorkloadInfo.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadInfo.vue
@ -25,7 +25,7 @@
 <!--			<el-button type="primary" @click="showAdd" icon="el-icon-plus"> </el-button>-->
      <el-button type="warning" v-loading="load.edit" @click="batchSetSbillIdNull" :disabled="this.sels.length===0 || load.edit==true" icon="el-icon-setting">移出结算单</el-button>
 			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button>
-      <el-popover placement="top-start" title="更多查询条件" width="400" v-model="moreVisible" trigger="manual" >
+      <el-popover placement="top-start" title="更多查询条件" width="600" v-model="moreVisible" trigger="manual" >
        <el-row>
          <el-col :span="24"  style="padding-top:5px;">
            <span class="more-label-font">创建时间:</span>
--- a/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
@ -23,7 +23,7 @@
 <!--			<el-button type="primary" @click="showAdd" icon="el-icon-plus"> </el-button>-->
      <el-button type="warning" v-loading="load.edit" @click="batchSetSbillIdNull" :disabled="this.sels.length===0 || load.edit==true" icon="el-icon-setting">移出结算单</el-button>
 			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button>
-      <el-popover placement="top-start" title="更多查询条件" width="400" v-model="moreVisible" trigger="manual" >
+      <el-popover placement="top-start" title="更多查询条件" width="600" v-model="moreVisible" trigger="manual" >
        <el-row>
          <el-col :span="24"  style="padding-top:5px;">
            <span class="more-label-font">创建时间:</span>