diff --git a/src/api/factory/site.js b/src/api/factory/site.js
index 83a5458..81af5b1 100644
--- a/src/api/factory/site.js
+++ b/src/api/factory/site.js
@@ -49,6 +49,8 @@ export const searchBusinessInfo6 = data => createAPI(`/site/searchBusinessInfo6`
export const searchBusinessInfo7 = data => createAPI(`/site/searchBusinessInfo7`,'post',data)
+export const searchBusinessInfo8 = data => createAPI(`/site/searchBusinessInfo8`,'post',data)
+
export const getResponsibleDepartment = data => createAPI(`/site/getResponsibleDepartment`,'post',data)
export const getEamWorkShop = data => createAPI(`/site/getEamWorkShop`,'post',data)
diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue
index b4490b5..7aa2b7f 100644
--- a/src/views/modules/eam/com_project_proof_record.vue
+++ b/src/views/modules/eam/com_project_proof_record.vue
@@ -1511,6 +1511,12 @@
} else {
this.proofDocumentList[i].projectLeader = ''
}
+ } else if (this.proofDocumentList[i].responsibleDepartment === 'DocEngineer2'){
+ if (this.searchData.docEngineer2 !== null && this.searchData.docEngineer2 !== ''){
+ this.proofDocumentList[i].projectLeader = this.searchData.docEngineer2.split("-")[1]
+ } else {
+ this.proofDocumentList[i].projectLeader = ''
+ }
} else if (this.proofDocumentList[i].responsibleDepartment === 'IQC'){
if (this.searchData.cQualityEngineer6 !== null && this.searchData.cQualityEngineer6 !== ''){
this.proofDocumentList[i].projectLeader = this.searchData.cQualityEngineer6.split("-")[1]
@@ -1762,6 +1768,7 @@
inData.cQualityEngineer5 = this.searchData.cQualityEngineer5
inData.cManufactureEngineer = this.searchData.cManufactureEngineer
inData.docEngineer = this.searchData.docEngineer
+ inData.docEngineer2 = this.searchData.docEngineer2
inData.cQualityEngineer6 = this.searchData.cQualityEngineer6
inData.ipqcHardTag = this.searchData.ipqcHardTag
this.sendMailHandle(inData)
diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue
index 2dedb10..522ef23 100644
--- a/src/views/modules/eam/eamProjectInfo.vue
+++ b/src/views/modules/eam/eamProjectInfo.vue
@@ -277,7 +277,7 @@
优先级
-
+
+
+
+ 文档工程师2
+
+
+
保存
关闭
@@ -868,6 +874,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+ 关闭
+
+
+
{
+ if (data && data.code === 0){
+ this.businessDataList8 = data.rows;
+ }
+ })
+ },
// 打开项目经理
openProjectManagerInfoDialog () {
//请求
@@ -3832,6 +3969,10 @@ import {updateColumnSize} from "../../../api/table";
//请求
this.searchBusinessInfoList7();
},
+ openDocEngineer2InfoDialog () {
+ //请求
+ this.searchBusinessInfoList8();
+ },
openEngineer6InfoDialog () {
//请求
this.searchBusinessInfoList6();
@@ -3874,6 +4015,10 @@ import {updateColumnSize} from "../../../api/table";
this.businessDataList7 = []
this.docEngineerFlag = false
},
+ closeDocEngineer2InfoDialog () {
+ this.businessDataList8 = []
+ this.docEngineer2Flag = false
+ },
projectManagerRowDblclick(row) {
if (row && row.username && row.userDisplay) {
this.modalData.projectManager = row.username + '-' + row.userDisplay;
@@ -3918,6 +4063,11 @@ import {updateColumnSize} from "../../../api/table";
this.modalData.docEngineerName = this.modalData.docEngineer.split('-')[1] // 截取用户名
this.docEngineerFlag = false
},
+ docEngineer2RowDblclick (row) {
+ this.modalData.docEngineer2 = row.username + '-' + row.userDisplay
+ this.modalData.docEngineer2Name = this.modalData.docEngineer2.split('-')[1] // 截取用户名
+ this.docEngineer2Flag = false
+ },
closeClear () {
this.modalData.bu = ''
this.modalData.projectNo = ''
@@ -3949,6 +4099,8 @@ import {updateColumnSize} from "../../../api/table";
this.modalData.cManufactureEngineerName = ''
this.modalData.docEngineer = ''
this.modalData.docEngineerName = ''
+ this.modalData.docEngineer2 = ''
+ this.modalData.docEngineer2Name = ''
this.modalData.ipqcHardTag = ''
this.modalData.ipqcHardTagName = ''
this.modalData.cQualityEngineer7 = ''
@@ -3990,6 +4142,9 @@ import {updateColumnSize} from "../../../api/table";
if (item.docEngineer != null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 != null && item.docEngineer2 !== ''){
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
@@ -4036,6 +4191,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineer: row.cManufactureEngineer,
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
+ docEngineer2: row.docEngineer2,
ipqcHardTag: row.ipqcHardTag,
cQualityEngineer7: row.cQualityEngineer7,
projectCreationDate: row.projectCreationDate,
@@ -4065,6 +4221,11 @@ import {updateColumnSize} from "../../../api/table";
} else {
this.modalData.docEngineer = ''
}
+ if (row.docEngineer2 != null && row.docEngineer2 !== ''){
+ this.modalData.docEngineer2Name= row.docEngineer2.split('-')[1] // 截取用户名
+ } else {
+ this.modalData.docEngineer2 = ''
+ }
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
} else {
@@ -4115,6 +4276,7 @@ import {updateColumnSize} from "../../../api/table";
cManufactureEngineer: row.cManufactureEngineer,
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
+ docEngineer2: row.docEngineer2,
ipqcHardTag: row.ipqcHardTag,
cQualityEngineer7: row.cQualityEngineer7,
projectCreationDate: row.buildDate,
@@ -4136,6 +4298,9 @@ import {updateColumnSize} from "../../../api/table";
if (row.docEngineer != null && row.docEngineer !== ''){
this.modalData.docEngineerName= row.docEngineer.split('-')[1] // 截取用户名
}
+ if (row.docEngineer2 != null && row.docEngineer2 !== ''){
+ this.modalData.docEngineer2Name= row.docEngineer2.split('-')[1] // 截取用户名
+ }
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
}
diff --git a/src/views/modules/eam/eamProjectInfoForConfirm.vue b/src/views/modules/eam/eamProjectInfoForConfirm.vue
index 205beb9..4fdbf3e 100644
--- a/src/views/modules/eam/eamProjectInfoForConfirm.vue
+++ b/src/views/modules/eam/eamProjectInfoForConfirm.vue
@@ -430,6 +430,8 @@ export default {
engineerName:'',
docEngineer:'',
docEngineerName:'',
+ docEngineer2:'',
+ docEngineer2Name:'',
ipqcHardTag:'',
ipqcHardTagName:'',
cQualityEngineer7:'',
@@ -877,6 +879,24 @@ export default {
fixed: '',
columnWidth: 120,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 401007,
+ serialNumber: '401007Table1DocEngineer2',
+ tableId: "401007Table1",
+ tableName: "项目信息待上传文件表",
+ columnProp: 'docEngineer2Name',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '文档工程师2',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 120,
+ },
{
userId: this.$store.state.user.name,
functionId: 401007,
@@ -1230,6 +1250,9 @@ export default {
if (item.docEngineer !== null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1];
}
+ if (item.docEngineer2 !== null && item.docEngineer2 !== ''){
+ item.docEngineer2Name = item.docEngineer2.split('-')[1];
+ }
if (item.ipqcHardTag !== null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
@@ -1261,6 +1284,10 @@ export default {
if (this.exportList[i].docEngineer !== null && this.exportList[i].docEngineer !== '') {
this.exportList[i].projectLeader = this.exportList[i].docEngineer.split("-")[1];
}
+ } else if (this.exportList[i].responsibleDepartment === 'R017') {
+ if (this.exportList[i].docEngineer2 !== null && this.exportList[i].docEngineer2 !== '') {
+ this.exportList[i].projectLeader = this.exportList[i].docEngineer2.split("-")[1];
+ }
} else if (this.exportList[i].responsibleDepartment === 'R013') {
if (this.exportList[i].cQualityEngineer5 !== null && this.exportList[i].cQualityEngineer5 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer5.split("-")[1];
@@ -1325,6 +1352,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
@@ -1377,6 +1409,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
@@ -1438,6 +1475,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
@@ -1507,6 +1549,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
@@ -1558,6 +1605,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
@@ -1618,6 +1670,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
diff --git a/src/views/modules/eam/eamProjectInfoForProof.vue b/src/views/modules/eam/eamProjectInfoForProof.vue
index b446960..139d101 100644
--- a/src/views/modules/eam/eamProjectInfoForProof.vue
+++ b/src/views/modules/eam/eamProjectInfoForProof.vue
@@ -631,6 +631,24 @@ export default {
fixed: '',
columnWidth: 120,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 401008,
+ serialNumber: '401008Table1DocEngineer2',
+ tableId: "401008Table1",
+ tableName: "项目打样记录表",
+ columnProp: 'docEngineer2Name',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '文档工程师2',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 120,
+ },
{
userId: this.$store.state.user.name,
functionId: 401008,
@@ -759,9 +777,9 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 103001,
- serialNumber: '103001Table1RequiredDeliveryDate',
- tableId: '103001Table1',
+ functionId: 401008,
+ serialNumber: '401008Table1RequiredDeliveryDate',
+ tableId: '401008Table1',
tableName: '打样记录表',
columnProp: 'planStartDate',
headerAlign: 'center',
@@ -777,9 +795,9 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 103001,
- serialNumber: '103001Table1ProofingNo',
- tableId: '103001Table1',
+ functionId: 401008,
+ serialNumber: '401008Table1ProofingNo',
+ tableId: '401008Table1',
tableName: '打样记录表',
columnProp: 'proofingNo',
headerAlign: 'center',
@@ -795,9 +813,9 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 103001,
- serialNumber: '103001Table1ProofingNumber',
- tableId: '103001Table1',
+ functionId: 401008,
+ serialNumber: '401008Table1ProofingNumber',
+ tableId: '401008Table1',
tableName: '打样记录表',
columnProp: 'proofingNumber',
headerAlign: 'center',
@@ -831,9 +849,9 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 103001,
- serialNumber: '103001Table1RequiredDeliveryDate',
- tableId: '103001Table1',
+ functionId: 401008,
+ serialNumber: '401008Table1RequiredDeliveryDate',
+ tableId: '401008Table1',
tableName: '打样记录表',
columnProp: 'requiredDeliveryDate',
headerAlign: 'center',
@@ -849,9 +867,9 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 103001,
- serialNumber: '103001Table1ActualityDeliveryDate',
- tableId: '103001Table1',
+ functionId: 401008,
+ serialNumber: '401008Table1ActualityDeliveryDate',
+ tableId: '401008Table1',
tableName: '打样记录表',
columnProp: 'actualityDeliveryDate',
headerAlign: 'center',
@@ -867,9 +885,9 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 103001,
- serialNumber: '103001Table1CreateDate',
- tableId: '103001Table1',
+ functionId: 401008,
+ serialNumber: '401008Table1CreateDate',
+ tableId: '401008Table1',
tableName: '打样文档表',
columnProp: 'createDate',
headerAlign: 'center',
@@ -885,9 +903,9 @@ export default {
},
{
userId: this.$store.state.user.name,
- functionId: 103001,
- serialNumber: '103001Table1CreateBy',
- tableId: '103001Table1',
+ functionId: 401008,
+ serialNumber: '401008Table1CreateBy',
+ tableId: '401008Table1',
tableName: '打样文档表',
columnProp: 'createBy',
headerAlign: 'center',
@@ -1001,6 +1019,9 @@ export default {
if (item.docEngineer !== null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1];
}
+ if (item.docEngineer2 !== null && item.docEngineer2 !== ''){
+ item.docEngineer2Name = item.docEngineer2.split('-')[1];
+ }
if (item.ipqcHardTag !== null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
@@ -1032,6 +1053,10 @@ export default {
if (this.exportList[i].docEngineer !== null && this.exportList[i].docEngineer !== '') {
this.exportList[i].projectLeader = this.exportList[i].docEngineer.split("-")[1];
}
+ } else if (this.exportList[i].responsibleDepartment === 'R017') {
+ if (this.exportList[i].docEngineer2 !== null && this.exportList[i].docEngineer2 !== '') {
+ this.exportList[i].projectLeader = this.exportList[i].docEngineer2.split("-")[1];
+ }
} else if (this.exportList[i].responsibleDepartment === 'R013') {
if (this.exportList[i].cQualityEngineer5 !== null && this.exportList[i].cQualityEngineer5 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer5.split("-")[1];
@@ -1107,6 +1132,9 @@ export default {
if (item.docEngineer !== null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1];
}
+ if (item.docEngineer2 !== null && item.docEngineer2 !== ''){
+ item.docEngineer2Name = item.docEngineer2.split('-')[1];
+ }
if (item.ipqcHardTag !== null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
@@ -1138,6 +1166,10 @@ export default {
if (this.dataList[i].docEngineer !== null && this.dataList[i].docEngineer !== '') {
this.dataList[i].projectLeader = this.dataList[i].docEngineer.split("-")[1];
}
+ } else if (this.dataList[i].responsibleDepartment === 'R017') {
+ if (this.dataList[i].docEngineer2 !== null && this.dataList[i].docEngineer2 !== '') {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1];
+ }
} else if (this.dataList[i].responsibleDepartment === 'R013') {
if (this.dataList[i].cQualityEngineer5 !== null && this.dataList[i].cQualityEngineer5 !== '') {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer5.split("-")[1];
@@ -1292,6 +1324,9 @@ export default {
if (item.docEngineer !== null && item.docEngineer !== '') {
item.docEngineerName = item.docEngineer.split('-')[1];
}
+ if (item.docEngineer2 !== null && item.docEngineer2 !== '') {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1];
+ }
if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
@@ -1323,6 +1358,10 @@ export default {
if (this.dataList[i].docEngineer !== null && this.dataList[i].docEngineer !== '') {
this.dataList[i].projectLeader = this.dataList[i].docEngineer.split("-")[1];
}
+ } else if (this.dataList[i].responsibleDepartment === 'R017') {
+ if (this.dataList[i].docEngineer2 !== null && this.dataList[i].docEngineer2 !== '') {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1];
+ }
} else if (this.dataList[i].responsibleDepartment === 'R013') {
if (this.dataList[i].cQualityEngineer5 !== null && this.dataList[i].cQualityEngineer5 !== '') {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer5.split("-")[1];
diff --git a/src/views/modules/eam/eamProjectInfoForUploads.vue b/src/views/modules/eam/eamProjectInfoForUploads.vue
index 1aead63..e55225c 100644
--- a/src/views/modules/eam/eamProjectInfoForUploads.vue
+++ b/src/views/modules/eam/eamProjectInfoForUploads.vue
@@ -841,6 +841,24 @@ export default {
fixed: '',
columnWidth: 120,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 401006,
+ serialNumber: '401006Table1DocEngineer2',
+ tableId: "401006Table1",
+ tableName: "项目信息待上传文件表",
+ columnProp: 'docEngineer2Name',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '文档工程师2',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 120,
+ },
{
userId: this.$store.state.user.name,
functionId: 401006,
@@ -1766,6 +1784,9 @@ export default {
if (item.docEngineer !== null && item.docEngineer !== '') {
item.docEngineerName = item.docEngineer.split('-')[1];
}
+ if (item.docEngineer2 !== null && item.docEngineer2 !== '') {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1];
+ }
if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
@@ -1813,6 +1834,10 @@ export default {
if (this.exportList[i].cQualityEngineer7 !== null && this.exportList[i].cQualityEngineer7 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer7.split("-")[1];
}
+ } else if (this.exportList[i].responsibleDepartment === 'R017') {
+ if (this.exportList[i].docEngineer2 !== null && this.exportList[i].docEngineer2 !== '') {
+ this.exportList[i].projectLeader = this.exportList[i].docEngineer2.split("-")[1];
+ }
}
}
})
@@ -1867,6 +1892,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
@@ -1944,6 +1974,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(this.dataList[i].responsibleDepartment === 'R017'){
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === ''){
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@@ -1999,6 +2035,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(this.dataList[i].responsibleDepartment === 'R017'){
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === ''){
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@@ -2031,6 +2073,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
@@ -2109,6 +2156,13 @@ export default {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
}
+ else if(this.dataList[i].responsibleDepartment === 'R017'){
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === ''){
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
+ }
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
this.dataList = data.list
@@ -2163,6 +2217,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(this.dataList[i].responsibleDepartment === 'R017') {
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === '') {
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@@ -2205,6 +2265,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
@@ -2282,6 +2347,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(this.dataList[i].responsibleDepartment === 'R017'){
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === ''){
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null) {
@@ -2336,6 +2407,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(this.dataList[i].responsibleDepartment === 'R017'){
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === ''){
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@@ -2386,6 +2463,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
@@ -2463,6 +2545,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(this.dataList[i].responsibleDepartment === 'R017') {
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === '') {
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@@ -2518,6 +2606,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(this.dataList[i].responsibleDepartment === 'R017') {
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === '') {
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@@ -2550,6 +2644,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
@@ -2627,6 +2726,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(this.dataList[i].responsibleDepartment === 'R017') {
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === '') {
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@@ -2682,6 +2787,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(this.dataList[i].responsibleDepartment === 'R017') {
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === '') {
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@@ -2724,6 +2835,11 @@ export default {
} else {
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 === null || item.docEngineer2 === ''){
+ item.docEngineer2Name = ''
+ } else {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.cQualityEngineer4 === null || item.cQualityEngineer4 === ''){
item.cQualityEngineer4Name = ''
} else {
@@ -2801,6 +2917,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(this.dataList[i].responsibleDepartment === 'R017') {
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === '') {
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
}
}
if (this.searchData.projectLeader !== '' && this.searchData.projectLeader !== null){
@@ -2856,6 +2978,12 @@ export default {
} else {
this.dataList[i].projectLeader = this.dataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(this.dataList[i].responsibleDepartment === 'R017') {
+ if (this.dataList[i].docEngineer2 === null || this.dataList[i].docEngineer2 === '') {
+ this.dataList[i].projectLeader = ''
+ } else {
+ this.dataList[i].projectLeader = this.dataList[i].docEngineer2.split("-")[1]
+ }
}
}
this.dataList = this.dataList.filter(item => item.projectLeader === this.searchData.projectLeader);
@@ -2938,6 +3066,12 @@ export default {
} else {
allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].cQualityEngineer7.split("-")[1]
}
+ } else if(allPersonnelInfoDataList[i].responsibleDepartment === 'R017') {
+ if (allPersonnelInfoDataList[i].docEngineer2 === null || allPersonnelInfoDataList[i].docEngineer2 === '') {
+ allPersonnelInfoDataList[i].projectLeader = ''
+ } else {
+ allPersonnelInfoDataList[i].projectLeader = allPersonnelInfoDataList[i].docEngineer2.split("-")[1]
+ }
}
}
diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue
index f3c3c60..352b4d3 100644
--- a/src/views/modules/eam/eamProjectPartInfo.vue
+++ b/src/views/modules/eam/eamProjectPartInfo.vue
@@ -2003,6 +2003,8 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cManufactureEngineerName:'',
docEngineer:'',
docEngineerName:'',
+ docEngineer2:'',
+ docEngineer2Name:'',
engineer:'',
engineerName:'',
ipqcHardTag:'',
@@ -2558,6 +2560,24 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
fixed: '',
columnWidth: 120,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 401004,
+ serialNumber: '401004Table1DocEngineer2',
+ tableId: "401004Table1",
+ tableName: "项目物料表",
+ columnProp: 'docEngineer2Name',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '文档工程师2',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 120,
+ },
{
userId: this.$store.state.user.name,
functionId: 401004,
@@ -3955,6 +3975,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.docEngineer !== null && item.docEngineer !== '') {
item.docEngineerName = item.docEngineer.split('-')[1];
}
+ if (item.docEngineer2 !== null && item.docEngineer2 !== '') {
+ item.docEngineer2Name = item.docEngineer2.split('-')[1];
+ }
if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
}
@@ -3986,6 +4009,10 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (this.exportList[i].docEngineer !== null && this.exportList[i].docEngineer !== '') {
this.exportList[i].projectLeader = this.exportList[i].docEngineer.split("-")[1];
}
+ } else if (this.exportList[i].responsibleDepartment === 'R017') {
+ if (this.exportList[i].docEngineer2 !== null && this.exportList[i].docEngineer2 !== '') {
+ this.exportList[i].projectLeader = this.exportList[i].docEngineer2.split("-")[1];
+ }
} else if (this.exportList[i].responsibleDepartment === 'R013') {
if (this.exportList[i].cQualityEngineer5 !== null && this.exportList[i].cQualityEngineer5 !== '') {
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer5.split("-")[1];
@@ -4066,6 +4093,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.docEngineer != null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 != null && item.docEngineer2 !== ''){
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
@@ -4111,6 +4141,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.docEngineer != null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 != null && item.docEngineer2 !== ''){
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
@@ -4175,6 +4208,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (item.docEngineer != null && item.docEngineer !== ''){
item.docEngineerName = item.docEngineer.split('-')[1]
}
+ if (item.docEngineer2 != null && item.docEngineer2 !== ''){
+ item.docEngineer2Name = item.docEngineer2.split('-')[1]
+ }
if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
}
@@ -4375,6 +4411,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cManufactureEngineer: row.cManufactureEngineer,
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
+ docEngineer2: row.docEngineer2,
ipqcHardTag: row.ipqcHardTag,
cQualityEngineer7: row.cQualityEngineer7,
finalPartNo: row.finalPartNo,
@@ -4395,6 +4432,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (row.docEngineer != null && row.docEngineer !== ''){
this.modalData.docEngineerName= row.docEngineer.split('-')[1] // 截取用户名
}
+ if (row.docEngineer2 != null && row.docEngineer2 !== ''){
+ this.modalData.docEngineer2Name= row.docEngineer2.split('-')[1] // 截取用户名
+ }
if (row.ipqcHardTag != null && row.ipqcHardTag !== ''){
this.modalData.ipqcHardTagName= row.ipqcHardTag.split('-')[1] // 截取用户名
}
@@ -4430,6 +4470,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cQualityEngineer6: row.cQualityEngineer6,
cManufactureEngineer: row.cManufactureEngineer,
docEngineer: row.docEngineer,
+ docEngineer2: row.docEngineer2,
ipqcHardTag: row.ipqcHardTag,
cQualityEngineer7: row.cQualityEngineer7,
remark: '',
@@ -4561,6 +4602,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cManufactureEngineer: row.cManufactureEngineer,
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
+ docEngineer2: row.docEngineer2,
ipqcHardTag: row.ipqcHardTag,
cQualityEngineer7: row.cQualityEngineer7,
buildDate: row.buildDate,
@@ -4582,6 +4624,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (row.docEngineer != null && row.docEngineer !== '') {
this.modalData.docEngineerName = row.docEngineer.split('-')[1] // 截取用户名
}
+ if (row.docEngineer2 != null && row.docEngineer2 !== '') {
+ this.modalData.docEngineer2Name = row.docEngineer2.split('-')[1] // 截取用户名
+ }
if (row.ipqcHardTag != null && row.ipqcHardTag !== '') {
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
}
@@ -4723,6 +4768,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cManufactureEngineer: row.cManufactureEngineer,
cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
docEngineer: row.docEngineer,
+ docEngineer2: row.docEngineer2,
ipqcHardTag: row.ipqcHardTag,
cQualityEngineer7: row.cQualityEngineer7,
buildDate: row.buildDate,
@@ -4744,6 +4790,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (row.docEngineer != null && row.docEngineer !== '') {
this.modalData.docEngineerName = row.docEngineer.split('-')[1] // 截取用户名
}
+ if (row.docEngineer2 != null && row.docEngineer2 !== '') {
+ this.modalData.docEngineer2Name = row.docEngineer2.split('-')[1] // 截取用户名
+ }
if (row.ipqcHardTag != null && row.ipqcHardTag !== '') {
this.modalData.ipqcHardTagName = row.ipqcHardTag.split('-')[1] // 截取用户名
}
@@ -4800,6 +4849,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cQualityEngineer6: this.proofingCurrentRow.cQualityEngineer6,
cManufactureEngineer: this.proofingCurrentRow.cManufactureEngineer,
docEngineer: this.proofingCurrentRow.docEngineer,
+ docEngineer2: this.proofingCurrentRow.docEngineer2,
ipqcHardTag: this.proofingCurrentRow.ipqcHardTag,
cQualityEngineer7: this.proofingCurrentRow.cQualityEngineer7,
// username:this.$store.state.user.name,
@@ -4837,6 +4887,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
cQualityEngineer6: this.proofingCurrentRow.cQualityEngineer6,
cManufactureEngineer: this.proofingCurrentRow.cManufactureEngineer,
docEngineer: this.proofingCurrentRow.docEngineer,
+ docEngineer2: this.proofingCurrentRow.docEngineer2,
ipqcHardTag: this.proofingCurrentRow.ipqcHardTag,
cQualityEngineer7: this.proofingCurrentRow.cQualityEngineer7,
// username:this.$store.state.user.name,
@@ -5082,6 +5133,10 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (this.proofingCurrentRow.docEngineer != null && this.proofingCurrentRow.docEngineer !== ''){
this.projectPartDocumentList[i].projectLeader= this.proofingCurrentRow.docEngineer.split('-')[1] // 截取用户名
}
+ } else if(this.projectPartDocumentList[i].responsibleDepartment === 'DocEngineer2'){
+ if (this.proofingCurrentRow.docEngineer2 != null && this.proofingCurrentRow.docEngineer2 !== ''){
+ this.projectPartDocumentList[i].projectLeader= this.proofingCurrentRow.docEngineer2.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] // 截取用户名
@@ -5236,6 +5291,10 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (this.proofingCurrentRow.docEngineer != null && this.proofingCurrentRow.docEngineer !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.docEngineer.split('-')[1] // 截取用户名
}
+ } else if (this.projectOtherDocumentList[i].responsibleDepartment === 'DocEngineer2') {
+ if (this.proofingCurrentRow.docEngineer2 != null && this.proofingCurrentRow.docEngineer2 !== '') {
+ this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.docEngineer2.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] // 截取用户名
@@ -5495,7 +5554,12 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
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') {
+ } else if (this.projectAllDocumentList[i].responsibleDepartment === 'DocEngineer2'){
+ if (this.proofingCurrentRow.docEngineer2 != null && this.proofingCurrentRow.docEngineer2 !== ''){
+ this.projectAllDocumentList[i].projectLeader= this.proofingCurrentRow.docEngineer2.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] // 截取用户名
}