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

2025.03.02 IPQC hardtag 

邮件通知增加限制条件
物料界面BOM页签增加生效日期
java8
jiayang yue 11 months ago
parent
e4f12387a0
commit
585594841e
6 changed files with 457 additions and 41 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. 8
      src/views/modules/eam/com_project_proof_record.vue
  2. 110
      src/views/modules/eam/eamProjectInfo.vue
  3. 124
      src/views/modules/eam/eamProjectInfoForConfirm.vue
  4. 39
      src/views/modules/eam/eamProjectInfoForProof.vue
  5. 133
      src/views/modules/eam/eamProjectInfoForUploads.vue
  6. 84
      src/views/modules/eam/eamProjectPartInfo.vue

8
src/views/modules/eam/com_project_proof_record.vue
View File

@ -1332,6 +1332,12 @@
} else {
this.proofDocumentList[i].projectLeader = ''
}
} else if (this.proofDocumentList[i].responsibleDepartment === 'IPQC-Hardtag'){
if (this.searchData.ipqcHardTag !== null && this.searchData.ipqcHardTag !== ''){
this.proofDocumentList[i].projectLeader = this.searchData.ipqcHardTag.split("-")[1]
} else {
this.proofDocumentList[i].projectLeader = ''
}
}
}
if (this.totalPage > 0) {
@ -1571,6 +1577,8 @@
inData.cQualityEngineer5 = this.searchData.cQualityEngineer5
inData.cManufactureEngineer = this.searchData.cManufactureEngineer
inData.docEngineer = this.searchData.docEngineer
inData.cQualityEngineer6 = this.searchData.cQualityEngineer6
inData.ipqcHardTag = this.searchData.ipqcHardTag
this.sendMailHandle(inData)
}
//刷新表格

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

