From e3171538a331a931fa3f1f48a090a94fc41d767c 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, 13 Jul 2022 12:28:31 +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

---
 .../xm/core/components/XmProjectSelect.vue    | 890 +++++++++++-------
 .../xmProduct/XmProductForLinkComplex.vue     |   2 +-
 .../xmProject/XmProjectForLinkComplex.vue     |  20 +-
 3 files changed, 543 insertions(+), 369 deletions(-)

diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 13ab9e34..30905d8a 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -1,378 +1,560 @@
 <template>
-	<section>
-			<el-popover
-							placement="bottom"
-							width="400"
-							trigger="manual"
-							v-model="projectVisible">
+  <section>
+    <el-popover
+      placement="bottom"
+      width="400"
+      trigger="manual"
+      v-model="projectVisible"
+    >
+	  <el-row>
+        <el-button
+          type="text"
+          icon="el-icon-refresh"
+          @click="refreshSelect"
+          title="重新从后台刷新数据回来"
+          >刷新</el-button
+        >&nbsp;&nbsp;
+        <el-button
+          v-if="editForm && editForm.id"
+          type="text"
+          icon="el-icon-circle-close"
+          @click="clearSelect"
+          title="清空当前选中的项目"
+          >清除选中</el-button
+        >&nbsp;&nbsp;
+                <el-popover
+                  placement="top-start"
+                  title=""
+                  width="400"
+                  v-model="moreVisible"
+                  trigger="manual"
+                >
+                  <el-row>
+                    <el-col :span="24" style="padding-top: 5px">
+                      <font class="more-label-font">项目编号:</font>
+                      <el-input
+                        v-model="filters.id"
+                        style="width: 100%"
+                        placeholder="输入项目编号"
+                        @keyup.enter.native="searchXmProjects"
+                      >
+                      </el-input>
+                    </el-col>
 
-								<el-row >
-									<!--列表 XmProject 项目表-->
-									<el-table  ref="table" :height="maxTableHeight" :data="xmProjects" :row-class-name="tableRowClassName" @sort-change="sortChange" :highlight-current-row="true" current-row-key="id" v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-										<el-table-column prop="name"  label="项目名称">
-											<template slot="header" slot-scope="scope">
-												项目名称
-												<span style="float:right;">
-												<el-button type="text" @click="clearSelect">清空</el-button>&nbsp;&nbsp;
-												<el-button type="text" @click="close">关闭</el-button>&nbsp;&nbsp;
-												<el-popover
-													placement="top-start"
-													title=""
-													width="400"
-													v-model="moreVisible"
-													trigger="manual" >
-													<el-row>
-														<el-col  :span="24"  style="padding-top:5px;">
-															<font class="more-label-font">项目编号:</font>
-															<el-input   v-model="filters.id" style="width:100%;"  placeholder="输入项目编号" @keyup.enter.native="searchXmProjects">
-															</el-input>
-														</el-col>
+                    <el-col :span="24" style="padding-top: 5px">
+                      <font class="more-label-font">创建时间:</font>
+                      <el-date-picker
+                        v-model="dateRanger"
+                        type="daterange"
+                        align="right"
+                        unlink-panels
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="完成日期"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        :default-time="['00:00:00', '23:59:59']"
+                        :picker-options="pickerOptions"
+                      ></el-date-picker>
+                    </el-col>
 
