From 2278ff7c0401f7f97e168a0943192357c1999cbf Mon Sep 17 00:00:00 2001
From: tom <tom.he@highdatas.com>
Date: 星期六, 03 八月 2024 13:50:15 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/promotion/promotion_html

---
 module/md/page/customer/page/evaluation_management_edit.html |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/md/page/customer/page/evaluation_management_edit.html b/module/md/page/customer/page/evaluation_management_edit.html
index da88915..97d605f 100644
--- a/module/md/page/customer/page/evaluation_management_edit.html
+++ b/module/md/page/customer/page/evaluation_management_edit.html
@@ -674,7 +674,7 @@
 							var formData_criteria_ = []
 							var formData_criteria_new = []
 							var criteria_ = {}
-							
+
 							me.formdata_rule_group.map(g=>{
 								formData_criteria_ = formData_criteria_.concat(g.children)
 							}) //缂栬緫椤甸潰鐨勮瘎鍒嗘暟鎹拰棰樼洰
@@ -691,7 +691,11 @@
 									}
 								})
 							})
-						
+							let formData_criteria_history = clone(me.formData_criteria)
+										formData_criteria_history.map(e =>{
+											e['data_id'] = e.id
+											delete e.id
+										})
 							// me.formdata_rule_group.map(g=>{
 								
 							// })

--
Gitblit v1.8.0