|
|
@@ -668,8 +668,8 @@
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane :label="$t('engineering')" name="engineeringProfession" v-if="user.company.packageEngineering == 1">
|
|
|
- <div style="padding-top:10px;">
|
|
|
- <el-table :data="projectProfessionList" size="small" :key="Math.random()">
|
|
|
+ <div style="padding-top:10px;" class="gongcheng">
|
|
|
+ <el-table :data="projectProfessionList" size="small" :key="Math.random()" :height="'400px'">
|
|
|
<el-table-column prop="professionId" width="200">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select v-model="scope.row.professionId" >
|
|
|
@@ -695,13 +695,13 @@
|
|
|
<el-link @click="showEditPpMembs(scope.row)">{{(scope.row.membList == null || scope.row.membList.length == 0)?$t('professionalparticipants'):$t('setup')}}</el-link>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="inchargerName" width="120" :label="$t('head')">
|
|
|
+ <el-table-column prop="inchargerName" width="200" :label="$t('head')">
|
|
|
<template slot-scope="scope">
|
|
|
<el-select v-model="scope.row.inchargerId" v-if="user.userNameNeedTranslate != 1">
|
|
|
<el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
|
|
|
- <!-- <selectCat :size="'mini'" :subject="participator" :subjectId="scope.row.inchargerId" :index="scope.index" :distinction="'4'" style="position: relative;z-index:99999999999 !important;"></selectCat> -->
|
|
|
+ <selectCat v-if="user.userNameNeedTranslate == 1" :size="'mini'" :subject="participator" :subjectId="scope.row.inchargerId" :other="scope.$index" :distinction="'4'" @selectCal="selectCal"></selectCat>
|
|
|
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -1076,6 +1076,7 @@
|
|
|
|
|
|
<!-- 项目专业人员的设置 -->
|
|
|
<el-dialog :title="$t('setupprojectprofessionals')" v-if="editPpMembDialog" :visible.sync="editPpMembDialog" :close-on-click-modal="false" customClass="customWidth" width="600px">
|
|
|
+ <div class="gongcheng">
|
|
|
<el-table :data="curProfessionRow.membList" height="400">
|
|
|
<el-table-column prop="name" :label="$t('professionals')">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -1083,6 +1084,7 @@
|
|
|
<el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
+ <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :subject="participator" :subjectId="scope.row.membId" :distinction="'11'" :other="scope.$index" @selectCal="selectCal"></selectCat>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="percentage" width="120" :label="$t('zhan-bi')">
|
|
|
@@ -1103,6 +1105,7 @@
|
|
|
<el-button @click="editPpMembDialog = false" >{{ $t('btn.cancel') }}</el-button>
|
|
|
<el-button type="primary" @click="addPpMemb" >{{ $t('btn.determine') }}</el-button>
|
|
|
</div>
|
|
|
+ </div>
|
|
|
</el-dialog>
|
|
|
<!-- 批量修改自定义维度 -->
|
|
|
<el-dialog :title="checkoradd ? $t('changes') : $t('pi-liang-tian-jia')" :visible.sync="checkedWuduDialog" v-if="checkedWuduDialog" width="40%">
|
|
|
@@ -4142,7 +4145,7 @@ a {
|
|
|
} else if(obj.distinction == '3') {
|
|
|
this.addForm.inchargerId = obj.id
|
|
|
} else if(obj.distinction =='4') {
|
|
|
- this.projectProfessionList[obj.index].inchargerId == obj.id
|
|
|
+ this.projectProfessionList[obj.other].inchargerId = obj.id
|
|
|
} else if(obj.distinction =='5') {
|
|
|
this.paramInchargerId = obj.id
|
|
|
} else if(obj.distinction == '10') {
|
|
|
@@ -4152,6 +4155,10 @@ a {
|
|
|
arr.push(userList[i].id)
|
|
|
}
|
|
|
this.addForm.auditUserIds = arr
|
|
|
+ } else if(obj.distinction == '11') {
|
|
|
+ let userList = obj.id
|
|
|
+ console.log(obj)
|
|
|
+ this.curProfessionRow.membList[obj.other].membId = userList
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -4281,4 +4288,7 @@ a {
|
|
|
.wpgCssClass .el-form-item__label{
|
|
|
font-weight: 600;
|
|
|
}
|
|
|
+.gongcheng .el-table .cell{
|
|
|
+ overflow: inherit !important;
|
|
|
+}
|
|
|
</style>
|
Lijy