-														<el-col  :span="24"  style="padding-top:5px;">
-															<font class="more-label-font">创建时间:</font>
-															<el-date-picker
-																v-model="dateRanger"
-																type="daterange"
-																align="right"
-																unlink-panels
-																range-separator="至"
-																start-placeholder="开始日期"
-																end-placeholder="完成日期"
-																value-format="yyyy-MM-dd HH:mm:ss"
-																:default-time="['00:00:00','23:59:59']"
-																:picker-options="pickerOptions"
-															></el-date-picker>
-														</el-col>
-
-														<el-col  :span="24"  style="padding-top:5px;">
-															<font class="more-label-font">
-																项目名称:
-															</font>
-															<el-input   v-model="filters.key" style="width:100%;"  placeholder="输入项目名字关键字">
-															</el-input>
-														</el-col>
-														<el-col  :span="24"  style="padding-top:5px;">
-															<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>
-														</el-col>
-														<el-col  :span="24"  style="padding-top:5px;">
-															<el-button type="text"  @click="moreVisible=false" >关闭</el-button><el-button type="primary"  @click="searchXmProjects" >查询</el-button>
-														</el-col>
-													</el-row>
-													<el-button type="text" slot="reference" @click="moreVisible=!moreVisible" style="float:right;">更多条件</el-button>
-												</el-popover>
-												</span>
-											</template>
-											<template slot-scope="scope">
-												<font>{{scope.row.name}}</font>
-											</template>
-										</el-table-column>
-									</el-table>
-									<el-pagination  layout="total, prev, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>
-								</el-row>
- 								<span slot="reference" @click="referenceClick">
-									<slot name="reference"><el-link title="项目，点击选择、清除选择"  type="warning"    icon="el-icon-search"><font style="font-size:14px;"><slot name="title">{{editForm && editForm.id?editForm.name:'选择项目'}}</slot></font></el-link> </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>
-	</section>
+                    <el-col :span="24" style="padding-top: 5px">
+                      <font class="more-label-font"> 项目名称: </font>
+                      <el-input
+                        v-model="filters.key"
+                        style="width: 100%"
+                        placeholder="输入项目名字关键字"
+                      >
+                      </el-input>
+                    </el-col>
+                    <el-col :span="24" style="padding-top: 5px">
+                      <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
+                      >
+                    </el-col>
+                    <el-col :span="24" style="padding-top: 5px">
+                      <el-button type="text" @click="moreVisible = false"
+                        >关闭</el-button
+                      ><el-button type="primary" @click="searchXmProjects"
+                        >查询</el-button
+                      >
+                    </el-col>
+                  </el-row>
+                  <el-button
+                    type="text"
+                    slot="reference"
+                    @click="moreVisible = !moreVisible" 
+                    >更多条件</el-button
+                  >
+                </el-popover>
+				<el-button
+				style="float: right"
+				type="text"
+				@click="close"
+				icon="el-icon-close"
+				title="关闭当前窗口"
+				>关闭</el-button
+				>
+	  </el-row>
+      <el-row
+        v-if="load.list == false && (!xmProjects || xmProjects.length == 0)"
+      >
+        <el-row v-if="linkProductId">
+          <el-row
+            >没有查到与产品【{{
+              linkProductId
+            }}】关联的项目,您可以尝试&nbsp;&nbsp;
+            <el-button
+              type="text"
+              icon="el-icon-refresh"
+              @click="refreshSelect"
+              title="重新从后台刷新数据回来"
+              >刷新</el-button
+            >&nbsp;&nbsp; 重新从后台加载，或者<el-button
+              @click="addProjectVisible = true"
+              icon="el-icon-plus"
+              type="text"
+              >创建项目</el-button
+            >
+            ，并自动关联产品【{{
+              linkProductId
+            }}】，或者到【产品->关联项目->加入更多项目到产品】手动关联一个已存在的项目。
+          </el-row>
+        </el-row>
+        <el-row v-else>
+          <el-row
+            >没有查到相关项目,您可以尝试&nbsp;&nbsp;
+            <el-button
+              type="text"
+              icon="el-icon-refresh"
+              @click="refreshSelect"
+              title="重新从后台刷新数据回来"
+              >刷新</el-button
+            >&nbsp;&nbsp; 重新从后台加载，或者<el-button
+              @click="addProjectVisible = true"
+              icon="el-icon-plus"
+              type="text"
+              >创建项目</el-button
+            >
+          </el-row>
+        </el-row>
+        <el-dialog append-to-body :visible.sync="addProjectVisible" width="70%">
+          <xm-project-add
+		  	:op-type="'add'"
+            :xm-product="{ id: linkProductId, name: '' }"
+            @cancel="addProjectVisible = false"
+            @submit="afterAddSubmit"
+          >
+          </xm-project-add>
+        </el-dialog>
+      </el-row>
+      <el-row>
+        <!--列表 XmProject 项目表-->
+        <el-table
+          ref="table"
+          :height="maxTableHeight"
+          :data="xmProjects"
+          :row-class-name="tableRowClassName"
+          @sort-change="sortChange"
+          :highlight-current-row="true"
+          current-row-key="id"
+          v-loading="load.list"
+          border
+          @selection-change="selsChange"
+          @row-click="rowClick"
+          style="width: 100%"
+        >
+          <el-table-column prop="name" label="项目名称">
+            <template slot="header" slot-scope="scope">
+              项目名称 
+            </template>
+            <template slot-scope="scope">
+              <font>{{ scope.row.name }}</font>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          layout="total, prev, next"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+          :page-sizes="[10, 20, 50, 100, 500]"
+          :current-page="pageInfo.pageNum"
+          :page-size="pageInfo.pageSize"
+          :total="pageInfo.total"
+          style="float: right"
+        ></el-pagination>
+      </el-row>
+      <span slot="reference" @click="referenceClick">
+        <slot name="reference"
+          ><el-link
+            title="项目，点击选择、清除选择"
+            type="warning"
+            icon="el-icon-search"
+            ><font style="font-size: 14px"
+              ><slot name="title">{{
+                editForm && editForm.id ? editForm.name : "选择项目"
+              }}</slot></font
+            ></el-link
+          >
+        </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>
+  </section>
 </template>
 
 <script>
