|
|
@@ -46,7 +46,7 @@
|
|
|
<!-- 部门筛选 -->
|
|
|
<el-form-item v-if="user.timeType.projectWithDept">
|
|
|
<span style="margin-left:5px;margin-right:5px;color:#606266;">部门</span>
|
|
|
- <el-cascader v-model="deptId" :options="departmentList" placeholder="请选择部门"
|
|
|
+ <el-cascader v-model="deptId" style="width:140px;" :options="departmentList" placeholder="请选择部门"
|
|
|
:props="{ checkStrictly: true, expandTrigger: 'hover' }" :show-all-levels="false" clearable filterable @change="searchClfList" size="small"
|
|
|
></el-cascader>
|
|
|
</el-form-item>
|
|
|
@@ -54,7 +54,16 @@
|
|
|
<!-- 项目经理筛选 -->
|
|
|
<el-form-item>
|
|
|
<span style="margin-left:5px;margin-right:5px;color:#606266;">项目经理</span>
|
|
|
- <el-select v-model="inchagerId" style="width:190px;" placeholder="请选择" clearable @change="manageSelect" size="small" filterable popper-class="managePopperClass">
|
|
|
+ <el-select v-model="inchagerId" style="width:140px;" placeholder="请选择" clearable @change="manageSelect" size="small" filterable popper-class="managePopperClass">
|
|
|
+ <el-option v-for="item in users" :key="item.id" :label="user.companyId == 936 ? item.name + '\u3000' + item.jobNumber : item.name" :value="item.id">
|
|
|
+ <span style="float: left">{{ item.name }}</span>
|
|
|
+ <span style="float: right; color: #8492a6;" v-if="user.companyId == 936">{{ item.jobNumber }}</span>
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item>
|
|
|
+ <span style="margin-left:5px;margin-right:5px;color:#606266;">参与人</span>
|
|
|
+ <el-select v-model="participationId" style="width:140px;" placeholder="请选择" clearable @change="participationSelect" size="small" filterable popper-class="managePopperClass">
|
|
|
<el-option v-for="item in users" :key="item.id" :label="user.companyId == 936 ? item.name + '\u3000' + item.jobNumber : item.name" :value="item.id">
|
|
|
<span style="float: left">{{ item.name }}</span>
|
|
|
<span style="float: right; color: #8492a6;" v-if="user.companyId == 936">{{ item.jobNumber }}</span>
|
|
|
@@ -1270,7 +1279,8 @@ a {
|
|
|
addBasekeyNodesialog: false,
|
|
|
addFormkeyNodes: {
|
|
|
name: ''
|
|
|
- }
|
|
|
+ },
|
|
|
+ participationId: ''
|
|
|
};
|
|
|
},
|
|
|
// 过滤器
|
|
|
@@ -3056,6 +3066,7 @@ a {
|
|
|
//选择参与人
|
|
|
changeParticipator() {
|
|
|
//检查是否在参与人中，如果没有需要加入到参与人中
|
|
|
+ // console.log('addform',this.addForm.userId,this.users);
|
|
|
this.participator = [];
|
|
|
this.addForm.userId.forEach(u=>{
|
|
|
var list = this.users.filter(au=>au.id == u);
|
|
|
@@ -3110,6 +3121,11 @@ a {
|
|
|
this.getList();
|
|
|
},
|
|
|
|
|
|
+ participationSelect(){
|
|
|
+ this.page = 1
|
|
|
+ this.getList()
|
|
|
+ },
|
|
|
+
|
|
|
//获取项目列表
|
|
|
getList() {
|
|
|
this.listLoading = true;
|
|
|
@@ -3121,7 +3137,8 @@ a {
|
|
|
status: this.status,
|
|
|
category: this.statusClf,
|
|
|
projectMainId: this.projectMainId,
|
|
|
- inchagerId: this.inchagerId
|
|
|
+ inchagerId: this.inchagerId,
|
|
|
+ participation: this.participationId
|
|
|
}
|
|
|
if(this.sortOrder){
|
|
|
if(this.sortProp == 'inchargerName'){
|
|
|
@@ -3233,6 +3250,7 @@ a {
|
|
|
|
|
|
//显示新增界面
|
|
|
handleAdd(i, item) {
|
|
|
+ // console.log('handleadd',i,item);
|
|
|
this.contractAmountReasonShow = false
|
|
|
if(i == -1) {
|
|
|
this.title = "新增项目";
|
|
|
@@ -3311,7 +3329,7 @@ a {
|
|
|
for (var i in arrList) {
|
|
|
array.push(parseInt(arrList[i]));
|
|
|
}
|
|
|
- console.log(array, '转换', listList)
|
|
|
+ // console.log(array, '转换', listList)
|
|
|
this.addForm = {
|
|
|
id: item.id,
|
|
|
name: item.projectName,
|
|
|
@@ -3340,7 +3358,7 @@ a {
|
|
|
changeContractReason: ''
|
|
|
}
|
|
|
this.contractAmountOld = item.contractAmount ? item.contractAmount : 0
|
|
|
- console.log(this.addForm, '数据')
|
|
|
+ // console.log(this.addForm, '数据')
|
|
|
if(this.user.timeType.projectWithDept) {
|
|
|
this.$set(this.addForm, 'deptId', array.reverse())
|
|
|
}
|
|
|
@@ -3391,7 +3409,7 @@ a {
|
|
|
|
|
|
|
|
|
this.deleteVif = item.creatorId
|
|
|
- console.log("handleadd",this.deleteVif,this.addForm.id)
|
|
|
+ // console.log("handleadd",this.deleteVif,this.addForm)
|
|
|
if(item.associateDegrees != null && item.associateDegrees != 'null' && item.associateDegrees != '') {
|
|
|
var spli = item.associateDegrees.split(',')
|
|
|
var sl = []
|
ggooalice