diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index f500651..31e69ef 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -2812,7 +2812,7 @@ export default { }, activated() { - if (this.$route.params && this.$route.params.type && this.$route.params.type === 'quote'){ + if (this.$route.params && this.$route.params.type && this.$route.params.type === 'quote') { this.handleQueryBomByQuote(); } else if (this.$route.params.partNo) { this.searchData.plmPartNo = this.$route.params.partNo diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue index bbdef11..de0f2f0 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue @@ -4,16 +4,16 @@ - + - + - + - + @@ -23,10 +23,12 @@ - - - UL文件号/UL Product Model - + + UL文件号/UL Product Model + + + + UL文件号/UL Product Model @@ -352,7 +354,20 @@ DictDataSelect, Chooselist }, - + computed: { + plmTechnicalSpecificationSheetFlag () { + return (value) => { + if (!this.plmTechnicalSpecificationSheetArr) { + return 'N' + } + let arr = this.plmTechnicalSpecificationSheetArr.filter(a => a.fieldId === value) + if (arr.length > 0) { + return arr[0].updateFlag + } + return 'N' + } + }, + }, data() { return { pageIndex: 1, @@ -626,7 +641,6 @@ status:'', isReject:'', }, - spForm:{ sp:'', nodeName:'', @@ -634,6 +648,7 @@ ifDisableFlag:false, rejectOpinion: '', submitModalFlag: false, + plmTechnicalSpecificationSheetArr: [], } }, mounted () { @@ -659,20 +674,20 @@ /* 列表方法的回调 */ getBaseData (val) { if (this.tagNo === 1013) { - if(this.tagNo1==1) { + if (this.tagNo1 === 1) { this.dataForm.partType = val.Base_id this.dataForm.partTypeDesc = val.Base_desc } } }, - choosePart(row){ - this.dataForm.erpPartNo=row.erpPartNo - this.dataForm.familyId=row.familyId - this.dataForm.familyName=row.familyName - this.dataForm.partDesc=row.partDesc - this.dataForm.spec=row.spec - this.partModelFlag=false; + choosePart (row) { + this.dataForm.erpPartNo = row.erpPartNo + this.dataForm.familyId = row.familyId + this.dataForm.familyName = row.familyName + this.dataForm.partDesc = row.partDesc + this.dataForm.spec = row.spec + this.partModelFlag = false }, //初始化组件的参数 @@ -807,18 +822,19 @@ } getNodeAuthority(tempData).then(({data}) => { if (data && data.code === 0) { - this.ifDisableFlag = true - let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm - let arr = plmStepRoleBaseBm.filter(a => a.fieldId === this.searchData.fieldId) - if (arr.length > 0) { - if (arr[0].updateFlag === 'N') { - this.ifDisableFlag = true - } else { - this.ifDisableFlag = false - } - } else { - this.ifDisableFlag = true - } + // this.ifDisableFlag = true + // let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm + // let arr = plmStepRoleBaseBm.filter(a => a.fieldId === this.searchData.fieldId) + // if (arr.length > 0) { + // if (arr[0].updateFlag === 'N') { + // this.ifDisableFlag = true + // } else { + // this.ifDisableFlag = false + // } + // } else { + // this.ifDisableFlag = true + // } + this.plmTechnicalSpecificationSheetArr = data.rows.plm_technical_specification_sheet } }) } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue index d36c5ed..c184cdc 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue @@ -28,22 +28,35 @@ -
- - - -
-
- - - -
-
- - - - -
+ +
+ + + +
+ + +
+ + + +
+ + +
+ + + + +
+ @@ -51,91 +64,113 @@ -
- - - -
-
- - - -
-
- - - -
+ +
+ + + +
+ + +
+ + + +
+ + +
+ + + +
+ -
- - - -
-
- - - -
-
- - - -
-
- - - - - - -
+ +
+ + + +
+ + +
+ + + +
+ + +
+ + + +
+ + +
+ + + + + + +
+ -
- - - - -
+ +
+ + + + +
+ -
- - - - -
+ +
+ + + + +
+ -
- - - 附加客户图纸/Attach Customer Drawing(点击跳转) - - - -
+ +
+ + 附加客户图纸/Attach Customer Drawing(点击跳转) + + + + 附加客户图纸/Attach Customer Drawing(点击跳转) + + +
+ @@ -201,19 +236,22 @@ -
- - - - -
+ +
+ + + + +
+ @@ -233,7 +271,7 @@ 取消 - + @@ -258,26 +296,52 @@ DictDataSelect, Chooselist }, + computed: { + plmStepRoleBaseBmFlag () { + return (value) => { + if (!this.plmStepRoleBaseBmArr) { + return 'N' + } + let arr = this.plmStepRoleBaseBmArr.filter(a => a.fieldId === value) + if (arr.length > 0) { + return arr[0].updateFlag + } + return 'N' + } + }, + plmTechnicalSpecificationSheetFlag () { + return (value) => { + if (!this.plmTechnicalSpecificationSheetArr) { + return 'N' + } + let arr = this.plmTechnicalSpecificationSheetArr.filter(a => a.fieldId === value) + if (arr.length > 0) { + return arr[0].updateFlag + } + return 'N' + } + }, + }, data() { return { searchData: { site: '', username: this.$store.state.user.name, codeNo: '', - buNo:'', - fieldId:'', + buNo: '', + fieldId: '', }, - superAdmin:false, - ifDisableFlag:false, - baseForm:{ - status:'', - isReject:'', + superAdmin: false, + ifDisableFlag: false, + baseForm: { + status: '', + isReject: '', }, - spForm:{ - sp:'', - nodeName:'', + spForm: { + sp: '', + nodeName: '', }, - dataForm:{ + dataForm: { materialType:'', site: '', codeNo:'', @@ -316,7 +380,7 @@ }, rejectOpinion: '', submitModalFlag: false, - ossColumns:[ + ossColumns: [ { userId: this.$store.state.user.name, functionId: 5011, @@ -390,7 +454,9 @@ columnWidth: 140 } ], - submitLoading: false + submitLoading: false, + plmTechnicalSpecificationSheetArr: [], + plmStepRoleBaseBmArr: [] } }, methods: { @@ -448,15 +514,12 @@ getOADetailForBM(this.searchData).then(({data}) => { this.spForm.nodeName = data.row.nodeName this.spForm.sp = data.row.sp == null ? '' : data.row.sp - // console.log('审批人：'+this.spForm.sp) - // console.log('用户：'+this.searchData.username) - // console.log(this.spForm.sp.includes(this.searchData.username)) }) searchBMcustomerInfo(this.searchData).then(({data}) => { if (data.rows.length > 0) { this.dataForm = data.rows[0] this.$message.success( '操作成功') - }else { + } else { this.dataForm.site = this.searchData.site this.dataForm.codeNo = this.searchData.codeNo } @@ -503,8 +566,8 @@ // 获取流程的配置权限 getNodeAuthority (row) { getBMStatusDesc(this.searchData).then(({data}) => { - this.superAdmin=data.superAdmin - if(data.superAdmin){ + this.superAdmin = data.superAdmin + if (data.superAdmin) { this.ifDisableFlag = false return false } @@ -512,7 +575,7 @@ this.ifDisableFlag = true return false } - if(data.status === '审批中') { + if (data.status === '审批中') { let tempData = { site: row.site, stepId: row.stepId, @@ -520,18 +583,8 @@ } getNodeAuthority(tempData).then(({data}) => { if (data && data.code === 0) { - this.ifDisableFlag = true - let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm - let arr = plmStepRoleBaseBm.filter(a => a.fieldId === this.searchData.fieldId) - if (arr.length > 0) { - if (arr[0].updateFlag === 'N') { - this.ifDisableFlag = true - } else { - this.ifDisableFlag = false - } - } else { - this.ifDisableFlag = true - } + this.plmStepRoleBaseBmArr = data.rows.plm_stepRole_base_bm + this.plmTechnicalSpecificationSheetArr = data.rows.plm_technical_specification_sheet } }) } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue index 7625a55..e9522c7 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue @@ -266,8 +266,7 @@ message: '操作成功', type: 'success', duration: 1500, - onClose: () => { - } + onClose: () => {} }) this.$emit("closeModel") } else { @@ -305,8 +304,8 @@ // 获取流程的配置权限 getNodeAuthority (row) { getBMStatusDesc(this.searchData).then(({data}) => { - this.superAdmin=data.superAdmin - if(data.superAdmin){ + this.superAdmin = data.superAdmin + if (data.superAdmin) { this.ifDisableFlag = false return false } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index 5574af6..b9e3ee5 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -4,15 +4,25 @@ - + + - 热转移打印人员/Technician - + 热转移打印人员/Technician + 热转移打印人员/Technician + - 印刷人员/Technician - + 印刷人员/Technician + 印刷人员/Technician + 刷新 @@ -41,14 +51,14 @@ - +
- - + + - + - + - + - + - + + - + + - + - + - + - + - +
- + - + - + + - + - + + - + - + - + @@ -669,27 +712,41 @@ printFlexo, printIndigo, }, + computed: { + plmTechnicalSpecificationSheetFlag () { + return (value) => { + if (!this.plmTechnicalSpecificationSheetArr) { + return 'N' + } + let arr = this.plmTechnicalSpecificationSheetArr.filter(a => a.fieldId === value) + if (arr.length > 0) { + return arr[0].updateFlag + } + return 'N' + } + }, + }, data() { return { - spForm:{ - sp:'', - nodeName:'', + spForm: { + sp: '', + nodeName: '', }, - nowRoute:{}, + nowRoute: {}, //动态组件 selectedComponent: null, - routeData:{ + routeData: { site: '', - partNo:'', - alternativeNo:'', - routingType:'', - routingRevision:'', + partNo: '', + alternativeNo: '', + routingType: '', + routingRevision: '', }, - componentKey:0, - routeFlag:false, - routeModelFlag:false, - height:200, + componentKey: 0, + routeFlag: false, + routeModelFlag: false, + height: 200, searchData: { site: '', username: this.$store.state.user.name, @@ -1085,7 +1142,8 @@ tagNo1:'', rejectOpinion: '', submitModalFlag: false, - submitLoading: false + submitLoading: false, + plmTechnicalSpecificationSheetArr: [] } }, mounted () { @@ -1096,9 +1154,6 @@ methods: { // 获取基础数据列表S getBaseList (type) { - if (this.ifDisableFlag) { - return false - } this.tagNo1 = type this.$nextTick(() => { let strVal = '' @@ -1602,58 +1657,58 @@ break; } }, + searchDetailTable(){ searchRouteDetail(this.routeData).then(({data}) => { this.routeDetailList=data.rows; }); }, + changeRouteRev(){ this.searchDetailTable() this.currentRoute=null this.modalFlag=true; - }, + getRow(row){ this.currentRoute=row }, - updateBMProcess(){ + + updateBMProcess () { updateBMProcess(this.sheetData).then(({data}) => { if (data && data.code === 0) { this.$clearHighLight() tsdBasicInformationSearch(this.searchData).then(({data}) => { - if(data.row){ - this.sheetData=data.row - }else { - + if (data.row) { + this.sheetData = data.row } - - }); + }) this.$message.success('操作成功') } else { this.$message.error(data.msg) } }) }, - updateBMRouteRev(){ - if(this.currentRoute==null){ + updateBMRouteRev () { + if (this.currentRoute == null) { this.$alert('请点击选择Route版本！', '错误', { confirmButtonText: '确定' }) return false; } - if(this.currentRoute.status!=='Buildable'){ + if (this.currentRoute.status!=='Buildable') { this.$alert('只有Buildable状态的可以保存！', '错误', { confirmButtonText: '确定' }) return false; } - let inData={ - site:this.routeData.site, - codeNo:this.searchData.codeNo, - routingType:this.currentRoute.routingType, - routingRevision:this.currentRoute.routingRevision, - routingAlternativeNo:this.currentRoute.alternativeNo + let inData = { + site: this.routeData.site, + codeNo: this.searchData.codeNo, + routingType: this.currentRoute.routingType, + routingRevision: this.currentRoute.routingRevision, + routingAlternativeNo: this.currentRoute.alternativeNo } this.$confirm("更改工艺路线后，之前填写的工艺信息都将覆盖，是否继续？", '保存提示', { confirmButtonText: '确定', @@ -1661,8 +1716,8 @@ }).then(() => { updateBMRouteRev(inData).then(({data}) => { if (data && data.code === 0) { - this.searchTable(); - this.modalFlag = false; + this.searchTable() + this.modalFlag = false this.$message.success('操作成功') } else { this.$message.error(data.msg) @@ -1670,7 +1725,8 @@ }) }) }, - jumpRoute(){ + + jumpRoute () { if (this.routeData.routingRevision != null || this.routeData.routingRevision !== '') { this.$message.error("route明细不存在") } @@ -1683,11 +1739,12 @@ localStorage.setItem('routeData', JSON.stringify(inData)) window.open('#/part-routingManagement'); }, + // 获取流程的配置权限 getNodeAuthority (row) { getBMStatusDesc(this.searchData).then(({data}) => { - this.superAdmin=data.superAdmin - if(data.superAdmin){ + this.superAdmin = data.superAdmin + if (data.superAdmin) { this.ifDisableFlag = false return false } @@ -1703,18 +1760,19 @@ } getNodeAuthority(tempData).then(({data}) => { if (data && data.code === 0) { - this.ifDisableFlag = true - let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm - let arr = plmStepRoleBaseBm.filter(a => a.fieldId === this.searchData.fieldId) - if (arr.length > 0) { - if (arr[0].updateFlag === 'N') { - this.ifDisableFlag = true - } else { - this.ifDisableFlag = false - } - } else { - this.ifDisableFlag = true - } + // this.ifDisableFlag = true + // let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm + // let arr = plmStepRoleBaseBm.filter(a => a.fieldId === this.searchData.fieldId) + // if (arr.length > 0) { + // if (arr[0].updateFlag === 'N') { + // this.ifDisableFlag = true + // } else { + // this.ifDisableFlag = false + // } + // } else { + // this.ifDisableFlag = true + // } + this.plmTechnicalSpecificationSheetArr = data.rows.plm_technical_specification_sheet } }) } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index a176ca0..8d16415 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -94,7 +94,7 @@ - + @@ -103,7 +103,7 @@
- + @@ -118,33 +118,33 @@ - - - - - + + + + + - + - + - + - - + + - + - - + + @@ -153,7 +153,8 @@
- 客服人员/ CS + 客服人员/ CS + 客服人员/ CS
@@ -161,7 +162,8 @@
- 工程人员/Engineer + 工程人员/Engineer + 工程人员/Engineer
@@ -169,7 +171,8 @@
- 设计制图人员/Artwork + 设计制图人员/Artwork + 设计制图人员/Artwork
@@ -185,7 +188,8 @@
- 技术员/Technician + 技术员/Technician + 技术员/Technician
@@ -217,15 +221,19 @@
- 计划人员/Planner + 计划人员/Planner + 计划人员/Planner
- - + + 质检人员/CQC + + + 质检人员/CQC @@ -233,20 +241,23 @@
- - + + 首件检测/FAI + + + 首件检测/FAI - +
- - - - - + + 文件管控专员/DCC + + + 文件管控专员/DCC @@ -258,7 +269,7 @@
- +
@@ -267,7 +278,7 @@
- +
@@ -402,6 +413,32 @@ components: { ChooseUser }, + computed: { + plmTechnicalSpecificationSheetFlag () { + return (value) => { + if (!this.plmTechnicalSpecificationSheetArr) { + return 'N' + } + let arr = this.plmTechnicalSpecificationSheetArr.filter(a => a.fieldId === value) + if (arr.length > 0) { + return arr[0].updateFlag + } + return 'N' + } + }, + plmTechnicalSpecificationTeamArrFlag () { + return (value) => { + if (!this.plmTechnicalSpecificationTeamArr) { + return 'N' + } + let arr = this.plmTechnicalSpecificationTeamArr.filter(a => a.fieldId === value) + if (arr.length > 0) { + return arr[0].updateFlag + } + return 'N' + } + }, + }, data() { return { quotationNo:'', @@ -524,9 +561,9 @@ // 获取基础数据列表S getBaseList (type) { - if (this.ifDisableFlag) { - return false - } + // if (this.ifDisableFlag) { + // return false + // } this.tagNo1 = type this.$nextTick(() => { let strVal = '' @@ -1036,20 +1073,20 @@ } getNodeAuthority(tempData).then(({data}) => { if (data && data.code === 0) { - this.ifDisableFlag = true + //this.ifDisableFlag = true this.plmTechnicalSpecificationSheetArr = data.rows.plm_technical_specification_sheet this.plmTechnicalSpecificationTeamArr = data.rows.plm_technicalSpecification_team - 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 - } + // 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 + // } } }) } @@ -1239,9 +1276,6 @@ // Select Technical handleMpOperator () { - if (this.ifDisableFlag) { - return - } this.mpVisible = true this.mpOperatorList = [] this.queryUserInfoByBM('R021').then(({data}) => { @@ -1257,9 +1291,6 @@ // Select CQC handleCqcOperator () { - if (this.ifDisableFlag) { - return - } this.cqcVisible = true this.cqcOperatorList = [] this.queryUserInfoByBM('R008').then(({data}) => { @@ -1275,9 +1306,6 @@ // Select FAI handleFaiOperator () { - if (this.ifDisableFlag) { - return - } this.faiVisible = true this.faiOperatorList = [] this.queryUserInfoByBM('R009').then(({data}) => { @@ -1293,9 +1321,6 @@ // Select DCC dccChooseModal () { - if (this.ifDisableFlag) { - return false - } let inData = { site: this.dataForm.site, buNo: this.dataForm.buNo, diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 048daa2..d2d3f76 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -189,11 +189,13 @@
-
- - - -
+ + + + + + +