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

2025.05.10 NPI系统 项目添加前道工程师角色 新增 修改 part 

自动邮件提醒功能 过滤掉part type为On hold 的part及其文档（打样、量产、确认、打样单）
java8
jiayang yue 8 months ago
parent
2765330fc2
commit
742bb8e573
5 changed files with 399 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 92
      src/views/modules/eam/eamProjectInfo.vue
  2. 62
      src/views/modules/eam/eamProjectInfoForConfirm.vue
  3. 39
      src/views/modules/eam/eamProjectInfoForProof.vue
  4. 133
      src/views/modules/eam/eamProjectInfoForUploads.vue
  5. 77
      src/views/modules/eam/eamProjectPartInfo.vue

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

@ -400,6 +400,14 @@
</span>
<el-input v-model="modalData.ipqcHardTagName" disabled style="width: 191px"></el-input>
</el-form-item>
<el-form-item prop="cQualityEngineer7Name" style="margin-left: 15px">
<template>
<span slot="label" style="" class="big-label">
<a herf="#" @click="getBaseList(2012)">前道工程师</a>
</span>
</template>
<el-input v-model="modalData.cQualityEngineer7Name" disabled style="width: 151px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button>
@ -1071,6 +1079,8 @@ import {updateColumnSize} from "../../../api/table";
engineerName:'',
ipqcHardTag:'',
ipqcHardTagName:'',
cQualityEngineer7:'',
cQualityEngineer7Name:'',
//projectCreationDate为当前服务器的时间
projectCreationDate: new Date(),
finalPartNo:'',
@ -1534,6 +1544,24 @@ import {updateColumnSize} from "../../../api/table";
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401003,
serialNumber: '401003Table1CQualityEngineer7Name',
tableId: "401003Table1",
tableName: "项目信息表",
columnProp: 'cQualityEngineer7Name',
headerAlign: "center",
align: "left",
columnLabel: '前道工程师',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401003,
@ -2005,6 +2033,24 @@ import {updateColumnSize} from "../../../api/table";
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401003,
serialNumber: '401003Table2CQualityEngineer7Name',
tableId: "401003Table2",
tableName: "项目信息物料表",
columnProp: 'cQualityEngineer7Name',
headerAlign: "center",
align: "left",
columnLabel: '前道工程师',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401003,
@ -2624,6 +2670,15 @@ import {updateColumnSize} from "../../../api/table";
}
})
}
if (this.tagNo === 2012) {
this.modalData.cQualityEngineer7 = val.username + '-' + val.user_display
this.modalData.cQualityEngineer7Name = this.modalData.cQualityEngineer7.split('-')[1]
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){
this.businessDataList7 = data.rows;
}
})
}
},
newCustomer () {
@ -2785,6 +2840,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
if (item.cQualityEngineer7 !== null && item.cQualityEngineer7 !== '') {
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1];
}
});
for (let i = 0; i < this.exportList.length; i++) {
@ -2822,6 +2880,10 @@ import {updateColumnSize} from "../../../api/table";
if (this.exportList[i].ipqcHardTag !== null && this.exportList[i].ipqcHardTag !== '') {
this.exportList[i].projectLeader = this.exportList[i].ipqcHardTag.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'R016') {
if (this.exportList[i].cQualityEngineer7 !== null && this.exportList[i].cQualityEngineer7 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer7.split("-")[1];
}
}
}
})
@ -2888,6 +2950,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
// 获取全部人员信息用于下拉框
@ -2960,6 +3025,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
// 获取全部人员信息用于下拉框
@ -3109,6 +3177,8 @@ import {updateColumnSize} from "../../../api/table";
docEngineerName: '',
ipqcHardTag: '',
ipqcHardTagName: '',
cQualityEngineer7: '',
cQualityEngineer7Name: '',
projectCreationDate:new Date(),
createDate: '',
// active: 'Y',
@ -3155,6 +3225,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
cQualityEngineer7: row.cQualityEngineer7,
projectCreationDate: row.projectCreationDate,
status: row.status,
// active: row.active,
@ -3176,6 +3247,9 @@ import {updateColumnSize} from "../../../api/table";
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName= row.ipqcHardTag.split('-')[1] // 截取用户名
}
if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){
this.modalData.cQualityEngineer7Name= row.cQualityEngineer7.split('-')[1] // 截取用户名
}
this.modalDisableFlag = true
this.modalPartDisableFlag = false
this.modalFlag = true
@ -3332,6 +3406,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineer: this.modalData.cManufactureEngineer,
docEngineer: this.modalData.docEngineer,
ipqcHardTag: this.modalData.ipqcHardTag,
cQualityEngineer7: this.modalData.cQualityEngineer7,
projectCreationDate: this.modalData.projectCreationDate,
createDate: this.modalData.createDate,
createBy: this.modalData.createBy,
@ -3405,6 +3480,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineer: this.modalData.cManufactureEngineer,
docEngineer: this.modalData.docEngineer,
ipqcHardTag: this.modalData.ipqcHardTag,
cQualityEngineer7: this.modalData.cQualityEngineer7,
projectCreationDate: this.modalData.projectCreationDate,
createDate: this.modalData.createDate,
createBy: this.modalData.createBy,
@ -3482,6 +3558,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineer: this.modalData.cManufactureEngineer,
docEngineer: this.modalData.docEngineer,
ipqcHardTag: this.modalData.ipqcHardTag,
cQualityEngineer7: this.modalData.cQualityEngineer7,
projectCreationDate: this.modalData.projectCreationDate,
createDate: this.modalData.createDate,
createBy: this.modalData.createBy,
@ -3845,6 +3922,8 @@ import {updateColumnSize} from "../../../api/table";
this.modalData.docEngineerName = ''
this.modalData.ipqcHardTag = ''
this.modalData.ipqcHardTagName = ''
this.modalData.cQualityEngineer7 = ''
this.modalData.cQualityEngineer7Name = ''
this.modalData.projectCreationDate = new Date()
},
@ -3885,6 +3964,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
}
})
@ -3926,6 +4008,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
cQualityEngineer7: row.cQualityEngineer7,
projectCreationDate: row.projectCreationDate,
status: '草稿',
partType: 'Active',
@ -3958,6 +4041,11 @@ import {updateColumnSize} from "../../../api/table";
} else {
this.modalData.ipqcHardTag = ''
}
if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){
this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
} else {
this.modalData.cQualityEngineer7 = ''
}
this.modalDisableFlag = true
this.modalPartDisableFlag = true
this.modalFlag = true
@ -3999,6 +4087,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
cQualityEngineer7: row.cQualityEngineer7,
projectCreationDate: row.buildDate,
status: row.status,
partType: row.partType,
@ -4021,6 +4110,9 @@ import {updateColumnSize} from "../../../api/table";
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
}
if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){
this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
}
this.modalDisableFlag = true
this.modalPartDisableFlag = true
this.modalFlag = true

