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

SQE-ME SQE-EE

master
han\hanst 4 days ago
parent
b40e84f09c
commit
16e37def56
3 changed files with 247 additions and 23 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. 25
      src/views/modules/eam/com_project_proof_record.vue
  2. 108
      src/views/modules/eam/eamProjectInfo.vue
  3. 137
      src/views/modules/eam/eamProjectPartInfo.vue

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

@ -1454,6 +1454,9 @@
init(inData,authUpdate) {
//初始化参数
this.searchData = JSON.parse(JSON.stringify(inData));
// 兼容后端返回下划线命名，统一映射到驼峰字段
this.searchData.sqemeEngineer = this.searchData.sqemeEngineer || ''
this.searchData.sqeeeEngineer = this.searchData.sqeeeEngineer || ''
this.authUpdate = authUpdate
const currentSite = this.syncSiteContext(inData ? inData.site : '')
this.searchData.site = currentSite
@ -1591,24 +1594,38 @@
} else {
this.proofDocumentList[i].projectLeader = ''
}
} else if (this.proofDocumentList[i].responsibleDepartment === 'QC'){
} else if (this.proofDocumentList[i].responsibleDepartment === 'QC' || this.proofDocumentList[i].responsibleDepartment === 'RQC'){
if (this.searchData.qcEngineer !== null && this.searchData.qcEngineer !== ''){
this.proofDocumentList[i].projectLeader = this.searchData.qcEngineer.split("-")[1]
} else {
this.proofDocumentList[i].projectLeader = ''
}
} else if (this.proofDocumentList[i].responsibleDepartment === 'PE'){
} else if (this.proofDocumentList[i].responsibleDepartment === 'PE' || this.proofDocumentList[i].responsibleDepartment === 'RPE'){
if (this.searchData.peEngineer !== null && this.searchData.peEngineer !== ''){
this.proofDocumentList[i].projectLeader = this.searchData.peEngineer.split("-")[1]
} else {
this.proofDocumentList[i].projectLeader = ''
}
} else if (this.proofDocumentList[i].responsibleDepartment === 'EE'){
} else if (this.proofDocumentList[i].responsibleDepartment === 'EE' || this.proofDocumentList[i].responsibleDepartment === 'REE'){
if (this.searchData.eeEngineer !== null && this.searchData.eeEngineer !== ''){
this.proofDocumentList[i].projectLeader = this.searchData.eeEngineer.split("-")[1]
} else {
this.proofDocumentList[i].projectLeader = ''
}
} else if (this.proofDocumentList[i].responsibleDepartment === 'SQE-ME' || this.proofDocumentList[i].responsibleDepartment === 'RSQEME'){
const sqeMe = this.searchData.sqemeEngineer
if (sqeMe !== null && sqeMe !== ''){
this.proofDocumentList[i].projectLeader = sqeMe.indexOf('-') > -1 ? sqeMe.split("-")[1] : sqeMe
} else {
this.proofDocumentList[i].projectLeader = ''
}
} else if (this.proofDocumentList[i].responsibleDepartment === 'SQE-EE' || this.proofDocumentList[i].responsibleDepartment === 'RSQEEE'){
const sqeEe = this.searchData.sqeeeEngineer
if (sqeEe !== null && sqeEe !== ''){
this.proofDocumentList[i].projectLeader = sqeEe.indexOf('-') > -1 ? sqeEe.split("-")[1] : sqeEe
} else {
this.proofDocumentList[i].projectLeader = ''
}
}
}
if (this.totalPage > 0) {
@ -1865,6 +1882,8 @@
inData.docEngineer2 = this.searchData.docEngineer2
inData.cQualityEngineer6 = this.searchData.cQualityEngineer6
inData.ipqcHardTag = this.searchData.ipqcHardTag
inData.sqemeEngineer = this.searchData.sqemeEngineer
inData.sqeeeEngineer = this.searchData.sqeeeEngineer
this.sendMailHandle(inData)
}
// 同步当前打样行并刷新打样文档（下达后后端已将试验申请单附件写入「试验申请单+三方签字」）

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

