Browse Source

plm BM

master
ruanqi 2 years ago
parent
commit
2a3babb6e0
  1. 1
      src/api/sampleManagement/technicalSpecificationList.js
  2. 4
      src/views/modules/processManagement/processBindingInfo.vue
  3. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
  4. 13
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
  5. 15
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
  6. 102
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  7. 1
      src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
  8. 8
      src/views/modules/sys/dict-data-select.vue

1
src/api/sampleManagement/technicalSpecificationList.js

@ -113,3 +113,4 @@ export const deleteBMprintIndigoColor= data => createAPI(`/technicalSpecificatio
* @returns {*}
*/
export const issueChange= data => createAPI(`/technicalSpecification/issueChange`,'post',data)
export const submitChange= data => createAPI(`/technicalSpecification/submitChange`,'post',data)

4
src/views/modules/processManagement/processBindingInfo.vue

@ -1188,9 +1188,9 @@
}
} else if (row.menuId === '103002') { // BM
this.queryTableParam = {
tableType: 'plm_technical_specification_sheet',
tableType: 'plm_stepRole_base_bm',
passTable: [],
addTable: []
addTable: ['plm_technical_specification_sheet']
}
} else {
return

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

@ -417,8 +417,12 @@
},
searchTable(){
searchBMBom(this.searchData).then(({data}) => {
if(data&& data.code===0){
this.bomList = data.rows;
this.bomData = data.row;
} else {
this.$message.error(data.msg)
}
});
},
searchDetailTable(){

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

@ -2,6 +2,9 @@
<div class="mod-config">
<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 v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="saveData">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="saveData">驳回</el-button>
</el-form>
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-row :gutter="20">
@ -154,9 +157,9 @@
</el-row>
</el-form>
<el-form label-position="top" style="margin-top: 60px; margin-left: 0px;text-align:center">
<el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>
</el-form>
<!-- <el-form label-position="top" style="margin-top: 60px; margin-left: 0px;text-align:center">-->
<!-- <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>-->
<!-- </el-form>-->
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
@ -181,6 +184,10 @@
buNo:'',
},
ifDisableFlag:false,
baseForm:{
status:'',
isReject:'',
},
dataForm:{
materialType:'',
site: '',

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

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form :inline="true" label-position="top" style="margin-top: 1px; margin-left: 0px;" >
<el-form-item label="Process">
<dict-data-select v-model="sheetData.process" dict-type="bm_process" style="width: 120px"></dict-data-select>
<dict-data-select :site="searchData.site" v-if="searchData.site" v-model="sheetData.process" dict-type="bm_process" style="width: 120px"></dict-data-select>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(103,1)"><a herf="#">热转移打印人员</a></span>
@ -909,22 +909,25 @@
},
searchTable(){
tsdBasicInformationSearch(this.searchData).then(({data}) => {
if(data.row){
if(data&& data.code===0){
this.sheetData=data.row
}else {
this.$message.error(data.msg)
}
});
if(this.searchData.buNo==='RDC'){
searchBMRoutingDetail(this.searchData).then(({data}) => {
if(data&& data.code===0){
if(data.rows.length>0){
this.dataForm=data.rows[0]
}else {
this.dataForm.site=this.searchData.site
this.dataForm.codeNo=this.searchData.codeNo
}
}else {
this.$message.error(data.msg)
}
});
let inData = {
site: this.searchData.site,
@ -953,8 +956,12 @@
}else {
searchBMRoute(this.searchData).then(({data}) => {
if(data&& data.code===0){
this.tableData = data.rows;
this.routeData = data.row;
}else {
this.$message.error(data.msg)
}
});
}
},

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

@ -2,6 +2,9 @@
<div class="mod-config">
<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 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="rejectSubmit">驳回</el-button>
</el-form>
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-row :gutter="20">
@ -61,7 +64,7 @@
<el-row :gutter="20">
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'Process'">
<el-input v-model="dataForm.process" readonly style="" ></el-input>
<el-input v-model="dataForm.process" disabled style="" ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
@ -163,9 +166,6 @@
</el-row>
</el-form>
<el-form label-position="top" style="margin-top: 25px; margin-left: 0px;text-align:center">
<el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>
</el-form>
<el-dialog
width="530px"
title="报价员"
@ -225,7 +225,11 @@
searchTechnicalSpecificationTeamStr,
updateBMBasicInformation,
searchPartLastQuotationNo,
submitChange, //
} from "@/api/sampleManagement/technicalSpecificationList.js"
import {
getNodeAuthority, //
} from '@/api/changeManagement/changeManagement.js'
import {
searchOperatorWithSite,
} from "@/api/project/project.js"
@ -309,6 +313,9 @@
methods: {
// S
getBaseList (val, type) {
if(this.ifDisableFlag){
return false
}
this.tagNo = val
this.tagNo1 = type
this.$nextTick(() => {
@ -370,7 +377,6 @@
}
//
this.searchTable();
},
refresh(){
if(this.searchData.codeNo===''||this.searchData.codeNo===null){
@ -382,7 +388,11 @@
tsdBasicInformationSearch(this.searchData).then(({data}) => {
//
if (data && data.code == 0) {
this.getNodeAuthority(data.row)
this.dataForm = data.row
console.log(!this.ifDisableFlag)
console.log(this.dataForm.status === 'spz')
console.log(this.dataForm.status === 'spz'&&!this.ifDisableFlag)
this.$alert('刷新成功', '成功', {
confirmButtonText: '确定'
})
@ -432,6 +442,7 @@
//
if (data && data.code == 0) {
this.dataForm = data.row
this.getNodeAuthority(data.row)
let inData = {
site: this.dataForm.site,
codeNo: this.dataForm.codeNo,
@ -591,7 +602,88 @@
window.open('#/quotation-sellForQuotation');
}
},
//
getNodeAuthority (row) {
let tempData = {
site: row.site,
stepId: row.stepId,
menuId: '103002'
}
debugger
getNodeAuthority(tempData).then(({data}) => {
if (data && data.code === 0) {
let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm
let arr = plmStepRoleBaseBm.filter(a => a.fieldId === 'basicInformation')
if (arr.length > 0) {
if(arr[0].updateFlag==='N'){
this.ifDisableFlag=true
}else {
this.ifDisableFlag=false
}
}else {
this.ifDisableFlag=true
}
}
})
},
//
agreeSubmit () {
this.$confirm(`是否确认提交?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let tempData = {
site: this.searchData.site,
userName: this.$store.state.user.name,
codeNo: this.searchData.codeNo,
menuId: '103002',
nodeConclusion: 'Y'
}
this.submitData(tempData)
})
},
//
rejectSubmit () {
this.$confirm(`是否确认驳回?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let tempData = {
site: this.searchData.site,
userName: this.$store.state.user.name,
codeNo: this.searchData.codeNo,
menuId: '103002',
nodeConclusion: 'N'
}
this.submitData(tempData)
})
},
submitData (tempData) {
updateBMBasicInformation(this.dataForm).then(({data}) => {
if (data && data.code === 0) {
submitChange(tempData).then(({data}) => {
if (data && data.code === 0) {
this.$message({message: '操作成功', type: 'success'})
this.submitModalFlag = false
this.modalFlag = false
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
} else {
this.$message.error(data.msg)
}
})
},
},
}
</script>

1
src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue

@ -118,6 +118,7 @@
buNo:'',
username:this.$store.state.user.name,
type:'',
ifDisableFlag:false,
},
pageRole:'',
activeName:'baseInfo',

8
src/views/modules/sys/dict-data-select.vue

@ -40,6 +40,10 @@ export default {
disabledOptionsValue:{
type:Array,
default:()=>[],
},
site:{
type:String,
default:undefined,
}
},
data () {
@ -68,6 +72,10 @@ export default {
dictType:this.dictType,
dictTypeList: this.dictTypeList
}
if (this.site){
params.site = this.site
}
try {
//
let {data} = await selectDictDataList(params);

Loading…
Cancel
Save