diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_cut.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_cut.vue
index 2633eb9..52c9701 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_cut.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_cut.vue
@@ -66,7 +66,7 @@
-
+
保存
@@ -143,6 +143,7 @@
username: this.$store.state.user.name,
codeNo: '',
buNo:'',
+ ifDisableFlag:'',
},
ifDisableFlag:false,
dataForm:{
@@ -273,6 +274,9 @@
}
//初始化参数
this.searchData = JSON.parse(JSON.stringify(inData));
+ if(this.searchData.ifDisableFlag){
+ this.ifDisableFlag=true
+ }
//刷新表格
this.searchTable();
this.cutSearch();
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
index 66cb66e..6d060cc 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
@@ -229,6 +229,7 @@
username: this.$store.state.user.name,
codeNo: '',
buNo:'',
+ ifDisableFlag:'',
},
ifDisableFlag:false,
dataForm:{
@@ -292,6 +293,9 @@
}
//初始化参数
this.searchData = JSON.parse(JSON.stringify(inData));
+ if(this.searchData.ifDisableFlag){
+ this.ifDisableFlag=true
+ }
//刷新表格
this.searchTable();
this.colorSearch();
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index 7271f9f..742ae9c 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -142,14 +142,31 @@
-
- 刷新
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 刷新
+ 变更
+
+
+
+
@@ -343,6 +361,24 @@
import packagePage from "./com_bm_demoSlot";/*组件*/
import fqc from "./com_bm_demoSlot";/*组件*/
import cqc from "./com_bm_demoSlot";/*组件*/
+
+
+//表格下方的引用
+ import prepress2 from "./com_bm_prepress";/*组件*/
+ import printing2 from "./com_bm_printing";/*组件*/
+ import printOther2 from "./com_bm_printOther";/*组件*/
+ import overprinting2 from "./com_bm_demoSlot";/*组件*/
+ import slitting2 from "./com_bm_demoSlot";/*组件*/
+ import lamTemperature2 from "./com_bm_demoSlot";/*组件*/
+ import cutting2 from "./com_bm_demoSlot";/*组件*/
+ import InkMixing2 from "./com_bm_inkMixing";/*组件*/
+ import InkFormulation2 from "./com_bm_inkFormulation";/*组件*/
+ import lamination2 from "./com_bm_lamination";/*组件*/
+ import CNC2 from "./com_bm_cnc";
+ import Cut2 from "./com_bm_cut";
+ import packagePage2 from "./com_bm_demoSlot";/*组件*/
+ import fqc2 from "./com_bm_demoSlot";/*组件*/
+ import cqc2 from "./com_bm_demoSlot";/*组件*/
export default {
components: {
Chooselist,
@@ -361,11 +397,34 @@
packagePage,
fqc,
cqc,
-
+ prepress2,
+ printing2,
+ printOther2,
+ overprinting2,
+ slitting2,
+ lamTemperature2,
+ cutting2,
+ InkMixing2,
+ InkFormulation2,
+ lamination2,
+ CNC2,
+ Cut2,
+ packagePage2,
+ fqc2,
+ cqc2,
},
data() {
return {
+ //动态组件
+ selectedComponent: null,
+ routeData:{
+ site: '',
+ partNo:'',
+ alternativeNo:'',
+ routingType:'',
+ routingRevision:'',
+ },
routeFlag:false,
routeModelFlag:false,
height:200,
@@ -791,7 +850,7 @@
}else {
searchBMRoute(this.searchData).then(({data}) => {
this.tableData = data.rows;
-
+ this.routeData = data.row;
});
}
},
@@ -1009,7 +1068,27 @@
return
})
},
-
+ chooseRoute(row){
+ switch (row.itemType) {
+ case 'Cut':
+ this.selectedComponent='Cut2';
+ let inData=JSON.parse(JSON.stringify(this.searchData))
+ inData.type='Cut'
+ inData.ifDisableFlag=true
+ this.$nextTick (()=>{this.$refs.routeRef.init(inData)});
+ break;
+ case 'prepress':
+ this.selectedComponent='prepress2';
+ let prepressData=JSON.parse(JSON.stringify(this.searchData))
+ prepressData.type='prepress'
+ prepressData.ifDisableFlag=true
+ this.$nextTick (()=>{this.$refs.routeRef.init(prepressData)});
+ break;
+ default :
+ this.selectedComponent=null;
+ break;
+ }
+ },
},
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index fde5de4..4e6919e 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -147,6 +147,7 @@
}else if(this.activeName == 'bom'){
this.getBom();
}else if(this.activeName == 'routing'){
+ this.changeHeight(1400);
this.getRouting();
}else if(this.activeName == 'technicalRequirement'){
this.getTechnicalRequirement();