diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index abfabe2..7011771 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -50,3 +50,21 @@ export const saveBMPrintOtherColor= data => createAPI(`/technicalSpecification/s export const deleteBMPrintOtherColor= data => createAPI(`/technicalSpecification/deleteBMPrintOtherColor`,'post',data) export const searchBMPropertiesHeaderForBM= data => createAPI(`/technicalSpecification/searchBMPropertiesHeaderForBM`,'post',data) + +export const searchBMInkMixingDetail= data => createAPI(`/technicalSpecification/searchBMInkMixingDetail`,'post',data) +export const updateBMInkMixingDetail= data => createAPI(`/technicalSpecification/updateBMInkMixingDetail`,'post',data) +export const searchBMInkMixingColor= data => createAPI(`/technicalSpecification/searchBMInkMixingColor`,'post',data) +export const saveBMInkMixingColor= data => createAPI(`/technicalSpecification/saveBMInkMixingColor`,'post',data) +export const deleteBMInkMixingColor= data => createAPI(`/technicalSpecification/deleteBMInkMixingColor`,'post',data) + +export const searchBMInkFormulationDetail= data => createAPI(`/technicalSpecification/searchBMInkFormulationDetail`,'post',data) +export const updateBMInkFormulationDetail= data => createAPI(`/technicalSpecification/updateBMInkFormulationDetail`,'post',data) +export const searchBMInkFormulationColor= data => createAPI(`/technicalSpecification/searchBMInkFormulationColor`,'post',data) +export const saveBMInkFormulationColor= data => createAPI(`/technicalSpecification/saveBMInkFormulationColor`,'post',data) +export const deleteBMInkFormulationColor= data => createAPI(`/technicalSpecification/deleteBMInkFormulationColor`,'post',data) + +export const searchBMLaminationDetail= data => createAPI(`/technicalSpecification/searchBMLaminationDetail`,'post',data) +export const updateBMLaminationDetail= data => createAPI(`/technicalSpecification/updateBMLaminationDetail`,'post',data) +export const searchBMLaminationCut= data => createAPI(`/technicalSpecification/searchBMLaminationCut`,'post',data) +export const saveBMLaminationCut= data => createAPI(`/technicalSpecification/saveBMLaminationCut`,'post',data) +export const deleteBMLaminationCut= data => createAPI(`/technicalSpecification/deleteBMLaminationCut`,'post',data) diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss index 1f3bf35..76732f1 100644 --- a/src/assets/scss/rq.scss +++ b/src/assets/scss/rq.scss @@ -50,3 +50,8 @@ overflow: hidden; float: right; } + +//多级标头的颜色 +.el-table thead.is-group th { + background: #17B3A3; +} diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkFormulation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkFormulation.vue new file mode 100644 index 0000000..4f15e29 --- /dev/null +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkFormulation.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue index 5e02fb1..f614c2a 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue @@ -196,11 +196,11 @@ + + diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue index 083e2e6..43434da 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue @@ -52,6 +52,12 @@ + + + + + + @@ -112,6 +118,8 @@ import tpInfo from "./com_bm_tpInfo";/*组件*/ import printOther from "./com_bm_printOther";/*组件*/ import InkMixing from "./com_bm_inkMixing";/*组件*/ + import InkFormulation from "./com_bm_inkFormulation";/*组件*/ + import lamination from "./com_bm_lamination";/*组件*/ export default { name: "technicalSpecificationDetail", components: { @@ -140,6 +148,8 @@ tpInfo, printOther, InkMixing, + InkFormulation, + lamination, }, data() { return { @@ -225,9 +235,13 @@ this.getTpInfo(); }else if(this.activeName == 'printOther'){ this.getPrintOther(); - } - else if(this.activeName == 'InkMixing'){ + }else if(this.activeName == 'InkMixing'){ this.getInkMixing(); + }else if(this.activeName == 'InkFormulation'){ + this.changeHeight(800); + this.getInkFormulation(); + }else if(this.activeName == 'lamination'){ + this.getLamination(); } }, @@ -326,6 +340,14 @@ this.dataForm.type='InkMixing' this.$refs.InkMixing.init(JSON.parse(JSON.stringify(this.dataForm))) }, + getInkFormulation(){ + this.dataForm.type='InkFormulation' + this.$refs.InkFormulation.init(JSON.parse(JSON.stringify(this.dataForm))) + }, + getLamination(){ + this.dataForm.type='lamination' + this.$refs.lamination.init(JSON.parse(JSON.stringify(this.dataForm))) + }, //看有没有这个页面的权限 getPageRole(){