-	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";
-	const map=new Map();
-
-	export default {
-		props:['linkProductId','linkIterationId','autoSelect'],
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		watch:{
-			linkIterationId(){
-				this.initData();
-			},
+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";
+const map = new Map();
 
-			linkProductId(){
-				this.initData();
-			}
-		},
-		data() {
-			const beginDate = new Date();
-			const endDate = new Date();
-			beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
-			return {
-				filters: {
-					key: '',
-					id:'',//项目编号
-					pmUser:null,//项目经理
+import XmProjectAdd from "../xmProject/XmProjectEdit.vue";
 
-				},
-				xmProjects: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				sels: [],//列表选中数据
-				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+export default {
+  props: ["linkProductId", "linkIterationId", "autoSelect"],
+  computed: {
+    ...mapGetters(["userInfo", "roles"]),
+  },
+  watch: {
+    linkIterationId() {
+      this.initData();
+    },
 
-				//新增xmProject界面初始化数据
-				addForm: {
-					id:'',name:'',branchId:'',remark:''
-				},
+    linkProductId() {
+      this.initData();
+    },
+  },
+  data() {
+    const beginDate = new Date();
+    const endDate = new Date();
+    beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12);
+    return {
+      filters: {
+        key: "",
+        id: "", //项目编号
+        pmUser: null, //项目经理
+      },
+      xmProjects: [], //查询结果
+      pageInfo: {
+        //分页数据
+        total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
+        pageSize: 10, //每页数据
+        count: false, //是否需要重新计算总记录数
+        pageNum: 1, //当前页码、从1开始计算
+        orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
+        orderDirs: [], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+      },
+      load: { list: false, edit: false, del: false, add: false }, //查询中...
+      sels: [], //列表选中数据
+      dicts: {}, //下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
 
-				//编辑xmProject界面初始化数据
-				editForm: {
-					id:'',name:'',branchId:'',remark:''
-				},
-				selectFiltersPmUserVisible:false,
-				maxTableHeight:300,
-				dateRanger: [ ],
-				pickerOptions:  util.getPickerOptions('datarange'),
-				projectVisible:false,
-				moreVisible:false,
-				hadInit:false,
-			}
-		},//end data
-		methods: {
-			handleSizeChange(pageSize) {
-				this.pageInfo.pageSize=pageSize;
-				this.getXmProjects();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getXmProjects();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getXmProjects();
-			},
-			searchXmProjects(){
-				 this.pageInfo.count=true;
-				 this.getXmProjects();
-			},
-			//获取列表 XmProject 项目表
-			getXmProjects() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}
-					params.orderBy= orderBys.join(",")
-				}
-				if(this.filters.key!==""){
-					params.key="%"+this.filters.key+"%"
-				}
-				if(this.linkProductId){
-					params.linkProductId=this.linkProductId
-				}
-				if(this.linkIterationId){
-					params.linkIterationId=this.linkIterationId
-				}
-				if(this.filters.id){
-					params.id=this.filters.id
-				}
+      //新增xmProject界面初始化数据
+      addForm: {
+        id: "",
+        name: "",
+        branchId: "",
+        remark: "",
+      },
 
-				if(this.filters.pmUser){
-					params.pmUserid=this.filters.pmUser.userid
-				}
-				this.load.list = true;
-				listXmProject(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){
-						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
-						this.xmProjects = res.data.data;
-						if(this.linkIterationId){
-							 map.set(this.linkIterationId,this.xmProjects)
-						}else if(this.linkProductId){
-							map.set(this.linkProductId,this.xmProjects)
-						}
-						if(this.autoSelect!==false&&this.xmProjects.length>0 && this.projectVisible==false){
-							var row=this.xmProjects[0];
-							this.$refs.table.setCurrentRow(row);
-							this.rowClick(row);
-						}
-					}else{
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
-					}
-					this.load.list = false;
-				}).catch( err => this.load.list = false );
-			},
+      //编辑xmProject界面初始化数据
+      editForm: {
+        id: "",
+        name: "",
+        branchId: "",
+        remark: "",
+      },
+      selectFiltersPmUserVisible: false,
+      maxTableHeight: 300,
+      dateRanger: [],
+      pickerOptions: util.getPickerOptions("datarange"),
+      projectVisible: false,
+      moreVisible: false,
+      hadInit: false, 
+	  addProjectVisible:false,
+    };
+  }, //end data
+  methods: {
+    handleSizeChange(pageSize) {
+      this.pageInfo.pageSize = pageSize;
+      this.getXmProjects();
+    },
+    handleCurrentChange(pageNum) {
+      this.pageInfo.pageNum = pageNum;
+      this.getXmProjects();
+    },
+    // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
+    sortChange(obj) {
+      var dir = "asc";
+      if (obj.order == "ascending") {
+        dir = "asc";
+      } else {
+        dir = "desc";
+      }
+      if (obj.prop == "xxx") {
+        this.pageInfo.orderFields = ["xxx"];
+        this.pageInfo.orderDirs = [dir];
+      }
+      this.getXmProjects();
+    },
+    searchXmProjects() {
+      this.pageInfo.count = true;
+      this.getXmProjects();
+    },
+    //获取列表 XmProject 项目表
+    getXmProjects() {
+      let params = {
+        pageSize: this.pageInfo.pageSize,
+        pageNum: this.pageInfo.pageNum,
+        total: this.pageInfo.total,
+        count: this.pageInfo.count,
+      };
+      if (
+        this.pageInfo.orderFields != null &&
+        this.pageInfo.orderFields.length > 0
+      ) {
+        let orderBys = [];
+        for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
+          orderBys.push(
+            this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i]
+          );
+        }
+        params.orderBy = orderBys.join(",");
+      }
+      if (this.filters.key !== "") {
+        params.key = "%" + this.filters.key + "%";
+      }
+      if (this.linkProductId) {
+        params.linkProductId = this.linkProductId;
+      }
+      if (this.linkIterationId) {
+        params.linkIterationId = this.linkIterationId;
+      }
+      if (this.filters.id) {
+        params.id = this.filters.id;
+      }
 
