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 6f40d40..bdc90e8 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 @@ -53,21 +53,21 @@ - 直接客户 + 客户 - + - - - - - + + + + + diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index cb70db4..689d61c 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -136,11 +136,11 @@ -
- - - -
+ + + + +
@@ -151,20 +151,22 @@
- - - -
+
+
+ + +
-
+
+ @@ -1996,9 +1998,7 @@ resolve(true); }else { reject(new Error('该项目已存在附件，不允许删除！')) - this.$alert('该项目已存在附件，不允许删除！', '提示', { - confirmButtonText: '确定' - }) + this.$message.warning('该项目已存在附件，不允许删除！') } } else { this.$message.warning(data.msg); @@ -2027,9 +2027,7 @@ resolve(true); } else { reject(new Error('该项目已绑定物料信息，不允许删除！')) - this.$alert('该项目已绑定物料信息，不允许删除！', '提示', { - confirmButtonText: '确定' - }) + this.$message.warning('该项目已绑定物料信息，不允许删除！') } } }) @@ -2052,9 +2050,7 @@ resolve(true); }else { reject(new Error('该项目已存在询价信息，不允许删除！')) - this.$alert('该项目已存在询价信息，不允许删除！', '提示', { - confirmButtonText: '确定' - }) + this.$message.warning('该项目已存在询价信息，不允许删除！') } } else { this.$message.warning(data.msg); @@ -2074,9 +2070,7 @@ resolve(true); }else { reject(new Error('该项目已存在报价信息，不允许删除！')) - this.$alert('该项目已存在报价信息，不允许删除！', '提示', { - confirmButtonText: '确定' - }) + this.$message.warning('该项目已存在报价信息，不允许删除！') } }else { this.$message.warning(data.msg); @@ -2100,9 +2094,7 @@ resolve(true); }else { reject(new Error('该项目已存在打样信息，不允许删除！')) - this.$alert('该项目已存在打样信息，不允许删除！', '提示', { - confirmButtonText: '确定' - }) + this.$message.warning('该项目已存在打样信息，不允许删除！') } } else { this.$message.warning(data.msg) @@ -2126,9 +2118,7 @@ resolve(true); } else { reject(new Error('该项目已存在测试记录，不允许删除！')) - this.$alert('该项目已存在测试记录，不允许删除！', '提示', { - confirmButtonText: '确定' - }) + this.$message.warning('该项目已存在测试记录，不允许删除！') } } else { this.$message.warning(data.msg); @@ -2150,9 +2140,7 @@ resolve(true); } else { reject(new Error('该项目已存在刀模申请，不允许删除！')) - this.$alert('该项目已存在刀模申请，不允许删除！', '提示', { - confirmButtonText: '确定' - }) + this.$message.warning('该项目已存在刀模申请，不允许删除！') } } else { this.$message.warning(data.msg) @@ -2174,10 +2162,8 @@ if (data.page.list.length===0){ resolve(true); } else { - this.$alert('该项目已绑定技术参数卡，不允许删除！', '提示', { - confirmButtonText: '确定' - }) reject(new Error('该项目已绑定技术参数卡，不允许删除！')) + this.$message.warning('该项目已绑定技术参数卡，不允许删除！') } } else { this.$message.warning(data.msg); @@ -2197,10 +2183,8 @@ if (data.rows.length===0){ resolve(true); } else { - this.$alert('该项目已存在变更记录，不允许删除！', '提示', { - confirmButtonText: '确定' - }) reject(new Error('该项目已存在变更记录，不允许删除！')) + this.$message.warning('该项目已存在变更记录，不允许删除！') } } else { this.$message.warning(data.msg) diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue index 3dae147..61b18ca 100644 --- a/src/views/modules/project/projectPart/searchProjectPart.vue +++ b/src/views/modules/project/projectPart/searchProjectPart.vue @@ -127,11 +127,11 @@
-
+
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index 0a534d7..3ccabc5 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -599,13 +599,13 @@
- + diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index e7b201c..64b75cb 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -631,13 +631,13 @@
- + diff --git a/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue b/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue index 010b4f3..4d97add 100644 --- a/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue +++ b/src/views/modules/quotation/sellForQuotation/quotationProjectInformation.vue @@ -39,13 +39,13 @@
- + diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue index 6ca74cc..051a9ad 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue @@ -38,7 +38,7 @@
- +
@@ -52,7 +52,7 @@
- + + +
@@ -384,6 +387,7 @@ productionFileComments: '', remark: '', nodeId: '', + directCustomer: '' }, dataForm2: { customerRevNo: '', diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue index 8f1f378..4bb13f2 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingFlexo.vue @@ -95,7 +95,7 @@ label="容积(BCM)"> - + - - - - - - - - - - - - - - - - - - - - +<!– –> +<!– –> +<!– –> +<!– –> +<!– –> +<!– –> + --> + + + + + + + + + + + + + + + + + + + + + - + + + + - - - - - + + + + + + + + - + + + + @@ -366,7 +422,7 @@ site: this.searchData.site, codeNo: this.searchData.codeNo, order: number, - printSide: 'front', + printSide: 'Front', colorReference: '', inkCode: '', colorMatch: '', @@ -428,7 +484,7 @@ let tempData = { site: this.searchData.site, codeNo: this.searchData.codeNo, - printSide: 'front', + printSide: 'Front', } saveBMPrintFlexoColorBatch(tempData).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index 9f94ce4..f47598c 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -743,13 +743,13 @@
- +