@ -384,7 +384,7 @@
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 20px;">
<el-form-item prop="cQualityEngineer4Name" :rules="rules.cQualityEngineer4Name">
<el-form-item prop="cQualityEngineer4Name" :rules="rules.cQualityEngineer4Name">
<span slot="label" style="" class="big-label">
<a herf="#" @click="getBaseList(2006)">SQE</a>
</span>
@ -394,6 +394,12 @@
<span slot="label" style="" @click="docEngineerFlag = true" class="big-label"><a herf="#">文档工程师</a></span>
<el-input v-model="modalData.docEngineerName" disabled style="width: 151px"></el-input>
</el-form-item>
<el-form-item prop="ipqcHardTagName" style="margin-left: 15px">
<span slot="label" style="" class="big-label">
<a herf="#" @click="getBaseList(2010)">IPQC-Hardtag</a>
</span>
<el-input v-model="modalData.ipqcHardTagName" disabled style="width: 191px"></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>
@ -1063,6 +1069,8 @@ import {updateColumnSize} from "../../../api/table";
docEngineerName:'',
engineer:'',
engineerName:'',
ipqcHardTag:'',
ipqcHardTagName:'',
//projectCreationDate为当前服务器的时间
projectCreationDate: new Date(),
finalPartNo:'',
@ -1508,6 +1516,24 @@ import {updateColumnSize} from "../../../api/table";
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401003,
serialNumber: '401003Table1IpqcHardTag',
tableId: "401003Table1",
tableName: "项目信息表",
columnProp: 'ipqcHardTagName',
headerAlign: "center",
align: "left",
columnLabel: 'IPQC-Hardtag',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401003,
@ -1961,6 +1987,24 @@ import {updateColumnSize} from "../../../api/table";
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401003,
serialNumber: '401003Table2IpqcHardTagName',
tableId: "401003Table2",
tableName: "项目信息物料表",
columnProp: 'ipqcHardTagName',
headerAlign: "center",
align: "left",
columnLabel: 'IPQC-Hardtag',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401003,
@ -2525,15 +2569,15 @@ import {updateColumnSize} from "../../../api/table";
if (val === 509 ) {
strVal = this.modalData.customerNo ? this.modalData.customerNo : ''
}
if (val === 2006 ) {
conSql = " and b.site = '" + this.$store.state.user.site + "'"
}
if (val === 2007 ) {
conSql = " and b.site = '" + this.$store.state.user.site + "'"
}
if (val === 2008 ) {
conSql = " and b.site = '" + this.$store.state.user.site + "'"
}
// if (val === 2006 ) {
// conSql = " and b.site = '" + this.$store.state.user.site + "'"
// }
// if (val === 2007 ) {
// conSql = " and b.site = '" + this.$store.state.user.site + "'"
// }
// if (val === 2008 ) {
// conSql = " and b.site = '" + this.$store.state.user.site + "'"
// }
this.$refs.baseList.init(val, strVal,conSql)
})
},
@ -2571,6 +2615,15 @@ import {updateColumnSize} from "../../../api/table";
}
})
}
if (this.tagNo === 2010) {
this.modalData.ipqcHardTag = val.username + '-' + val.user_display
this.modalData.ipqcHardTagName = this.modalData.ipqcHardTag.split('-')[1]
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){
this.businessDataList7 = data.rows;
}
})
}
},
newCustomer () {
@ -2729,6 +2782,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.cQualityEngineer6 !== null && item.cQualityEngineer6 !== '') {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1];
}
if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
});
for (let i = 0; i < this.exportList.length; i++) {
@ -2762,6 +2818,10 @@ import {updateColumnSize} from "../../../api/table";
if (this.exportList[i].cQualityEngineer6 !== null && this.exportList[i].cQualityEngineer6 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer6.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'R015') {
if (this.exportList[i].ipqcHardTag !== null && this.exportList[i].ipqcHardTag !== '') {
this.exportList[i].projectLeader = this.exportList[i].ipqcHardTag.split("-")[1];
}
}
}
})
@ -2825,6 +2885,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.docEngineer != null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1]
}
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
// 获取全部人员信息用于下拉框
@ -2894,6 +2957,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.docEngineer != null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1]
}
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
// 获取全部人员信息用于下拉框
@ -3041,6 +3107,8 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineerName: '',
docEngineer: '',
docEngineerName: '',
ipqcHardTag: '',
ipqcHardTagName: '',
projectCreationDate:new Date(),
createDate: '',
// active: 'Y',
@ -3086,6 +3154,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineer: row.cManufactureEngineer,
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
projectCreationDate: row.projectCreationDate,
status: row.status,
// active: row.active,
@ -3104,6 +3173,9 @@ import {updateColumnSize} from "../../../api/table";
if (row.docEngineer != null && row.docEngineer !== ''){
this.modalData.docEngineerName= row.docEngineer.split('-')[1] // 截取用户名
}
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName= row.ipqcHardTag.split('-')[1] // 截取用户名
}
this.modalDisableFlag = true
this.modalPartDisableFlag = false
this.modalFlag = true
@ -3259,6 +3331,7 @@ import {updateColumnSize} from "../../../api/table";
cQualityEngineer6: this.modalData.cQualityEngineer6,
cManufactureEngineer: this.modalData.cManufactureEngineer,
docEngineer: this.modalData.docEngineer,
ipqcHardTag: this.modalData.ipqcHardTag,
projectCreationDate: this.modalData.projectCreationDate,
createDate: this.modalData.createDate,
createBy: this.modalData.createBy,
@ -3331,6 +3404,7 @@ import {updateColumnSize} from "../../../api/table";
cQualityEngineer6: this.modalData.cQualityEngineer6,
cManufactureEngineer: this.modalData.cManufactureEngineer,
docEngineer: this.modalData.docEngineer,
ipqcHardTag: this.modalData.ipqcHardTag,
projectCreationDate: this.modalData.projectCreationDate,
createDate: this.modalData.createDate,
createBy: this.modalData.createBy,
@ -3407,6 +3481,7 @@ import {updateColumnSize} from "../../../api/table";
cQualityEngineer6: this.modalData.cQualityEngineer6,
cManufactureEngineer: this.modalData.cManufactureEngineer,
docEngineer: this.modalData.docEngineer,
ipqcHardTag: this.modalData.ipqcHardTag,
projectCreationDate: this.modalData.projectCreationDate,
createDate: this.modalData.createDate,
createBy: this.modalData.createBy,
@ -3768,6 +3843,8 @@ import {updateColumnSize} from "../../../api/table";
this.modalData.cManufactureEngineerName = ''
this.modalData.docEngineer = ''
this.modalData.docEngineerName = ''
this.modalData.ipqcHardTag = ''
this.modalData.ipqcHardTagName = ''
this.modalData.projectCreationDate = new Date()
},
@ -3805,6 +3882,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.docEngineer != null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1]
}
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
}
})
@ -3845,6 +3925,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineer: row.cManufactureEngineer,
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
projectCreationDate: row.projectCreationDate,
status: '草稿',
partType: 'Active',
@ -3872,6 +3953,11 @@ import {updateColumnSize} from "../../../api/table";
} else {
this.modalData.docEngineer = ''
}
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
} else {
this.modalData.ipqcHardTag = ''
}
this.modalDisableFlag = true
this.modalPartDisableFlag = true
this.modalFlag = true
@ -3912,6 +3998,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineer: row.cManufactureEngineer,
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
projectCreationDate: row.buildDate,
status: row.status,
partType: row.partType,
@ -3931,6 +4018,9 @@ import {updateColumnSize} from "../../../api/table";
if (row.docEngineer != null && row.docEngineer !== ''){
this.modalData.docEngineerName= row.docEngineer.split('-')[1] // 截取用户名
}
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
}
this.modalDisableFlag = true
this.modalPartDisableFlag = true
this.modalFlag = true

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

