diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index d513df0..9175d8a 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -175,4 +175,9 @@ export const updateBMInkMixingColorBatch= data => createAPI(`/technicalSpecifica
export const updateBMBasicInfoEntry= data => createAPI(`/technicalSpecification/updateBMBasicInfoEntry`,'post',data)
+export const searchBMSilkScreenColor= data => createAPI(`/technicalSpecification/searchBMSilkScreenColor`,'post',data)
+export const saveBMSilkScreenColor= data => createAPI(`/technicalSpecification/saveBMSilkScreenColor`,'post',data)
+export const deleteBMSilkScreenColor= data => createAPI(`/technicalSpecification/deleteBMSilkScreenColor`,'post',data)
+export const saveBMSilkScreenColorBatch= data => createAPI(`/technicalSpecification/saveBMSilkScreenColorBatch`,'post',data)
+export const updateBMSilkScreenColorBatch= data => createAPI(`/technicalSpecification/updateBMSilkScreenColorBatch`,'post',data)
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index ee3c6fa..11b8b87 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -1027,6 +1027,9 @@
+
+
+
@@ -1158,6 +1161,7 @@
import fqc from "./com_bm_demoSlot";/*组件*/
import cqc from "./com_bm_demoSlot";/*组件*/
import printFlexo from "./com_bm_printingFlexo";/*组件*/
+ import silkScreen from "./com_bm_silkScreen";/*组件*/
import printIndigo from "./com_bm_printingIndigo";
import DictDataSelect from "../../sys/dict-data-select-highlight";
import {updateBMProcessInfo} from "../../../../api/sampleManagement/technicalSpecificationList";
@@ -1182,6 +1186,7 @@
fqc,
cqc,
printFlexo,
+ silkScreen,
printIndigo,
},
props: {
@@ -1514,6 +1519,9 @@
case 'printFlexo':
this.getPrintFlexo();
break
+ case 'silkScreen':
+ this.getSilkScreen();
+ break
case 'printIndigo':
this.getPrintIndigo();
break
@@ -1617,6 +1625,12 @@
this.$refs.printFlexo.init(inData)
},
+ getSilkScreen () {
+ let inData = JSON.parse(JSON.stringify(this.searchData))
+ inData.type = 'silkScreen'
+ this.$refs.silkScreen.init(inData)
+ },
+
getPrintIndigo () {
let inData = JSON.parse(JSON.stringify(this.searchData))
inData.type = 'printIndigo'
@@ -1841,6 +1855,13 @@
printIndigo.ifDisableFlag=true
this.$nextTick (()=>{this.$refs.routeRef.init(printIndigo)});
break;
+ case 'silkScreen':
+ this.selectedComponent = 'silkScreen'
+ let silkScreen = JSON.parse(JSON.stringify(this.searchData))
+ silkScreen.type = 'silkScreen'
+ silkScreen.ifDisableFlag = true
+ this.$nextTick (()=>{this.$refs.routeRef.init(silkScreen)})
+ break;
default :
this.selectedComponent = null;
break;
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_silkScreen.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_silkScreen.vue
new file mode 100644
index 0000000..0593e54
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_silkScreen.vue
@@ -0,0 +1,1276 @@
+
+
+
+
+
+
+ 刷新
+
+ 新增
+ 一键导入
+ 批量编辑
+ 批量保存
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+ scope.row.showOrder = value.match(/^(\d+\.?\d*|\.\d+)$/) ? value : ''"
+ style="height: 11px; width: 98%;">
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+ scope.row.showOrder = value.match(/^(\d+\.?\d*|\.\d+)$/) ? value : ''"
+ style="height: 11px; width: 98%;">
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+ scope.row.showOrder = value.match(/^(\d+\.?\d*|\.\d+)$/) ? value : ''"
+ style="height: 11px; width: 98%;">
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+ scope.row.showOrder = value.match(/^(\d+\.?\d*|\.\d+)$/) ? value : ''"
+ style="height: 11px; width: 98%;">
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row[scope.column.property]}}
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 油墨代号/颜色IFS No
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
+
+