@ -542,12 +542,18 @@
<el-input v-model="modalData.cManufactureEngineerName" disabled class="project-modal-input"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="4" v-if="isAntennaBu">
<el-form-item>
<span slot="label" class="big-label"><a herf="#" @click="getBaseList(2006)">SQE</a></span>
<el-input v-model="modalData.cQualityEngineer4Name" disabled class="project-modal-input"></el-input>
</el-form-item>
</el-col>
<el-col v-else :span="4">
<el-form-item prop="sqemeEngineerName">
<span slot="label" class="big-label"><a herf="#" @click="getBaseList(3004)">SQE-ME</a></span>
<el-input v-model="modalData.sqemeEngineerName" disabled class="project-modal-input"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item prop="qcEngineerName">
<span slot="label" class="big-label">
@ -568,6 +574,19 @@
</el-col>
</el-row>
<el-row :gutter="12" class="project-modal-row" v-if="isAlphaBu">
<el-col :span="4">
<el-form-item prop="sqeeeEngineerName">
<span slot="label" class="big-label"><a herf="#" @click="getBaseList(3005)">SQE-EE</a></span>
<el-input v-model="modalData.sqeeeEngineerName" disabled class="project-modal-input"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" class="project-modal-empty"></el-col>
<el-col :span="4" class="project-modal-empty"></el-col>
<el-col :span="4" class="project-modal-empty"></el-col>
<el-col :span="4" class="project-modal-empty"></el-col>
</el-row>
<el-row :gutter="12" class="project-modal-row" v-if="isAntennaBu">
<el-col :span="4">
<el-form-item prop="eeEngineerName">
@ -1377,6 +1396,10 @@ import {updateColumnSize} from "../../../api/table";
peEngineerName:'',
eeEngineer:'',
eeEngineerName:'',
sqemeEngineer:'',
sqemeEngineerName:'',
sqeeeEngineer:'',
sqeeeEngineerName:'',
remark:'',
//projectCreationDate为当前服务器的时间
projectCreationDate: new Date(),
@ -2973,6 +2996,20 @@ import {updateColumnSize} from "../../../api/table";
}
return ''
},
getSqeEngineerValue (row, camelField) {
if (!row) {
return ''
}
return row[camelField] || ''
},
normalizeSqeEngineerFields (target) {
if (!target) {
return target
}
target.sqemeEngineer = this.getSqeEngineerValue(target, 'sqemeEngineer')
target.sqeeeEngineer = this.getSqeEngineerValue(target, 'sqeeeEngineer')
return target
},
handleColumnResize(newWidth, oldWidth, column, event){
let inData= this.columnList.filter(item => item.columnProp === column.property)[0]
inData.columnWidth=newWidth
@ -3249,6 +3286,24 @@ import {updateColumnSize} from "../../../api/table";
}
})
}
if (this.tagNo === 3004) {
this.modalData.sqemeEngineer = val.username + '-' + val.user_display
this.modalData.sqemeEngineerName = this.modalData.sqemeEngineer.split('-')[1]
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){
this.businessDataList7 = data.rows;
}
})
}
if (this.tagNo === 3005) {
this.modalData.sqeeeEngineer = val.username + '-' + val.user_display
this.modalData.sqeeeEngineerName = this.modalData.sqeeeEngineer.split('-')[1]
searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
if (data && data.code === 0){
this.businessDataList7 = data.rows;
}
})
}
},
newCustomer () {
@ -3404,6 +3459,7 @@ import {updateColumnSize} from "../../../api/table";
await eamProjectInfoSearch(this.searchData).then(({data}) => {
this.exportList = data.page.list
this.exportList.forEach((item) => {
this.normalizeSqeEngineerFields(item)
item.projectManagerName = this.getUserDisplayName(item.projectManager);
item.projectOwnerName = this.getUserDisplayName(item.projectOwner);
item.engineerName = this.getUserDisplayName(item.engineer);
@ -3435,6 +3491,8 @@ import {updateColumnSize} from "../../../api/table";
item.qcEngineerName = this.getUserDisplayName(item.qcEngineer);
item.peEngineerName = this.getUserDisplayName(item.peEngineer);
item.eeEngineerName = this.getUserDisplayName(item.eeEngineer);
item.sqemeEngineerName = this.getUserDisplayName(item.sqemeEngineer);
item.sqeeeEngineerName = this.getUserDisplayName(item.sqeeeEngineer);
});
for (let i = 0; i < this.exportList.length; i++) {
@ -3525,6 +3583,7 @@ import {updateColumnSize} from "../../../api/table";
this.totalPage = data.page.totalCount
// 遍历dataList
this.dataList.forEach((item) => {
this.normalizeSqeEngineerFields(item)
item.projectManagerName = this.getUserDisplayName(item.projectManager)
item.projectOwnerName = this.getUserDisplayName(item.projectOwner)
item.engineerName = this.getUserDisplayName(item.engineer)
@ -3556,6 +3615,8 @@ import {updateColumnSize} from "../../../api/table";
item.qcEngineerName = this.getUserDisplayName(item.qcEngineer)
item.peEngineerName = this.getUserDisplayName(item.peEngineer)
item.eeEngineerName = this.getUserDisplayName(item.eeEngineer)
item.sqemeEngineerName = this.getUserDisplayName(item.sqemeEngineer)
item.sqeeeEngineerName = this.getUserDisplayName(item.sqeeeEngineer)
})
// 获取全部人员信息用于下拉框
@ -3608,6 +3669,7 @@ import {updateColumnSize} from "../../../api/table";
this.totalPage = data.page.totalCount
// 遍历dataList
this.dataList.forEach((item) => {
this.normalizeSqeEngineerFields(item)
item.projectManagerName = this.getUserDisplayName(item.projectManager)
item.projectOwnerName = this.getUserDisplayName(item.projectOwner)
item.engineerName = this.getUserDisplayName(item.engineer)
@ -3639,6 +3701,8 @@ import {updateColumnSize} from "../../../api/table";
item.qcEngineerName = this.getUserDisplayName(item.qcEngineer)
item.peEngineerName = this.getUserDisplayName(item.peEngineer)
item.eeEngineerName = this.getUserDisplayName(item.eeEngineer)
item.sqemeEngineerName = this.getUserDisplayName(item.sqemeEngineer)
item.sqeeeEngineerName = this.getUserDisplayName(item.sqeeeEngineer)
})
// 获取全部人员信息用于下拉框
@ -3800,6 +3864,10 @@ import {updateColumnSize} from "../../../api/table";
peEngineerName: '',
eeEngineer: '',
eeEngineerName: '',
sqemeEngineer: '',
sqemeEngineerName: '',
sqeeeEngineer: '',
sqeeeEngineerName: '',
projectCreationDate:new Date(),
createDate: '',
remark: '',
@ -3856,6 +3924,8 @@ import {updateColumnSize} from "../../../api/table";
qcEngineer: row.qcEngineer,
peEngineer: row.peEngineer,
eeEngineer: row.eeEngineer,
sqemeEngineer: this.getSqeEngineerValue(row, 'sqemeEngineer'),
sqeeeEngineer: this.getSqeEngineerValue(row, 'sqeeeEngineer'),
projectCreationDate: row.projectCreationDate,
status: row.status,
remark: row.remark,
@ -3893,6 +3963,12 @@ import {updateColumnSize} from "../../../api/table";
if (row.eeEngineer != null && row.eeEngineer !== ''){
this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
}
if (this.modalData.sqemeEngineer) {
this.modalData.sqemeEngineerName = this.getUserDisplayName(this.modalData.sqemeEngineer)
}
if (this.modalData.sqeeeEngineer) {
this.modalData.sqeeeEngineerName = this.getUserDisplayName(this.modalData.sqeeeEngineer)
}
let editBuNo = this.getBuNoByJoinedValue(this.modalData.bu)
this.loadModalProjectCategory(editBuNo, this.modalData.projectCategory)
this.syncBusinessSearchSite(this.modalData.site)
@ -3942,6 +4018,7 @@ import {updateColumnSize} from "../../../api/table";
this.clearModalFlag = false
},
saveData () {
this.normalizeSqeEngineerFields(this.modalData)
this.modalData.oriProjectId = this.modalData.projectNo
this.modalData.finalCustomerId = this.modalData.customerNo
if (this.modalData.projectNo === '' || this.modalData.projectNo == null) {
@ -4086,6 +4163,8 @@ import {updateColumnSize} from "../../../api/table";
qcEngineer: this.modalData.qcEngineer,
peEngineer: this.modalData.peEngineer,
eeEngineer: this.modalData.eeEngineer,
sqemeEngineer: this.modalData.sqemeEngineer,
sqeeeEngineer: this.modalData.sqeeeEngineer,
projectCreationDate: this.modalData.projectCreationDate,
createDate: this.modalData.createDate,
createBy: this.modalData.createBy,
@ -4165,6 +4244,8 @@ import {updateColumnSize} from "../../../api/table";
qcEngineer: this.modalData.qcEngineer,
peEngineer: this.modalData.peEngineer,
eeEngineer: this.modalData.eeEngineer,
sqemeEngineer: this.modalData.sqemeEngineer,
sqeeeEngineer: this.modalData.sqeeeEngineer,
projectCreationDate: this.modalData.projectCreationDate,
createDate: this.modalData.createDate,
createBy: this.modalData.createBy,
@ -4248,6 +4329,8 @@ import {updateColumnSize} from "../../../api/table";
qcEngineer: this.modalData.qcEngineer,
peEngineer: this.modalData.peEngineer,
eeEngineer: this.modalData.eeEngineer,
sqemeEngineer: this.modalData.sqemeEngineer,
sqeeeEngineer: this.modalData.sqeeeEngineer,
projectCreationDate: this.modalData.projectCreationDate,
createDate: this.modalData.createDate,
createBy: this.modalData.createBy,
@ -4652,6 +4735,10 @@ import {updateColumnSize} from "../../../api/table";
this.modalData.peEngineerName = ''
this.modalData.eeEngineer = ''
this.modalData.eeEngineerName = ''
this.modalData.sqemeEngineer = ''
this.modalData.sqemeEngineerName = ''
this.modalData.sqeeeEngineer = ''
this.modalData.sqeeeEngineerName = ''
this.modalData.projectCreationDate = new Date()
this.modalData.remark = ''
},
@ -4671,6 +4758,7 @@ import {updateColumnSize} from "../../../api/table";
this.projectPartList = data.page.list
// 遍历dataList
this.projectPartList.forEach((item) => {
this.normalizeSqeEngineerFields(item)
item.projectManagerName = this.getUserDisplayName(item.projectManager)
item.projectOwnerName = this.getUserDisplayName(item.projectOwner)
item.engineerName = this.getUserDisplayName(item.engineer)
@ -4702,6 +4790,8 @@ import {updateColumnSize} from "../../../api/table";
item.qcEngineerName = this.getUserDisplayName(item.qcEngineer)
item.peEngineerName = this.getUserDisplayName(item.peEngineer)
item.eeEngineerName = this.getUserDisplayName(item.eeEngineer)
item.sqemeEngineerName = this.getUserDisplayName(item.sqemeEngineer)
item.sqeeeEngineerName = this.getUserDisplayName(item.sqeeeEngineer)
})
}
})
@ -4748,6 +4838,8 @@ import {updateColumnSize} from "../../../api/table";
qcEngineer: row.qcEngineer,
peEngineer: row.peEngineer,
eeEngineer: row.eeEngineer,
sqemeEngineer: this.getSqeEngineerValue(row, 'sqemeEngineer'),
sqeeeEngineer: this.getSqeEngineerValue(row, 'sqeeeEngineer'),
projectCreationDate: row.projectCreationDate,
status: '草稿',
partType: 'Active',
@ -4806,6 +4898,12 @@ import {updateColumnSize} from "../../../api/table";
} else {
this.modalData.eeEngineer = ''
}
if (this.modalData.sqemeEngineer) {
this.modalData.sqemeEngineerName = this.getUserDisplayName(this.modalData.sqemeEngineer)
}
if (this.modalData.sqeeeEngineer) {
this.modalData.sqeeeEngineerName = this.getUserDisplayName(this.modalData.sqeeeEngineer)
}
this.syncBusinessSearchSite(this.modalData.site)
this.modalDisableFlag = true
this.modalPartDisableFlag = true
@ -4853,6 +4951,8 @@ import {updateColumnSize} from "../../../api/table";
qcEngineer: row.qcEngineer,
peEngineer: row.peEngineer,
eeEngineer: row.eeEngineer,
sqemeEngineer: this.getSqeEngineerValue(row, 'sqemeEngineer'),
sqeeeEngineer: this.getSqeEngineerValue(row, 'sqeeeEngineer'),
projectCreationDate: row.buildDate,
status: row.status,
partType: row.partType,
@ -4891,6 +4991,12 @@ import {updateColumnSize} from "../../../api/table";
if (row.eeEngineer != null && row.eeEngineer !== ''){
this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
}
if (this.modalData.sqemeEngineer) {
this.modalData.sqemeEngineerName = this.getUserDisplayName(this.modalData.sqemeEngineer)
}
if (this.modalData.sqeeeEngineer) {
this.modalData.sqeeeEngineerName = this.getUserDisplayName(this.modalData.sqeeeEngineer)
}
this.syncBusinessSearchSite(this.modalData.site)
this.modalDisableFlag = true
this.modalPartDisableFlag = true

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