@ -430,6 +430,8 @@ export default {
engineerName:'',
docEngineer:'',
docEngineerName:'',
ipqcHardTag:'',
ipqcHardTagName:'',
//projectCreationDate为当前服务器的时间
projectCreationDate: new Date(),
finalPartNo:'',
@ -873,6 +875,24 @@ export default {
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401007,
serialNumber: '401007Table1IpqcHardTag',
tableId: "401007Table1",
tableName: "项目信息待上传文件表",
columnProp: 'ipqcHardTagName',
headerAlign: "center",
align: "left",
columnLabel: 'IPQC-Hardtag',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401007,
@ -1190,6 +1210,9 @@ export default {
if (item.docEngineer !== null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1];
}
if (item.ipqcHardTag !== null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
});
for (let i = 0; i < this.exportList.length; i++) {
@ -1223,6 +1246,10 @@ export default {
if (this.exportList[i].cQualityEngineer6 !== null && this.exportList[i].cQualityEngineer6 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer6.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'R015') {
if (this.exportList[i].ipqcHardTag !== null && this.exportList[i].ipqcHardTag !== '') {
this.exportList[i].projectLeader = this.exportList[i].ipqcHardTag.split("-")[1];
}
}
}
})
@ -1285,6 +1312,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
}
// 获取全部人员信息用于下拉框
@ -1326,6 +1358,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
}
// 获取全部人员信息用于下拉框
@ -1337,8 +1374,10 @@ export default {
let pjmList = []
// 遍历data.page.list
data.list.forEach((item) => {
if (!pjmList.includes(item.projectOwner.split('-')[0])) {
pjmList.push(item.projectOwner.split('-')[0])
if (item.projectOwner !== null && item.projectOwner !== '') {
if (!pjmList.includes(item.projectOwner.split('-')[0])) {
pjmList.push(item.projectOwner.split('-')[0])
}
}
})
if (pjmList.includes(this.$store.state.user.name)) {
@ -1375,6 +1414,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
}
} else {
@ -1435,6 +1479,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
}
// 获取全部人员信息用于下拉框
@ -1476,6 +1525,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
}
// 获取全部人员信息用于下拉框
@ -1526,6 +1580,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
// }
} else {
@ -1536,6 +1595,7 @@ export default {
this.getAllPersonnelList()
})
}
},
// 获取全部人员信息用于下拉框
@ -1550,37 +1610,43 @@ export default {
const engineersMap = new Map();
allPersonnelInfoDataList.forEach((item) => {
// Handle project owners
if (!projectOwnersMap.has(item.projectOwner)) {
const projectOwnerId = projectOwnersMap.size + 1; // Incrementing by +1
projectOwnersMap.set(item.projectOwner, {
projectOwnerId,
projectOwner: item.projectOwner,
projectOwnerName: item.projectOwner.split('-')[1]
});
allPersonnelList.push(projectOwnersMap.get(item.projectOwner));
if (item.projectOwner !== null && item.projectOwner !== '') {
// Handle project owners
if (!projectOwnersMap.has(item.projectOwner)) {
const projectOwnerId = projectOwnersMap.size + 1; // Incrementing by +1
projectOwnersMap.set(item.projectOwner, {
projectOwnerId,
projectOwner: item.projectOwner,
projectOwnerName: item.projectOwner.split('-')[1]
});
allPersonnelList.push(projectOwnersMap.get(item.projectOwner));
}
}
// Handle project managers
if (!projectManagersMap.has(item.projectManager)) {
const projectManagerId = projectManagersMap.size + 1;
projectManagersMap.set(item.projectManager, {
projectManagerId,
projectManager: item.projectManager,
projectManagerName: item.projectManager.split('-')[1]
});
allPersonnelList.push(projectManagersMap.get(item.projectManager));
if (item.projectManager !== null && item.projectManager !== '') {
// Handle project managers
if (!projectManagersMap.has(item.projectManager)) {
const projectManagerId = projectManagersMap.size + 1;
projectManagersMap.set(item.projectManager, {
projectManagerId,
projectManager: item.projectManager,
projectManagerName: item.projectManager.split('-')[1]
});
allPersonnelList.push(projectManagersMap.get(item.projectManager));
}
}
// Handle engineers
if (!engineersMap.has(item.engineer)) {
const engineerId = engineersMap.size + 1;
engineersMap.set(item.engineer, {
engineerId,
engineer: item.engineer,
engineerName: item.engineer.split('-')[1]
});
allPersonnelList.push(engineersMap.get(item.engineer));
if (item.engineer !== null && item.engineer !== '') {
// Handle engineers
if (!engineersMap.has(item.engineer)) {
const engineerId = engineersMap.size + 1;
engineersMap.set(item.engineer, {
engineerId,
engineer: item.engineer,
engineerName: item.engineer.split('-')[1]
});
allPersonnelList.push(engineersMap.get(item.engineer));
}
}
});

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

@ -631,6 +631,24 @@ export default {
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401008,
serialNumber: '401008Table1IpqcHardTag',
tableId: "401008Table1",
tableName: "项目打样记录表",
columnProp: 'ipqcHardTagName',
headerAlign: "center",
align: "left",
columnLabel: 'IPQC-Hardtag',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401008,
@ -965,6 +983,9 @@ export default {
if (item.docEngineer !== null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1];
}
if (item.ipqcHardTag !== null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
});
for (let i = 0; i < this.exportList.length; i++) {
@ -998,6 +1019,10 @@ export default {
if (this.exportList[i].cQualityEngineer6 !== null && this.exportList[i].cQualityEngineer6 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer6.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'R015') {
if (this.exportList[i].ipqcHardTag !== null && this.exportList[i].ipqcHardTag !== '') {
this.exportList[i].projectLeader = this.exportList[i].ipqcHardTag.split("-")[1];
}
}
}
})
@ -1057,6 +1082,9 @@ export default {
if (item.docEngineer !== null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1];
}
if (item.ipqcHardTag !== null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
});
for (let i = 0; i < this.dataList.length; i++) {
@ -1090,6 +1118,10 @@ export default {
if (this.dataList[i].cQualityEngineer6 !== null && this.dataList[i].cQualityEngineer6 !== '') {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1];
}
} else if (this.dataList[i].responsibleDepartment === 'R015') {
if (this.dataList[i].ipqcHardTag !== null && this.dataList[i].ipqcHardTag !== '') {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1];
}
}
}
@ -1228,6 +1260,9 @@ export default {
if (item.docEngineer !== null && item.docEngineer !== '') {
item.docEngineerName = item.docEngineer.split('-')[1];
}
if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
});
for (let i = 0; i < this.dataList.length; i++) {
@ -1261,6 +1296,10 @@ export default {
if (this.dataList[i].cQualityEngineer6 !== null && this.dataList[i].cQualityEngineer6 !== '') {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1];
}
} else if (this.dataList[i].responsibleDepartment === 'R015') {
if (this.dataList[i].ipqcHardTag !== null && this.dataList[i].ipqcHardTag !== '') {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1];
}
}
}

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

