|
|
|
@ -13,14 +13,15 @@ |
|
|
|
<el-form-item label=" " > |
|
|
|
<el-checkbox v-model="jumpFlag">保存后跳转至详情</el-checkbox> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item prop="testPartNo" :rules="dataRole.testPartNo" style="margin-left: 12px"> |
|
|
|
<span slot="label" style="" @click="getBaseList(134,1)" ><a herf="#">项目料号</a></span> |
|
|
|
<el-input v-model="dataForm.testPartNo" @change="changeTestDesc" style="width: 130px" :disabled="dataForm.id!=0" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
<!-- <el-form-item prop="testPartNo" style="margin-left: 12px" :label="'正式料号'">--> |
|
|
|
<!--<!– <span slot="label" style="" @click="getBaseList(134,1)" ><a herf="#">正式料号</a></span>–>--> |
|
|
|
<!-- <el-input v-model="dataForm.testPartNo" @change="changeTestDesc" style="width: 130px" disabled ></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole"> |
|
|
|
<el-form-item :label="'PLM料号'"> |
|
|
|
<el-input v-model="dataForm.finalPartNo" style="width: 130px" disabled></el-input> |
|
|
|
<el-form-item :rules="dataRole.testPartNo"> |
|
|
|
<span slot="label" style="" @click="choosePartModel()"><a herf="#">正式料号</a></span> |
|
|
|
<el-input v-model="dataForm.finalPartNo" style="width: 130px" readonly></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'项目号'"> |
|
|
|
<el-input v-model="dataForm.projectId" style="width: 130px" disabled></el-input> |
|
|
|
@ -38,6 +39,8 @@ |
|
|
|
<el-form-item :label="'版本号'" prop="revNo" :rules="dataRole.revNo"> |
|
|
|
<el-input v-model="dataForm.revNo" style="width: 130px" :disabled="dataForm.id!=0" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole"> |
|
|
|
<el-form-item > |
|
|
|
<span slot="label" style="" @click="getUserList(1)"><a herf="#">CQC人员</a></span> |
|
|
|
<el-input v-model="dataForm.cqcOperatorName" ref="cqcOperatorName" placeholder="请选择人员" readonly style="width: 130px" ></el-input> |
|
|
|
@ -50,22 +53,29 @@ |
|
|
|
<!-- <span slot="label" style="" @click="quotationOfficerChooseModal()"><a herf="#">报价员</a></span>--> |
|
|
|
<!-- <el-input v-model="dataForm.quotationOfficer" readonly style="width: 274px" @focus="quotationOfficerChooseModal()"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" > |
|
|
|
<el-form-item > |
|
|
|
<span slot="label" style="" @click="engineerChooseModal()"><a herf="#">Select PE Engineer</a></span> |
|
|
|
<el-input v-model="dataForm.engineer" readonly style="width: 274px" @focus="engineerChooseModal()"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<!-- </el-form>--> |
|
|
|
<!-- <el-form :inline="true" label-position="top" label-width="100px" >--> |
|
|
|
<el-form-item > |
|
|
|
<span slot="label" style="" @click="technicianModal()"><a herf="#">Select Artwork</a></span> |
|
|
|
<el-input v-model="dataForm.technician" readonly style="width: 274px" @focus="technicianModal()"></el-input> |
|
|
|
<span slot="label" style="" @click="getUserList(7)"><a herf="#">Select PE Engineer</a></span> |
|
|
|
<el-input v-model="dataForm.engineer" readonly style="width: 130px" placeholder="请选择人员" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole"> |
|
|
|
<el-form-item > |
|
|
|
<span slot="label" style="" @click="getUserList(3)"><a herf="#">PE人员</a></span> |
|
|
|
<el-input v-model="dataForm.peOperaterName" ref="peOperaterName" placeholder="请选择人员" readonly style="width: 130px" ></el-input> |
|
|
|
<span slot="label" style="" @click="getUserList(8)"><a herf="#">Select Artwork</a></span> |
|
|
|
<el-input v-model="dataForm.technician" readonly style="width: 130px" placeholder="请选择人员" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
<!-- <el-form-item >--> |
|
|
|
<!-- <span slot="label" style="" @click="engineerChooseModal()"><a herf="#">Select PE Engineer</a></span>--> |
|
|
|
<!-- <el-input v-model="dataForm.engineer" readonly style="width: 130px" @focus="engineerChooseModal()"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- 274px--> |
|
|
|
<!-- <el-form-item >--> |
|
|
|
<!-- <span slot="label" style="" @click="technicianModal()"><a herf="#">Select Artwork</a></span>--> |
|
|
|
<!-- <el-input v-model="dataForm.technician" readonly style="width: 130px" @focus="technicianModal()"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- <el-form-item >--> |
|
|
|
<!-- <span slot="label" style="" @click="getUserList(3)"><a herf="#">PE人员</a></span>--> |
|
|
|
<!-- <el-input v-model="dataForm.peOperaterName" ref="peOperaterName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<el-form-item > |
|
|
|
<span slot="label" style="" @click="getUserList(4)"><a herf="#">CS人员</a></span> |
|
|
|
<el-input v-model="dataForm.csOperaterName" ref="csOperaterName" placeholder="请选择人员" readonly style="width: 130px" ></el-input> |
|
|
|
@ -231,7 +241,75 @@ |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-dialog> |
|
|
|
<el-dialog |
|
|
|
width="700px" |
|
|
|
title="选择物料" |
|
|
|
:close-on-click-modal="false" |
|
|
|
:visible.sync="partModelFlag"> |
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" > |
|
|
|
<el-form-item style="margin-left: 0px" label="项目编码"> |
|
|
|
|
|
|
|
<el-input v-model="partSearch.projectId" style="width: 130px" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item style="margin-left: 0px" label="正式料号"> |
|
|
|
<el-input v-model="partSearch.finalPartNo" style="width: 130px" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item style="margin-left: 0px" label="项目料号"> |
|
|
|
<el-input v-model="partSearch.testPartNo" style="width: 130px" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item style="margin-left: 0px" label="物料描述"> |
|
|
|
<el-input v-model="partSearch.partDesc" style="width: 130px" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label=" "> |
|
|
|
<el-button type="primary" @click="refreshPartList()">{{'查询'}}</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
height="450" |
|
|
|
:data="partList" |
|
|
|
border |
|
|
|
@row-dblclick="choosePartNo" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
prop="finalPartNo" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="120" |
|
|
|
style="font-size: 20px" |
|
|
|
label="正式料号"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="testPartNo" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="120" |
|
|
|
style="font-size: 20px" |
|
|
|
label="项目料号"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="projectId" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="120" |
|
|
|
style="font-size: 20px" |
|
|
|
label="项目编码"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="customerPartNo" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="120" |
|
|
|
label="客户料号"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="partDesc" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="120" |
|
|
|
label="物料名称"> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> |
|
|
|
<ChooseUser ref="userList" @getBaseData="getUserData"></ChooseUser> |
|
|
|
@ -247,6 +325,7 @@ |
|
|
|
searchTechnicalSpecificationTeamStr, |
|
|
|
getTestPartChangeData, |
|
|
|
getProofingDataByUserRole, |
|
|
|
getFinalPartData, |
|
|
|
} from "@/api/sampleManagement/technicalSpecificationList.js" |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist' |
|
|
|
import ChooseUser from '@/views/modules/common/ChooseUser' |
|
|
|
@ -284,6 +363,8 @@ |
|
|
|
quotationOfficerList:[], |
|
|
|
engineerList:[], |
|
|
|
technicianList:[], |
|
|
|
engineerNo:'', |
|
|
|
technicianNo:'', |
|
|
|
oriCodeNo:'', |
|
|
|
cqcOperator:'', |
|
|
|
faiOperator:'', |
|
|
|
@ -306,6 +387,14 @@ |
|
|
|
site:this.$store.state.user.site, |
|
|
|
username:this.$store.state.user.name, |
|
|
|
}, |
|
|
|
partSearch:{ |
|
|
|
projectId:'', |
|
|
|
finalPartNo:'', |
|
|
|
testPartNo:'', |
|
|
|
partDesc:'', |
|
|
|
site:this.$store.state.user.site, |
|
|
|
username:this.$store.state.user.name, |
|
|
|
}, |
|
|
|
quotationOfficerList:[], |
|
|
|
engineerList:[], |
|
|
|
technicianList:[], |
|
|
|
@ -349,6 +438,8 @@ |
|
|
|
}, |
|
|
|
proofingList:[], |
|
|
|
proofingModelFlag:false, |
|
|
|
partList:[], |
|
|
|
partModelFlag:false, |
|
|
|
} |
|
|
|
}, |
|
|
|
created () { |
|
|
|
@ -378,7 +469,12 @@ |
|
|
|
if(type==6) { |
|
|
|
strVal = this.dataForm.mpOperator |
|
|
|
} |
|
|
|
|
|
|
|
if(type==7) { |
|
|
|
strVal = this.dataForm.engineerNo |
|
|
|
} |
|
|
|
if(type==8) { |
|
|
|
strVal = this.dataForm.technicianNo |
|
|
|
} |
|
|
|
this.$refs.userList.init(this.$store.state.user.site,'%%', strVal) |
|
|
|
}) |
|
|
|
}, |
|
|
|
@ -427,6 +523,20 @@ |
|
|
|
// this.$triggerInputEvent(this.$refs.mpOperatorName); |
|
|
|
// }); |
|
|
|
} |
|
|
|
if(this.tagNo1==7) { |
|
|
|
this.dataForm.engineerNo = val.username |
|
|
|
this.dataForm.engineer = val.userDisplay |
|
|
|
// this.$nextTick(() => { |
|
|
|
// this.$triggerInputEvent(this.$refs.mpOperatorName); |
|
|
|
// }); |
|
|
|
} |
|
|
|
if(this.tagNo1==8) { |
|
|
|
this.dataForm.technicianNo = val.username |
|
|
|
this.dataForm.technician = val.userDisplay |
|
|
|
// this.$nextTick(() => { |
|
|
|
// this.$triggerInputEvent(this.$refs.mpOperatorName); |
|
|
|
// }); |
|
|
|
} |
|
|
|
}, |
|
|
|
// 获取基础数据列表S |
|
|
|
getBaseList (val, type) { |
|
|
|
@ -598,6 +708,8 @@ |
|
|
|
mpOperatorName:'', |
|
|
|
mpOperator:'', |
|
|
|
oriCodeNo:'', |
|
|
|
engineerNo:'', |
|
|
|
technicianNo:'', |
|
|
|
} |
|
|
|
this.visible = true |
|
|
|
} |
|
|
|
@ -620,6 +732,27 @@ |
|
|
|
|
|
|
|
this.proofingModelFlag=true |
|
|
|
}, |
|
|
|
|
|
|
|
choosePartModel(){ |
|
|
|
this.partSearch={ |
|
|
|
projectId:'', |
|
|
|
finalPartNo:'', |
|
|
|
partDesc:'', |
|
|
|
testPartNo:'', |
|
|
|
site:this.$store.state.user.site, |
|
|
|
username:this.$store.state.user.name, |
|
|
|
} |
|
|
|
getFinalPartData(this.partSearch).then(({data}) => { |
|
|
|
this.partList=data.rows |
|
|
|
}) |
|
|
|
|
|
|
|
this.partModelFlag=true |
|
|
|
}, |
|
|
|
refreshPartList(){ |
|
|
|
getFinalPartData(this.partSearch).then(({data}) => { |
|
|
|
this.partList=data.rows |
|
|
|
}) |
|
|
|
}, |
|
|
|
refreshProofingList(){ |
|
|
|
getProofingDataByUserRole(this.proofingSearch).then(({data}) => { |
|
|
|
this.proofingList=data.rows |
|
|
|
@ -643,6 +776,13 @@ |
|
|
|
this.changeProofingNo(row) |
|
|
|
}) |
|
|
|
}, |
|
|
|
choosePartNo(row){ |
|
|
|
this.dataForm.projectId=row.projectId |
|
|
|
this.dataForm.testPartNo=row.testPartNo |
|
|
|
this.dataForm.partDesc=row.partDesc |
|
|
|
this.dataForm.finalPartNo=row.finalPartNo |
|
|
|
this.partModelFlag=false |
|
|
|
}, |
|
|
|
chooseProofingNo(row){ |
|
|
|
this.dataForm.proofingNo=row.proofingNo |
|
|
|
this.dataForm.projectId=row.projectId |
|
|
|
@ -655,11 +795,9 @@ |
|
|
|
getTestPartChangeData(inData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
if(data.row!=null){ |
|
|
|
this.dataForm.projectId=data.row.projectId |
|
|
|
this.dataForm.partDesc=data.row.partDesc |
|
|
|
this.dataForm.finalPartNo=data.row.finalPartNo |
|
|
|
}else { |
|
|
|
this.dataForm.projectId='' |
|
|
|
this.dataForm.partDesc='' |
|
|
|
} |
|
|
|
|
|
|
|
@ -757,6 +895,10 @@ |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
this.dataForm.engineerList = []; |
|
|
|
this.dataForm.engineerList.push(this.dataForm.engineerNo); |
|
|
|
this.dataForm.technicianList = []; |
|
|
|
this.dataForm.technicianList.push(this.dataForm.technicianNo); |
|
|
|
saveTechnicalSpecificationSheet(this.dataForm).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.$message.success( '操作成功') |
|
|
|
|