From b4e5d5cad762d2fce28bd8e5e708c5b4d85a0747 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Fri, 30 Dec 2022 11:08:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=20=E9=A2=84=E7=AE=97=E9=87=87=E8=B4=AD=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E8=87=B3=E5=B0=91=E9=80=89=E6=8B=A9=E4=B8=80=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/business/process-new.ftl  | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index 0181d27..e545156 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -490,7 +490,7 @@
             <el-table-column prop="totalTaxInclude_" label="含税总金额（元）" width="120"></el-table-column>
             <el-table-column prop="totalTaxExclude" label="不含税金额（元）" width="120"></el-table-column>
             <el-table-column prop="totalTax" label="税金（元）" width="110"></el-table-column>
-            <el-table-column prop="isUnderwritten" label="是否垫资"></el-table-column>
+            <el-table-column prop="isUnderwrittenDesc" label="是否垫资"></el-table-column>
             <el-table-column prop="payTime" label="支出时间" width="160"></el-table-column>
             <el-table-column prop="payAmount" label="支出金额（元）" width="120"></el-table-column>
             <el-table-column prop="amountAlready" label="已采购数量" width="100"></el-table-column>
@@ -674,16 +674,21 @@
        * 过滤本次流程要填写的采购清单
        */
       filterProcurementDetails() {
-        this.procurementDetailSelectorVisible = false
-        this.changeMode(procurementContractProcess)
-        this.processType = procurementContract
-
-        const procurementDetails = this.procurementDetails.filter(detail => {
+        const filteredProcurementDetails = this.procurementDetails.filter(detail => {
           return detail.amountCurrent && detail.amountCurrent !== 0;
         })
-        this.procurementDetails = procurementDetails
+
+        if (isEmpty(filteredProcurementDetails)) {
+          this.$message.warning("预算采购明细至少选择一项")
+          return
+        }
+        this.processType = procurementContract
+        this.changeMode(procurementContractProcess)
+        this.procurementDetailSelectorVisible = false
+
+        this.procurementDetails = [...filteredProcurementDetails]
         // 保留副本，提交订单的时候构建表单的时候用
-        this.filteredProcurementDetails = [...procurementDetails]
+        this.filteredProcurementDetails = filteredProcurementDetails
       },
 
       goToHome() {
@@ -851,7 +856,6 @@
               this.procurementDetails = procurementDetails && procurementDetails.map(detail => ({
                 ...detail, feeType: computeFeeType(detail.type),
                 totalTaxInclude_: detail.totalTaxInclude, totalTaxInclude: undefined, // 存在相同字段转换一下
-                isUnderwritten: detail.isUnderwritten === 1 ? "是" : "否",
                 rowKey: rowKey++, children: []
               }))