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

2025-08-07 1、增加CQE岗位角色 

2、在RDC的技术参数卡增加CQE人员的选择
           3、流程管理增加这个人员的出口配置
master
fengyuan_yang 5 months ago
parent
a112212971
commit
1ebea9c250
2 changed files with 110 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 118
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  2. 25
      src/views/modules/sampleManagement/technicalSpecificationList.vue

118
src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
View File

@ -64,16 +64,6 @@
<el-input :readonly="readonly" v-model="dataForm.partDesc" disabled></el-input> <el-input :readonly="readonly" v-model="dataForm.partDesc" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="3">-->
<!-- <el-form-item label="Rev No">-->
<!-- <el-input v-model="dataForm.rev" disabled></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="3">-->
<!-- <el-form-item label="Customer Rev">-->
<!-- <el-input v-model="dataForm.customerRev" disabled></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
@ -182,14 +172,6 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<!-- <el-col :span="6">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item >-->
<!-- <span slot="label" style="" @click="getBaseList(6)"><a herf="#">Select Technical</a></span>-->
<!-- <el-input v-model="dataForm.mpOperatorName" ref="mpOperatorName" placeholder="请选择人员" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item v-if="plmTechnicalSpecificationTeamArrFlag('mpOperatorList') === 'N'||readonly"> <el-form-item v-if="plmTechnicalSpecificationTeamArrFlag('mpOperatorList') === 'N'||readonly">
@ -202,30 +184,6 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="12"><div class="grid-content bg-purple">-->
<!-- <el-form-item >-->
<!-- <span slot="label" style="" @click="engineerChooseModal()"><a herf="#">Select PE Engineer</a></span>-->
<!-- <el-input v-model="dataForm.engineer" ref="engineer" readonly style="" @focus="engineerChooseModal()"></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="12"><div class="grid-content bg-purple">-->
<!-- <el-form-item >-->
<!-- <span slot="label" style="" @click="technicianModal()"><a herf="#">Select Artwork</a></span>-->
<!-- <el-input v-model="dataForm.technician" ref="technician" readonly style="" @focus="technicianModal()"></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="6">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item >-->
<!-- <span slot="label" style="" @click="getBaseList(3)"><a herf="#">PE人员</a></span>-->
<!-- <el-input v-model="dataForm.peOperaterName" ref="peOperaterName" placeholder="请选择人员" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item > <el-form-item >
@ -416,7 +374,7 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="3">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item> <el-form-item>
<span v-if="plmTechnicalSpecificationTeamArrFlag('technicianList') === 'N'||readonly" slot="label">设计制图人员/Artwork</span> <span v-if="plmTechnicalSpecificationTeamArrFlag('technicianList') === 'N'||readonly" slot="label">设计制图人员/Artwork</span>
@ -425,6 +383,15 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="3">
<div class="grid-content bg-purple">
<el-form-item>
<span v-if="plmTechnicalSpecificationTeamArrFlag('qualityEngineerList') === 'N'||readonly" slot="label">质量工程师/CQE</span>
<span v-else slot="label" @click="getBaseList(10)"><a herf="#">质量工程师/CQE</a></span>
<el-input :value="dataForm.qualityEngineer" ref="qualityEngineer" readonly placeholder="请选择人员"></el-input>
</el-form-item>
</div>
</el-col>
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item v-if="plmTechnicalSpecificationTeamArrFlag('mpOperatorList') === 'N'||readonly"> <el-form-item v-if="plmTechnicalSpecificationTeamArrFlag('mpOperatorList') === 'N'||readonly">
@ -1136,6 +1103,7 @@
quotationOfficerList: [], quotationOfficerList: [],
engineerList: [], engineerList: [],
technicianList: [], technicianList: [],
qualityEngineerList: [],
spForm: { spForm: {
sp:'', sp:'',
nodeName:'', nodeName:'',
@ -1190,6 +1158,7 @@
cqcOperatorList: [], cqcOperatorList: [],
faiOperatorList: [], faiOperatorList: [],
planOperatorList: [], planOperatorList: [],
qualityEngineerList: [],
dccList: '', dccList: '',
ecnNeedChangeDrawing: '', ecnNeedChangeDrawing: '',
documentSource: '', documentSource: '',
@ -1197,6 +1166,8 @@
shopOrder: '', shopOrder: '',
planOperator: '', planOperator: '',
planOperatorName: '', planOperatorName: '',
qualityEngineerNo: '',
qualityEngineer: ''
}, },
dataForm2: { dataForm2: {
stage: '', stage: '',
@ -1213,7 +1184,8 @@
planOperatorList: [], planOperatorList: [],
cqcOperatorList: [], cqcOperatorList: [],
faiOperatorList: [], faiOperatorList: [],
dccList: []
dccList: [],
qualityEngineerList: []
}, },
dataEntryForm: { dataEntryForm: {
remarkPage: '', remarkPage: '',
@ -1259,9 +1231,6 @@
// 获取基础数据列表S // 获取基础数据列表S
getBaseList (type) { getBaseList (type) {
// if (this.ifDisableFlag) {
// return false
// }
this.tagNo1 = type this.tagNo1 = type
this.$nextTick(() => { this.$nextTick(() => {
let strVal = '' let strVal = ''
@ -1294,6 +1263,10 @@
strVal = this.dataForm.planOperator strVal = this.dataForm.planOperator
roleId = 'R023' roleId = 'R023'
} }
if(type === 10) {
strVal = this.dataForm.qualityEngineerNo
roleId = 'R024'
}
this.$refs.baseList.init(this.searchData.site, this.searchData.buNo, strVal, roleId) this.$refs.baseList.init(this.searchData.site, this.searchData.buNo, strVal, roleId)
}) })
}, },
@ -1345,16 +1318,10 @@
if (this.tagNo1 === 7) { if (this.tagNo1 === 7) {
this.dataForm.engineerNo = val.username this.dataForm.engineerNo = val.username
this.dataForm.engineer = val.userDisplay this.dataForm.engineer = val.userDisplay
// this.$nextTick(() => {
// this.$triggerInputEvent(this.$refs.mpOperatorName);
// });
} }
if (this.tagNo1 === 8) { if (this.tagNo1 === 8) {
this.dataForm.technicianNo = val.username this.dataForm.technicianNo = val.username
this.dataForm.technician = val.userDisplay this.dataForm.technician = val.userDisplay
// this.$nextTick(() => {
// this.$triggerInputEvent(this.$refs.mpOperatorName);
// });
} }
if (this.tagNo1 === 9) { if (this.tagNo1 === 9) {
this.dataForm.planOperator = val.username this.dataForm.planOperator = val.username
@ -1363,6 +1330,11 @@
this.$triggerInputEvent(this.$refs.planOperatorName); this.$triggerInputEvent(this.$refs.planOperatorName);
}) })
} }
if (this.tagNo1 === 10) {
this.dataForm.qualityEngineerNo = val.username
this.dataForm.qualityEngineer = val.userDisplay
this.$forceUpdate(); // 强制组件重新渲染
}
}, },
// 初始化组件的参数 // 初始化组件的参数
@ -1433,6 +1405,16 @@
searchTechnicalSpecificationTeamStr(inData3).then(({data}) => { searchTechnicalSpecificationTeamStr(inData3).then(({data}) => {
this.dataForm.technicianList = data.rows this.dataForm.technicianList = data.rows
}) })
if (this.searchData.buNo === 'RDC') {
let inData7 = {
site: this.dataForm.site,
codeNo: this.dataForm.codeNo,
type: 'qualityEngineer',
}
searchTechnicalSpecificationTeamStr(inData7).then(({data}) => {
this.dataForm.qualityEngineerList = data.rows
})
}
let inData4 = { let inData4 = {
site: data.row.site, site: data.row.site,
productNo: data.row.finalPartNo, productNo: data.row.finalPartNo,
@ -1540,6 +1522,16 @@
searchTechnicalSpecificationTeamStr(inData3).then(({data}) => { searchTechnicalSpecificationTeamStr(inData3).then(({data}) => {
this.dataForm.technicianList = data.rows this.dataForm.technicianList = data.rows
}) })
if (this.searchData.buNo === 'RDC') {
let inData7 = {
site: this.dataForm.site,
codeNo: this.dataForm.codeNo,
type: 'qualityEngineer',
}
searchTechnicalSpecificationTeamStr(inData7).then(({data}) => {
this.dataForm.qualityEngineerList = data.rows
})
}
let inData4 = { let inData4 = {
site: data.row.site, site: data.row.site,
productNo: data.row.finalPartNo, productNo: data.row.finalPartNo,
@ -1699,6 +1691,10 @@
if (this.dataForm.planOperator !== '') { if (this.dataForm.planOperator !== '') {
this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
} }
this.dataForm.qualityEngineerList = []
if (this.dataForm.qualityEngineerNo !== '') {
this.dataForm.qualityEngineerList.push(this.dataForm.qualityEngineerNo) // CQE
}
this.$confirm("是否保存基本信息？", '保存提示', { this.$confirm("是否保存基本信息？", '保存提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -1733,6 +1729,10 @@
if (this.dataForm.planOperator !== '') { if (this.dataForm.planOperator !== '') {
this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
} }
this.dataForm.qualityEngineerList = []
if (this.dataForm.qualityEngineerNo !== '') {
this.dataForm.qualityEngineerList.push(this.dataForm.qualityEngineerNo) // CQE
}
updateBMBasicInformation(this.dataForm).then(({data}) => { updateBMBasicInformation(this.dataForm).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message.success( '操作成功') this.$message.success( '操作成功')
@ -1826,6 +1826,10 @@
if (this.dataForm.planOperator !== '') { if (this.dataForm.planOperator !== '') {
this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
} }
this.dataForm.qualityEngineerList = []
if (this.dataForm.qualityEngineerNo !== '') {
this.dataForm.qualityEngineerList.push(this.dataForm.qualityEngineerNo) // CQE
}
let tempData = { let tempData = {
...this.dataForm, ...this.dataForm,
site: this.searchData.site, site: this.searchData.site,
@ -1861,6 +1865,10 @@
if (this.dataForm.planOperator !== '') { if (this.dataForm.planOperator !== '') {
this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
} }
this.dataForm.qualityEngineerList = []
if (this.dataForm.qualityEngineerNo !== '') {
this.dataForm.qualityEngineerList.push(this.dataForm.qualityEngineerNo) // CQE
}
let tempData = { let tempData = {
...this.dataForm, ...this.dataForm,
site: this.searchData.site, site: this.searchData.site,
@ -1917,6 +1925,10 @@
if (this.dataForm.planOperator !== '') { if (this.dataForm.planOperator !== '') {
this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
} }
this.dataForm.qualityEngineerList = []
if (this.dataForm.qualityEngineerNo !== '') {
this.dataForm.qualityEngineerList.push(this.dataForm.qualityEngineerNo) // CQE
}
let tempData = { let tempData = {
...this.dataForm, ...this.dataForm,
site: this.searchData.site, site: this.searchData.site,

25
src/views/modules/sampleManagement/technicalSpecificationList.vue
View File

@ -215,28 +215,35 @@
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item :label="'客服人员'"> <el-form-item :label="'客服人员'">
<el-input v-model="infoData.csOperaterName" ref="csOperaterName" placeholder="未选择人员" readonly></el-input>
<el-input v-model="infoData.csOperaterName" placeholder="未选择人员" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item :label="'工程人员'"> <el-form-item :label="'工程人员'">
<el-input v-model="infoData.engineer" ref="peOperaterName" placeholder="未选择人员" readonly></el-input>
<el-input v-model="infoData.engineer" placeholder="未选择人员" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="6">
<el-col :span="3">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item :label="'设计制图人员'"> <el-form-item :label="'设计制图人员'">
<el-input v-model="infoData.technician" ref="csOperaterName" placeholder="未选择人员" readonly></el-input>
<el-input v-model="infoData.technician" placeholder="未选择人员" readonly></el-input>
</el-form-item>
</div>
</el-col>
<el-col :span="3">
<div class="grid-content bg-purple">
<el-form-item :label="'质量工程师'">
<el-input v-model="infoData.qualityEngineer" placeholder="未选择人员" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item :label="'技术员'"> <el-form-item :label="'技术员'">
<el-input v-model="infoData.mpOperatorName" ref="mpOperatorName" placeholder="未选择人员" readonly></el-input>
<el-input v-model="infoData.mpOperatorName" placeholder="未选择人员" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
@ -245,28 +252,28 @@
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item :label="'计划人员'"> <el-form-item :label="'计划人员'">
<el-input v-model="infoData.planOperatorName" ref="planOperatorName" placeholder="未选择人员" readonly></el-input>
<el-input v-model="infoData.planOperatorName" placeholder="未选择人员" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item :label="'质检人员'"> <el-form-item :label="'质检人员'">
<el-input v-model="infoData.cqcOperatorName" ref="dccOperaterName" placeholder="未选择人员" readonly></el-input>
<el-input v-model="infoData.cqcOperatorName" placeholder="未选择人员" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item :label="'首件检测'"> <el-form-item :label="'首件检测'">
<el-input v-model="infoData.faiOperatorName" ref="mpOperatorName" placeholder="未选择人员" readonly></el-input>
<el-input v-model="infoData.faiOperatorName" placeholder="未选择人员" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<div class="grid-content bg-purple"> <div class="grid-content bg-purple">
<el-form-item :label="'文件管控专员'"> <el-form-item :label="'文件管控专员'">
<el-input v-model="infoData.dccOperaterName" ref="dccOperaterName" placeholder="未选择人员" readonly></el-input>
<el-input v-model="infoData.dccOperaterName" placeholder="未选择人员" readonly></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>

Write Preview
Loading…
Cancel
Save