From 3204b10b5fd7e3631172fb5eb8fce1a6acd0eca9 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 14 Dec 2022 14:51:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/business/process-new.ftl  | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index fc360aa..d3f5a8a 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -239,12 +239,11 @@
             <el-table-column prop="param" label="参数"></el-table-column>
             <el-table-column prop="unit" label="单位"></el-table-column>
             <el-table-column prop="amount" label="数量"></el-table-column>
-            <el-table-column prop="price" label="单价" width="100"></el-table-column>
+            <el-table-column prop="price" label="单价" width="120"></el-table-column>
             <el-table-column prop="taxRate" label="税率"></el-table-column>
-            <el-table-column prop="totalTaxInclude" label="含税金额" width="100"></el-table-column>
-            <el-table-column prop="totalTaxExclude" label="不含税金额" width="100"></el-table-column>
-            <el-table-column prop="totalTax" label="含税总金额" width="100"></el-table-column>
-            <el-table-column prop="fee" label="税金"></el-table-column>
+            <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="税金"></el-table-column>
 
             <el-table-column prop="expirationDate" label="质保期" fixed="right" width="150">
               <template slot-scope="scope">
@@ -627,14 +626,27 @@
           this.changeMode(saleContractDetail)
           const loading = this.$loading({
             lock: true,
-            text: '正在加载项目',
+            text: '销售合同清单明细',
             spinner: 'el-icon-loading',
             background: 'rgba(0, 0, 0, 0.7)'
           })
           fetch("${base}/process/sale-contract-details/" + id)
               .then(res => res.json())
               .then(data => {
-                this.saleContractDetails = data
+                // 转换数据
+                // @formatter:off
+                const computeType = (type) => {
+                  switch (type) {
+                    case 1: return '设备'
+                    case 2: return '工程'
+                    case 3: return '服务'
+                    default: return '未知'
+                  }
+                }
+                // @formatter:on
+                this.saleContractDetails = data.map(detail => ({
+                  ...detail, type: computeType(detail.type)
+                }))
               })
               .catch(err => {
                 this.$message.error("销售合同清单明细加载失败");