@ -2028,6 +2028,10 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
peEngineerName:'',
eeEngineer:'',
eeEngineerName:'',
sqemeEngineer:'',
sqemeEngineerName:'',
sqeeeEngineer:'',
sqeeeEngineerName:'',
//projectCreationDate为当前服务器的时间
projectCreationDate: new Date(),
finalPartNo:'',
@ -2049,6 +2053,8 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
testPartNo: '',
partDesc: '',
cProjectTypeDb: '',
sqemeEngineer: '',
sqeeeEngineer: '',
projectPhase: '',
proofingNo: '',
proofingNumber: '',
@ -2159,12 +2165,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
copyDocumentList: [],
copyDialog: false,
departmentList:[],
cProjectTypeDbList: [
{cProjectTypeDb: 'Sustaining'},
{cProjectTypeDb: 'Low Risk'},
{cProjectTypeDb: 'High Risk'},
],
cProjectTypeDbList: [],
projectPhaseList: [
{projectPhase: 'Prototype'},
{projectPhase: 'Alpha'},
@ -3906,6 +3907,20 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
}
return this.$store.state.user.site
},
normalizeSqeEngineerFields (target) {
if (!target) {
return target
}
target.sqemeEngineer = target.sqemeEngineer || ''
target.sqeeeEngineer = target.sqeeeEngineer || ''
return target
},
splitUserDisplayName (userValue) {
if (userValue === null || userValue === undefined || userValue === '') {
return ''
}
return userValue.indexOf('-') > -1 ? userValue.split('-')[1] : userValue
},
handleColumnResize(newWidth, oldWidth, column, event){
let inData= this.columnList.filter(item => item.columnProp === column.property)[0]
inData.columnWidth=newWidth
@ -3974,6 +3989,31 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
let buNo = this.getBuNoByBuDesc(buDesc)
this.loadSearchProjectCategory(buNo)
},
// 新增打样弹窗按 BU 加载项目分类
loadProofingProjectCategory (buNo, site) {
const currentSite = this.resolveCurrentPartSite(site)
let inData = {
site: currentSite,
buNo: buNo || ''
}
getProjectCategoryByBu(inData).then(({data}) => {
if (data && data.code === 0) {
this.cProjectTypeDbList = (data.rows || []).map(item => ({
cProjectTypeDb: item.projectCategory
}))
} else {
this.cProjectTypeDbList = []
}
if (this.newProofingRecordData.cProjectTypeDb && !this.cProjectTypeDbList.some(item => item.cProjectTypeDb === this.newProofingRecordData.cProjectTypeDb)) {
this.cProjectTypeDbList.push({ cProjectTypeDb: this.newProofingRecordData.cProjectTypeDb })
}
}).catch(() => {
this.cProjectTypeDbList = []
if (this.newProofingRecordData.cProjectTypeDb) {
this.cProjectTypeDbList.push({ cProjectTypeDb: this.newProofingRecordData.cProjectTypeDb })
}
})
},
// 获取基础数据列表S
getBaseList (val,type) {
@ -4114,18 +4154,28 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
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 === 'QC' || this.exportList[i].responsibleDepartment === 'R018') {
} else if (this.exportList[i].responsibleDepartment === 'QC' || this.exportList[i].responsibleDepartment === 'RQC' || this.exportList[i].responsibleDepartment === 'R018') {
if (this.exportList[i].qcEngineer !== null && this.exportList[i].qcEngineer !== '') {
this.exportList[i].projectLeader = this.exportList[i].qcEngineer.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'PE' || this.exportList[i].responsibleDepartment === 'R019') {
} else if (this.exportList[i].responsibleDepartment === 'PE' || this.exportList[i].responsibleDepartment === 'RPE' || this.exportList[i].responsibleDepartment === 'R019') {
if (this.exportList[i].peEngineer !== null && this.exportList[i].peEngineer !== '') {
this.exportList[i].projectLeader = this.exportList[i].peEngineer.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'EE' || this.exportList[i].responsibleDepartment === 'R020') {
} else if (this.exportList[i].responsibleDepartment === 'EE' || this.exportList[i].responsibleDepartment === 'REE' || this.exportList[i].responsibleDepartment === 'R020') {
if (this.exportList[i].eeEngineer !== null && this.exportList[i].eeEngineer !== '') {
this.exportList[i].projectLeader = this.exportList[i].eeEngineer.split("-")[1];
}
} else if (this.exportList[i].responsibleDepartment === 'SQE-ME' || this.exportList[i].responsibleDepartment === 'RSQEME') {
const sqeMe = this.exportList[i].sqemeEngineer;
if (sqeMe !== null && sqeMe !== '') {
this.exportList[i].projectLeader = this.splitUserDisplayName(sqeMe);
}
} else if (this.exportList[i].responsibleDepartment === 'SQE-EE' || this.exportList[i].responsibleDepartment === 'RSQEEE') {
const sqeEe = this.exportList[i].sqeeeEngineer;
if (sqeEe !== null && sqeEe !== '') {
this.exportList[i].projectLeader = this.splitUserDisplayName(sqeEe);
}
}
}
})
@ -4171,6 +4221,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
this.totalPage = data.page.totalCount
// 遍历dataList
this.dataList.forEach((item) => {
this.normalizeSqeEngineerFields(item)
item.projectManagerName = item.projectManager.split('-')[1]
item.projectOwnerName = item.projectOwner.split('-')[1]
item.engineerName = item.engineer.split('-')[1]
@ -4219,6 +4270,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
this.totalPage = data.page.totalCount
// 遍历dataList
this.dataList.forEach((item) => {
this.normalizeSqeEngineerFields(item)
item.projectManagerName = item.projectManager.split('-')[1]
item.projectOwnerName = item.projectOwner.split('-')[1]
item.engineerName = item.engineer.split('-')[1]
@ -4286,6 +4338,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
this.totalPage = data.page.totalCount
// 遍历dataList
this.dataList.forEach((item) => {
this.normalizeSqeEngineerFields(item)
item.projectManagerName = item.projectManager.split('-')[1]
item.projectOwnerName = item.projectOwner.split('-')[1]
item.engineerName = item.engineer.split('-')[1]
@ -4405,6 +4458,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
proofingClickRow(row){
row.proofingId = -1
this.proofingCurrentRow=JSON.parse(JSON.stringify(row));
this.normalizeSqeEngineerFields(this.proofingCurrentRow)
this.searchProjectDocumentTypeData.site = this.resolveCurrentPartSite(row.site)
},
/**
@ -4417,6 +4471,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
// 判断是否是获取焦点的事件
if (row) {
this.proofingCurrentRow = JSON.parse(JSON.stringify(row))
this.normalizeSqeEngineerFields(this.proofingCurrentRow)
this.searchProjectDocumentTypeData.site = this.resolveCurrentPartSite(row.site)
}
},
@ -4516,6 +4571,8 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
qcEngineer: row.qcEngineer,
peEngineer: row.peEngineer,
eeEngineer: row.eeEngineer,
sqemeEngineer: row.sqemeEngineer || '',
sqeeeEngineer: row.sqeeeEngineer || '',
finalPartNo: row.finalPartNo,
finalPartDesc: row.finalPartDesc,
// active: row.active,
@ -4587,6 +4644,8 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
qcEngineer: row.qcEngineer,
peEngineer: row.peEngineer,
eeEngineer: row.eeEngineer,
sqemeEngineer: row.sqemeEngineer || '',
sqeeeEngineer: row.sqeeeEngineer || '',
remark: '',
planStartDate : new Date(),
proofingNo: '',
@ -4595,6 +4654,7 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
createDate: '',
createBy: this.$store.state.user.name,
}
this.loadProofingProjectCategory(row.buNo, row.site)
this.visible = true
},
@ -4722,6 +4782,8 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
qcEngineer: row.qcEngineer,
peEngineer: row.peEngineer,
eeEngineer: row.eeEngineer,
sqemeEngineer: row.sqemeEngineer || '',
sqeeeEngineer: row.sqeeeEngineer || '',
buildDate: row.buildDate,
status: row.status,
partType: row.partType,
@ -4928,6 +4990,8 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
qcEngineer: row.qcEngineer,
peEngineer: row.peEngineer,
eeEngineer: row.eeEngineer,
sqemeEngineer: row.sqemeEngineer || '',
sqeeeEngineer: row.sqeeeEngineer || '',
buildDate: row.buildDate,
status: row.status,
partType: row.partType,
@ -5021,6 +5085,8 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
qcEngineer: this.proofingCurrentRow.qcEngineer,
peEngineer: this.proofingCurrentRow.peEngineer,
eeEngineer: this.proofingCurrentRow.eeEngineer,
sqemeEngineer: this.proofingCurrentRow.sqemeEngineer,
sqeeeEngineer: this.proofingCurrentRow.sqeeeEngineer,
// username:this.$store.state.user.name,
page: 1,
limit: 1000
@ -5032,7 +5098,8 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
showProofDetailModal(row) {
this.activeModalTab = 'proofRecord'
// 保存当前行数据
this.proofingCurrentRow = row;
this.proofingCurrentRow = JSON.parse(JSON.stringify(row));
this.normalizeSqeEngineerFields(this.proofingCurrentRow)
// 打开模态框
this.dialogVisible = true;
// 模态框打开后刷新 proofRecord 组件的数据
@ -5062,6 +5129,8 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
qcEngineer: this.proofingCurrentRow.qcEngineer,
peEngineer: this.proofingCurrentRow.peEngineer,
eeEngineer: this.proofingCurrentRow.eeEngineer,
sqemeEngineer: this.proofingCurrentRow.sqemeEngineer,
sqeeeEngineer: this.proofingCurrentRow.sqeeeEngineer,
// username:this.$store.state.user.name,
page: 1,
limit: 1000
@ -5317,18 +5386,28 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (this.proofingCurrentRow.cQualityEngineer7 != null && this.proofingCurrentRow.cQualityEngineer7 !== '') {
this.projectPartDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer7.split('-')[1] // 截取用户名
}
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'QC') {
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'QC' || this.projectPartDocumentList[i].responsibleDepartment === 'RQC') {
if (this.proofingCurrentRow.qcEngineer != null && this.proofingCurrentRow.qcEngineer !== '') {
this.projectPartDocumentList[i].projectLeader = this.proofingCurrentRow.qcEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'PE') {
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'PE' || this.projectPartDocumentList[i].responsibleDepartment === 'RPE') {
if (this.proofingCurrentRow.peEngineer != null && this.proofingCurrentRow.peEngineer !== '') {
this.projectPartDocumentList[i].projectLeader = this.proofingCurrentRow.peEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'EE') {
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'EE' || this.projectPartDocumentList[i].responsibleDepartment === 'REE') {
if (this.proofingCurrentRow.eeEngineer != null && this.proofingCurrentRow.eeEngineer !== '') {
this.projectPartDocumentList[i].projectLeader = this.proofingCurrentRow.eeEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'SQE-ME' || this.projectPartDocumentList[i].responsibleDepartment === 'RSQEME') {
const sqeMe = this.proofingCurrentRow.sqemeEngineer
if (sqeMe != null && sqeMe !== '') {
this.projectPartDocumentList[i].projectLeader = this.splitUserDisplayName(sqeMe)
}
} else if (this.projectPartDocumentList[i].responsibleDepartment === 'SQE-EE' || this.projectPartDocumentList[i].responsibleDepartment === 'RSQEEE') {
const sqeEe = this.proofingCurrentRow.sqeeeEngineer
if (sqeEe != null && sqeEe !== '') {
this.projectPartDocumentList[i].projectLeader = this.splitUserDisplayName(sqeEe)
}
}
else {
this.projectPartDocumentList[i].projectLeader = ''
@ -5488,18 +5567,28 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (this.proofingCurrentRow.cQualityEngineer7 != null && this.proofingCurrentRow.cQualityEngineer7 !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer7.split('-')[1] // 截取用户名
}
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'QC') {
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'QC' || this.projectOtherDocumentList[i].responsibleDepartment === 'RQC') {
if (this.proofingCurrentRow.qcEngineer != null && this.proofingCurrentRow.qcEngineer !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.qcEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'PE') {
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'PE' || this.projectOtherDocumentList[i].responsibleDepartment === 'RPE') {
if (this.proofingCurrentRow.peEngineer != null && this.proofingCurrentRow.peEngineer !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.peEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'EE') {
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'EE' || this.projectOtherDocumentList[i].responsibleDepartment === 'REE') {
if (this.proofingCurrentRow.eeEngineer != null && this.proofingCurrentRow.eeEngineer !== '') {
this.projectOtherDocumentList[i].projectLeader = this.proofingCurrentRow.eeEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'SQE-ME' || this.projectOtherDocumentList[i].responsibleDepartment === 'RSQEME') {
const sqeMe = this.proofingCurrentRow.sqemeEngineer
if (sqeMe != null && sqeMe !== '') {
this.projectOtherDocumentList[i].projectLeader = this.splitUserDisplayName(sqeMe)
}
} else if (this.projectOtherDocumentList[i].responsibleDepartment === 'SQE-EE' || this.projectOtherDocumentList[i].responsibleDepartment === 'RSQEEE') {
const sqeEe = this.proofingCurrentRow.sqeeeEngineer
if (sqeEe != null && sqeEe !== '') {
this.projectOtherDocumentList[i].projectLeader = this.splitUserDisplayName(sqeEe)
}
}
else {
this.projectOtherDocumentList[i].projectLeader = ''
@ -5770,18 +5859,28 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
if (this.proofingCurrentRow.cQualityEngineer7 != null && this.proofingCurrentRow.cQualityEngineer7 !== '') {
this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.cQualityEngineer7.split('-')[1] // 截取用户名
}
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'QC') {
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'QC' || this.projectAllDocumentList[i].responsibleDepartment === 'RQC') {
if (this.proofingCurrentRow.qcEngineer != null && this.proofingCurrentRow.qcEngineer !== '') {
this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.qcEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'PE') {
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'PE' || this.projectAllDocumentList[i].responsibleDepartment === 'RPE') {
if (this.proofingCurrentRow.peEngineer != null && this.proofingCurrentRow.peEngineer !== '') {
this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.peEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'EE') {
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'EE' || this.projectAllDocumentList[i].responsibleDepartment === 'REE') {
if (this.proofingCurrentRow.eeEngineer != null && this.proofingCurrentRow.eeEngineer !== '') {
this.projectAllDocumentList[i].projectLeader = this.proofingCurrentRow.eeEngineer.split('-')[1] // 截取用户名
}
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'SQE-ME' || this.projectAllDocumentList[i].responsibleDepartment === 'RSQEME') {
const sqeMe = this.proofingCurrentRow.sqemeEngineer
if (sqeMe != null && sqeMe !== '') {
this.projectAllDocumentList[i].projectLeader = this.splitUserDisplayName(sqeMe)
}
} else if (this.projectAllDocumentList[i].responsibleDepartment === 'SQE-EE' || this.projectAllDocumentList[i].responsibleDepartment === 'RSQEEE') {
const sqeEe = this.proofingCurrentRow.sqeeeEngineer
if (sqeEe != null && sqeEe !== '') {
this.projectAllDocumentList[i].projectLeader = this.splitUserDisplayName(sqeEe)
}
} else {
this.projectAllDocumentList[i].projectLeader = ''
}

Write Preview
Loading…
Cancel
Save