-			//选择行xmProject
-			selsChange: function (sels) {
-				this.sels = sels;
-			},
+      if (this.filters.pmUser) {
+        params.pmUserid = this.filters.pmUser.userid;
+      }
+      this.load.list = true;
+      listXmProject(params)
+        .then((res) => {
+          var tips = res.data.tips;
+          if (tips.isOk) {
+            this.pageInfo.total = res.data.total;
+            this.pageInfo.count = false;
+            this.xmProjects = res.data.data;
+            if (this.linkIterationId) {
+              map.set(this.linkIterationId, this.xmProjects);
+            } else if (this.linkProductId) {
+              map.set(this.linkProductId, this.xmProjects);
+            }
+            if (
+              this.autoSelect !== false &&
+              this.xmProjects.length > 0 &&
+              this.projectVisible == false
+            ) {
+              var row = this.xmProjects[0];
+              this.$refs.table.setCurrentRow(row);
+              this.rowClick(row);
+            }
+          } else {
+            this.$notify({
+              position: "bottom-left",
+              showClose: true,
+              message: tips.msg,
+              type: "error",
+            });
+          }
+          this.load.list = false;
+        })
+        .catch((err) => (this.load.list = false));
+    },
 
-			rowClick: function(row, event, column){
-				this.editForm=row
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-				this.selectedProject(row)
-				this.projectVisible=false;
-				this.moreVisible=false;
-			},
-			selectedProject:function(row){
-				this.editForm=row
-				this.$emit('selected',row);
-				this.projectVisible=false;
-				this.moreVisible=false;
-			},
+    //选择行xmProject
+    selsChange: function (sels) {
+      this.sels = sels;
+    },
 