62
src/views/modules/eam/eamProjectInfoForConfirm.vue
View File

@ -432,6 +432,8 @@ export default {
docEngineerName:'',
ipqcHardTag:'',
ipqcHardTagName:'',
cQualityEngineer7:'',
cQualityEngineer7Name:'',
//projectCreationDate为当前服务器的时间
projectCreationDate: new Date(),
finalPartNo:'',
@ -893,6 +895,24 @@ export default {
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401007,
serialNumber: '401007Table1CQualityEngineer7',
tableId: "401007Table1",
tableName: "项目信息待文档确认表",
columnProp: 'cQualityEngineer7Name',
headerAlign: "center",
align: "left",
columnLabel: '前道工程师',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401007,
@ -1213,6 +1233,9 @@ export default {
if (item.ipqcHardTag !== null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
if (item.cQualityEngineer7 !== null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1];
}
});
for (let i = 0; i < this.exportList.length; i++) {
@ -1250,6 +1273,10 @@ export default {
if (this.exportList[i].ipqcHardTag !== null && this.exportList[i].ipqcHardTag !== '') {
this.exportList[i].projectLeader = this.exportList[i].ipqcHardTag.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'R016') {
if (this.exportList[i].cQualityEngineer7 !== null && this.exportList[i].cQualityEngineer7 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer7.split("-")[1];
}
}
}
})
@ -1280,6 +1307,7 @@ export default {
searchOverConfirmProgressList(this.searchData).then(({data}) => {
if (data.code === 0) {
this.dataList = data.page.list
console.log('list', this.dataList)
this.allPersonnelInfoList = data.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
@ -1317,7 +1345,13 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
console.log('list2', this.dataList)
}
// 获取全部人员信息用于下拉框
this.getAllPersonnelList()
@ -1363,6 +1397,11 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
}
// 获取全部人员信息用于下拉框
@ -1380,7 +1419,7 @@ export default {
}
}
})
if (pjmList.includes(this.$store.state.user.name)) {
if (pjmList.includes(this.$store.state.user.name) || this.$store.state.user.name === 'admin') {
this.dataList = data.page.list
this.allPersonnelInfoList = data.list
this.pageIndex = data.page.currPage
@ -1419,12 +1458,16 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
}
} else {
this.$route.query.flag = '3'
}
// 获取全部人员信息用于下拉框
this.getAllPersonnelList()
})
@ -1484,6 +1527,11 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
}
// 获取全部人员信息用于下拉框
@ -1530,6 +1578,11 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
}
// 获取全部人员信息用于下拉框
@ -1585,6 +1638,11 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
// }
} else {

39
src/views/modules/eam/eamProjectInfoForProof.vue
View File

@ -649,6 +649,24 @@ export default {
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401008,
serialNumber: '401008Table1CQualityEngineer7',
tableId: "401008Table1",
tableName: "项目打样记录表",
columnProp: 'cQualityEngineer7Name',
headerAlign: "center",
align: "left",
columnLabel: '前道工程师',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401008,
@ -986,6 +1004,9 @@ export default {
if (item.ipqcHardTag !== null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
if (item.cQualityEngineer7 !== null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1];
}
});
for (let i = 0; i < this.exportList.length; i++) {
@ -1023,6 +1044,10 @@ export default {
if (this.exportList[i].ipqcHardTag !== null && this.exportList[i].ipqcHardTag !== '') {
this.exportList[i].projectLeader = this.exportList[i].ipqcHardTag.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'R016') {
if (this.exportList[i].cQualityEngineer7 !== null && this.exportList[i].cQualityEngineer7 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer7.split("-")[1];
}
}
}
})
@ -1085,6 +1110,9 @@ export default {
if (item.ipqcHardTag !== null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
if (item.cQualityEngineer7 !== null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1];
}
});
for (let i = 0; i < this.dataList.length; i++) {
@ -1122,6 +1150,10 @@ export default {
if (this.dataList[i].ipqcHardTag !== null && this.dataList[i].ipqcHardTag !== '') {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1];
}
} else if (this.dataList[i].responsibleDepartment === 'R016') {
if (this.dataList[i].cQualityEngineer7 !== null && this.dataList[i].cQualityEngineer7 !== '') {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1];
}
}
}
@ -1263,6 +1295,9 @@ export default {
if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
if (item.cQualityEngineer7 !== null && item.cQualityEngineer7 !== '') {
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1];
}
});
for (let i = 0; i < this.dataList.length; i++) {
@ -1300,6 +1335,10 @@ export default {
if (this.dataList[i].ipqcHardTag !== null && this.dataList[i].ipqcHardTag !== '') {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1];
}
} else if (this.dataList[i].responsibleDepartment === 'R016') {
if (this.dataList[i].cQualityEngineer7 !== null && this.dataList[i].cQualityEngineer7 !== '') {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1];
}
}
}

