diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index ad1e326..a0a90da 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -90,6 +90,7 @@ export const deleteBMPrintingColor= data => createAPI(`/technicalSpecification/d export const upBMRevNo= data => createAPI(`/technicalSpecification/upBMRevNo`,'post',data) export const searchBMBomDetail= data => createAPI(`/technicalSpecification/searchBMBomDetail`,'post',data) export const updateBMBomRev= data => createAPI(`/technicalSpecification/updateBMBomRev`,'post',data) +export const updateBMProcessBom= data => createAPI(`/technicalSpecification/updateBMProcessBom`,'post',data) export const searchRouteDetail= data => createAPI(`/technicalSpecification/searchRouteDetail`,'post',data) diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index 29be6e4..dc1e1e1 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -3089,7 +3089,12 @@ temp.push(itemB) } }) - this.chooseItemList2 = temp + this.chooseItemList2 = temp.map(item => { + if (item.availableValueList.length > 0) { + item.chooseValue = item.availableValueList[0].availableValue + } + return item + }) this.chooseModelFlag2 = false }, diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue index fef1a01..ba8206a 100644 --- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue +++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue @@ -65,6 +65,10 @@ + Select Planner + + + Select CQC @@ -464,6 +468,9 @@ customerRev: '', mpOperatorList: [], csOperatorList: [], + planOperator: '', + planOperatorName: '', + planOperatorList: [], }, dccList:'', dccFlag:false, @@ -582,6 +589,10 @@ strVal = this.dataForm.technicianNo roleId = 'R014' } + if(type === 9) { + strVal = this.dataForm.planOperator + roleId = 'R023' + } this.$refs.userList.init(this.$store.state.user.site,this.dataForm.buNo!==''?this.dataForm.buNo:'%%', strVal,roleId) }) }, @@ -644,6 +655,10 @@ // this.$triggerInputEvent(this.$refs.mpOperatorName); // }); } + if(this.tagNo1 === 9) { + this.dataForm.planOperator = val.username + this.dataForm.planOperatorName = val.userDisplay + } }, // 获取基础数据列表S getBaseList (val, type) { @@ -856,6 +871,9 @@ customerRev: '', mpOperatorList: [], csOperatorList: [], + planOperator: '', + planOperatorName: '', + planOperatorList: [], } // 获取DCCList this.visible = true @@ -1094,6 +1112,8 @@ this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork this.dataForm.csOperatorList = [] this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS + this.dataForm.planOperatorList = [] + this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner this.saveLoading = true saveTechnicalSpecificationSheet(this.dataForm).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue index cf3815b..8a75c6b 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue @@ -3,26 +3,30 @@ - - - - - - - - - - - - - - 刷新 - 变更 - 跳转至BOM - 同意 - 驳回 - - + + + + + + + + + + + + + + + + + 刷新 + 变更 + 跳转至BOM + 保存数据 + 同意 + 驳回 + +
@@ -165,16 +169,20 @@ searchBMBom, searchBMBomDetail, updateBMBomRev, - tsdBasicInformationSearch,getBMStatusDesc, + tsdBasicInformationSearch, + getBMStatusDesc, submitChange, // 提交 getOADetailForBM, + updateBMProcessBom, // 保存数据 } from "@/api/sampleManagement/technicalSpecificationList.js" import { getNodeAuthority, // 获取节点权限 } from '@/api/changeManagement/changeManagement.js' import Chooselist from '@/views/modules/common/Chooselist' + import DictDataSelect from "../../sys/dict-data-select-highlight"; export default { components: { + DictDataSelect, Chooselist }, @@ -197,6 +205,7 @@ alternativeNo:'', bomType:'', engChgLevel:'', + urlFile: '' }, currentRow:"", bomList:[], @@ -515,18 +524,18 @@ }) return false; } - if (this.currentRow.status!=='Buildable') { + if (this.currentRow.status !== 'Buildable') { this.$alert('只有Buildable状态的可以保存！', '错误', { confirmButtonText: '确定' }) return false; } let inData = { - site:this.bomData.site, - codeNo:this.searchData.codeNo, - bomType:this.currentRow.bomType, - engChgLevel:this.currentRow.engChgLevel, - bomAlternativeNo:this.currentRow.alternativeNo + site: this.bomData.site, + codeNo: this.searchData.codeNo, + bomType: this.currentRow.bomType, + engChgLevel: this.currentRow.engChgLevel, + bomAlternativeNo: this.currentRow.alternativeNo } updateBMBomRev(inData).then(({data})=>{ if(data&& data.code===0){ @@ -602,6 +611,23 @@ }) }, + // 修改表单数据 + updateBMProcess () { + let inData = { + site: this.bomData.site, + codeNo: this.searchData.codeNo, + urlFile: this.bomData.urlFile + } + updateBMProcessBom(inData).then(({data})=>{ + if (data&& data.code === 0) { + this.searchTable() + this.$message.success( '操作成功') + } else { + this.$message.error(data.msg) + } + }) + }, + // 同意提交 agreeSubmit () { this.$confirm(`是否确认提交?`, '提示', { diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index 7a728d4..35a1fa1 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -481,8 +481,8 @@ documentSource: '', copyFlag: '', shopOrder: '', - planOperator:'', - planOperatorName:'', + planOperator: '', + planOperatorName: '', }, dataRole: { partTypeDesc: [