|
|
|
@ -277,7 +277,7 @@ |
|
|
|
<template #label> |
|
|
|
<span class="big-label">优先级</span> |
|
|
|
</template> |
|
|
|
<el-select v-model="modalData.priority" placeholder="请选择" clearable style="width: 151px"> |
|
|
|
<el-select v-model="modalData.priority" placeholder="请选择" clearable style="width: 150px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in priorityList" |
|
|
|
:key = "i.priority" |
|
|
|
@ -433,6 +433,12 @@ |
|
|
|
<el-input v-model="modalData.cQualityEngineer7Name" disabled style="width: 151px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: 20px;"> |
|
|
|
<el-form-item label="文档工程师2" prop="docEngineer2Name"> |
|
|
|
<span slot="label" style="" @click="docEngineer2Flag = true" class="big-label"><a herf="#">文档工程师2</a></span> |
|
|
|
<el-input v-model="modalData.docEngineer2Name" disabled style="width: 151px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-footer style="height:40px;margin-top: 10px;text-align:center"> |
|
|
|
<el-button type="primary" @click="saveData()">保存</el-button> |
|
|
|
<el-button @click="modalFlag = false">关闭</el-button> |
|
|
|
@ -868,6 +874,58 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<el-dialog title="文档工程师" @close="closeDocEngineer2InfoDialog" @open="openDocEngineer2InfoDialog" |
|
|
|
:visible.sync="docEngineer2Flag" width="559px" v-drag> |
|
|
|
<el-form inline="inline" label-position="top" :model="searchBusinessData8" style="margin-left: 7px;margin-top: |
|
|
|
-5px;"> |
|
|
|
<el-form-item label="用户账号"> |
|
|
|
<el-input v-model="searchBusinessData8.username" clearable style="width: 110px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="用户名"> |
|
|
|
<el-input v-model="searchBusinessData8.userDisplay" clearable style="width: 110px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="是否在用"> |
|
|
|
<el-select filterable v-model="searchBusinessData8.active" style="width: 140px"> |
|
|
|
<el-option label="是" value="Y"></el-option> |
|
|
|
<el-option label="否" value="N"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label=" "> |
|
|
|
<el-button type="primary" style="padding: 3px 12px" @click="searchBusinessInfoList8()">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
:height="height + 110" |
|
|
|
:data="businessDataList8" |
|
|
|
stripe |
|
|
|
highlight-current-row |
|
|
|
border |
|
|
|
@row-dblclick="docEngineer2RowDblclick" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
prop="username" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="用户账号"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="userDisplay" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="用户名"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="active" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="是否在用"> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
<el-footer style="height:40px;margin-top: 10px;text-align:center"> |
|
|
|
<el-button @click="docEngineer2Flag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<el-tabs style="height:100%; margin-top: 0px; width: 100%;" v-model="activeName" class="customer-tab" type="border-card" @tab-click="tabClick"> |
|
|
|
<el-tab-pane label="项目物料" name="projectPart"> |
|
|
|
<el-table |
|
|
|
@ -953,7 +1011,7 @@ import row from "element-ui/packages/row"; |
|
|
|
import 'moment/locale/zh-cn'; |
|
|
|
import {EventBus} from "../../../main"; |
|
|
|
import {queryCustomerList} from "../../../api/customer/customer"; |
|
|
|
import {searchBusinessInfo7} from "../../../api/factory/site"; |
|
|
|
import {searchBusinessInfo7, searchBusinessInfo8} from "../../../api/factory/site"; |
|
|
|
import {updateColumnSize} from "../../../api/table"; |
|
|
|
/*打样记录組件*/ |
|
|
|
|
|
|
|
@ -1036,6 +1094,7 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
businessDataList5: [], |
|
|
|
businessDataList6: [], |
|
|
|
businessDataList7: [], |
|
|
|
businessDataList8: [], |
|
|
|
dataList: [], |
|
|
|
selectTypeFlag: [], |
|
|
|
projectPartList: [], |
|
|
|
@ -1055,6 +1114,7 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
FQC1Flag:false, |
|
|
|
MFGlag:false, |
|
|
|
docEngineerFlag:false, |
|
|
|
docEngineer2Flag:false, |
|
|
|
newCustomerFlag:false, |
|
|
|
modalData:{ |
|
|
|
flag:'', |
|
|
|
@ -1099,12 +1159,15 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
cManufactureEngineerName:'', |
|
|
|
docEngineer:'', |
|
|
|
docEngineerName:'', |
|
|
|
docEngineer2:'', |
|
|
|
docEngineer2Name:'', |
|
|
|
engineer:'', |
|
|
|
engineerName:'', |
|
|
|
ipqcHardTag:'', |
|
|
|
ipqcHardTagName:'', |
|
|
|
cQualityEngineer7:'', |
|
|
|
cQualityEngineer7Name:'', |
|
|
|
|
|
|
|
//projectCreationDate为当前服务器的时间 |
|
|
|
projectCreationDate: new Date(), |
|
|
|
finalPartNo:'', |
|
|
|
@ -1188,6 +1251,15 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
page: 1, |
|
|
|
limit: 10, |
|
|
|
}, |
|
|
|
searchBusinessData8:{ |
|
|
|
site: this.$store.state.user.site, |
|
|
|
username: '', |
|
|
|
roleDesc: '', |
|
|
|
userDisplay: '', |
|
|
|
active: '', |
|
|
|
page: 1, |
|
|
|
limit: 10, |
|
|
|
}, |
|
|
|
activeName: 'projectPart', |
|
|
|
// 展示列集 |
|
|
|
columnList: [ |
|
|
|
@ -1551,6 +1623,24 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120, |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 401003, |
|
|
|
serialNumber: '401003Table1DocEngineer2', |
|
|
|
tableId: "401003Table1", |
|
|
|
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: 401003, |
|
|
|
@ -2040,6 +2130,24 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120, |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 401003, |
|
|
|
serialNumber: '401003Table2DocEngineer2', |
|
|
|
tableId: "401003Table2", |
|
|
|
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: 401003, |
|
|
|
@ -2859,6 +2967,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.cQualityEngineer5 !== null && item.cQualityEngineer5 !== '') { |
|
|
|
item.cQualityEngineer5Name = item.cQualityEngineer5.split('-')[1]; |
|
|
|
} |
|
|
|
@ -2892,6 +3003,10 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
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 === 'R011') { |
|
|
|
if (this.exportList[i].cQualityEngineer4 !== null && this.exportList[i].cQualityEngineer4 !== '') { |
|
|
|
this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer4.split("-")[1]; |
|
|
|
@ -2975,6 +3090,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] |
|
|
|
} |
|
|
|
@ -3050,6 +3168,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] |
|
|
|
} |
|
|
|
@ -3203,6 +3324,8 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
cManufactureEngineerName: '', |
|
|
|
docEngineer: '', |
|
|
|
docEngineerName: '', |
|
|
|
docEngineer2: '', |
|
|
|
docEngineer2Name: '', |
|
|
|
ipqcHardTag: '', |
|
|
|
ipqcHardTagName: '', |
|
|
|
cQualityEngineer7: '', |
|
|
|
@ -3252,6 +3375,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, |
|
|
|
@ -3272,6 +3396,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] // 截取用户名 |
|
|
|
} |
|
|
|
@ -3433,6 +3560,7 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
cQualityEngineer6: this.modalData.cQualityEngineer6, |
|
|
|
cManufactureEngineer: this.modalData.cManufactureEngineer, |
|
|
|
docEngineer: this.modalData.docEngineer, |
|
|
|
docEngineer2: this.modalData.docEngineer2, |
|
|
|
ipqcHardTag: this.modalData.ipqcHardTag, |
|
|
|
cQualityEngineer7: this.modalData.cQualityEngineer7, |
|
|
|
projectCreationDate: this.modalData.projectCreationDate, |
|
|
|
@ -3507,6 +3635,7 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
cQualityEngineer6: this.modalData.cQualityEngineer6, |
|
|
|
cManufactureEngineer: this.modalData.cManufactureEngineer, |
|
|
|
docEngineer: this.modalData.docEngineer, |
|
|
|
docEngineer2: this.modalData.docEngineer2, |
|
|
|
ipqcHardTag: this.modalData.ipqcHardTag, |
|
|
|
cQualityEngineer7: this.modalData.cQualityEngineer7, |
|
|
|
projectCreationDate: this.modalData.projectCreationDate, |
|
|
|
@ -3585,6 +3714,7 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
cQualityEngineer6: this.modalData.cQualityEngineer6, |
|
|
|
cManufactureEngineer: this.modalData.cManufactureEngineer, |
|
|
|
docEngineer: this.modalData.docEngineer, |
|
|
|
docEngineer2: this.modalData.docEngineer2, |
|
|
|
ipqcHardTag: this.modalData.ipqcHardTag, |
|
|
|
cQualityEngineer7: this.modalData.cQualityEngineer7, |
|
|
|
projectCreationDate: this.modalData.projectCreationDate, |
|
|
|
@ -3797,6 +3927,13 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
searchBusinessInfoList8 () { |
|
|
|
searchBusinessInfo8(this.searchBusinessData8).then(({data}) => { |
|
|
|
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] // 截取用户名 |
|
|
|
} |
|
|
|
|
jiayang yue
5 months ago