@ -714,6 +714,24 @@ export default {
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401006,
serialNumber: '401006Table1IpqcHardTag',
tableId: "401006Table1",
tableName: "项目信息待上传文件表",
columnProp: 'ipqcHardTagName',
headerAlign: "center",
align: "left",
columnLabel: 'IPQC-Hardtag',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401006,
@ -1256,6 +1274,9 @@ export default {
if (item.docEngineer !== null && item.docEngineer !== '') {
item.docEngineerName = item.docEngineer.split('-')[1];
}
if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
});
for (let i = 0; i < this.exportList.length; i++) {
@ -1289,6 +1310,10 @@ export default {
if (this.exportList[i].cQualityEngineer6 !== null && this.exportList[i].cQualityEngineer6 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer6.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'R015') {
if (this.exportList[i].ipqcHardTag !== null && this.exportList[i].ipqcHardTag !== '') {
this.exportList[i].projectLeader = this.exportList[i].ipqcHardTag.split("-")[1];
}
}
}
})
@ -1358,6 +1383,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001'){
@ -1398,6 +1428,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R015'){
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@ -1441,6 +1477,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R015'){
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -1488,6 +1530,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001'){
@ -1528,6 +1575,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R015') {
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === '') {
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@ -1571,6 +1624,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R015'){
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -1628,6 +1687,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001') {
@ -1668,6 +1732,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R015'){
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null) {
@ -1710,6 +1780,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if (this.dataList[i].responsibleDepartment === 'R015') {
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === '') {
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -1775,6 +1851,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001'){
@ -1815,6 +1896,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R015'){
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@ -1858,6 +1945,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R015'){
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -1905,6 +1998,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001'){
@ -1945,6 +2043,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R015') {
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === '') {
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@ -1988,6 +2092,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R015'){
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -2045,6 +2155,11 @@ export default {
} else {
item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
}
if (item.ipqcHardTag === null || item.ipqcHardTag === ''){
item.ipqcHardTagName = ''
} else {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].responsibleDepartment === 'R001') {
@ -2085,6 +2200,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R015'){
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@ -2128,6 +2249,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer6.split("-")[1]
}
} else if(this.dataList[i].responsibleDepartment === 'R015'){
if (this.dataList[i].ipqcHardTag === null || this.dataList[i].ipqcHardTag === ''){
this.dataList[i].projectLeader = ''
} else {
this.dataList[i].projectLeader = this.dataList[i].ipqcHardTag.split("-")[1]
}
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@ -2198,6 +2325,12 @@ export default {
} else {
allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].cQualityEngineer6.split("-")[1]
}
} else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R015'){
if (allPersonnelInfoDataList[i].ipqcHardTag === null || allPersonnelInfoDataList[i].ipqcHardTag === ''){
allPersonnelInfoDataList[i].projectLeader = ''
} else {
allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].ipqcHardTag.split("-")[1]
}
}
}

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

