diff --git a/src/api/base/properties.js b/src/api/base/properties.js index 55eaf8a..ca8f92f 100644 --- a/src/api/base/properties.js +++ b/src/api/base/properties.js @@ -20,6 +20,7 @@ export const getItemLists = data => createAPI(`/properties/getItemLists`,'post', export const deleteModalDetail = data => createAPI(`/properties/deleteModalDetail`,'post',data) export const saveItemAvailable = data => createAPI(`/properties/saveItemAvailable`,'post',data) export const deleteItemAvailable = data => createAPI(`/properties/deleteItemAvailable`,'post',data) +export const getPartItemWithPartNo = data => createAPI(`/plm/partInformation/getPartItemWithPartNo`,'post',data) export const getItemModal = data => createAPI(`/properties/getItemModal`,'post',data) diff --git a/src/views/modules/common/ChooseUser.vue b/src/views/modules/common/ChooseUser.vue new file mode 100644 index 0000000..a0b7d70 --- /dev/null +++ b/src/views/modules/common/ChooseUser.vue @@ -0,0 +1,214 @@ + + + + diff --git a/src/views/modules/proofing/profingFile.vue b/src/views/modules/proofing/profingFile.vue new file mode 100644 index 0000000..f584888 --- /dev/null +++ b/src/views/modules/proofing/profingFile.vue @@ -0,0 +1,205 @@ + + + + + diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index 6fb7062..15c8fad 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -238,7 +238,7 @@ CS - + @@ -247,7 +247,7 @@ NPI工程师 - + @@ -269,7 +269,7 @@ - + @@ -495,7 +495,7 @@ - + @@ -919,6 +919,7 @@ + @@ -2519,6 +2520,7 @@ export default { * 客户信息新增/编辑 */ saveData() { + this.$refs.modalForm.validate((valid) => { if (!valid) { this.validateDataValue() @@ -2527,6 +2529,22 @@ export default { this.$message.warning('请选择项目料号') return } + if(this.modalData.trackerName==''||this.modalData.trackerName==null){ + this.$message.warning('请选择CS') + return + } + if(this.modalData.engineerName==''||this.modalData.engineerName==null){ + this.$message.warning('请选择NPI工程师') + return + } + if(this.modalData.approverName==''||this.modalData.approverName==null){ + this.$message.warning('请选择Approver') + return + } + if(this.delegateAccessName==''||this.delegateAccessName==null){ + this.$message.warning('请选择DelegateAccess') + return + } this.confirmProjectPart(); // 将选中的 人员信息添加到请求 this.modalData.delegateAccessList = this.selectionDelegateAccess 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 269dcc2..e469d1f 100644 --- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue +++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue @@ -15,7 +15,7 @@ 测试料号 - + @@ -36,20 +36,20 @@ - - - - 报价员 - + + + + + - 工程师 + Select PE Engineer - 技术员 + Select Artwork diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue index 65e561e..ffde020 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue @@ -144,6 +144,7 @@ } //初始化参数 this.searchData = JSON.parse(JSON.stringify(inData)); + if(this.searchData.ifDisableFlag){ this.ifDisableFlag=true } @@ -157,6 +158,7 @@ }, searchTable(){ searchBMPropertiesValue(this.searchData).then(({data}) => { + this.tableData = data.rows; }); searchBMPropertiesHeaderForBM(this.searchData).then(({data}) => { @@ -252,7 +254,9 @@ if (arr[0].updateFlag === 'N') { this.ifDisableFlag = true } else { - this.ifDisableFlag = false + if(!this.searchData.ifDisableFlag){ + this.ifDisableFlag = false + } } } else { this.ifDisableFlag = true diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue index 73f3de3..687c4bf 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue @@ -76,7 +76,6 @@ //刷新表格 this.searchData.type='PackageInfo' this.$refs.PackageInfo.init(JSON.parse(JSON.stringify(this.searchData))) - }, }, diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue index 2180598..7dda0b2 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printing.vue @@ -261,7 +261,6 @@ this.searchTable(); this.colorSearch(); //刷新表格 - console.log(this.searchData) this.searchData.type='printing' this.$refs.printing.init(JSON.parse(JSON.stringify(this.searchData))) }, diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index 2aea29c..9759c81 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -5,11 +5,11 @@ - 热转移打印人员 + 热转移打印人员 - 印刷人员 + 印刷人员 @@ -428,7 +428,7 @@ 取消 - + @@ -448,7 +448,7 @@ import { getNodeAuthority, // 获取节点权限 } from '@/api/changeManagement/changeManagement.js' - import Chooselist from '@/views/modules/common/Chooselist' + import ChooseUser from '@/views/modules/common/ChooseUser' import { searchOperatorWithSite, } from "@/api/project/project.js" @@ -474,7 +474,7 @@ export default { components: { DictDataSelect, - Chooselist, + ChooseUser, prepress, printing, printOther, @@ -875,43 +875,42 @@ }, methods: { // 获取基础数据列表S - getBaseList (val, type) { + getBaseList ( type) { if(this.ifDisableFlag){ return false } - this.tagNo = val this.tagNo1 = type this.$nextTick(() => { let strVal = '' - if (val === 103) { + if(type==1) { strVal = this.sheetData.overPrintOperator } if(type==2) { strVal = this.sheetData.printOperator } - } - this.$refs.baseList.init(val, strVal) + + this.$refs.baseList.init(this.searchData.site,this.searchData.buNo, strVal) }) }, /* 列表方法的回调 */ getBaseData (val) { - if (this.tagNo === 103) { - if(this.tagNo1==1) { - this.sheetData.overPrintOperator = val.username - this.sheetData.overPrintOperatorName = val.user_display - this.$nextTick(() => { - this.$triggerInputEvent(this.$refs.overPrintOperatorName); - }); - } - if(this.tagNo1==2) { - this.sheetData.printOperator = val.username - this.sheetData.printOperatorName = val.user_display - this.$nextTick(() => { - this.$triggerInputEvent(this.$refs.printOperatorName); - }); - } + + if(this.tagNo1==1) { + this.sheetData.overPrintOperator = val.username + this.sheetData.overPrintOperatorName = val.userDisplay + this.$nextTick(() => { + this.$triggerInputEvent(this.$refs.overPrintOperatorName); + }); } + if(this.tagNo1==2) { + this.sheetData.printOperator = val.username + this.sheetData.printOperatorName = val.userDisplay + this.$nextTick(() => { + this.$triggerInputEvent(this.$refs.printOperatorName); + }); + } + }, @@ -988,7 +987,6 @@ } }, closeModel(){ - console.log('666') this.routeModelFlag=false; }, //根据itemType diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index 95f44cb..405911a 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -101,13 +101,13 @@
- CQC人员 + CQC人员
- FAI人员 + FAI人员
@@ -131,25 +131,25 @@ @@ -231,7 +231,7 @@ - + @@ -249,10 +249,10 @@ import { searchOperatorWithSite, } from "@/api/project/project.js" - import Chooselist from '@/views/modules/common/Chooselist' + import ChooseUser from '@/views/modules/common/ChooseUser' export default { components: { - Chooselist + ChooseUser }, data() { return { @@ -331,15 +331,14 @@ }, methods: { // 获取基础数据列表S - getBaseList (val, type) { + getBaseList (type) { if(this.ifDisableFlag){ return false } - this.tagNo = val this.tagNo1 = type this.$nextTick(() => { let strVal = '' - if (val === 103) { + if(type==1) { strVal = this.dataForm.cqcOperator } @@ -358,55 +357,54 @@ if(type==6) { strVal = this.dataForm.mpOperator } - } - this.$refs.baseList.init(val, strVal) + + this.$refs.baseList.init(this.searchData.site,this.searchData.buNo, strVal) }) }, /* 列表方法的回调 */ getBaseData (val) { - if (this.tagNo === 103) { + if(this.tagNo1==1) { this.dataForm.cqcOperator = val.username - this.dataForm.cqcOperatorName = val.user_display + this.dataForm.cqcOperatorName = val.userDisplay this.$nextTick(() => { this.$triggerInputEvent(this.$refs.cqcOperatorName); }); } if(this.tagNo1==2) { this.dataForm.faiOperator = val.username - this.dataForm.faiOperatorName = val.user_display + this.dataForm.faiOperatorName = val.userDisplay this.$nextTick(() => { this.$triggerInputEvent(this.$refs.faiOperatorName); }); } if(this.tagNo1==3) { this.dataForm.peOperater = val.username - this.dataForm.peOperaterName = val.user_display + this.dataForm.peOperaterName = val.userDisplay this.$nextTick(() => { this.$triggerInputEvent(this.$refs.peOperaterName); }); } if(this.tagNo1==4) { this.dataForm.csOperater = val.username - this.dataForm.csOperaterName = val.user_display + this.dataForm.csOperaterName = val.userDisplay this.$nextTick(() => { this.$triggerInputEvent(this.$refs.csOperaterName); }); } if(this.tagNo1==5) { this.dataForm.dccOperater = val.username - this.dataForm.dccOperaterName = val.user_display + this.dataForm.dccOperaterName = val.userDisplay this.$nextTick(() => { this.$triggerInputEvent(this.$refs.dccOperaterName); }); } if(this.tagNo1==6) { this.dataForm.mpOperator = val.username - this.dataForm.mpOperatorName = val.user_display + this.dataForm.mpOperatorName = val.userDisplay this.$nextTick(() => { this.$triggerInputEvent(this.$refs.mpOperatorName); }); - } } }, //初始化组件的参数 diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue index 017fa62..31b6a85 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue @@ -158,7 +158,7 @@ }else if(this.activeName == 'bom'){ this.getBom(); }else if(this.activeName == 'routing'){ - this.changeHeight(1100); + this.changeHeight(2000); this.getRouting(); }else if(this.activeName == 'technicalRequirement'){ this.getTechnicalRequirement(); diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index bec9813..abb7f8d 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -251,7 +251,7 @@ - 项目编码 + 物料编码 @@ -306,7 +306,7 @@ - + @@ -323,7 +323,32 @@ - + + + + + @@ -598,7 +623,7 @@ - + @@ -722,7 +747,32 @@ - + + + + + @@ -1113,7 +1163,7 @@ import TestRoutingTable from "./testSoRouting/testRoutingTable.vue"; import {selectTestSoRoutingList} from "../../../api/test/testSoRouting"; import TestAttribute from "./testSoAttribute/testAttribute.vue"; - import {partPropertiesList} from "../../../api/base/properties"; + import {partPropertiesList,getPartItemWithPartNo} from "@/api/base/properties.js"; import TestProperties from "./testAttribute/testProperties.vue"; import {getTestPropertiesList,searchTestPropertiesItem} from "../../../api/test/testProperties"; import TestFile from "./file/testFile.vue"; @@ -1189,6 +1239,8 @@ }, data () { return { + partItemList1:[], + partItemList2:[], testFileList:[], dialogProperties:[], attributeList:[], @@ -2191,7 +2243,89 @@ // 项目集合 projectList:[], addressModelFlag: false, - contactModelFlag: false + contactModelFlag: false, + columnItemList: [ + { + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table2PropertiesItemID', + tableId: "103001Table2", + tableName: "物料属性表", + columnProp: 'propertiesItemNo', + headerAlign: "center", + align: "center", + columnLabel: '属性编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table2PropertiesItemDesc', + tableId: "103001Table2", + tableName: "物料属性表", + columnProp: 'itemDesc', + headerAlign: "center", + align: "left", + columnLabel: '属性名称', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 120, + }, + { + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table2ValueType', + tableId: "103001Table2", + tableName: "物料属性表", + columnProp: 'valueType', + headerAlign: "center", + align: "center", + columnLabel: '属性类型', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table2ValueChooseFlag', + tableId: "103001Table2", + tableName: "物料属性表", + columnProp: 'textValue', + headerAlign: "center", + align: "left", + columnLabel: '实测值', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100, + }, + // { + // userId: this.$store.state.user.name, + // functionId: 103001, + // serialNumber: '103001Table2ValueChooseFlag', + // tableId: "103001Table2", + // tableName: "物料属性表", + // columnProp: 'numValue', + // headerAlign: "center", + // align: "center", + // columnLabel: '数字值', + // columnHidden: false, + // columnImage: false, + // status: true, + // fixed: '', + // columnWidth: 70, + // }, + ], } }, mounted () { @@ -2334,9 +2468,9 @@ this.refreshCurrentTabTable() }, dialogTabClick(){ - // if (this.activeTab === 'attribute') { - // this.getTestProperties(); - // } + if (this.activeTab === 'partAttribute') { + this.getPartItem(this.modalData.site,this.modalData.testPartNo,1); + } }, /** * 当前值发生变化的时候修改 @@ -2376,6 +2510,9 @@ this.getProjectInformation() } else if (this.activeTable === 'customer_information') { this.getCustomerInformation() + }else if (this.activeTable === 'test_attribute') { + console.log(this.testCurrentRow) + this.getPartItem(this.testCurrentRow.site,this.testCurrentRow.testPartNo,2); } }, @@ -3463,6 +3600,28 @@ }) }, + getPartItem(site,partNo,type) { + let tempData = { + site: site, + partNo: partNo, + recordType: 'IP' + } + getPartItemWithPartNo(tempData).then(({data}) => { + if (data && data.code === 0) { + if(type==1){ + this.partItemList1 = data.rows + }else { + this.partItemList2 = data.rows + } + } else { + if(type==1){ + this.partItemList1 = [] + }else { + this.partItemList2 = [] + } + } + }) + }, } }