rq 1 year ago
parent
commit
0532688dd4
  1. 2
      src/api/sampleManagement/technicalSpecificationList.js
  2. 184
      src/views/modules/sampleManagement/com_technical-add-or-update.vue
  3. 18
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
  4. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
  5. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
  6. 64
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  7. 7
      src/views/modules/sampleManagement/technicalSpecificationList.vue

2
src/api/sampleManagement/technicalSpecificationList.js

@ -118,3 +118,5 @@ export const submitChange= data => createAPI(`/technicalSpecification/submitChan
export const getBMStatusDesc= data => createAPI(`/technicalSpecification/getBMStatusDesc`,'post',data)
export const getFinalPartData= data => createAPI(`/technicalSpecification/getFinalPartData`,'post',data)

184
src/views/modules/sampleManagement/com_technical-add-or-update.vue

@ -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="'正式料号'">-->
<!--&lt;!&ndash; <span slot="label" style="" @click="getBaseList(134,1)" ><a herf="#">正式料号</a></span>&ndash;&gt;-->
<!-- <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( '操作成功')

18
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue

@ -2,7 +2,7 @@
<div class="mod-config" v-highlight-container>
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-button type="primary" @click="refresh()" >刷新数据</el-button>
<el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>
<el-button type="primary" @click="saveData()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
<el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
</el-form>
@ -40,22 +40,22 @@
<el-input v-model="dataForm.partDesc" disabled style="" ></el-input>
</el-form-item>
</div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'客户版本/Customer Rev.'">
<el-input v-model="dataForm.customerRevNo" disabled style="" ></el-input>
<el-input v-model="dataForm.customerRevNo" :disabled="ifDisableFlag" style="" ></el-input>
</el-form-item>
</div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'图号/Drawing Number'">
<el-input v-model="dataForm.materialNumber" disabled style="" ></el-input>
<el-input v-model="dataForm.materialNumber" :disabled="ifDisableFlag" style="" ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'需要的认证/Certificates Needed'">
<el-input v-model="dataForm.certification" disabled style="" ></el-input>
<el-input v-model="dataForm.certification" :disabled="ifDisableFlag" style="" ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
@ -80,7 +80,7 @@
maxlength="120"
show-word-limit
:disabled="ifDisableFlag"
style="height: 60px" disabled>
style="height: 60px" >
</el-input>
</el-form-item>
</div></el-col>
@ -96,7 +96,7 @@
maxlength="120"
show-word-limit
:disabled="ifDisableFlag"
style="height: 60px" disabled>
style="height: 60px" >
</el-input>
</el-form-item>
</div></el-col>

4
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue

@ -8,9 +8,9 @@
<el-input v-model="searchData.propertiesCodeNo" readonly style="width: 150px" ></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="refreshBMPageModal()" v-if="!ifDisableFlag">更新模板</el-button>
<el-button type="primary" @click="refreshBMPageModal()" v-if="!ifDisableFlag&&isAuth('103002:bmModel')">更新模板</el-button>
<el-button type="primary" @click="searchTable()" >刷新数据</el-button>
<el-button type="primary" @click="saveTable()" v-if="!ifDisableFlag">保存数据</el-button>
<el-button type="primary" @click="saveTable()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存数据</el-button>
<el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
</el-form-item>

4
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue

@ -13,7 +13,7 @@
<el-input v-model="sheetData.printOperatorName" ref="printOperatorName" placeholder="请选择人员" readonly style="width: 120px" ></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="updateBMProcess()" v-if="!ifDisableFlag">保存</el-button>
<el-button type="primary" @click="updateBMProcess()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
<el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
</el-form-item>
@ -194,7 +194,7 @@
width="60"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="bmModel(scope.row)" v-if="!ifDisableFlag">填写</a>
<a type="text" size="small" @click="bmModel(scope.row)" v-if="!ifDisableFlag&&isAuth('103002:bmRoute')">填写</a>
</template>
</el-table-column>
<el-table-column

64
src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue

@ -2,7 +2,7 @@
<div class="mod-config" v-highlight-container>
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-button type="primary" @click="refresh()" >刷新数据</el-button>
<el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>
<el-button type="primary" @click="saveData()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
<el-button v-if="dataForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="dataForm.status === 'spz' && dataForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
</el-form>
@ -99,6 +99,9 @@
<el-input @focus="jumpPage('B')" ref="jumpB" class="blue-input" v-model="dataForm.proofingNo" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item >
<span slot="label" style="" @click="getBaseList(1)"><a herf="#">CQC人员</a></span>
@ -111,24 +114,34 @@
<el-input v-model="dataForm.faiOperatorName" ref="faiOperatorName" placeholder="请选择人员" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"><div class="grid-content bg-purple">
<el-col :span="6"><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>
<span slot="label" style="" @click="getBaseList(7)"><a herf="#">Select PE Engineer</a></span>
<el-input v-model="dataForm.engineer" readonly placeholder="请选择人员" ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="12"><div class="grid-content bg-purple">
<el-col :span="6"><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>
<span slot="label" style="" @click="getBaseList(8)"><a herf="#">Select Artwork</a></span>
<el-input v-model="dataForm.technician" readonly placeholder="请选择人员" ></el-input>
</el-form-item>
</div></el-col>
</el-row>
<!-- </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-row :gutter="20">
<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>
@ -323,6 +336,8 @@
csOperaterName:'',
dccOperater:'',
dccOperaterName:'',
engineerNo:'',
technicianNo:'',
},
dataRole: {
partTypeDesc: [
@ -372,7 +387,12 @@
if(type==6) {
strVal = this.dataForm.mpOperator
}
if(type==7) {
strVal = this.dataForm.engineerNo
}
if(type==8) {
strVal = this.dataForm.technicianNo
}
this.$refs.baseList.init(this.searchData.site,this.searchData.buNo, strVal)
})
},
@ -421,6 +441,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);
// });
}
},
//
init(inData) {
@ -617,6 +651,10 @@
this.technicianFlag=false
},
saveData(){
this.dataForm.engineerList = [];
this.dataForm.engineerList.push(this.dataForm.engineerNo);
this.dataForm.technicianList = [];
this.dataForm.technicianList.push(this.dataForm.technicianNo);
this.$confirm("是否保存基本信息?", '保存提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

7
src/views/modules/sampleManagement/technicalSpecificationList.vue

@ -8,7 +8,7 @@
<el-input v-model="searchData.oriCodeNo" style="width: 130px"></el-input>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(105,1)"><a herf="#">测试料号</a></span>
<span slot="label" style="" @click="getBaseList(105,1)"><a herf="#">正式料号</a></span>
<el-input v-model="searchData.testPartNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'状态'">
@ -65,8 +65,9 @@
label="操作">
<template slot-scope="scope">
<!-- <a type="text" size="small" @click="addRevModel(scope.row)" v-if="scope.row.statusDesc!=='已完成'">升版</a>-->
<a type="text" size="small" @click="jumpDetail(scope.row)">详情</a>
<a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)" v-if="scope.row.statusDesc!=='已完成'">修改</a>
<a type="text" size="small" v-if="scope.row.statusDesc==='已完成'" @click="jumpDetail(scope.row)">详情</a>
<a type="text" size="small" v-if="scope.row.statusDesc!=='已完成'" @click="jumpDetail(scope.row)">修改</a>
<!-- <a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)" v-if="scope.row.statusDesc!=='已完成'">修改</a>-->
<a type="text" size="small" @click="deleteData(scope.row)" v-if="scope.row.statusDesc!=='已完成'">删除</a>
<a type="text" size="small" v-if="scope.row.status === 'cg'" @click="issueModal(scope.row)">下达</a>
</template>

Loading…
Cancel
Save