diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl index fe7f87c..6d70232 100644 --- a/src/main/resources/templates/admin/business/process-new.ftl +++ b/src/main/resources/templates/admin/business/process-new.ftl @@ -83,7 +83,8 @@ <#-- 业务采购流程项目选择 --> - + - + @@ -112,7 +113,7 @@ - + @@ -121,9 +122,10 @@ @@ -136,7 +138,7 @@
- 保存 + 下一步
@@ -220,7 +222,8 @@ + :rules="[{ required: true, message: '申请人电话不能为空'}, + { pattern:/^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/, message: '请输入合法手机号', trigger: 'blur' }]"> @@ -305,20 +308,20 @@
- -
-
@@ -435,17 +438,17 @@ - - - - - - + + + + + + @@ -464,33 +467,76 @@ <#-- 选择 业务采购清单明细 -->
- + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -517,6 +563,8 @@ const saleContractProcess = "saleContractProcess" const saleContractDetail = "saleContractDetail" const BUTTON = "btn" + const saleContract = "sale_contract" + const procurementContract = "procurement_contract" const isEmpty = (obj) => { return !obj || (obj.length && obj.length === 0) @@ -579,7 +627,14 @@ saveProcurementDetail() { this.procurementDetailSelectorVisible = false this.changeMode(procurementContractProcess) - this.processType = 'procurement_contract' + this.processType = procurementContract + + this.procurementDetails = this.procurementDetails.filter(detail => { + if (detail.amountCurrent) { + return detail.amountCurrent !== 0; + } + return false + }) }, goToHome() { @@ -607,12 +662,12 @@ goToSaleContractProcess() { this.changeMode(saleContractProcess) - this.processType = 'sale_contract' + this.processType = saleContract }, goToProcurementContract() { this.changeMode(procurementContractProcess) - this.processType = 'procurement_contract' + this.processType = procurementContract }, goToContractDetail() { @@ -712,6 +767,7 @@ this.procurementDetails = procurementDetails.map(detail => ({ ...detail, feeType: computeFeeType(detail.type), + totalTaxInclude_: detail.totalTaxInclude, totalTaxInclude: null, // 存在相同字段转换一下 isUnderwritten: detail.isUnderwritten === 1 ? "是" : "否" })) @@ -764,9 +820,12 @@ this.$message.error("未上传附件"); return false } + if (processType === saleContract) { + this.checkExpirationDate() + } // 采购合同需要验证 供应商比选材料 - if (processType === 'procurement_contract') { + if (processType === procurementContract) { const { procurementMode } = processForm // specify_purchase("指定采购"), @@ -869,8 +928,20 @@ }).finally(() => loading.close()) }, + checkExpirationDate() { + const emptyRows = this.incomeDetails.filter(detail => isBlank(detail.expirationDate)) + if (isNotEmpty(emptyRows)) { + const row = emptyRows[0] + this.$message.error("名称为：'" + row.name + "' 类别为：'" + row.type + "' 的质保期未填写") + return false + } + return true + }, submitToSaleContractProcess() { - this.goToSaleContractProcess() + // 做校验 + if (this.checkExpirationDate()) { + this.goToSaleContractProcess() + } }, handleRemove(file, fileList) { @@ -969,6 +1040,8 @@ return "新增销售合同流程" case saleContractDetail: return "销售合同清单明细" + case procurementContractDetail: + return "业务采购合同清单明细" case procurementContractProcess: return "新增业务采购合同流程" }