From 079d9ecaf1be002bb740d659d5132fb706d43877 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, 10 Aug 2022 11:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/components/XmIterationSelect.vue  |  5 +-
 .../xm/core/components/XmProductSelect.vue    | 57 ++++------------
 .../xm/core/components/XmProjectSelect.vue    | 68 ++++---------------
 src/views/xm/core/crowd/XmTaskCrowdMng.vue    |  4 +-
 src/views/xm/core/wiki/archive/WikiList.vue   |  2 +-
 src/views/xm/core/xmGroup/XmGroupMng.vue      |  2 +-
 .../xm/core/xmIteration/XmIterationBox.vue    |  2 +-
 .../xm/core/xmIteration/XmIterationMng.vue    |  2 +-
 src/views/xm/core/xmMenu/XmEpicFeatures.vue   |  2 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |  2 +-
 src/views/xm/core/xmMenu/XmMenuSelect.vue     |  2 +-
 .../core/xmMenuTemplate/XmMenuTemplateMng.vue |  2 +-
 src/views/xm/core/xmProduct/XmProductMng.vue  |  2 +-
 .../xm/core/xmProduct/XmProductTplMng.vue     |  2 +-
 src/views/xm/core/xmProject/XmProjectMng.vue  |  4 +-
 .../xm/core/xmProject/XmProjectTplMng.vue     |  2 +-
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  2 +-
 src/views/xm/core/xmTask/XmPhase.vue          |  2 +-
 src/views/xm/core/xmTask/XmTaskList.vue       |  2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue        |  2 +-
 .../core/xmTaskExecuser/XmTaskExecuserMng.vue |  2 +-
 .../xm/core/xmTaskSbill/XmTaskSbillMng.vue    |  2 +-
 .../core/xmTaskTemplate/XmTaskTemplateMng.vue |  4 +-
 .../xm/core/xmWorkload/XmTaskSbillSelect.vue  |  4 +-
 .../xm/core/xmWorkload/XmWorkloadInfo.vue     |  2 +-
 .../xm/core/xmWorkload/XmWorkloadMng.vue      |  2 +-
 26 files changed, 56 insertions(+), 128 deletions(-)

diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index e9a78de3..f5c1adde 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -23,7 +23,7 @@
 					placement="top-start"
 					title="更多条件、操作"
 					v-model="moreVisible"
-					width="600"
+					width="500"
 					trigger="manual" >
 					<el-button  type="text" style="float:right;margin-top:-40px;"  @click="moreVisible=false" icon="el-icon-close">关闭</el-button>
 					<el-row>   
@@ -137,6 +137,8 @@
   
 	const map=new Map();
 	import { mapGetters } from 'vuex' 
+
+	import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
 	import XmIterationAdd from "../xmIteration/XmIterationEdit.vue";
 
 	export default {
@@ -405,6 +407,7 @@
 			}, 
 		},//end methods
 		components: { 
+			MdpSelectUserXm,
 			XmIterationAdd,
 		    //在下面添加其它组件
 		},
diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index e8955b90..1b52d32b 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -30,7 +30,7 @@
         <el-popover
           placement="top-start"
           title="更多条件、操作"
-          width="600"
+          width="500"
           v-model="moreVisible"
           trigger="manual"
         >
@@ -60,17 +60,7 @@
             </el-row>
             <el-row>
               <font class="more-label-font"> 产品经理: </font>
-              <el-tag
-                v-if="filters.pmUser"
-                closable
-                @click="selectFiltersPmUser"
-                @close="clearFiltersPmUser()"
-                >{{ filters.pmUser.username }}</el-tag
-              >
-              <el-button v-else @click="selectFiltersPmUser()"
-                >选责任人</el-button
-              >
-              <el-button @click="setFiltersPmUserAsMySelf()">我的</el-button>
+              <mdp-select-user-xm label="选择产品经理" v-model="filters" userid-key="pmUserid" username-key="pmUsername" :project-id="linkProjectId" :clearable="true"></mdp-select-user-xm>
             </el-row>
             
 
@@ -222,8 +212,8 @@ import util from "@/common/js/util"; //全局公共库
 //import Sticky from '@/components/Sticky' // 粘性header组件
 //import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 import { listXmProductWithState } from "@/api/xm/core/xmProduct";
-import { mapGetters } from "vuex";
-import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
+import { mapGetters } from "vuex"; 
+import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
 import XmProductAdd from "../xmProduct/XmProductEdit.vue";
 const map = new Map();
 
