diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index 7011771..a812ff4 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -68,3 +68,16 @@ export const updateBMLaminationDetail= data => createAPI(`/technicalSpecificatio
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)
+
+export const searchBMCncDetail= data => createAPI(`/technicalSpecification/searchBMCncDetail`,'post',data)
+export const updateBMCncDetail= data => createAPI(`/technicalSpecification/updateBMCncDetail`,'post',data)
+export const searchBMCncCut= data => createAPI(`/technicalSpecification/searchBMCncCut`,'post',data)
+export const saveBMCncCut= data => createAPI(`/technicalSpecification/saveBMCncCut`,'post',data)
+export const deleteBMCncCut= data => createAPI(`/technicalSpecification/deleteBMCncCut`,'post',data)
+
+export const searchBMCutDetail= data => createAPI(`/technicalSpecification/searchBMCutDetail`,'post',data)
+export const updateBMCutDetail= data => createAPI(`/technicalSpecification/updateBMCutDetail`,'post',data)
+export const searchBMCutCut= data => createAPI(`/technicalSpecification/searchBMCutCut`,'post',data)
+export const saveBMCutCut= data => createAPI(`/technicalSpecification/saveBMCutCut`,'post',data)
+export const deleteBMCutCut= data => createAPI(`/technicalSpecification/deleteBMCutCut`,'post',data)
+
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_cnc.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_cnc.vue
new file mode 100644
index 0000000..72148c6
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_cnc.vue
@@ -0,0 +1,347 @@
+
+
+
+
+ 刷新
+ 新增
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_cut.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_cut.vue
new file mode 100644
index 0000000..d90d233
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_cut.vue
@@ -0,0 +1,398 @@
+
+
+
+
+ 刷新
+ 新增
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 43434da..b701b42 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -58,6 +58,12 @@
+
+
+
+
+
+
@@ -120,6 +126,8 @@
import InkMixing from "./com_bm_inkMixing";/*组件*/
import InkFormulation from "./com_bm_inkFormulation";/*组件*/
import lamination from "./com_bm_lamination";/*组件*/
+ import CNC from "./com_bm_cnc";
+ import Cut from "./com_bm_cut";
export default {
name: "technicalSpecificationDetail",
components: {
@@ -150,6 +158,8 @@
InkMixing,
InkFormulation,
lamination,
+ CNC,
+ Cut,
},
data() {
return {
@@ -242,6 +252,10 @@
this.getInkFormulation();
}else if(this.activeName == 'lamination'){
this.getLamination();
+ }else if(this.activeName == 'CNC'){
+ this.getCNC();
+ }else if(this.activeName == 'Cut'){
+ this.getCut();
}
},
@@ -348,6 +362,14 @@
this.dataForm.type='lamination'
this.$refs.lamination.init(JSON.parse(JSON.stringify(this.dataForm)))
},
+ getCNC(){
+ this.dataForm.type='CNC'
+ this.$refs.CNC.init(JSON.parse(JSON.stringify(this.dataForm)))
+ },
+ getCut(){
+ this.dataForm.type='Cut'
+ this.$refs.Cut.init(JSON.parse(JSON.stringify(this.dataForm)))
+ },
//看有没有这个页面的权限
getPageRole(){
@@ -358,7 +380,7 @@
})
},
getPageIf(key){
- return this.pageRole.indexOf(key) !== -1 || false
+ return this.pageRole.indexOf(key+';') !== -1 || false
},
changeHeight(height){