From d6f62e53ceb2ea9f67646bae4fa54d5f3f576e3c Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Thu, 5 Jan 2023 19:24:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E9=87=91=E9=A2=9D=20=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/business/process-edit.ftl | 28 +++++++-----------
 .../templates/admin/business/process-new.ftl  | 29 +++++++------------
 2 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl
index e583a4b..25f7700 100644
--- a/src/main/resources/templates/admin/business/process-edit.ftl
+++ b/src/main/resources/templates/admin/business/process-edit.ftl
@@ -687,6 +687,15 @@
        * 保存 业务采购合同清单明细,返回上一级的表单界面
        */
       saveProcurementContractDetail() {
+        let contractAmount = 0
+        for (let element of this.procurementDetails) {
+          const children = element['children'] || []
+          contractAmount += element['totalTaxInclude'] || 0
+          for (let child of children) {
+            contractAmount += child['totalTaxInclude'] || 0
+          }
+        }
+        this.contractAmount = contractAmount
         this.goToProcurementContract()
       },
 
@@ -836,6 +845,7 @@
                   }
                   ret.push(parent)
                 }
+                console.log(ret)
                 return ret
               }
 
@@ -1298,24 +1308,6 @@
         this.applyDeptSectorOptions = JSON.parse('${applyDeptSectorOptions}')
       },
 
-      watch: {
-        // 每当 question 改变时，这个函数就会执行
-        procurementDetails(newValue, oldValue) {
-          if (this.processType === procurementContract) {
-            let contractAmount = 0
-            for (let element of newValue) {
-              const children = element['children'] || []
-              contractAmount = newValue['totalTaxInclude'] || 0
-              for (let child of children) {
-                contractAmount = contractAmount + child['contractAmount'] || 0
-              }
-            }
-
-            this.contractAmount = contractAmount
-          }
-        }
-      },
-
       filters: {
         ellipsis(value, limit = 40) {
           if (!value) return ''
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index 1131ea0..ed5d251 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -255,7 +255,7 @@
               </el-form-item>
 
               <el-form-item label="合同金额">
-                <span v-if="projectSelected">{{processForm.contractAmount}}元</span>
+                <span v-if="projectSelected">{{processForm.contractAmount|numberFormat}}元</span>
                 <span v-else>未选择项目</span>
               </el-form-item>
 
@@ -834,10 +834,20 @@
        * 保存 业务采购合同清单明细
        */
       saveProcurementContractDetail() {
+        let contractAmount = 0
+        for (let element of this.procurementDetails) {
+          const children = element['children'] || []
+          contractAmount += element['totalTaxInclude'] || 0
+          for (let child of children) {
+            contractAmount += child['totalTaxInclude'] || 0
+          }
+        }
+        this.processForm['contractAmount'] = contractAmount
         this.changeMode(procurementContractProcess)
         this.processType = procurementContract
       },
 
+
       goToContractDetail() {
         const { projectId } = this.processForm
         if (projectId) {
@@ -1475,23 +1485,6 @@
         // this.handleSelectProject({ id: 135 })
         this.applyDeptSectorOptions = JSON.parse('${applyDeptSectorOptions}')
       },
-      watch: {
-        // 每当 question 改变时，这个函数就会执行
-        procurementDetails(newValue, oldValue) {
-          if (this.processType === procurementContract) {
-            let contractAmount = 0
-            for (let element of newValue) {
-              const children = element['children'] || []
-              contractAmount = newValue['totalTaxInclude'] || 0
-              for (let child of children) {
-                contractAmount = contractAmount + child['contractAmount'] || 0
-              }
-            }
-
-            this.processForm['contractAmount'] = contractAmount
-          }
-        }
-      },
 
       filters: {
         ellipsis(value, limit = 40) {