diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index e1748fa..c10cff6 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -100,3 +100,10 @@ export const updateBMRemarkPage= data => createAPI(`/technicalSpecification/upda export const updateBMProcess= data => createAPI(`/technicalSpecification/updateBMProcess`,'post',data) export const searchPartLastQuotationNo= data => createAPI(`/technicalSpecification/searchPartLastQuotationNo`,'post',data) export const checkUrl= data => createAPI(`/technicalSpecification/checkUrl`,'post',data) +export const searchBMprintFlexoColor= data => createAPI(`/technicalSpecification/searchBMprintFlexoColor`,'post',data) +export const saveBMprintFlexoColor= data => createAPI(`/technicalSpecification/saveBMprintFlexoColor`,'post',data) +export const deleteBMprintFlexoColor= data => createAPI(`/technicalSpecification/deleteBMprintFlexoColor`,'post',data) + +export const searchBMprintIndigoColor= data => createAPI(`/technicalSpecification/searchBMprintIndigoColor`,'post',data) +export const saveBMprintIndigoColor= data => createAPI(`/technicalSpecification/saveBMprintIndigoColor`,'post',data) +export const deleteBMprintIndigoColor= data => createAPI(`/technicalSpecification/deleteBMprintIndigoColor`,'post',data) diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue index 5a2a884..29c25de 100644 --- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue +++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue @@ -296,20 +296,6 @@ trigger: ['change','blur'] } ], - projectType: [ - { - required: true, - message: ' ', - trigger: 'change' - } - ], - projectTypeDb: [ - { - required: true, - message: ' ', - trigger: ['change','blur'] - } - ], customerName: [ { required: true, @@ -331,34 +317,6 @@ trigger: 'change' } ], - projectSourceDesc: [ - { - required: true, - message: ' ', - trigger: 'change' - } - ], - projectSource: [ - { - required: true, - message: ' ', - trigger: ['change','blur'] - } - ], - priorityDesc: [ - { - required: true, - message: ' ', - trigger: 'change' - } - ], - priority: [ - { - required: true, - message: ' ', - trigger: ['change','blur'] - } - ], needDate: [ { required: true, @@ -710,12 +668,12 @@ } }) }else { - if(!this.dataForm.projectTypeDb){ - this.$alert('请选择项目类型！', '错误', { - confirmButtonText: '确定' - }) - return false; - } + // if(!this.dataForm.projectTypeDb){ + // this.$alert('请选择项目类型！', '错误', { + // confirmButtonText: '确定' + // }) + // return false; + // } if(!this.dataForm.customerId){ this.$alert('请选择所属客户！', '错误', { confirmButtonText: '确定' @@ -728,24 +686,24 @@ }) return false; } - if(!this.dataForm.projectSource){ - this.$alert('请选择项目来源！', '错误', { - confirmButtonText: '确定' - }) - return false; - } + // if(!this.dataForm.projectSource){ + // this.$alert('请选择项目来源！', '错误', { + // confirmButtonText: '确定' + // }) + // return false; + // } if(!this.dataForm.buDesc){ this.$alert('请选择BU！', '错误', { confirmButtonText: '确定' }) return false; } - if(!this.dataForm.priority){ - this.$alert('请选择优先级！', '错误', { - confirmButtonText: '确定' - }) - return false; - } + // if(!this.dataForm.priority){ + // this.$alert('请选择优先级！', '错误', { + // confirmButtonText: '确定' + // }) + // return false; + // } if(!this.dataForm.needDate){ this.$alert('请选择要求日期！', '错误', { confirmButtonText: '确定' diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue new file mode 100644 index 0000000..ffac40e --- /dev/null +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue @@ -0,0 +1,411 @@ + + + + + diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue new file mode 100644 index 0000000..8925134 --- /dev/null +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue @@ -0,0 +1,402 @@ + + + + + diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index 223424c..b685f21 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -338,6 +338,12 @@
+
+ +
+
+ +
{this.$refs.routeRef.init(cqc)}); break; + case 'printFlexo': + this.selectedComponent='printFlexo'; + let printFlexo=JSON.parse(JSON.stringify(this.searchData)) + printFlexo.type='printFlexo' + printFlexo.ifDisableFlag=true + this.$nextTick (()=>{this.$refs.routeRef.init(printFlexo)}); + break; + case 'printIndigo': + this.selectedComponent='printIndigo'; + let printIndigo=JSON.parse(JSON.stringify(this.searchData)) + printIndigo.type='printIndigo' + printIndigo.ifDisableFlag=true + this.$nextTick (()=>{this.$refs.routeRef.init(printIndigo)}); + break; default : this.selectedComponent=null; break; diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/old_technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/old_technicalSpecificationDetail.vue index 83096f0..9aa3eae 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/old_technicalSpecificationDetail.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/old_technicalSpecificationDetail.vue @@ -221,6 +221,7 @@ }else if(this.activeName == 'bom'){ this.getBom(); }else if(this.activeName == 'routing'){ + this.changeHeight(800); this.getRouting(); }else if(this.activeName == 'prepress'){ this.changeHeight(800);