Browse Source

plm BMM

master
ruanqi 1 year ago
parent
commit
bd750ad34e
  1. 1
      src/api/sampleManagement/technicalSpecificationList.js
  2. 78
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  3. 2
      src/views/modules/sys/user.vue
  4. 14
      src/views/modules/tooling/searchToolApply.vue
  5. 11
      src/views/modules/tooling/toolingInfo.vue

1
src/api/sampleManagement/technicalSpecificationList.js

@ -35,6 +35,7 @@ export const deleteBMTPInfoColor= data => createAPI(`/technicalSpecification/del
export const searchBMTPInfoCut= data => createAPI(`/technicalSpecification/searchBMTPInfoCut`,'post',data) export const searchBMTPInfoCut= data => createAPI(`/technicalSpecification/searchBMTPInfoCut`,'post',data)
export const saveBMTPInfoCut= data => createAPI(`/technicalSpecification/saveBMTPInfoCut`,'post',data) export const saveBMTPInfoCut= data => createAPI(`/technicalSpecification/saveBMTPInfoCut`,'post',data)
export const deleteBMTPInfoCut= data => createAPI(`/technicalSpecification/deleteBMTPInfoCut`,'post',data) export const deleteBMTPInfoCut= data => createAPI(`/technicalSpecification/deleteBMTPInfoCut`,'post',data)
export const searchBMUser= data => createAPI(`/technicalSpecification/searchBMUser`,'post',data)
export const searchBMPrepressDetail= data => createAPI(`/technicalSpecification/searchBMPrepressDetail`,'post',data) export const searchBMPrepressDetail= data => createAPI(`/technicalSpecification/searchBMPrepressDetail`,'post',data)

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

@ -176,10 +176,14 @@
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
<el-col :span="6"><div class="grid-content bg-purple"> <el-col :span="6"><div class="grid-content bg-purple">
<el-form-item >
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">DCC人员</a></span>
<el-input v-model="dataForm.dccOperaterName" ref="dccOperaterName" placeholder="请选择人员" readonly style="" ></el-input>
</el-form-item>
<!-- <el-form-item >-->
<!-- <span slot="label" style="" @click="getBaseList(5)"><a herf="#">DCC人员</a></span>-->
<!-- <el-input v-model="dataForm.dccOperaterName" ref="dccOperaterName" placeholder="请选择人员" readonly style="" ></el-input>-->
<!-- </el-form-item>-->
<el-form-item >
<span slot="label" style="" @click="dccChooseModal()"><a herf="#">DCC人员</a></span>
<el-input v-model="dataForm.dcc" ref="dcc" readonly style="" @focus="dccChooseModal()"></el-input>
</el-form-item>
</div></el-col> </div></el-col>
<el-col :span="6"><div class="grid-content bg-purple"> <el-col :span="6"><div class="grid-content bg-purple">
<el-form-item > <el-form-item >
@ -265,6 +269,23 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog
width="530px"
title="DCC人员"
:close-on-click-modal="false"
:visible.sync="dccFlag">
<el-transfer v-model="dccList" class="rq" filterable :props="{
key: 'operatorId',
label: 'operatorName'
}" :data="operatorList" :titles="['未选择', '已选择']"></el-transfer>
<span slot="footer" class="dialog-footer">
<div style="margin-top: 5px">
<el-button type="primary" @click="savetDccList()">确定</el-button>
<el-button @click="dccFlag = false" type="primary">取消</el-button>
</div>
</span>
</el-dialog>
<ChooseUser ref="baseList" @getBaseData="getBaseData"></ChooseUser> <ChooseUser ref="baseList" @getBaseData="getBaseData"></ChooseUser>
<!-- 提交 --> <!-- 提交 -->
@ -289,6 +310,7 @@
updateBMBasicInformation, updateBMBasicInformation,
searchPartLastQuotationNo,getBMStatusDesc,getOADetailForBM, searchPartLastQuotationNo,getBMStatusDesc,getOADetailForBM,
submitChange, issueChange, // // submitChange, issueChange, // //
searchBMUser,
} from "@/api/sampleManagement/technicalSpecificationList.js" } from "@/api/sampleManagement/technicalSpecificationList.js"
import { import {
getNodeAuthority, // getNodeAuthority, //
@ -314,7 +336,9 @@
quotationOfficerFlag:false, quotationOfficerFlag:false,
engineerFlag:false, engineerFlag:false,
technicianFlag:false, technicianFlag:false,
dccFlag:false,
operatorList:[], operatorList:[],
dccList:[],
quotationOfficerList:[], quotationOfficerList:[],
engineerList:[], engineerList:[],
technicianList:[], technicianList:[],
@ -322,6 +346,7 @@
sp:'', sp:'',
nodeName:'', nodeName:'',
}, },
dataForm:{ dataForm:{
nodeName:'', nodeName:'',
process:'', process:'',
@ -364,6 +389,8 @@
dccOperaterName:'', dccOperaterName:'',
engineerNo:'', engineerNo:'',
technicianNo:'', technicianNo:'',
dcc:'',
dccList:'',
}, },
dataRole: { dataRole: {
partTypeDesc: [ partTypeDesc: [
@ -546,6 +573,14 @@
this.quotationNo = data.rows[0].quotationNo this.quotationNo = data.rows[0].quotationNo
} }
}) })
let inData5 = {
site: this.dataForm.site,
codeNo: this.dataForm.codeNo,
type: 'dcc',
}
searchTechnicalSpecificationTeamStr(inData5).then(({data}) => {
this.dataForm.dccList = data.rows
})
} else { } else {
this.dataList = ''; this.dataList = '';
this.$alert('刷新失败请重新打开技术参数卡', '失败', { this.$alert('刷新失败请重新打开技术参数卡', '失败', {
@ -597,6 +632,14 @@
this.quotationNo = data.rows[0].quotationNo this.quotationNo = data.rows[0].quotationNo
} }
}) })
let inData5 = {
site: this.dataForm.site,
codeNo: this.dataForm.codeNo,
type: 'dcc',
}
searchTechnicalSpecificationTeamStr(inData5).then(({data}) => {
this.dataForm.dccList = data.rows
})
} else { } else {
this.dataList = ''; this.dataList = '';
} }
@ -643,7 +686,20 @@
this.engineerList = JSON.parse(JSON.stringify(this.dataForm.engineerList)); this.engineerList = JSON.parse(JSON.stringify(this.dataForm.engineerList));
this.engineerFlag=true this.engineerFlag=true
}, },
dccChooseModal(){
if(this.ifDisableFlag){
return false
}
let inData={
site:this.dataForm.site,
buNo:this.dataForm.buNo,
}
searchBMUser(inData).then(({data}) => {
this.operatorList=data.rows
})
this.dccList = JSON.parse(JSON.stringify(this.dataForm.dccList));
this.dccFlag=true
},
saveEngineerList(){ saveEngineerList(){
let engineerName=''; let engineerName='';
for (let i = 0; i < this.engineerList.length; i++) { for (let i = 0; i < this.engineerList.length; i++) {
@ -682,6 +738,18 @@
this.dataForm.technicianList=JSON.parse(JSON.stringify(this.technicianList)); this.dataForm.technicianList=JSON.parse(JSON.stringify(this.technicianList));
this.technicianFlag=false this.technicianFlag=false
}, },
savetDccList(){
let dccName='';
for (let i = 0; i < this.dccList.length; i++) {
let select= this.operatorList.filter(item => item.operatorId === this.dccList[i])
if(select.length>0){
dccName+=select[0].operatorName+';'
}
}
this.dataForm.dcc=dccName
this.dataForm.dccList=JSON.parse(JSON.stringify(this.dccList));
this.dccFlag=false
},
saveData(){ saveData(){
this.dataForm.engineerList = []; this.dataForm.engineerList = [];
this.dataForm.engineerList.push(this.dataForm.engineerNo); this.dataForm.engineerList.push(this.dataForm.engineerNo);

2
src/views/modules/sys/user.vue

@ -427,7 +427,7 @@
width="600px" width="600px"
title="功能清单" title="功能清单"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="functionFlag">
:visible.sync ="functionFlag">
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"> <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
用户 <el-input v-model="selectUser.username" style="width: 130px" readonly></el-input> 用户 <el-input v-model="selectUser.username" style="width: 130px" readonly></el-input>
名称 <el-input v-model="selectUser.userDisplay" style="width: 130px" readonly></el-input> 名称 <el-input v-model="selectUser.userDisplay" style="width: 130px" readonly></el-input>

14
src/views/modules/tooling/searchToolApply.vue

@ -208,7 +208,7 @@
<el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'总成本'"> <el-form-item :label="'总成本'">
<el-input v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
<el-input v-field="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'申请人'" required="required"> <el-form-item :label="'申请人'" required="required">
<el-input v-model="dataForm.applyBy" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applyBy" style="width: 130px" disabled></el-input>
@ -354,7 +354,7 @@
<el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'总成本'"> <el-form-item :label="'总成本'">
<el-input v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
<el-input v-field="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'申请人'" required="required"> <el-form-item :label="'申请人'" required="required">
<el-input v-model="dataForm.applyBy" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applyBy" style="width: 130px" disabled></el-input>
@ -1382,6 +1382,7 @@
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.height = window.innerHeight - 520; this.height = window.innerHeight - 520;
this.fieldColumn()
}) })
}, },
methods: { methods: {
@ -1845,7 +1846,7 @@
} }
this.modelFlag=true this.modelFlag=true
}, },
changeSum() {
changeSum(row) {
if(row.standardCost<0||row.standardCost==null||row.standardCost==''){ if(row.standardCost<0||row.standardCost==null||row.standardCost==''){
row.standardCost=0 row.standardCost=0
// this.$alert('', '', { // this.$alert('', '', {
@ -2063,6 +2064,13 @@
} }
}) })
}, },
fieldColumn(){
if(!this.accessField('10601001')){
this.columnList2=this.columnList2.filter(item => item.columnProp !== 'standardCost');
this.columnList1=this.columnList1.filter(item => item.columnProp !== 'totalCost');
}
},
}, },
activated() { activated() {
if (this.$route.params.type === 'tokenLogin') { if (this.$route.params.type === 'tokenLogin') {

11
src/views/modules/tooling/toolingInfo.vue

@ -93,7 +93,7 @@
<el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'总成本'"> <el-form-item :label="'总成本'">
<el-input v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
<el-input v-field="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'申请人'" required="required"> <el-form-item :label="'申请人'" required="required">
<el-input v-model="dataForm.applyBy" style="width: 130px" ></el-input> <el-input v-model="dataForm.applyBy" style="width: 130px" ></el-input>
@ -160,7 +160,7 @@
</el-table-column> </el-table-column>
<el-table-column label="工具成本" width="70" prop="standardCost" show-overflow-tooltip> <el-table-column label="工具成本" width="70" prop="standardCost" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本"
<el-input v-field="accessField('10601001')" v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本"
style="width:98%"></el-input> style="width:98%"></el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -850,6 +850,13 @@
return s return s
}, },
fieldColumn(){
if(!this.accessField('10601001')){
this.columnList2=this.columnList2.filter(item => item.columnProp !== 'standardCost');
}
},
}, },
} }
</script> </script>

Loading…
Cancel
Save