From 8a2ca99a372a7b44b990ab161337dfb333767e38 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期二, 12 九月 2023 11:13:01 +0800
Subject: [PATCH] 5600码盘功能点确定时获取正在码盘里没有显示的字段传到脚本里改进

---
 pages/modal/5600.vue |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index e619e88..7eb6358 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);
-	    
+		//鑾峰彇姝e湪鐮佺洏閲屾病鏈夋樉绀虹殑瀛楁
+		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) => ({

--
Gitblit v1.9.1