-			/**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();
-			},
+    rowClick: function (row, event, column) {
+      this.editForm = row;
+      this.$emit("row-click", row, event, column); //  @row-click="rowClick"
+      this.selectedProject(row);
+      this.projectVisible = false;
+      this.moreVisible = false;
+    },
+    selectedProject: function (row) {
+      this.editForm = row;
+      this.$emit("selected", row);
+      this.projectVisible = false;
+      this.moreVisible = false;
+    },
 
-			tableRowClassName({row, rowIndex}) {
-				if (row && this.editForm && row.id == this.editForm.id) {
-					return 'success-row';
-				}
-				return '';
-			},
-			clearSelect(){
-				this.$refs.table.setCurrentRow();
-				this.$emit("clear");
-				this.selectedProject(null);
-				this.projectVisible=false;
-				this.moreVisible=false;
-			},
-			close(){
-				this.projectVisible=false;
-				this.moreVisible=false;
-				this.$emit("close");
-			},
+    /**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();
+    },
 
-			initData(){
+    tableRowClassName({ row, rowIndex }) {
+      if (row && this.editForm && row.id == this.editForm.id) {
+        return "success-row";
+      }
+      return "";
+    },
+    clearSelect() {
+      this.$refs.table.setCurrentRow();
+      this.$emit("clear");
+      this.selectedProject(null);
+      this.projectVisible = false;
+      this.moreVisible = false;
+    },
+	
+    refreshSelect() {
+      this.searchXmProjects();
+      this.moreVisible = false;
+    },
+    close() {
+      this.projectVisible = false;
+      this.moreVisible = false;
+      this.$emit("close");
+    },
 
-				if(this.linkIterationId){
-					var xmProjects=map.get(this.linkIterationId);
-					if(xmProjects){
-						this.xmProjects=xmProjects;
-						if(this.projectVisible==false){
-							if(this.autoSelect!==false && this.xmProjects.length>0){
-								var row=this.xmProjects[0];
-								this.$refs.table.setCurrentRow(row);
-								this.rowClick(row);
-							}
-						}
-					}else{
-						this.searchXmProjects();
-					}
-				}else if(this.linkProductId){
-					var xmProjects=map.get(this.linkProductId);
-					if(xmProjects){
-						this.xmProjects=xmProjects;
-						if(this.projectVisible==false){
-							if(this.autoSelect!==false && this.xmProjects.length>0){
-								var row=this.xmProjects[0];
-								this.$refs.table.setCurrentRow(row);
-								this.rowClick(row);
-							}
-						}
-					}else{
-						this.searchXmProjects();
-					}
-				}else{
-					this.searchXmProjects();
-				}
-			},
+    initData() {
+      if (this.linkIterationId) {
+        var xmProjects = map.get(this.linkIterationId);
+        if (xmProjects) {
+          this.xmProjects = xmProjects;
+          if (this.projectVisible == false) {
+            if (this.autoSelect !== false && this.xmProjects.length > 0) {
+              var row = this.xmProjects[0];
+              this.$refs.table.setCurrentRow(row);
+              this.rowClick(row);
+            }
+          }
+        } else {
+          this.searchXmProjects();
+        }
+      } else if (this.linkProductId) {
+        var xmProjects = map.get(this.linkProductId);
+        if (xmProjects) {
+          this.xmProjects = xmProjects;
+          if (this.projectVisible == false) {
+            if (this.autoSelect !== false && this.xmProjects.length > 0) {
+              var row = this.xmProjects[0];
+              this.$refs.table.setCurrentRow(row);
+              this.rowClick(row);
+            }
+          }
+        } else {
+          this.searchXmProjects();
+        }
+      } else {
+        this.searchXmProjects();
+      }
+    },
 
-			referenceClick(){
-				if(!this.hadInit){
-					this.initData();
-					this.hadInit=true;
-				}
-				this.projectVisible=!this.projectVisible;
-			},
-			reloadOne(){
-				listXmProject({id:this.editForm.id}).then((res) => {
-					var tips = res.data.tips;
-					if(tips.isOk && rea.data.data && res.data.data.length>0){
-						Object.assign(this.editForm,res.data.data[0])
-						this.rowClick(this.editForm)
-					}
-				})
-			},
-		},//end methods
-		components: {
-			UsersSelect,
-		    //在下面添加其它组件
-		},
-		mounted() {
-			this.$nextTick(() => {
-				if(this.$refs.table){
-					this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
-				}
-				
-				if(this.autoSelect!==false){
-					this.initData();
-					this.hadInit=true;
-				}
-        	});
-		}
-	}
+    referenceClick() {
+      if (!this.hadInit) {
+        this.initData();
+        this.hadInit = true;
+      }
+      this.projectVisible = !this.projectVisible;
+    },
+    reloadOne() {
+      listXmProject({ id: this.editForm.id }).then((res) => {
+        var tips = res.data.tips;
+        if (tips.isOk && rea.data.data && res.data.data.length > 0) {
+          Object.assign(this.editForm, res.data.data[0]);
+          this.rowClick(this.editForm);
+        }
+      });
+    },
+	
+    afterAddSubmit(row) {
+      this.xmProjects.push(row);
+      if (this.iterationId) {
+        map.set(this.iterationId, this.xmProjects);
+      } else if (this.linkProjectId) {
+        map.set(this.linkProductId, this.xmProjects);
+      }
+      if (
+        this.autoSelect !== false &&
+        this.xmProjects.length > 0 &&
+        this.projectVisible == false
+      ) {
+        var row = this.xmProjects[0];
+        this.$refs.table.setCurrentRow(row);
+        this.rowClick(row);
+      }
+      this.addProjectVisible = false;
+    }, 
+  }, //end methods
+  components: {
+    UsersSelect,XmProjectAdd,
+    //在下面添加其它组件
+  },
+  mounted() {
+    this.$nextTick(() => {
+      if (this.$refs.table) {
+        this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
+      }
 
+      if (this.autoSelect !== false) {
+        this.initData();
+        this.hadInit = true;
+      }
+    });
+  },
+};
 </script>
 <style scoped>
-
-
-.more-label-font{
-	text-align:center;
-	float:left;
-	padding-top:5px;
+.more-label-font {
+  text-align: center;
+  float: left;
+  padding-top: 5px;
 }
-.align-right{
-	float: right;
+.align-right {
+  float: right;
 }
 </style>
diff --git a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
index 1f74d94d..0b74d1ce 100644
--- a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <el-row>
-      <el-col :span="4">
+      <el-col :span="4" class="padding-right padding-left">
 	  <el-row>
           <el-col :span="24"> 
               <xm-product-select
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index 36815f5b..188ad5d0 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -2,8 +2,8 @@
   <section>
     <el-row>
       <el-col :span="4" class="padding-right padding-left">
-        <el-row class="padding">
-          <el-col :span="20">
+        <el-row>
+          <el-col :span="24">
             <xm-project-select
               ref="xmProjectSelect"
               :auto-select="true"
@@ -12,20 +12,12 @@
               @row-click="onProjectRowClick"
               @clear="onProjectClearSelect"
             ></xm-project-select>
-          </el-col>
-          <el-col :span="4" v-if="xmProduct">
-             
-              <el-link
-                type="warning" 
-                @click="projectAddVisible = true"
-                icon="el-icon-plus"
-                ><font style="font-size: 14px">项目</font></el-link
-              > 
-          </el-col>
+          </el-col> 
         </el-row>
         <el-row
           ref="pageBody"
-          class="padding border"
+          class="padding"
+          :class="{border:selProject&&selProject.id}"
           :style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }"
         >
 			<h4 class="padding-bottom" v-if="selProject">常用功能快捷导航</h4>
@@ -121,7 +113,7 @@
         </el-row>
       </el-col>
       <el-col :span="20">
-        <el-tabs :value="showPanel" @tab-click="tabClick">
+        <el-tabs :value="showPanel" @tab-click="tabClick" style="margin-top:-10px;">
           <el-tab-pane
             label="项目概览"
             name="projectOverview"