diff --git a/src/api/base/properties.js b/src/api/base/properties.js index f01244c..b26cb18 100644 --- a/src/api/base/properties.js +++ b/src/api/base/properties.js @@ -22,3 +22,17 @@ export const getItemModal = data => createAPI(`/properties/getItemModal`,'post', export const itemSaveData = data => createAPI(`/properties/itemSaveData`,'post',data) export const getItemData = data => createAPI(`/properties/getItemData`,'post',data) export const refreshItemModal = data => createAPI(`/properties/refreshItemModal`,'post',data) + + + +export const propertiesModelSearchForBM = data => createAPI(`/properties/propertiesModelSearchForBM`,'post',data) +export const searchModalDetailsForBM= data => createAPI(`/properties/searchModalDetailsForBM`,'post',data) +export const getItemListsForBM= data => createAPI(`/properties/getItemListsForBM`,'post',data) +export const saveModalDetailsForBM= data => createAPI(`/properties/saveModalDetailsForBM`,'post',data) +export const deleteModalDetailsForBM= data => createAPI(`/properties/deleteModalDetailsForBM`,'post',data) +export const deleteModalDetailForBM= data => createAPI(`/properties/deleteModalDetailForBM`,'post',data) + +export const goUpItemForBM= data => createAPI(`/properties/goUpItemForBM`,'post',data) +export const goDownForBM= data => createAPI(`/properties/goDownForBM`,'post',data) + + diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index 098a775..7ef8a0d 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -20,3 +20,4 @@ export const searchBMBom= data => createAPI(`/technicalSpecification/searchBMBom export const deleteBMBom= data => createAPI(`/technicalSpecification/deleteBMBom`,'post',data) export const searchBMRoutingDetail= data => createAPI(`/technicalSpecification/searchBMRoutingDetail`,'post',data) export const updateBMRoutingDetail= data => createAPI(`/technicalSpecification/updateBMRoutingDetail`,'post',data) +export const searchBMPropertiesValue= data => createAPI(`/technicalSpecification/searchBMPropertiesValue`,'post',data) diff --git a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue new file mode 100644 index 0000000..a5e0904 --- /dev/null +++ b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue @@ -0,0 +1,840 @@ + + + diff --git a/src/views/modules/base/propertiesItem/propertiesItem.vue b/src/views/modules/base/propertiesItem/propertiesItem.vue index 4ab6738..2125bdb 100644 --- a/src/views/modules/base/propertiesItem/propertiesItem.vue +++ b/src/views/modules/base/propertiesItem/propertiesItem.vue @@ -12,6 +12,7 @@ + @@ -111,6 +112,7 @@ + diff --git a/src/views/modules/base/propertiesItem/propertiesModel.vue b/src/views/modules/base/propertiesItem/propertiesModel.vue index f34fc47..208bfb1 100644 --- a/src/views/modules/base/propertiesItem/propertiesModel.vue +++ b/src/views/modules/base/propertiesItem/propertiesModel.vue @@ -995,6 +995,7 @@ this.chooseModalData.itemNo = row.itemNo; this.chooseModalData.itemDesc = row.itemDesc; this.chooseModalData.valueTypeDb = row.valueTypeDb; + this.chooseModalData.itemType=row.functionType; searchItemAvailable(this.chooseModalData).then(({data}) => { this.chooseTableData = data.rows }) 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 6e71674..95f6abb 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -107,7 +107,7 @@ {{'关闭'}} - + diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue index 02b9618..18c611c 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue @@ -1,71 +1,59 @@