From fd6b8f3edc8edf0a892bae55674fe8a05371bf0d Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期五, 27 十月 2023 08:36:35 +0800
Subject: [PATCH] 5600码盘确定后事件参数增加事务回滚参数start_transaction: true
---
pages/modal/5600.vue | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index e619e88..383cc02 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -640,8 +640,9 @@
this.$data.detail2StyleDefList.push(detailStyle);
// console.log(this.$data.detail2StyleDefList);
}else{
+ detailStyle.form.attrs = data.row.attrs;
this.$data.detail1StyleDefList.push(detailStyle);
- // console.log(this.$data.detail1StyleDefList);
+ // console.log(this.$data.detail1StyleDefList);
}
},
//鍔犺浇宸茬爜鐩樺唴瀹�@@ -751,7 +752,23 @@
detailAttrList.push(detail_attr);
});
// console.log(detailAttrList);
-
+ //鑾峰彇姝ｅ湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
+ this.$data.detail1StyleDefList.forEach(style=>{
+ style.form.attrs.forEach(attr => {
+ for(var key in detailAttrList){
+ let keys = Object.keys(detailAttrList[key]);
+ let isflag = true;
+ keys.forEach((ele) => {
+ if(ele == attr.attr) isflag = false;
+ });
+ if(isflag) {
+ detailAttrList[attr.attr] = attr.value;
+ }
+ }
+ });
+ });
+ // console.log(detailAttrList);
+ // return;
var input_param = Base64.encode(
JSON.stringify(
Object.keys(head_attr).map((a) => ({
@@ -783,7 +800,7 @@
);
var dataInfo={
ed_type: 0,
- start_transaction: '',
+ start_transaction: true,
class_id: this.$data.head_styledef.form.clsId,
class_name: '',
event_id: this.$data.param.After_OK_Event.ID,
--
Gitblit v1.9.1