133
src/views/modules/eam/eamProjectInfoForUploads.vue
View File

@ -859,6 +859,24 @@ export default {
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401006,
serialNumber: '401006Table1CQualityEngineer7',
tableId: "401006Table1",
tableName: "项目信息待上传文件表",
columnProp: 'cQualityEngineer7Name',
headerAlign: "center",
align: "left",
columnLabel: '前道工程师',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401006,
@ -1751,6 +1769,9 @@ export default {
if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
if (item.cQualityEngineer7 !== null && item.cQualityEngineer7 !== '') {
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1];
}
});
for (let i = 0; i < this.exportList.length; i++) {
@ -1788,6 +1809,10 @@ export default {
if (this.exportList[i].ipqcHardTag !== null && this.exportList[i].ipqcHardTag !== '') {
this.exportList[i].projectLeader = this.exportList[i].ipqcHardTag.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'R016') {
if (this.exportList[i].cQualityEngineer7 !== null && this.exportList[i].cQualityEngineer7 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer7.split("-")[1];
}
}
}
})
@ -1862,6 +1887,11 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001'){
@ -1908,6 +1938,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R016'){
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@ -1957,6 +1993,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R016'){
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -2009,6 +2051,11 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split("-")[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001'){
@ -2055,6 +2102,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R016') {
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === '') {
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@ -2104,6 +2157,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R016'){
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -2166,6 +2225,11 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split("-")[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001') {
@ -2212,6 +2276,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R016'){
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null) {
@ -2260,6 +2330,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if (this.dataList[i].responsibleDepartment === 'R016') {
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === '') {
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -2330,6 +2406,11 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split("-")[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001'){
@ -2376,6 +2457,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R016'){
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@ -2425,6 +2512,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R016'){
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -2477,6 +2570,11 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split("-")[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001'){
@ -2523,6 +2621,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R016') {
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === '') {
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@ -2572,6 +2676,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R016'){
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -2634,6 +2744,11 @@ export default {
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 === null || item.cQualityEngineer7 === ''){
item.cQualityEngineer7Name = ''
} else {
item.cQualityEngineer7Name = item.cQualityEngineer7.split("-")[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001') {
@ -2680,6 +2795,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R016'){
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@ -2729,6 +2850,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R016'){
if (this.dataList[i].cQualityEngineer7 === null || this.dataList[i].cQualityEngineer7 === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -2805,6 +2932,12 @@ export default {
} else {
allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].ipqcHardTag.split("-")[1]
}
} else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R016'){
if (allPersonnelInfoDataList[i].cQualityEngineer7 === null || allPersonnelInfoDataList[i].cQualityEngineer7 === ''){
allPersonnelInfoDataList[i].projectLeader = ''
} else {
allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].cQualityEngineer7.split("-")[1]
}
}
}

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

@ -2007,6 +2007,8 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
engineerName:'',
ipqcHardTag:'',
ipqcHardTagName:'',
cQualityEngineer7:'',
cQualityEngineer7Name:'',
//projectCreationDate为当前服务器的时间
projectCreationDate: new Date(),
finalPartNo:'',
@ -2574,6 +2576,24 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401004,
serialNumber: '401004Table1CQualityEngineer7',
tableId: "401004Table1",
tableName: "项目物料表",
columnProp: 'cQualityEngineer7Name',
headerAlign: "center",
align: "left",
columnLabel: '前道工程师',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401004,
@ -3939,6 +3959,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
if (item.projectManager !== null && item.projectManager !== '') {
item.projectManagerName = item.projectManager.split('-')[1];
}
});
for (let i = 0; i < this.exportList.length; i++) {
@ -3976,6 +3999,10 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (this.exportList[i].ipqcHardTag !== null && this.exportList[i].ipqcHardTag !== '') {
this.exportList[i].projectLeader = this.exportList[i].ipqcHardTag.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'R016') {
if (this.exportList[i].cQualityEngineer7 !== null && this.exportList[i].cQualityEngineer7 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer7.split("-")[1];
}
}
}
})
@ -4043,6 +4070,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
// 判断是否全部存在数据
if (this.totalPage > 0) {
@ -4085,6 +4115,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
// 获取全部人员信息用于下拉框
@ -4146,6 +4179,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
}
})
// 获取全部人员信息用于下拉框
@ -4341,6 +4377,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
ipqcHardTagName: row.ipqcHardTag.split('-')[1], // 截取用户名
cQualityEngineer7: row.cQualityEngineer7,
cQualityEngineer7Name: row.cQualityEngineer7.split('-')[1], // 截取用户名
finalPartNo: row.finalPartNo,
finalPartDesc: row.finalPartDesc,
// active: row.active,
@ -4362,6 +4401,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName= row.ipqcHardTag.split('-')[1] // 截取用户名
}
if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){
this.modalData.cQualityEngineer7Name= row.cQualityEngineer7.split('-')[1] // 截取用户名
}
this.getFinalPartDesc()
this.formalPartNoFlag = true
},
@ -4392,6 +4434,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cManufactureEngineer: row.cManufactureEngineer,
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
cQualityEngineer7: row.cQualityEngineer7,
remark: '',
planStartDate : new Date(),
proofingNo: '',
@ -4522,6 +4565,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
ipqcHardTagName: row.ipqcHardTag.split('-')[1], // 截取用户名
cQualityEngineer7: row.cQualityEngineer7,
cQualityEngineer7Name: row.cQualityEngineer7.split('-')[1], // 截取用户名
buildDate: row.buildDate,
status: row.status,
partType: row.partType,
@ -4544,6 +4590,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (row.ipqcHardTag != null && row.ipqcHardTag !== '') {
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
}
if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== '') {
this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
}
if (row.status === '草稿') {
if (row.projectOwner.split('-')[0] === this.$store.state.user.name) {
this.modalData.status = '进行中'
@ -4680,6 +4729,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
ipqcHardTagName: row.ipqcHardTag.split('-')[1], // 截取用户名
cQualityEngineer7: row.cQualityEngineer7,
cQualityEngineer7Name: row.cQualityEngineer7.split('-')[1], // 截取用户名
buildDate: row.buildDate,
status: row.status,
partType: row.partType,
@ -4702,6 +4754,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (row.ipqcHardTag != null && row.ipqcHardTag !== '') {
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
}
if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== '') {
this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
}
if (row.status === '已量产') {
this.modalData.status = '进行中'
this.modalData.closeDate = ''
@ -4753,6 +4808,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cManufactureEngineer: this.proofingCurrentRow.cManufactureEngineer,
docEngineer: this.proofingCurrentRow.docEngineer,
ipqcHardTag: this.proofingCurrentRow.ipqcHardTag,
cQualityEngineer7: this.proofingCurrentRow.cQualityEngineer7,
// username:this.$store.state.user.name,
page: 1,
limit: 1000
@ -4789,6 +4845,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cManufactureEngineer: this.proofingCurrentRow.cManufactureEngineer,
docEngineer: this.proofingCurrentRow.docEngineer,
ipqcHardTag: this.proofingCurrentRow.ipqcHardTag,
cQualityEngineer7: this.proofingCurrentRow.cQualityEngineer7,
// username:this.$store.state.user.name,
page: 1,
limit: 1000
@ -5036,7 +5093,12 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (this.proofingCurrentRow.ipqcHardTag != null && this.proofingCurrentRow.ipqcHardTag !== '') {
this.projectPartDocumentList[i].projectLeader = this.proofingCurrentRow.ipqcHardTag.split('-')[1] // 截取用户名
}
} else {
} else if (this.projectPartDocumentList[i].responsibleDepartment === '前道工程师') {
if (this.proofingCurrentRow.cQualityEngineer7 != null && this.proofingCurrentRow.cQualityEngineer7 !== '') {
this.projectPartDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer7.split('-')[1] // 截取用户名
}
}
else {
this.projectPartDocumentList[i].projectLeader = ''
}
this.projectPartDocumentList[i].buNo = inData.buNo
@ -5185,7 +5247,12 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (this.proofingCurrentRow.ipqcHardTag != null && this.proofingCurrentRow.ipqcHardTag !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.ipqcHardTag.split('-')[1] // 截取用户名
}
} else {
} else if (this.projectOtherDocumentList[i].responsibleDepartment === '前道工程师') {
if (this.proofingCurrentRow.cQualityEngineer7 != null && this.proofingCurrentRow.cQualityEngineer7 !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer7.split('-')[1] // 截取用户名
}
}
else {
this.projectOtherDocumentList[i].projectLeader = ''
}
}
@ -5439,6 +5506,12 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (this.proofingCurrentRow.ipqcHardTag != null && this.proofingCurrentRow.ipqcHardTag !== '') {
this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.ipqcHardTag.split('-')[1] // 截取用户名
}
} else if (this.projectAllDocumentList[i].responsibleDepartment === '前道工程师') {
if (this.proofingCurrentRow.cQualityEngineer7 != null && this.proofingCurrentRow.cQualityEngineer7 !== '') {
this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer7.split('-')[1] // 截取用户名
}
} else {
this.projectAllDocumentList[i].projectLeader = ''
}
}
}

Write Preview
Loading…
Cancel
Save