diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index d273210..69b31cc 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -11,3 +11,4 @@ export const BMBasicInformationSearch = data => createAPI(`/technicalSpecificati export const getProofingDataByUserRole= data => createAPI(`/technicalSpecification/getProofingDataByUserRole`,'post',data) export const updateBMBasicInformation= data => createAPI(`/technicalSpecification/updateBMBasicInformation`,'post',data) export const searchBMcustomerInfo= data => createAPI(`/technicalSpecification/searchBMcustomerInfo`,'post',data) +export const updateBMcustomerInfo= data => createAPI(`/technicalSpecification/updateBMcustomerInfo`,'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 432382d..6e71674 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -753,13 +753,13 @@ } }) }, - deleteData(){ + deleteData(row){ this.$confirm('确定要删除这条数据?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - deleteProjectPartWithId(this.dataForm).then(({data}) => { + deleteProjectPartWithId(row).then(({data}) => { if (data && data.code === 0) { this.$message.success( '操作成功') this.searchTable(); diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue index 1d4f1a3..3b61f2f 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue @@ -157,6 +157,7 @@ diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue new file mode 100644 index 0000000..4534e1e --- /dev/null +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue @@ -0,0 +1,408 @@ + + + + + diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index e32230b..3501d3a 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -13,10 +13,10 @@
- + - +
@@ -179,7 +179,7 @@ site: '', username: this.$store.state.user.name, codeNo: '', - bu:'', + buNo:'', }, ifDisableFlag:false, quotationOfficerFlag:false, diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue index d97d207..e2c4edb 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue @@ -4,11 +4,11 @@ - + - - 777 + + 777 @@ -23,17 +23,20 @@ diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 42cd62d..91c0639 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -402,6 +402,57 @@ status: true, fixed: '', columnWidth: 80 + },{ + userId: this.$store.state.user.name, + functionId: 103002, + serialNumber: '103002Table1TestPartNo', + tableId: "103002Table1", + tableName: "技术参数卡列表", + columnProp: "projectId", + headerAlign: "center", + align: "left", + columnLabel: "项目号", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + },{ + userId: this.$store.state.user.name, + functionId: 103002, + serialNumber: '103002Table1TestPartNo', + tableId: "103002Table1", + tableName: "技术参数卡列表", + columnProp: "buNo", + headerAlign: "center", + align: "left", + columnLabel: "BU", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 50 + },{ + userId: this.$store.state.user.name, + functionId: 103002, + serialNumber: '103002Table1TestPartNo', + tableId: "103002Table1", + tableName: "技术参数卡列表", + columnProp: "buDesc", + headerAlign: "center", + align: "left", + columnLabel: "BU名称", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 70 },{ userId: this.$store.state.user.name, functionId: 103002, @@ -703,6 +754,7 @@ let inData={ site:this.$store.state.user.site, codeNo:row.codeNo, + buNo:row.buNo, username:this.$store.state.user.name}; localStorage.setItem('tsfData', JSON.stringify(inData)) window.open('#/BMPage');