diff --git a/src/api/project/project.js b/src/api/project/project.js index 36c68dc..7f72a4f 100644 --- a/src/api/project/project.js +++ b/src/api/project/project.js @@ -31,3 +31,5 @@ export const deleteProjectInfo= data => createAPI(`/project/deleteProjectInfo`,' export const getProjectInfoPartList= data => createAPI(`/project/getProjectInfoPartList`,'post',data) export const saveProjectPart= data => createAPI(`/project/saveProjectPart`,'post',data) export const deleteProjectPartWithId= data => createAPI(`/project/deleteProjectPartWithId`,'post',data) +export const getPlmToolPurchaseRequestDataByProject= data => createAPI(`/project/getPlmToolPurchaseRequestDataByProject`,'post',data) +export const savePlmToolPurchaseRequestData= data => createAPI(`/project/savePlmToolPurchaseRequestData`,'post',data) diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue index b800510..cf33e8c 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -79,7 +79,7 @@ - + @@ -127,9 +127,9 @@ columnList:[ { userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4TestPartNo', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4TestPartNo', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "testPartNo", headerAlign: "center", @@ -144,9 +144,9 @@ columnWidth: 80 },{ userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4PartType', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4PartType', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "partType", headerAlign: "center", @@ -161,9 +161,9 @@ columnWidth: 60 },{ userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4PartTypeDesc', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4PartTypeDesc', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "partTypeDesc", headerAlign: "center", @@ -178,9 +178,9 @@ columnWidth: 80 },{ userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4PartName', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4PartName', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "partName", headerAlign: "center", @@ -195,9 +195,9 @@ columnWidth: 120 },{ userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4PartDesc', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4PartDesc', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "partDesc", headerAlign: "center", @@ -212,9 +212,9 @@ columnWidth: 120 },{ userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4PartSpec', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4PartSpec', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "partSpec", headerAlign: "center", @@ -229,9 +229,9 @@ columnWidth: 120 },{ userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4MaterialNumber', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4MaterialNumber', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "materialNumber", headerAlign: "center", @@ -246,9 +246,9 @@ columnWidth: 120 },{ userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4Remark', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4Remark', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "remark", headerAlign: "center", @@ -263,9 +263,9 @@ columnWidth: 120 },{ userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4CreateDate', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4CreateDate', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "createDate", headerAlign: "center", @@ -280,9 +280,9 @@ columnWidth: 160 },{ userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4CreateBy', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4CreateBy', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "createBy", headerAlign: "center", @@ -297,9 +297,9 @@ columnWidth: 80 },{ userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4UpdateDate', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4UpdateDate', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "updateDate", headerAlign: "center", @@ -314,9 +314,9 @@ columnWidth: 160 },{ userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table4UpdateBy', - tableId: "101002003Table4", + functionId: 101002001, + serialNumber: '101002001Table4UpdateBy', + tableId: "101002001Table4", tableName: "项目物料", columnProp: "updateBy", headerAlign: "center", diff --git a/src/views/modules/project/projectInfo/com_project_info_purchase_request.vue b/src/views/modules/project/projectInfo/com_project_info_purchase_request.vue new file mode 100644 index 0000000..125250d --- /dev/null +++ b/src/views/modules/project/projectInfo/com_project_info_purchase_request.vue @@ -0,0 +1,777 @@ + + + + + diff --git a/src/views/modules/project/projectInfo/com_project_puotation.vue b/src/views/modules/project/projectInfo/com_project_puotation.vue index 6add340..7f51995 100644 --- a/src/views/modules/project/projectInfo/com_project_puotation.vue +++ b/src/views/modules/project/projectInfo/com_project_puotation.vue @@ -85,9 +85,9 @@ columnList: [ { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1QuotationNo', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5QuotationNo', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'quotationNo', headerAlign: 'center', @@ -103,9 +103,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1CustomerNo', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5CustomerNo', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'customerNo', headerAlign: 'center', @@ -121,9 +121,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1CustomerDesc', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5CustomerDesc', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'customerDesc', headerAlign: 'center', @@ -139,9 +139,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1TrackerName', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5TrackerName', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'trackerName', headerAlign: 'center', @@ -157,9 +157,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1QuoterName', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5QuoterName', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'quoterName', headerAlign: 'center', @@ -175,9 +175,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1TestPartNo', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5TestPartNo', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'testPartNo', headerAlign: 'center', @@ -193,9 +193,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1PriorityLevel', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5PriorityLevel', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'priorityLevel', headerAlign: 'center', @@ -211,9 +211,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1RequiredCompletionDate', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5RequiredCompletionDate', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'requiredCompletionDate', headerAlign: 'center', @@ -229,9 +229,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1quotationStatus', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5quotationStatus', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'quotationStatus', headerAlign: 'center', @@ -247,9 +247,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1CreateDate', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5CreateDate', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'createDate', headerAlign: 'center', @@ -265,9 +265,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1CreateBy', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5CreateBy', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'createBy', headerAlign: 'center', @@ -283,9 +283,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1UpdateDate', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5UpdateDate', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'updateDate', headerAlign: 'center', @@ -301,9 +301,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1UpdateBy', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table5UpdateBy', + tableId: '101002001Table5', tableName: '报价信息表', columnProp: 'updateBy', headerAlign: 'center', diff --git a/src/views/modules/project/projectInfo/com_project_sample.vue b/src/views/modules/project/projectInfo/com_project_sample.vue index b30857c..c26b17b 100644 --- a/src/views/modules/project/projectInfo/com_project_sample.vue +++ b/src/views/modules/project/projectInfo/com_project_sample.vue @@ -83,9 +83,9 @@ columnList: [ { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1SampleNo', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6SampleNo', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'sampleNo', headerAlign: 'center', @@ -101,9 +101,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1CustomerNo', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6CustomerNo', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'customerNo', headerAlign: 'center', @@ -119,9 +119,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1CustomerDesc', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6CustomerDesc', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'customerDesc', headerAlign: 'center', @@ -137,9 +137,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1TrackerName', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6TrackerName', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'trackerName', headerAlign: 'center', @@ -155,9 +155,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1QuoterName', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6QuoterName', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'quoterName', headerAlign: 'center', @@ -173,9 +173,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1TestPartNo', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6TestPartNo', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'testPartNo', headerAlign: 'center', @@ -191,9 +191,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1PriorityLevel', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6PriorityLevel', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'priorityLevel', headerAlign: 'center', @@ -209,9 +209,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1RequiredCompletionDate', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6RequiredCompletionDate', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'requiredCompletionDate', headerAlign: 'center', @@ -227,9 +227,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1sampleStatus', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6sampleStatus', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'sampleStatus', headerAlign: 'center', @@ -245,9 +245,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1CreateDate', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6CreateDate', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'createDate', headerAlign: 'center', @@ -263,9 +263,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1CreateBy', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6CreateBy', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'createBy', headerAlign: 'center', @@ -281,9 +281,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1UpdateDate', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6UpdateDate', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'updateDate', headerAlign: 'center', @@ -299,9 +299,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101002005, - serialNumber: '101002005Table1UpdateBy', - tableId: '101002005Table1', + functionId: 101002001, + serialNumber: '101002001Table6UpdateBy', + tableId: '101002001Table6', tableName: '打样信息表', columnProp: 'updateBy', headerAlign: 'center', diff --git a/src/views/modules/project/projectInfo/com_project_test.vue b/src/views/modules/project/projectInfo/com_project_test.vue new file mode 100644 index 0000000..532cefc --- /dev/null +++ b/src/views/modules/project/projectInfo/com_project_test.vue @@ -0,0 +1,380 @@ + + + + + diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index 6c6dd3f..8f850c1 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -30,7 +30,6 @@ - + + + + + + - @@ -301,6 +305,8 @@ import projectPart from "./com_project_info_part";/*組件*/ import projectQuotation from "./com_project_puotation";/*組件*/ import sample from "./com_project_sample";/*組件*/ + import test from "./com_project_test";/*組件*/ + import purchase from "./com_project_info_purchase_request";/*組件*/ export default { components: { Chooselist, @@ -309,6 +315,8 @@ projectPart, projectQuotation, sample, + test, + purchase, }, name: "null", data() { @@ -1092,6 +1100,12 @@ if (this.activeName == 'sample') { this.refreshSampleTable(); } + if (this.activeName == 'test') { + this.refreshTestTable(); + } + if (this.activeName == 'purchase') { + this.refreshPurchaseTable(); + } }, refreshPartTable(){ let inData={ @@ -1121,6 +1135,24 @@ } this.$refs.sample.init(inData) }, + refreshTestTable(){ + let inData={ + site: this.currentRow.site, + projectId: this.currentRow.projectId, + username:this.$store.state.user.name, + page: 1, + limit: 1000 + } + this.$refs.test.init(inData) + }, + refreshPurchaseTable(){ + let inData={ + site: this.currentRow.site, + projectId: this.currentRow.projectId, + username:this.$store.state.user.name, + } + this.$refs.purchase.init(inData) + }, //刷新派设备文档的列表 getFileContentData() { let currentData = {orderRef2: this.currentRow.projectId};