@ -482,8 +482,8 @@
label=""
prop=""
header-align="center"
align="right"
width="50">
align="center"
width="80">
</el-table-column>
<el-table-column
v-for="(item, index) in columnProjectBomList"
@ -1523,6 +1523,8 @@ import {updateColumnSize} from "../../../api/table";
docEngineerName:'',
engineer:'',
engineerName:'',
ipqcHardTag:'',
ipqcHardTagName:'',
//projectCreationDate为当前服务器的时间
projectCreationDate: new Date(),
finalPartNo:'',
@ -2060,6 +2062,24 @@ import {updateColumnSize} from "../../../api/table";
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401004,
serialNumber: '401004Table1IpqcHardTag',
tableId: "401004Table1",
tableName: "项目物料表",
columnProp: 'ipqcHardTagName',
headerAlign: "center",
align: "left",
columnLabel: 'IPQC-Hardtag',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 401004,
@ -2682,6 +2702,24 @@ import {updateColumnSize} from "../../../api/table";
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 401005,
serialNumber: '401005Table1EffectiveDate',
tableId: "401005Table1",
tableName: "项目物料表",
columnProp: 'effectiveDate',
headerAlign: "center",
align: "center",
columnLabel: '生效日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
],
columnProjectRoutingList: [
{
@ -3397,6 +3435,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.docEngineer !== null && item.docEngineer !== '') {
item.docEngineerName = item.docEngineer.split('-')[1];
}
if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
});
for (let i = 0; i < this.exportList.length; i++) {
@ -3430,6 +3471,10 @@ import {updateColumnSize} from "../../../api/table";
if (this.exportList[i].cQualityEngineer6 !== null && this.exportList[i].cQualityEngineer6 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer6.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'R015') {
if (this.exportList[i].ipqcHardTag !== null && this.exportList[i].ipqcHardTag !== '') {
this.exportList[i].projectLeader = this.exportList[i].ipqcHardTag.split("-")[1];
}
}
}
})
@ -3494,6 +3539,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.docEngineer != null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1]
}
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
// 判断是否全部存在数据
if (this.totalPage > 0) {
@ -3535,6 +3583,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.docEngineer != null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1]
}
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
// 获取全部人员信息用于下拉框
@ -3593,6 +3644,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.docEngineer != null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1]
}
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
})
// 获取全部人员信息用于下拉框
@ -3789,6 +3843,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineer: row.cManufactureEngineer,
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
finalPartNo: row.finalPartNo,
finalPartDesc: row.finalPartDesc,
// active: row.active,
@ -3807,6 +3862,9 @@ import {updateColumnSize} from "../../../api/table";
if (row.docEngineer != null && row.docEngineer !== ''){
this.modalData.docEngineerName= row.docEngineer.split('-')[1] // 截取用户名
}
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName= row.ipqcHardTag.split('-')[1] // 截取用户名
}
this.getFinalPartDesc()
this.formalPartNoFlag = true
},
@ -3836,6 +3894,7 @@ import {updateColumnSize} from "../../../api/table";
cQualityEngineer6: row.cQualityEngineer6,
cManufactureEngineer: row.cManufactureEngineer,
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
remark: '',
planStartDate : new Date(),
proofingNo: '',
@ -3965,6 +4024,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineer: row.cManufactureEngineer,
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
ipqcHardTag: row.ipqcHardTag,
buildDate: row.buildDate,
status: row.status,
partType: row.partType,
@ -3984,6 +4044,9 @@ import {updateColumnSize} from "../../../api/table";
if (row.docEngineer != null && row.docEngineer !== '') {
this.modalData.docEngineerName = row.docEngineer.split('-')[1] // 截取用户名
}
if (row.ipqcHardTag != null && row.ipqcHardTag !== '') {
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
}
if (row.status === '草稿') {
if (row.projectOwner.split('-')[0] === this.$store.state.user.name) {
this.modalData.status = '进行中'
@ -4099,6 +4162,7 @@ import {updateColumnSize} from "../../../api/table";
cQualityEngineer6: this.proofingCurrentRow.cQualityEngineer6,
cManufactureEngineer: this.proofingCurrentRow.cManufactureEngineer,
docEngineer: this.proofingCurrentRow.docEngineer,
ipqcHardTag: this.proofingCurrentRow.ipqcHardTag,
// username:this.$store.state.user.name,
page: 1,
limit: 1000
@ -4355,6 +4419,12 @@ import {updateColumnSize} from "../../../api/table";
if (this.proofingCurrentRow.docEngineer != null && this.proofingCurrentRow.docEngineer !== ''){
this.projectPartDocumentList[i].projectLeader= this.proofingCurrentRow.docEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'IPQC-Hardtag') {
if (this.proofingCurrentRow.ipqcHardTag != null && this.proofingCurrentRow.ipqcHardTag !== '') {
this.projectPartDocumentList[i].projectLeader = this.proofingCurrentRow.ipqcHardTag.split('-')[1] // 截取用户名
}
} else {
this.projectPartDocumentList[i].projectLeader = ''
}
this.projectPartDocumentList[i].buNo = inData.buNo
}
@ -4501,6 +4571,12 @@ import {updateColumnSize} from "../../../api/table";
if (this.proofingCurrentRow.docEngineer != null && this.proofingCurrentRow.docEngineer !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.docEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'IPQC-Hardtag') {
if (this.proofingCurrentRow.ipqcHardTag != null && this.proofingCurrentRow.ipqcHardTag !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.ipqcHardTag.split('-')[1] // 截取用户名
}
} else {
this.projectOtherDocumentList[i].projectLeader = ''
}
}
} else {
@ -4746,6 +4822,10 @@ import {updateColumnSize} from "../../../api/table";
if (this.proofingCurrentRow.docEngineer != null && this.proofingCurrentRow.docEngineer !== ''){
this.projectAllDocumentList[i].projectLeader= this.proofingCurrentRow.docEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'IPQC-Hardtag') {
if (this.proofingCurrentRow.ipqcHardTag != null && this.proofingCurrentRow.ipqcHardTag !== '') {
this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.ipqcHardTag.split('-')[1] // 截取用户名
}
}
}
}

Write Preview
Loading…
Cancel
Save