From 9970225ed26a821bf382145a47b8d9871cdef0cd Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期日, 15 一月 2023 09:34:30 +0800
Subject: [PATCH] test

---
 pages/modal/ms_classAttr.vue |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index 7544666..0928068 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -785,6 +785,7 @@
 					            clsid: this.$data.param.Sub_Cls.ID,
 					            objid: "",
 					            attr: req,
+								mast_attr: [],
 								inputParamter:[{ attr: 'mast_input_3037', value: result.decodedata }]
 					        }
 							
@@ -807,9 +808,27 @@
 						this.$data.scanCodeVal=result.decodedata;
 						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
+					        var mast_req=[];
+							//涓绘暟鎹被灞炴�
+							var classattrlist = this.$data.classAttrList;  
+							for (var i = 0; i < classattrlist.length; i++) {
+								var attr = classattrlist[i].Attr;
+								for (var j = 0; j < attr.length; j++) {
+									var ar = attr[j];
+									if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
+										if(ar.Value=='璇�) ar.Value='';
+									if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
+										mast_req.push({ attr: ar.Name, val: ar.ValID ?ar.ValID :'' });
+									else if(ar.Type=='甯冨皵鍊�)
+										mast_req.push({ attr: ar.Name, val: ar.Value?'1':'0'});
+									else
+										mast_req.push({ attr: ar.Name, val: ar.Value ?ar.Value :''});
+								}
+							}
 					        var req=[];
-					        var attrlist = this.$data.subClassAttrList;
-					        for (var i = 0; i < attrlist.length; i++) {
+					        //瀛愭暟鎹被灞炴�
+							var attrlist = this.$data.subClassAttrList;
+					        for (var i = 0; i < attrlist.length; i++) { 
 					        	var attr = attrlist[i].Attr;
 					        	for (var j = 0; j < attr.length; j++) {
 					        		var ar = attr[j];
@@ -833,6 +852,7 @@
 					            clsid: this.$data.param.Sub_Cls.ID,
 					            objid: "",
 					            attr: req,
+								mast_attr: mast_req,
 								inputParamter:[{ attr: 'input_3037', value: this.$data.scanCodeVal }]
 					        }
 							
@@ -2147,6 +2167,7 @@
 		    	    button_name: '鏂板',
 		    	    master: {
 		    	        cls_id: this.$data.param.Sub_Cls.ID, // button=bottom鏃�master鐨刢ls_id
+						attr: info.mast_attr //涓绘暟鎹被灞炴�
 		    	        //obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 		    	    }
 		    	};

--
Gitblit v1.9.1