wilson
/
xujiecloud-vue
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新加字段也可以显示

master
han\hanst 4 days ago
parent
3f22412f4d
commit
bd79c3d01b
2 changed files with 131 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 131
      src/views/modules/eam/eamProjectInfo.vue
  2. 77
      src/views/modules/eam/eamProjectPartInfo.vue

131
src/views/modules/eam/eamProjectInfo.vue
View File

@ -137,7 +137,8 @@
border border
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
v-for="(item,index) in columnList" :key="index"
v-for="(item,index) in visibleColumnList"
:key="item.serialNumber || item.columnProp || index"
:sortable="item.columnSortable" :sortable="item.columnSortable"
:prop="item.columnProp" :prop="item.columnProp"
:header-align="item.headerAlign" :header-align="item.headerAlign"
@ -1143,7 +1144,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-for="(item,index) in columnPartList" :key="index"
v-for="(item,index) in visibleColumnPartList"
:key="item.serialNumber || item.columnProp || index"
:sortable="item.columnSortable" :sortable="item.columnSortable"
:prop="item.columnProp" :prop="item.columnProp"
:header-align="item.headerAlign" :header-align="item.headerAlign"
@ -1222,6 +1224,12 @@ import {updateColumnSize} from "../../../api/table";
engineersList() { engineersList() {
return this.allPersonnelInfoList.filter(item => item.engineerId !== undefined); return this.allPersonnelInfoList.filter(item => item.engineerId !== undefined);
}, },
visibleColumnList () {
return this.columnList.filter(item => item.status !== false && item.status !== 0)
},
visibleColumnPartList () {
return this.columnPartList.filter(item => item.status !== false && item.status !== 0)
},
currentModalBuNo () { currentModalBuNo () {
return this.getBuNoByJoinedValue(this.modalData.bu) return this.getBuNoByJoinedValue(this.modalData.bu)
}, },
@ -2990,11 +2998,20 @@ import {updateColumnSize} from "../../../api/table";
if (value === null || value === undefined || value === '') { if (value === null || value === undefined || value === '') {
return '' return ''
} }
let userParts = String(value).split('-')
if (userParts.length > 1) {
return userParts[1]
let userValue = String(value).trim()
let separatorIndex = userValue.indexOf('-')
if (separatorIndex > -1 && separatorIndex < userValue.length - 1) {
return userValue.substring(separatorIndex + 1)
} }
return ''
return userValue
},
refreshTableLayout (tableRefName) {
this.$nextTick(() => {
let tableRef = this.$refs[tableRefName]
if (tableRef && tableRef.doLayout) {
tableRef.doLayout()
}
})
}, },
handleColumnResize(newWidth, oldWidth, column, event){ handleColumnResize(newWidth, oldWidth, column, event){
let inData= this.columnList.filter(item => item.columnProp === column.property)[0] let inData= this.columnList.filter(item => item.columnProp === column.property)[0]
@ -3202,7 +3219,7 @@ import {updateColumnSize} from "../../../api/table";
} }
if (this.tagNo === 2006) { if (this.tagNo === 2006) {
this.modalData.cQualityEngineer4 = val.username + '-' + val.user_display this.modalData.cQualityEngineer4 = val.username + '-' + val.user_display
this.modalData.cQualityEngineer4Name = this.modalData.cQualityEngineer4.split('-')[1]
this.modalData.cQualityEngineer4Name = this.getUserDisplayName(this.modalData.cQualityEngineer4)
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => { searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){ if (data && data.code === 0){
this.businessDataList7 = data.rows; this.businessDataList7 = data.rows;
@ -3211,7 +3228,7 @@ import {updateColumnSize} from "../../../api/table";
} }
if (this.tagNo === 2007) { if (this.tagNo === 2007) {
this.modalData.cQualityEngineer5 = val.username + '-' + val.user_display this.modalData.cQualityEngineer5 = val.username + '-' + val.user_display
this.modalData.cQualityEngineer5Name = this.modalData.cQualityEngineer5.split('-')[1]
this.modalData.cQualityEngineer5Name = this.getUserDisplayName(this.modalData.cQualityEngineer5)
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => { searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){ if (data && data.code === 0){
this.businessDataList7 = data.rows; this.businessDataList7 = data.rows;
@ -3220,7 +3237,7 @@ import {updateColumnSize} from "../../../api/table";
} }
if (this.tagNo === 2008) { if (this.tagNo === 2008) {
this.modalData.cQualityEngineer6 = val.username + '-' + val.user_display this.modalData.cQualityEngineer6 = val.username + '-' + val.user_display
this.modalData.cQualityEngineer6Name = this.modalData.cQualityEngineer6.split('-')[1]
this.modalData.cQualityEngineer6Name = this.getUserDisplayName(this.modalData.cQualityEngineer6)
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => { searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){ if (data && data.code === 0){
this.businessDataList7 = data.rows; this.businessDataList7 = data.rows;
@ -3229,7 +3246,7 @@ import {updateColumnSize} from "../../../api/table";
} }
if (this.tagNo === 2010) { if (this.tagNo === 2010) {
this.modalData.ipqcHardTag = val.username + '-' + val.user_display this.modalData.ipqcHardTag = val.username + '-' + val.user_display
this.modalData.ipqcHardTagName = this.modalData.ipqcHardTag.split('-')[1]
this.modalData.ipqcHardTagName = this.getUserDisplayName(this.modalData.ipqcHardTag)
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => { searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){ if (data && data.code === 0){
this.businessDataList7 = data.rows; this.businessDataList7 = data.rows;
@ -3238,7 +3255,7 @@ import {updateColumnSize} from "../../../api/table";
} }
if (this.tagNo === 2012) { if (this.tagNo === 2012) {
this.modalData.cQualityEngineer7 = val.username + '-' + val.user_display this.modalData.cQualityEngineer7 = val.username + '-' + val.user_display
this.modalData.cQualityEngineer7Name = this.modalData.cQualityEngineer7.split('-')[1]
this.modalData.cQualityEngineer7Name = this.getUserDisplayName(this.modalData.cQualityEngineer7)
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => { searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){ if (data && data.code === 0){
this.businessDataList7 = data.rows; this.businessDataList7 = data.rows;
@ -3247,7 +3264,7 @@ import {updateColumnSize} from "../../../api/table";
} }
if (this.tagNo === 3001) { if (this.tagNo === 3001) {
this.modalData.qcEngineer = val.username + '-' + val.user_display this.modalData.qcEngineer = val.username + '-' + val.user_display
this.modalData.qcEngineerName = this.modalData.qcEngineer.split('-')[1]
this.modalData.qcEngineerName = this.getUserDisplayName(this.modalData.qcEngineer)
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => { searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){ if (data && data.code === 0){
this.businessDataList7 = data.rows; this.businessDataList7 = data.rows;
@ -3256,7 +3273,7 @@ import {updateColumnSize} from "../../../api/table";
} }
if (this.tagNo === 3002) { if (this.tagNo === 3002) {
this.modalData.peEngineer = val.username + '-' + val.user_display this.modalData.peEngineer = val.username + '-' + val.user_display
this.modalData.peEngineerName = this.modalData.peEngineer.split('-')[1]
this.modalData.peEngineerName = this.getUserDisplayName(this.modalData.peEngineer)
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => { searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){ if (data && data.code === 0){
this.businessDataList7 = data.rows; this.businessDataList7 = data.rows;
@ -3265,7 +3282,7 @@ import {updateColumnSize} from "../../../api/table";
} }
if (this.tagNo === 3003) { if (this.tagNo === 3003) {
this.modalData.eeEngineer = val.username + '-' + val.user_display this.modalData.eeEngineer = val.username + '-' + val.user_display
this.modalData.eeEngineerName = this.modalData.eeEngineer.split('-')[1]
this.modalData.eeEngineerName = this.getUserDisplayName(this.modalData.eeEngineer)
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => { searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){ if (data && data.code === 0){
this.businessDataList7 = data.rows; this.businessDataList7 = data.rows;
@ -3274,7 +3291,7 @@ import {updateColumnSize} from "../../../api/table";
} }
if (this.tagNo === 3004) { if (this.tagNo === 3004) {
this.modalData.sqemeEngineer = val.username + '-' + val.user_display this.modalData.sqemeEngineer = val.username + '-' + val.user_display
this.modalData.sqemeEngineerName = this.modalData.sqemeEngineer.split('-')[1]
this.modalData.sqemeEngineerName = this.getUserDisplayName(this.modalData.sqemeEngineer)
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => { searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){ if (data && data.code === 0){
this.businessDataList7 = data.rows; this.businessDataList7 = data.rows;
@ -3283,7 +3300,7 @@ import {updateColumnSize} from "../../../api/table";
} }
if (this.tagNo === 3005) { if (this.tagNo === 3005) {
this.modalData.sqeeeEngineer = val.username + '-' + val.user_display this.modalData.sqeeeEngineer = val.username + '-' + val.user_display
this.modalData.sqeeeEngineerName = this.modalData.sqeeeEngineer.split('-')[1]
this.modalData.sqeeeEngineerName = this.getUserDisplayName(this.modalData.sqeeeEngineer)
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => { searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){ if (data && data.code === 0){
this.businessDataList7 = data.rows; this.businessDataList7 = data.rows;
@ -3917,34 +3934,34 @@ import {updateColumnSize} from "../../../api/table";
updateBy: this.$store.state.user.name, updateBy: this.$store.state.user.name,
} }
if (row.cQualityEngineer4 != null && row.cQualityEngineer4 !== ''){ if (row.cQualityEngineer4 != null && row.cQualityEngineer4 !== ''){
this.modalData.cQualityEngineer4Name= row.cQualityEngineer4.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer4Name = this.getUserDisplayName(row.cQualityEngineer4)
} }
if (row.cQualityEngineer5 != null && row.cQualityEngineer5 !== ''){ if (row.cQualityEngineer5 != null && row.cQualityEngineer5 !== ''){
this.modalData.cQualityEngineer5Name= row.cQualityEngineer5.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer5Name = this.getUserDisplayName(row.cQualityEngineer5)
} }
if (row.cQualityEngineer6 != null && row.cQualityEngineer6 !== ''){ if (row.cQualityEngineer6 != null && row.cQualityEngineer6 !== ''){
this.modalData.cQualityEngineer6Name= row.cQualityEngineer6.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer6Name = this.getUserDisplayName(row.cQualityEngineer6)
} }
if (row.docEngineer != null && row.docEngineer !== ''){ if (row.docEngineer != null && row.docEngineer !== ''){
this.modalData.docEngineerName= row.docEngineer.split('-')[1] // 截取用户名
this.modalData.docEngineerName = this.getUserDisplayName(row.docEngineer)
} }
if (row.docEngineer2 != null && row.docEngineer2 !== ''){ if (row.docEngineer2 != null && row.docEngineer2 !== ''){
this.modalData.docEngineer2Name= row.docEngineer2.split('-')[1] // 截取用户名
this.modalData.docEngineer2Name = this.getUserDisplayName(row.docEngineer2)
} }
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){ if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName= row.ipqcHardTag.split('-')[1] // 截取用户名
this.modalData.ipqcHardTagName = this.getUserDisplayName(row.ipqcHardTag)
} }
if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){ if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){
this.modalData.cQualityEngineer7Name= row.cQualityEngineer7.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer7Name = this.getUserDisplayName(row.cQualityEngineer7)
} }
if (row.qcEngineer != null && row.qcEngineer !== ''){ if (row.qcEngineer != null && row.qcEngineer !== ''){
this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
this.modalData.qcEngineerName = this.getUserDisplayName(row.qcEngineer)
} }
if (row.peEngineer != null && row.peEngineer !== ''){ if (row.peEngineer != null && row.peEngineer !== ''){
this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
this.modalData.peEngineerName = this.getUserDisplayName(row.peEngineer)
} }
if (row.eeEngineer != null && row.eeEngineer !== ''){ if (row.eeEngineer != null && row.eeEngineer !== ''){
this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
this.modalData.eeEngineerName = this.getUserDisplayName(row.eeEngineer)
} }
if (this.modalData.sqemeEngineer) { if (this.modalData.sqemeEngineer) {
this.modalData.sqemeEngineerName = this.getUserDisplayName(this.modalData.sqemeEngineer) this.modalData.sqemeEngineerName = this.getUserDisplayName(this.modalData.sqemeEngineer)
@ -4629,49 +4646,49 @@ import {updateColumnSize} from "../../../api/table";
if (row && row.username && row.userDisplay) { if (row && row.username && row.userDisplay) {
this.modalData.projectManager = row.username + '-' + row.userDisplay; this.modalData.projectManager = row.username + '-' + row.userDisplay;
if (this.modalData.projectManager) { if (this.modalData.projectManager) {
this.modalData.projectManagerName = this.modalData.projectManager.split('-')[1];
this.modalData.projectManagerName = this.getUserDisplayName(this.modalData.projectManager);
} }
} }
this.projectManagerFlag = false; this.projectManagerFlag = false;
}, },
projectOwnerRowDblclick (row) { projectOwnerRowDblclick (row) {
this.modalData.projectOwner = row.username + '-' + row.userDisplay this.modalData.projectOwner = row.username + '-' + row.userDisplay
this.modalData.projectOwnerName = this.modalData.projectOwner.split('-')[1] // 截取用户名
this.modalData.projectOwnerName = this.getUserDisplayName(this.modalData.projectOwner)
this.projectOwnerFlag = false this.projectOwnerFlag = false
}, },
engineerRowDblclick (row) { engineerRowDblclick (row) {
this.modalData.cQualityEngineer1 = row.username + '-' + row.userDisplay this.modalData.cQualityEngineer1 = row.username + '-' + row.userDisplay
this.modalData.cQualityEngineer1Name = this.modalData.cQualityEngineer1.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer1Name = this.getUserDisplayName(this.modalData.cQualityEngineer1)
this.engineerFlag = false this.engineerFlag = false
}, },
engineer6RowDblclick (row) { engineer6RowDblclick (row) {
this.modalData.engineer = row.username + '-' + row.userDisplay this.modalData.engineer = row.username + '-' + row.userDisplay
this.modalData.engineerName = this.modalData.engineer.split('-')[1] // 截取用户名
this.modalData.engineerName = this.getUserDisplayName(this.modalData.engineer)
this.engineer6Flag = false this.engineer6Flag = false
}, },
IPQCRowDblclick (row) { IPQCRowDblclick (row) {
this.modalData.cQualityEngineer2 = row.username + '-' + row.userDisplay this.modalData.cQualityEngineer2 = row.username + '-' + row.userDisplay
this.modalData.cQualityEngineer2Name = this.modalData.cQualityEngineer2.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer2Name = this.getUserDisplayName(this.modalData.cQualityEngineer2)
this.IPQCFlag = false this.IPQCFlag = false
}, },
FQC1RowDblclick (row) { FQC1RowDblclick (row) {
this.modalData.cQualityEngineer3 = row.username + '-' + row.userDisplay this.modalData.cQualityEngineer3 = row.username + '-' + row.userDisplay
this.modalData.cQualityEngineer3Name = this.modalData.cQualityEngineer3.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer3Name = this.getUserDisplayName(this.modalData.cQualityEngineer3)
this.FQC1Flag = false this.FQC1Flag = false
}, },
MFGRowDblclick (row) { MFGRowDblclick (row) {
this.modalData.cManufactureEngineer = row.username + '-' + row.userDisplay this.modalData.cManufactureEngineer = row.username + '-' + row.userDisplay
this.modalData.cManufactureEngineerName = this.modalData.cManufactureEngineer.split('-')[1] // 截取用户名
this.modalData.cManufactureEngineerName = this.getUserDisplayName(this.modalData.cManufactureEngineer)
this.MFGlag = false this.MFGlag = false
}, },
docEngineerRowDblclick (row) { docEngineerRowDblclick (row) {
this.modalData.docEngineer = row.username + '-' + row.userDisplay this.modalData.docEngineer = row.username + '-' + row.userDisplay
this.modalData.docEngineerName = this.modalData.docEngineer.split('-')[1] // 截取用户名
this.modalData.docEngineerName = this.getUserDisplayName(this.modalData.docEngineer)
this.docEngineerFlag = false this.docEngineerFlag = false
}, },
docEngineer2RowDblclick (row) { docEngineer2RowDblclick (row) {
this.modalData.docEngineer2 = row.username + '-' + row.userDisplay this.modalData.docEngineer2 = row.username + '-' + row.userDisplay
this.modalData.docEngineer2Name = this.modalData.docEngineer2.split('-')[1] // 截取用户名
this.modalData.docEngineer2Name = this.getUserDisplayName(this.modalData.docEngineer2)
this.docEngineer2Flag = false this.docEngineer2Flag = false
}, },
closeClear () { closeClear () {
@ -4830,52 +4847,52 @@ import {updateColumnSize} from "../../../api/table";
updateBy: this.$store.state.user.name, updateBy: this.$store.state.user.name,
} }
if (row.cQualityEngineer4 != null && row.cQualityEngineer4 !== ''){ if (row.cQualityEngineer4 != null && row.cQualityEngineer4 !== ''){
this.modalData.cQualityEngineer4Name= row.cQualityEngineer4.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer4Name = this.getUserDisplayName(row.cQualityEngineer4)
} else { } else {
this.modalData.cQualityEngineer4 = '' this.modalData.cQualityEngineer4 = ''
} }
if (row.cQualityEngineer5 != null && row.cQualityEngineer5 !== ''){ if (row.cQualityEngineer5 != null && row.cQualityEngineer5 !== ''){
this.modalData.cQualityEngineer5Name= row.cQualityEngineer5.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer5Name = this.getUserDisplayName(row.cQualityEngineer5)
} else { } else {
this.modalData.cQualityEngineer5 = '' this.modalData.cQualityEngineer5 = ''
} }
if (row.cQualityEngineer6 != null && row.cQualityEngineer6 !== ''){ if (row.cQualityEngineer6 != null && row.cQualityEngineer6 !== ''){
this.modalData.cQualityEngineer6Name= row.cQualityEngineer6.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer6Name = this.getUserDisplayName(row.cQualityEngineer6)
} else { } else {
this.modalData.cQualityEngineer6 = '' this.modalData.cQualityEngineer6 = ''
} }
if (row.docEngineer != null && row.docEngineer !== ''){ if (row.docEngineer != null && row.docEngineer !== ''){
this.modalData.docEngineerName= row.docEngineer.split('-')[1] // 截取用户名
this.modalData.docEngineerName = this.getUserDisplayName(row.docEngineer)
} else { } else {
this.modalData.docEngineer = '' this.modalData.docEngineer = ''
} }
if (row.docEngineer2 != null && row.docEngineer2 !== ''){ if (row.docEngineer2 != null && row.docEngineer2 !== ''){
this.modalData.docEngineer2Name= row.docEngineer2.split('-')[1] // 截取用户名
this.modalData.docEngineer2Name = this.getUserDisplayName(row.docEngineer2)
} else { } else {
this.modalData.docEngineer2 = '' this.modalData.docEngineer2 = ''
} }
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){ if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
this.modalData.ipqcHardTagName = this.getUserDisplayName(row.ipqcHardTag)
} else { } else {
this.modalData.ipqcHardTag = '' this.modalData.ipqcHardTag = ''
} }
if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){ if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){
this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer7Name = this.getUserDisplayName(row.cQualityEngineer7)
} else { } else {
this.modalData.cQualityEngineer7 = '' this.modalData.cQualityEngineer7 = ''
} }
if (row.qcEngineer != null && row.qcEngineer !== ''){ if (row.qcEngineer != null && row.qcEngineer !== ''){
this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
this.modalData.qcEngineerName = this.getUserDisplayName(row.qcEngineer)
} else { } else {
this.modalData.qcEngineer = '' this.modalData.qcEngineer = ''
} }
if (row.peEngineer != null && row.peEngineer !== ''){ if (row.peEngineer != null && row.peEngineer !== ''){
this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
this.modalData.peEngineerName = this.getUserDisplayName(row.peEngineer)
} else { } else {
this.modalData.peEngineer = '' this.modalData.peEngineer = ''
} }
if (row.eeEngineer != null && row.eeEngineer !== ''){ if (row.eeEngineer != null && row.eeEngineer !== ''){
this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
this.modalData.eeEngineerName = this.getUserDisplayName(row.eeEngineer)
} else { } else {
this.modalData.eeEngineer = '' this.modalData.eeEngineer = ''
} }
@ -4943,34 +4960,34 @@ import {updateColumnSize} from "../../../api/table";
updateBy: this.$store.state.user.name, updateBy: this.$store.state.user.name,
} }
if (row.cQualityEngineer4 != null && row.cQualityEngineer4 !== ''){ if (row.cQualityEngineer4 != null && row.cQualityEngineer4 !== ''){
this.modalData.cQualityEngineer4Name= row.cQualityEngineer4.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer4Name = this.getUserDisplayName(row.cQualityEngineer4)
} }
if (row.cQualityEngineer5 != null && row.cQualityEngineer5 !== ''){ if (row.cQualityEngineer5 != null && row.cQualityEngineer5 !== ''){
this.modalData.cQualityEngineer5Name= row.cQualityEngineer5.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer5Name = this.getUserDisplayName(row.cQualityEngineer5)
} }
if (row.cQualityEngineer6 != null && row.cQualityEngineer6 !== ''){ if (row.cQualityEngineer6 != null && row.cQualityEngineer6 !== ''){
this.modalData.cQualityEngineer6Name= row.cQualityEngineer6.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer6Name = this.getUserDisplayName(row.cQualityEngineer6)
} }
if (row.docEngineer != null && row.docEngineer !== ''){ if (row.docEngineer != null && row.docEngineer !== ''){
this.modalData.docEngineerName= row.docEngineer.split('-')[1] // 截取用户名
this.modalData.docEngineerName = this.getUserDisplayName(row.docEngineer)
} }
if (row.docEngineer2 != null && row.docEngineer2 !== ''){ if (row.docEngineer2 != null && row.docEngineer2 !== ''){
this.modalData.docEngineer2Name= row.docEngineer2.split('-')[1] // 截取用户名
this.modalData.docEngineer2Name = this.getUserDisplayName(row.docEngineer2)
} }
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){ if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
this.modalData.ipqcHardTagName = this.getUserDisplayName(row.ipqcHardTag)
} }
if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){ if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){
this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
this.modalData.cQualityEngineer7Name = this.getUserDisplayName(row.cQualityEngineer7)
} }
if (row.qcEngineer != null && row.qcEngineer !== ''){ if (row.qcEngineer != null && row.qcEngineer !== ''){
this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
this.modalData.qcEngineerName = this.getUserDisplayName(row.qcEngineer)
} }
if (row.peEngineer != null && row.peEngineer !== ''){ if (row.peEngineer != null && row.peEngineer !== ''){
this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
this.modalData.peEngineerName = this.getUserDisplayName(row.peEngineer)
} }
if (row.eeEngineer != null && row.eeEngineer !== ''){ if (row.eeEngineer != null && row.eeEngineer !== ''){
this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
this.modalData.eeEngineerName = this.getUserDisplayName(row.eeEngineer)
} }
if (this.modalData.sqemeEngineer) { if (this.modalData.sqemeEngineer) {
this.modalData.sqemeEngineerName = this.getUserDisplayName(this.modalData.sqemeEngineer) this.modalData.sqemeEngineerName = this.getUserDisplayName(this.modalData.sqemeEngineer)
@ -5030,9 +5047,11 @@ import {updateColumnSize} from "../../../api/table";
switch (columnId) { switch (columnId) {
case 1: case 1:
this.columnList = data.rows this.columnList = data.rows
this.refreshTableLayout('mainTable')
break; break;
case 2: case 2:
this.columnPartList = data.rows this.columnPartList = data.rows
this.refreshTableLayout('projectPartTable')
break; break;
// case 3: // case 3:
// this.columnList2 = data.rows // this.columnList2 = data.rows
@ -5069,9 +5088,11 @@ import {updateColumnSize} from "../../../api/table";
switch (columnId) { switch (columnId) {
case 1: case 1:
this.columnList = data.rows this.columnList = data.rows
this.refreshTableLayout('mainTable')
break; break;
case 2: case 2:
this.columnPartList = data.rows this.columnPartList = data.rows
this.refreshTableLayout('projectPartTable')
break; break;
// case 3: // case 3:
// this.columnList2 = data.rows // this.columnList2 = data.rows

77
src/views/modules/eam/eamProjectPartInfo.vue
View File

@ -185,7 +185,8 @@
border border
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
v-for="(item,index) in columnList" :key="index"
v-for="(item,index) in visibleColumnList"
:key="item.serialNumber || item.columnProp || index"
:sortable="item.columnSortable" :sortable="item.columnSortable"
:prop="item.columnProp" :prop="item.columnProp"
:header-align="item.headerAlign" :header-align="item.headerAlign"
@ -1782,6 +1783,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
finalPartNosList() { finalPartNosList() {
return this.allPersonnelInfoList.filter(item => item.finalPartNoId !== undefined); return this.allPersonnelInfoList.filter(item => item.finalPartNoId !== undefined);
}, },
visibleColumnList() {
return this.columnList.filter(item => item.status !== false && item.status !== 0);
},
}, },
components: { components: {
UploadFileList1, UploadFileList1,
@ -3913,6 +3917,13 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
} }
return userValue.indexOf('-') > -1 ? userValue.split('-')[1] : userValue return userValue.indexOf('-') > -1 ? userValue.split('-')[1] : userValue
}, },
refreshMainTableLayout () {
this.$nextTick(() => {
if (this.$refs.mainTable && this.$refs.mainTable.doLayout) {
this.$refs.mainTable.doLayout()
}
})
},
handleColumnResize(newWidth, oldWidth, column, event){ handleColumnResize(newWidth, oldWidth, column, event){
let inData= this.columnList.filter(item => item.columnProp === column.property)[0] let inData= this.columnList.filter(item => item.columnProp === column.property)[0]
inData.columnWidth=newWidth inData.columnWidth=newWidth
@ -4101,6 +4112,11 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.projectManager !== null && item.projectManager !== '') { if (item.projectManager !== null && item.projectManager !== '') {
item.projectManagerName = item.projectManager.split('-')[1]; item.projectManagerName = item.projectManager.split('-')[1];
} }
item.qcEngineerName = this.splitUserDisplayName(item.qcEngineer);
item.peEngineerName = this.splitUserDisplayName(item.peEngineer);
item.eeEngineerName = this.splitUserDisplayName(item.eeEngineer);
item.sqemeEngineerName = this.splitUserDisplayName(item.sqemeEngineer);
item.sqeeeEngineerName = this.splitUserDisplayName(item.sqeeeEngineer);
}); });
for (let i = 0; i < this.exportList.length; i++) { for (let i = 0; i < this.exportList.length; i++) {
@ -4148,15 +4164,15 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
} }
} else if (this.exportList[i].responsibleDepartment === 'QC' || this.exportList[i].responsibleDepartment === 'RQC' || this.exportList[i].responsibleDepartment === 'R018') { } else if (this.exportList[i].responsibleDepartment === 'QC' || this.exportList[i].responsibleDepartment === 'RQC' || this.exportList[i].responsibleDepartment === 'R018') {
if (this.exportList[i].qcEngineer !== null && this.exportList[i].qcEngineer !== '') { if (this.exportList[i].qcEngineer !== null && this.exportList[i].qcEngineer !== '') {
this.exportList[i].projectLeader = this.exportList[i].qcEngineer.split("-")[1];
this.exportList[i].projectLeader = this.splitUserDisplayName(this.exportList[i].qcEngineer);
} }
} else if (this.exportList[i].responsibleDepartment === 'PE' || this.exportList[i].responsibleDepartment === 'RPE' || this.exportList[i].responsibleDepartment === 'R019') { } else if (this.exportList[i].responsibleDepartment === 'PE' || this.exportList[i].responsibleDepartment === 'RPE' || this.exportList[i].responsibleDepartment === 'R019') {
if (this.exportList[i].peEngineer !== null && this.exportList[i].peEngineer !== '') { if (this.exportList[i].peEngineer !== null && this.exportList[i].peEngineer !== '') {
this.exportList[i].projectLeader = this.exportList[i].peEngineer.split("-")[1];
this.exportList[i].projectLeader = this.splitUserDisplayName(this.exportList[i].peEngineer);
} }
} else if (this.exportList[i].responsibleDepartment === 'EE' || this.exportList[i].responsibleDepartment === 'REE' || this.exportList[i].responsibleDepartment === 'R020') { } else if (this.exportList[i].responsibleDepartment === 'EE' || this.exportList[i].responsibleDepartment === 'REE' || this.exportList[i].responsibleDepartment === 'R020') {
if (this.exportList[i].eeEngineer !== null && this.exportList[i].eeEngineer !== '') { if (this.exportList[i].eeEngineer !== null && this.exportList[i].eeEngineer !== '') {
this.exportList[i].projectLeader = this.exportList[i].eeEngineer.split("-")[1];
this.exportList[i].projectLeader = this.splitUserDisplayName(this.exportList[i].eeEngineer);
} }
} else if (this.exportList[i].responsibleDepartment === 'SQE-ME' || this.exportList[i].responsibleDepartment === 'RSQEME') { } else if (this.exportList[i].responsibleDepartment === 'SQE-ME' || this.exportList[i].responsibleDepartment === 'RSQEME') {
const sqeMe = this.exportList[i].sqemeEngineer; const sqeMe = this.exportList[i].sqemeEngineer;
@ -4241,6 +4257,11 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){ if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1] item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
} }
item.qcEngineerName = this.splitUserDisplayName(item.qcEngineer)
item.peEngineerName = this.splitUserDisplayName(item.peEngineer)
item.eeEngineerName = this.splitUserDisplayName(item.eeEngineer)
item.sqemeEngineerName = this.splitUserDisplayName(item.sqemeEngineer)
item.sqeeeEngineerName = this.splitUserDisplayName(item.sqeeeEngineer)
}) })
// 判断是否全部存在数据 // 判断是否全部存在数据
if (this.totalPage > 0) { if (this.totalPage > 0) {
@ -4289,6 +4310,11 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){ if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1] item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
} }
item.qcEngineerName = this.splitUserDisplayName(item.qcEngineer)
item.peEngineerName = this.splitUserDisplayName(item.peEngineer)
item.eeEngineerName = this.splitUserDisplayName(item.eeEngineer)
item.sqemeEngineerName = this.splitUserDisplayName(item.sqemeEngineer)
item.sqeeeEngineerName = this.splitUserDisplayName(item.sqeeeEngineer)
}) })
// 获取全部人员信息用于下拉框 // 获取全部人员信息用于下拉框
@ -4356,6 +4382,11 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){ if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1] item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
} }
item.qcEngineerName = this.splitUserDisplayName(item.qcEngineer)
item.peEngineerName = this.splitUserDisplayName(item.peEngineer)
item.eeEngineerName = this.splitUserDisplayName(item.eeEngineer)
item.sqemeEngineerName = this.splitUserDisplayName(item.sqemeEngineer)
item.sqeeeEngineerName = this.splitUserDisplayName(item.sqeeeEngineer)
}) })
// 获取全部人员信息用于下拉框 // 获取全部人员信息用于下拉框
@ -4588,13 +4619,13 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
this.modalData.cQualityEngineer7Name= row.cQualityEngineer7.split('-')[1] // 截取用户名 this.modalData.cQualityEngineer7Name= row.cQualityEngineer7.split('-')[1] // 截取用户名
} }
if (row.qcEngineer != null && row.qcEngineer !== ''){ if (row.qcEngineer != null && row.qcEngineer !== ''){
this.modalData.qcEngineerName= row.qcEngineer.split('-')[1] // 截取用户名
this.modalData.qcEngineerName = this.splitUserDisplayName(row.qcEngineer)
} }
if (row.peEngineer != null && row.peEngineer !== ''){ if (row.peEngineer != null && row.peEngineer !== ''){
this.modalData.peEngineerName= row.peEngineer.split('-')[1] // 截取用户名
this.modalData.peEngineerName = this.splitUserDisplayName(row.peEngineer)
} }
if (row.eeEngineer != null && row.eeEngineer !== ''){ if (row.eeEngineer != null && row.eeEngineer !== ''){
this.modalData.eeEngineerName= row.eeEngineer.split('-')[1] // 截取用户名
this.modalData.eeEngineerName = this.splitUserDisplayName(row.eeEngineer)
} }
this.getFinalPartDesc() this.getFinalPartDesc()
this.formalPartNoFlag = true this.formalPartNoFlag = true
@ -4800,13 +4831,13 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名 this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
} }
if (row.qcEngineer != null && row.qcEngineer !== '') { if (row.qcEngineer != null && row.qcEngineer !== '') {
this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
this.modalData.qcEngineerName = this.splitUserDisplayName(row.qcEngineer)
} }
if (row.peEngineer != null && row.peEngineer !== '') { if (row.peEngineer != null && row.peEngineer !== '') {
this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
this.modalData.peEngineerName = this.splitUserDisplayName(row.peEngineer)
} }
if (row.eeEngineer != null && row.eeEngineer !== '') { if (row.eeEngineer != null && row.eeEngineer !== '') {
this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
this.modalData.eeEngineerName = this.splitUserDisplayName(row.eeEngineer)
} }
if (row.status === '草稿') { if (row.status === '草稿') {
if (row.projectOwner.split('-')[0] === this.$store.state.user.name) { if (row.projectOwner.split('-')[0] === this.$store.state.user.name) {
@ -5008,13 +5039,13 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名 this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
} }
if (row.qcEngineer != null && row.qcEngineer !== '') { if (row.qcEngineer != null && row.qcEngineer !== '') {
this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
this.modalData.qcEngineerName = this.splitUserDisplayName(row.qcEngineer)
} }
if (row.peEngineer != null && row.peEngineer !== '') { if (row.peEngineer != null && row.peEngineer !== '') {
this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
this.modalData.peEngineerName = this.splitUserDisplayName(row.peEngineer)
} }
if (row.eeEngineer != null && row.eeEngineer !== '') { if (row.eeEngineer != null && row.eeEngineer !== '') {
this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
this.modalData.eeEngineerName = this.splitUserDisplayName(row.eeEngineer)
} }
if (row.status === '已量产') { if (row.status === '已量产') {
this.modalData.status = '进行中' this.modalData.status = '进行中'
@ -5374,15 +5405,15 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
} }
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'QC' || this.projectPartDocumentList[i].responsibleDepartment === 'RQC') { } else if (this.projectPartDocumentList[i].responsibleDepartment === 'QC' || this.projectPartDocumentList[i].responsibleDepartment === 'RQC') {
if (this.proofingCurrentRow.qcEngineer != null && this.proofingCurrentRow.qcEngineer !== '') { if (this.proofingCurrentRow.qcEngineer != null && this.proofingCurrentRow.qcEngineer !== '') {
this.projectPartDocumentList[i].projectLeader = this.proofingCurrentRow.qcEngineer.split('-')[1] // 截取用户名
this.projectPartDocumentList[i].projectLeader = this.splitUserDisplayName(this.proofingCurrentRow.qcEngineer)
} }
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'PE' || this.projectPartDocumentList[i].responsibleDepartment === 'RPE') { } else if (this.projectPartDocumentList[i].responsibleDepartment === 'PE' || this.projectPartDocumentList[i].responsibleDepartment === 'RPE') {
if (this.proofingCurrentRow.peEngineer != null && this.proofingCurrentRow.peEngineer !== '') { if (this.proofingCurrentRow.peEngineer != null && this.proofingCurrentRow.peEngineer !== '') {
this.projectPartDocumentList[i].projectLeader = this.proofingCurrentRow.peEngineer.split('-')[1] // 截取用户名
this.projectPartDocumentList[i].projectLeader = this.splitUserDisplayName(this.proofingCurrentRow.peEngineer)
} }
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'EE' || this.projectPartDocumentList[i].responsibleDepartment === 'REE') { } else if (this.projectPartDocumentList[i].responsibleDepartment === 'EE' || this.projectPartDocumentList[i].responsibleDepartment === 'REE') {
if (this.proofingCurrentRow.eeEngineer != null && this.proofingCurrentRow.eeEngineer !== '') { if (this.proofingCurrentRow.eeEngineer != null && this.proofingCurrentRow.eeEngineer !== '') {
this.projectPartDocumentList[i].projectLeader = this.proofingCurrentRow.eeEngineer.split('-')[1] // 截取用户名
this.projectPartDocumentList[i].projectLeader = this.splitUserDisplayName(this.proofingCurrentRow.eeEngineer)
} }
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'SQE-ME' || this.projectPartDocumentList[i].responsibleDepartment === 'RSQEME') { } else if (this.projectPartDocumentList[i].responsibleDepartment === 'SQE-ME' || this.projectPartDocumentList[i].responsibleDepartment === 'RSQEME') {
const sqeMe = this.proofingCurrentRow.sqemeEngineer const sqeMe = this.proofingCurrentRow.sqemeEngineer
@ -5555,15 +5586,15 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
} }
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'QC' || this.projectOtherDocumentList[i].responsibleDepartment === 'RQC') { } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'QC' || this.projectOtherDocumentList[i].responsibleDepartment === 'RQC') {
if (this.proofingCurrentRow.qcEngineer != null && this.proofingCurrentRow.qcEngineer !== '') { if (this.proofingCurrentRow.qcEngineer != null && this.proofingCurrentRow.qcEngineer !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.qcEngineer.split('-')[1] // 截取用户名
this.projectOtherDocumentList[i].projectLeader = this.splitUserDisplayName(this.proofingCurrentRow.qcEngineer)
} }
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'PE' || this.projectOtherDocumentList[i].responsibleDepartment === 'RPE') { } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'PE' || this.projectOtherDocumentList[i].responsibleDepartment === 'RPE') {
if (this.proofingCurrentRow.peEngineer != null && this.proofingCurrentRow.peEngineer !== '') { if (this.proofingCurrentRow.peEngineer != null && this.proofingCurrentRow.peEngineer !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.peEngineer.split('-')[1] // 截取用户名
this.projectOtherDocumentList[i].projectLeader = this.splitUserDisplayName(this.proofingCurrentRow.peEngineer)
} }
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'EE' || this.projectOtherDocumentList[i].responsibleDepartment === 'REE') { } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'EE' || this.projectOtherDocumentList[i].responsibleDepartment === 'REE') {
if (this.proofingCurrentRow.eeEngineer != null && this.proofingCurrentRow.eeEngineer !== '') { if (this.proofingCurrentRow.eeEngineer != null && this.proofingCurrentRow.eeEngineer !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.eeEngineer.split('-')[1] // 截取用户名
this.projectOtherDocumentList[i].projectLeader = this.splitUserDisplayName(this.proofingCurrentRow.eeEngineer)
} }
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'SQE-ME' || this.projectOtherDocumentList[i].responsibleDepartment === 'RSQEME') { } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'SQE-ME' || this.projectOtherDocumentList[i].responsibleDepartment === 'RSQEME') {
const sqeMe = this.proofingCurrentRow.sqemeEngineer const sqeMe = this.proofingCurrentRow.sqemeEngineer
@ -5620,6 +5651,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
switch (columnId) { switch (columnId) {
case 1: case 1:
this.columnList = data.rows this.columnList = data.rows
this.refreshMainTableLayout()
break; break;
// case 2: // case 2:
// this.detailColumnList = data.rows // this.detailColumnList = data.rows
@ -5847,15 +5879,15 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
} }
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'QC' || this.projectAllDocumentList[i].responsibleDepartment === 'RQC') { } else if (this.projectAllDocumentList[i].responsibleDepartment === 'QC' || this.projectAllDocumentList[i].responsibleDepartment === 'RQC') {
if (this.proofingCurrentRow.qcEngineer != null && this.proofingCurrentRow.qcEngineer !== '') { if (this.proofingCurrentRow.qcEngineer != null && this.proofingCurrentRow.qcEngineer !== '') {
this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.qcEngineer.split('-')[1] // 截取用户名
this.projectAllDocumentList[i].projectLeader = this.splitUserDisplayName(this.proofingCurrentRow.qcEngineer)
} }
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'PE' || this.projectAllDocumentList[i].responsibleDepartment === 'RPE') { } else if (this.projectAllDocumentList[i].responsibleDepartment === 'PE' || this.projectAllDocumentList[i].responsibleDepartment === 'RPE') {
if (this.proofingCurrentRow.peEngineer != null && this.proofingCurrentRow.peEngineer !== '') { if (this.proofingCurrentRow.peEngineer != null && this.proofingCurrentRow.peEngineer !== '') {
this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.peEngineer.split('-')[1] // 截取用户名
this.projectAllDocumentList[i].projectLeader = this.splitUserDisplayName(this.proofingCurrentRow.peEngineer)
} }
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'EE' || this.projectAllDocumentList[i].responsibleDepartment === 'REE') { } else if (this.projectAllDocumentList[i].responsibleDepartment === 'EE' || this.projectAllDocumentList[i].responsibleDepartment === 'REE') {
if (this.proofingCurrentRow.eeEngineer != null && this.proofingCurrentRow.eeEngineer !== '') { if (this.proofingCurrentRow.eeEngineer != null && this.proofingCurrentRow.eeEngineer !== '') {
this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.eeEngineer.split('-')[1] // 截取用户名
this.projectAllDocumentList[i].projectLeader = this.splitUserDisplayName(this.proofingCurrentRow.eeEngineer)
} }
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'SQE-ME' || this.projectAllDocumentList[i].responsibleDepartment === 'RSQEME') { } else if (this.projectAllDocumentList[i].responsibleDepartment === 'SQE-ME' || this.projectAllDocumentList[i].responsibleDepartment === 'RSQEME') {
const sqeMe = this.proofingCurrentRow.sqemeEngineer const sqeMe = this.proofingCurrentRow.sqemeEngineer
@ -6568,6 +6600,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
switch (columnId) { switch (columnId) {
case 1: case 1:
this.columnList = data.rows this.columnList = data.rows
this.refreshMainTableLayout()
break; break;
// case 2: // case 2:
// this.detailColumnList = data.rows // this.detailColumnList = data.rows

Write Preview
Loading…
Cancel
Save