@@ -248,8 +238,9 @@ export default {
     return {
       filters: {
         key: "",
-        id: "", //产品编号
-        pmUser: null, //产品经理
+        id: "", //产品编号 
+        pmUserid:'',
+        pmUsername:'',
       },
       xmProducts: [], //查询结果
       pageInfo: {
@@ -353,8 +344,8 @@ export default {
         params.id = this.filters.id;
       }
 
-      if (this.filters.pmUser) {
-        params.pmUserid = this.filters.pmUser.userid;
+      if (this.filters.pmUserid) {
+        params.pmUserid = this.filters.pmUserid;
       }
       this.load.list = true;
       listXmProductWithState(params)
@@ -378,7 +369,7 @@ export default {
               this.$refs.table.setCurrentRow(row);
               this.rowClick(row);
             }else{
-				if(this.xmProducts.length==0 ){
+				if(this.xmProducts.length==0 && this.moreVisible==false ){
 					if(this.editForm && this.editForm.id){
 						this.clearSelect()
 					}
@@ -414,29 +405,7 @@ export default {
       this.$emit("selected", row);
       this.productVisible = false;
       this.moreVisible = false;
-    },
-
-    /**begin 自定义函数请在下面加**/
-    clearFiltersPmUser: function () {
-      this.filters.pmUser = null;
-      this.searchXmProducts();
-    },
-    selectFiltersPmUser() {
-      this.selectFiltersPmUserVisible = true;
-    },
-    onFiltersPmUserSelected(users) {
-      if (users && users.length > 0) {
-        this.filters.pmUser = users[0];
-      } else {
-        this.filters.pmUser = null;
-      }
-      this.selectFiltersPmUserVisible = false;
-      this.searchXmProducts();
-    },
-    setFiltersPmUserAsMySelf() {
-      this.filters.pmUser = this.userInfo;
-      this.searchXmProducts();
-    },
+    }, 
 
     tableRowClassName({ row, rowIndex }) {
       if (row && this.editForm && row.id == this.editForm.id) {
@@ -530,8 +499,8 @@ export default {
       this.addProductVisible = false;
     },
   }, //end methods
-  components: {
-    UsersSelect,
+  components: { 
+    MdpSelectUserXm,
     XmProductAdd,
     //在下面添加其它组件
   },
diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 7a186718..770ab1e9 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -30,7 +30,7 @@
                 <el-popover
                   placement="top-start"
                   title="更多条件、操作"
-                  width="600"
+                  width="500"
                   v-model="moreVisible"
                   trigger="manual"
                 >
@@ -60,19 +60,7 @@
                     </el-row>
                     <el-row>
                       <font class="more-label-font"> 项目经理: </font>
-                      <el-tag
-                        v-if="filters.pmUser"
-                        closable
-                        @click="selectFiltersPmUser"
-                        @close="clearFiltersPmUser()"
-                        >{{ filters.pmUser.username }}</el-tag
-                      >
-                      <el-button v-else @click="selectFiltersPmUser()"
-                        >选责任人</el-button
-                      >
-                      <el-button @click="setFiltersPmUserAsMySelf()"
-                        >我的</el-button
-                      >
+                      <mdp-select-user-xm label="选择项目经理" v-model="filters" userid-key="pmUserid" username-key="pmUsername" :clearable="true"></mdp-select-user-xm>
                     </el-row>
 
                     <el-row>
@@ -206,18 +194,7 @@
           >
         </slot>
       </span>
-    </el-popover>
-    <el-drawer
-      title="选择员工"
-      :visible.sync="selectFiltersPmUserVisible"
-      size="60%"
-      append-to-body
-    >
-      <users-select
-        @confirm="onFiltersPmUserSelected"
-        ref="usersSelect"
-      ></users-select>
-    </el-drawer>
+    </el-popover> 
 	
         <el-dialog append-to-body :visible.sync="addProjectVisible" width="70%" top="20px">
           <xm-project-add
@@ -236,10 +213,10 @@ import util from "@/common/js/util"; //全局公共库
 //import Sticky from '@/components/Sticky' // 粘性header组件
 //import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 import { listXmProject } from "@/api/xm/core/xmProject";
-import { mapGetters } from "vuex";
-import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
+import { mapGetters } from "vuex"; 
 const map = new Map();
 
+import MdpSelectUserXm from "@/views/xm/core/components/MdpSelectUserXm/index";
 import XmProjectAdd from "../xmProject/XmProjectEdit.vue";
 
 export default {
@@ -264,7 +241,8 @@ export default {
       filters: {
         key: "",
         id: "", //项目编号
-        pmUser: null, //项目经理
+        pmUserid:'',
+        pmUsername:'',
       },
       xmProjects: [], //查询结果
       pageInfo: {
@@ -365,8 +343,8 @@ export default {
         params.id = this.filters.id;
       }
 
-      if (this.filters.pmUser) {
-        params.pmUserid = this.filters.pmUser.userid;
+      if (this.filters.pmUserid) {
+        params.pmUserid = this.filters.pmUserid;
       }
       this.load.list = true;
       listXmProject(params)
@@ -390,7 +368,7 @@ export default {
               this.$refs.table.setCurrentRow(row);
               this.rowClick(row);
             } else{
-				if(this.xmProjects.length==0 ){
+				if(this.xmProjects.length==0  && this.moreVisible==false){
 					if(this.editForm && this.editForm.id){
 						this.clearSelect()
 					}
@@ -426,29 +404,7 @@ export default {
       this.$emit("selected", row);
       this.projectVisible = false;
       this.moreVisible = false;
-    },
-
-    /**begin 自定义函数请在下面加**/
-    clearFiltersPmUser: function () {
-      this.filters.pmUser = null;
-      this.searchXmProjects();
-    },
-    selectFiltersPmUser() {
-      this.selectFiltersPmUserVisible = true;
-    },
-    onFiltersPmUserSelected(users) {
-      if (users && users.length > 0) {
-        this.filters.pmUser = users[0];
-      } else {
-        this.filters.pmUser = null;
-      }
-      this.selectFiltersPmUserVisible = false;
-      this.searchXmProjects();
-    },
-    setFiltersPmUserAsMySelf() {
-      this.filters.pmUser = this.userInfo;
-      this.searchXmProjects();
-    },
+    }, 
 
     tableRowClassName({ row, rowIndex }) {
       if (row && this.editForm && row.id == this.editForm.id) {
@@ -545,7 +501,7 @@ export default {
     }, 
   }, //end methods
   components: {
-    UsersSelect,XmProjectAdd,
+    MdpSelectUserXm,XmProjectAdd,
     //在下面添加其它组件
   },
   mounted() {
diff --git a/src/views/xm/core/crowd/XmTaskCrowdMng.vue b/src/views/xm/core/crowd/XmTaskCrowdMng.vue
index 7ed37d26..ab1cdab3 100644
--- 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="600"
+            width="500"
             trigger="click"
           >
             <el-row>  
@@ -170,7 +170,7 @@
           <el-popover
             placement="top-start"
             title="选择展示方式"
-            width="600"
+            width="500"
             trigger="hover"
           >
             <el-row>
diff --git a/src/views/xm/core/wiki/archive/WikiList.vue b/src/views/xm/core/wiki/archive/WikiList.vue
index b80466dc..ca5de76f 100644
--- 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="600"
+								width="500"
 								v-model="moreVisible"
 								trigger="manual" >
 								<el-row> 
diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue
index 348ee266..386e43a6 100644
--- 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="600"
+				width="500"
 				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>
diff --git a/src/views/xm/core/xmIteration/XmIterationBox.vue b/src/views/xm/core/xmIteration/XmIterationBox.vue
index 519ed74b..04dcceb0 100644
--- 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="600"
+				width="500"
 				trigger="click" >
 				<el-divider content-position="left"><strong>查询条件</strong></el-divider>
 				<el-row>
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index a53345f9..518e6231 100644
--- 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="600" trigger="click">
+      <el-popover placement="top-start" title="" width="500" trigger="click">
         <el-divider content-position="left"
           ><strong>查询条件</strong></el-divider
         >
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index 1d31ac3f..599798c6 100644
--- 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="600"
+							width="500"
 							trigger="manual"
 							v-model="moreVisible"
 						>
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index a56df26a..da13e6c4 100644
--- 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="600"
+							width="500"
 							v-model="moreVisible"
 							trigger="manual" >
 							
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index dbc93eec..ba64d0d3 100644
--- 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="600"
+						width="500"
 						trigger="click" >
 						<el-row>  
 							<el-col  :span="24"  style="padding-top:5px;" >
diff --git a/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue b/src/views/xm/core/xmMenuTemplate/XmMenuTemplateMng.vue
index ffbac22a..5bf55c40 100644
--- 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="600"
+						width="500"
 						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> 
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 691f6853..54aca0ae 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -325,7 +325,7 @@
 					<el-dialog
 						title="通过复制创建新的模板或者新的产品"
 						:visible.sync="copyToVisible"
-						width="600" > 
+						width="500" > 
 						<el-form>
 						<el-form-item label="产品名称">
 							<el-input v-model="xmProductCopy.productName" placeholder="新的产品名称"></el-input> 
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 32817783..8f09644d 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -86,7 +86,7 @@
 		<el-dialog
 			title="通过复制创建新的模板或者新的产品"
 			:visible.sync="copyToVisible"
-			width="600" > 
+			width="500" > 
 			<el-form>
 			<el-form-item label="产品名称">
 				<el-input v-model="xmProductCopy.productName" placeholder="新的产品名称"></el-input> 
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 5dcb7a18..6cf66325 100644
--- 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="600"
+							width="500"
 							trigger="click" >
 							<el-row>  
 								<el-row>   
@@ -303,7 +303,7 @@
 		<el-dialog
 			title="通过复制创建新的模板或者新的项目"
 			:visible.sync="copyToVisible"
-			width="600" > 
+			width="500" > 
 			<el-form>
 			<el-form-item label="项目名称">
 				<el-input v-model="xmProjectCopy.name" placeholder="新的项目名称"></el-input> 
diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue
index 0a32f523..e464db82 100644
--- a/src/views/xm/core/xmProject/XmProjectTplMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue
@@ -47,7 +47,7 @@
 			title="通过复制创建新的模板或者新的项目"
 			:visible.sync="copyToVisible"
 			append-to-body
-			width="600" > 
+			width="500" > 
 			<el-form>
 			<el-form-item label="项目名称">
 				<el-input v-model="xmProjectCopy.name" placeholder="新的项目名称"></el-input> 
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 1b20d4cb..97fbd30f 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -27,7 +27,7 @@
 				<el-popover
 					placement="top-start"
 					title="更多条件、操作"
-					width="600"
+					width="500"
 					v-model="moreVisible"
 					trigger="manual" >
 					
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 6ca6ff4e..38b7c284 100644
--- 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="600"
+            width="500"
             trigger="manual"
             v-model="moreVisible"
           >
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index ae4cb82e..73448120 100644
--- 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="600"
+							width="500"
 							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> 
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 569cdaff..bb177971 100644
--- 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="600"
+            width="500"
             trigger="manual"
             v-model="moreVisible"
           >
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index 57d90ab5..ca2c7493 100644
--- 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="600" >
+							width="500" >
 							<el-row>
   									<!--结算状态0未结算1已部分结算2无需结算4已申请结算5结算失败6已全部结算--> 
 									<el-button type="primary" v-if="scope.row.status=='7' " @click="becomeCandidate(scope.row)">成为候选人</el-button>
diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
index 165ea10d..6a2552a5 100644
--- 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="600" v-model="moreVisible" trigger="manual" >
+      <el-popover placement="top-start" title="更多查询条件" width="500" v-model="moreVisible" trigger="manual" >
         <el-row>
           <el-col :span="24"  style="padding-top:5px;">
             <span class="more-label-font">创建时间:</span>
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
index 407ad139..f84050b5 100644
--- 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="600"
+						width="500"
 						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="600"
+						width="500"
 						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> 
diff --git a/src/views/xm/core/xmWorkload/XmTaskSbillSelect.vue b/src/views/xm/core/xmWorkload/XmTaskSbillSelect.vue
index 2e83978d..a0052da2 100644
--- 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="600"
+      width="500"
       trigger="manual"
       v-model="sbillVisible">
 
@@ -18,7 +18,7 @@
 												<el-popover
                           placement="top-start"
                           title=""
-                          width="600"
+                          width="500"
                           v-model="moreVisible"
                           trigger="manual" >
 													<el-row>
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadInfo.vue b/src/views/xm/core/xmWorkload/XmWorkloadInfo.vue
index 5e3dbee2..b3840bad 100644
--- 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="600" v-model="moreVisible" trigger="manual" >
+      <el-popover placement="top-start" title="更多查询条件" width="500" v-model="moreVisible" trigger="manual" >
         <el-row>
           <el-col :span="24"  style="padding-top:5px;">
             <span class="more-label-font">创建时间:</span>
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadMng.vue b/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
index 40afe889..4e9bdf88 100644
--- 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="600" v-model="moreVisible" trigger="manual" >
+      <el-popover placement="top-start" title="更多查询条件" width="500" v-model="moreVisible" trigger="manual" >
         <el-row>
           <el-col :span="24"  style="padding-top:5px;">
             <span class="more-label-font">创建时间:</span>