From 5694a4f834c226351764c004c10c3e55620d96e7 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期三, 29 三月 2023 16:54:33 +0800
Subject: [PATCH] test

---
 pages/modal/ms_classAttr.vue |  423 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 348 insertions(+), 75 deletions(-)

diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index e2af8ff..7de23fe 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -176,6 +176,19 @@
 		float: left;
 		display: inline-block;
 	}
+	button.btn_sava {
+		width:100%;
+		margin-top: 50rpx;
+		padding: 20rpx;
+		line-height: 1.5;
+		background: #27A6E1;
+		border: none;
+		color: #fff;
+	    font-size: 38rpx;
+		font-weight: bold;
+		float: left;
+		display: inline-block;
+	}
 	.i_tishi{
 		color: red;
 		vertical-align: sub;
@@ -218,6 +231,9 @@
 		text-align: center;
 		font-weight: bold;
 	}
+	.v-panel{
+		min-height:788rpx;
+	}
 	.v-panellist{
 		border:4rpx solid #aaa;
 		border-radius: 10rpx;
@@ -246,6 +262,7 @@
 
 <template>
 	<view class="content">
+		<!-- 涓绘暟鎹�-->
 		<view class="v-area" v-for="(classattr,index) in classAttrList">
 			<div class="class_attr_title" style="display: none;">
 				<div class="title_line"></div>
@@ -255,6 +272,7 @@
 				<span class="title">{{classattr.Name}}</span>
 				<a href="javascript:;" class="arrow" @tap="onarrow(index,classattr.Open)"><i class="ace-icon fa ":class="classattr.Open?'fa-angle-down':'fa-angle-up'"></i></a>
 			</div>
+			<!-- 涓绘暟鎹樉绀鸿鎯呭尯 -->
 			<div class="class_attr_body" :style="{'display':classattr.Open?'block':'none'}">
 				<div class="dv_field_div" v-for="(attr,iindex) in classattr.Attr">
 					<view class="form-group" v-if="attr.Type=='瀛楃涓� || attr.Type=='鍙彉闀垮瓧绗︿覆' || attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�" :style="{'display':attr.hidden == 'True'?'none':''}">
@@ -406,26 +424,30 @@
 				</div>
 			</div>
 		</view>
-		<view class="v-area class_attr_body">
-			<view class="form-group">
-				<!-- 宸﹀彸甯冨眬 -->
-				<p class="tx_title2" >{{param.Scan_Code.Name}}:</p>
-				<input type="text" class="attr_field" :value="scanCodeVal" @focus="scan_ontap" :style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'">
-				<div class="text-right2" v-if="param.Scan_Code.Have_Select_Button==true">
-					<a @tap="scan_classAttr_extButton()" ><i class="ace-icon fa" :class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
-				</div>
-				<!-- 涓婁笅甯冨眬 -->
-				<!-- <text class="tx_title">{{param.Scan_Code.Name}}锛�/text> 
-				<div class="text-right" v-if="param.Scan_Code.Have_Select_Button==true">  
-					<a @tap="ms_classAttr_extButton()"><i class="ace-icon fa" :class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
-				</div>
-				<input type="text" value="" > -->
-			</view>
-		</view>
 		
+		<!-- 浠庢暟鎹�-->
 		<view class="v-panel">
 			<div class="panel_title">{{param.Sub_Cls.Title}}</div>
-			<view class="v-panellist" v-for="(subpanel,index) in subPanelList">
+			<!-- 浠庢暟鎹壂鐮佸尯 -->
+			<view class="v-area class_attr_body" v-if="param.Sub_Cls.Can_Add_Delete == true">
+				<h4 style="margin: 15rpx 0 0 30rpx;font-weight: bold;">鏂板{{param.Sub_Cls.Name }}</h4>
+				<view class="form-group">
+					<!-- 宸﹀彸甯冨眬 -->
+					<p class="tx_title2" >{{param.Scan_Code.Name}}:</p>
+					<input type="text" class="attr_field" :value="scanCodeVal" @focus="scan_ontap" @blur="scan_onevent" :style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'">
+					<div class="text-right2" v-if="param.Scan_Code.Have_Select_Button==true">
+						<a @tap="scan_classAttr_extButton()" ><i class="ace-icon fa" :class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
+					</div>
+					<!-- 涓婁笅甯冨眬 -->
+					<!-- <text class="tx_title">{{param.Scan_Code.Name}}锛�/text> 
+					<div class="text-right" v-if="param.Scan_Code.Have_Select_Button==true">  
+						<a @tap="ms_classAttr_extButton()"><i class="ace-icon fa" :class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
+					</div>
+					<input type="text" value="" > -->
+				</view>
+			</view>
+			<!-- 浠庢暟鎹樉绀鸿鎯呭尯 -->
+			<view class="v-panellist" v-for="(subpanel,iiindex) in subPanelList">
 				<view class="v-area" v-for="(subclassattr,index) in subpanel.subClassAttr">
 					<div class="class_attr_title" style="display: none;">
 						<div class="title_line"></div>
@@ -443,22 +465,22 @@
 									<div class="text-right" v-if="attr.ext_button==true">
 										<a @tap="classAttr_extButton(index,iindex)" ><i class="ace-icon fa fa-plus-circle"></i></a>
 									</div>
-									<input type="text" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true" > <!-- =='flase'?true:false -->
-									<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'" :data-index="index":data-iindex="iindex" style="height:60px;" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true"></textarea>
-									<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'" :data-index="index":data-iindex="iindex" style="height:90px;" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true"></textarea>
+									<input type="text" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true" > <!-- =='flase'?true:false -->
+									<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'" :data-iiindex="iiindex" :data-index="index":data-iindex="iindex" style="height:60px;" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true"></textarea>
+									<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'" :data-iiindex="iiindex" :data-index="index":data-iindex="iindex" style="height:90px;" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true"></textarea>
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith +'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</p>
-									<input type="text" class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true" >
-									<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'" :data-index="index":data-iindex="iindex" style="height:60px;" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true"></textarea>
-									<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'" :data-index="index":data-iindex="iindex" style="height:90px;" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true"></textarea>
+									<input type="text" class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true" >
+									<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'" :data-iiindex="iiindex" :data-index="index":data-iindex="iindex" style="height:60px;" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true"></textarea>
+									<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'" :data-iiindex="iiindex" :data-index="index":data-iindex="iindex" style="height:90px;" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true"></textarea>
 									<div class="text-right2" v-if="attr.ext_button==true">
 										<a @tap="classAttr_extButton(index,iindex)" ><i class="ace-icon fa fa-plus-circle"></i></a>
 									</div>
 								</view>
 							</view>
 							<view class="form-group" v-if="attr.Type=='甯冨皵鍊�" :style="{'display':attr.hidden == 'True'?'none':''}">
-								<checkbox-group class="check_rememberPwd" @change="oncheck" :data-ischeck="attr.Value" :data-index="index" :data-iindex="iindex" :style="{'margin-left': subclassattr.control_style=='宸﹀彸甯冨眬'?subclassattr.title_p_wdith+2 +'%':'10rpx'}">
+								<checkbox-group class="check_rememberPwd" @change="oncheck" :data-ischeck="attr.Value" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'margin-left': subclassattr.control_style=='宸﹀彸甯冨眬'?subclassattr.title_p_wdith+2 +'%':'10rpx'}">
 									<label>
 										<checkbox :value="attr.Value" :checked="attr.Value"/>
 										<text>{{attr.DispName}}<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></text>
@@ -468,13 +490,13 @@
 							<view class="form-group" v-if="attr.Type=='鏃ユ湡' || attr.Type=='鏃堕棿'" :style="{'display':attr.hidden == 'True'?'none':''}">
 								<view v-if="subclassattr.control_style=='涓婁笅甯冨眬'">
 									<text class="tx_title" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</text>
-									<picker mode="date" :value="attr.Value" @change="ondateTime" class="date_iput" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}">
+									<picker mode="date" :value="attr.Value" @change="ondateTime" class="date_iput" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}">
 									   <view class="picker">{{attr.Value}}</view>
 									</picker>
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</p>
-									<picker mode="date" :value="attr.Value" @change="ondateTime" class="date_iput attr_field" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 +'%'}">
+									<picker mode="date" :value="attr.Value" @change="ondateTime" class="date_iput attr_field" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 +'%'}">
 									   <view class="picker">{{attr.Value}}</view>
 									</picker>
 								</view>
@@ -482,17 +504,17 @@
 							<view class="form-group" v-if="attr.Type=='瀛楀吀' || attr.Type=='瀛楀吀-瀛楃涓�" :style="{'display':attr.hidden == 'True'?'none':''}">
 								<view v-if="subclassattr.control_style=='涓婁笅甯冨眬'">
 									<text class="tx_title" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</text>
-									<picker class="section_iput" @change="onchange" :range="attr.dictitem" range-key="CN_S_NAME" v-if="attr.select==false" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true">
+									<picker class="section_iput" @change="onchange" :range="attr.dictitem" range-key="CN_S_NAME" v-if="attr.select==false" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true">
 										<label class="">{{ attr.Value }}</label>
 									</picker>
-									<select-cy :value="attr.Value" :name="attr.Name" :options="attr.dictitem" showClearIcon="true" @change="onchange2" v-else-if="attr.select==true" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true"></select-cy>
+									<select-cy :value="attr.Value" :name="attr.Name" :options="attr.dictitem" showClearIcon="true" @change="sub_onchange2" v-else-if="attr.select==true" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true"></select-cy>
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</p>
-									<picker class="section_iput attr_field" @change="onchange" :range="attr.dictitem" range-key="CN_S_NAME" v-if="attr.select==false" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 +'%'}">
+									<picker class="section_iput attr_field" @change="onchange" :range="attr.dictitem" range-key="CN_S_NAME" v-if="attr.select==false" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 +'%'}">
 										<label class="">{{ attr.Value }}</label>
 									</picker>
-									<select-cy :value="attr.Value" :name="attr.Name" :options="attr.dictitem" showClearIcon="true" @change="onchange2" v-else-if="attr.select==true" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"></select-cy>
+									<select-cy :value="attr.Value" :name="attr.Name" :options="attr.dictitem" showClearIcon="true" @change="sub_onchange2" v-else-if="attr.select==true" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"></select-cy>
 									
 								</view>
 							</view>
@@ -503,21 +525,21 @@
 										<a @tap="classAttr_AddRef" :data-classid="attr.RelCls.split('|')[0]" :data-classname="attr.RelCls.split('|')[1]" ><i class="ace-icon fa fa-plus-circle"></i></a>
 									</div>
 									<div class="text-right" v-if="attr.Type=='寮曠敤瀵硅薄(澶氫釜)'">
-										<picker class="select" @change="classAttr_AddRef" :range="attr.RelClsList" range-key="name" :data-index="index" :data-iindex="iindex">
+										<picker class="select" @change="classAttr_AddRef" :range="attr.RelClsList" range-key="name" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex">
 											<label class="">{{ attr.Value }}</label>
 										</picker>
 										<a class="class_attr_add_ref"><i class="ace-icon fa fa-plus-circle"></i></a>
 									</div>
-									<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" disabled="true" >
+									<input type="text" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" disabled="true" >
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</p>
-									<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 16 +'%'}" disabled="true" >
+									<input type="text" class="attr_field" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 16 +'%'}" disabled="true" >
 									<div class="text-right2" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)'">
 										<a @tap="classAttr_AddRef" :data-classid="attr.RelCls.split('|')[0]" :data-classname="attr.RelCls.split('|')[1]" ><i class="ace-icon fa fa-plus-circle"></i></a>
 									</div>
 									<div class="text-right2" v-if="attr.Type=='寮曠敤瀵硅薄(澶氫釜)'">
-										<picker class="select" @change="classAttr_AddRef" :range="attr.RelClsList" range-key="name" :data-index="index" :data-iindex="iindex">
+										<picker class="select" @change="classAttr_AddRef" :range="attr.RelClsList" range-key="name" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex">
 											<label class="">{{ attr.Value }}</label>
 										</picker>
 										<a class="class_attr_add_ref"><i class="ace-icon fa fa-plus-circle"></i></a>
@@ -559,33 +581,36 @@
 							<view class="form-group" v-if="attr.Type=='缂栫爜'" :style="{'display':attr.hidden == 'True'?'none':''}">
 								<view v-if="subclassattr.control_style=='涓婁笅甯冨眬'">
 									<text class="tx_title" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</text>
-									<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" :disabled="attr.edit?false:true" >
+									<input type="text" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" :disabled="attr.edit?false:true" >
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</p>
-									<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 +'%'}" :disabled="attr.edit?false:true" >
+									<input type="text" class="attr_field" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 +'%'}" :disabled="attr.edit?false:true" >
 								</view>
 							</view>
 							<view class="form-group" v-if="attr.Type=='鐪佸競鍖�" :style="{'display':attr.hidden == 'True'?'none':''}">
 								<view v-if="subclassattr.control_style=='涓婁笅甯冨眬'">
 									<text class="tx_title" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</text>
-									<pickerAddress class="date_iput" @change="addresschange" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" >{{attr.Value}}</pickerAddress>
+									<pickerAddress class="date_iput" @change="addresschange" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" >{{attr.Value}}</pickerAddress>
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
 									<p class="tx_title2" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</p>
-									<pickerAddress class="date_iput attr_field" @change="addresschange" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 +'%'}">{{attr.Value}}</pickerAddress>
+									<pickerAddress class="date_iput attr_field" @change="addresschange" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 +'%'}">{{attr.Value}}</pickerAddress>
 								</view>
 							</view>
 						</div>
 					</div>
 				</view>
 				
-				<view class="v-paneldel"><a href="javascript:;" class="panel_del" @tap="panel_del(index)"><i class="ace-icon fu-delete"></i></a></view>
+				<view class="v-paneldel" v-if="param.Sub_Cls.Can_Add_Delete == true">
+					<a href="javascript:;" class="panel_del" @tap="panel_del(index)"><i class="ace-icon fu-delete"></i></a>
+				</view>
 			</view>
 		</view>
 		
-		<button type="default" @tap="cancel" class="btn_cancel">鍙栨秷</button>
-		<button type="default" @tap="sava" class="btn_add">{{title}}</button>
+		<button type="default" @tap="cancel" class="btn_cancel" v-if="param.Sub_Cls.Can_Add_Delete == true">鍙栨秷</button>
+		<button type="default" @tap="sava" class="btn_add" v-if="param.Sub_Cls.Can_Add_Delete == true">{{title}}</button>
+		<button type="default" @tap="sava" class="btn_sava" v-else-if="param.Sub_Cls.Can_Add_Delete == false">{{title}}</button>
 	</view>
 </template> 
 
@@ -726,10 +751,10 @@
 					name: styleName,
 					type: '2'
 				};
-				$this.$store.state.thisEditName = styleName;
 				// console.log($this.$store.getters.getclassGridStyleInfo);
 				//鑾峰彇涓绘暟鎹被鐣岄潰鏍峰紡
 				if(clsType=='Mast'){
+					$this.$store.state.thisEditName = styleName;
 					if($this.$store.getters.getclassGridStyleInfo){
 						$this.$data.classGridStyle = $this.$store.getters.getclassGridStyleInfo.data;
 						$this.class_attr_init();
@@ -751,6 +776,7 @@
 						});
 					}
 				} else if(clsType=='Sub'){  //鑾峰彇浠庢暟鎹被鐣岄潰鏍峰紡
+					$this.$store.state.thisEditSubName = styleName;
 					if($this.$store.getters.getSubClassGridStyleInfo){
 						$this.$data.subClassGridStyle = $this.$store.getters.getSubClassGridStyleInfo.data;
 						$this.subClass_attr_init();
@@ -778,14 +804,67 @@
 				getApp().onScan((result)=>{
 					//console.log(result.decodedata);
 					var isVal =this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value;
+					// if(!isVal){
+					// 	this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
+					// 	var isVald =this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value;
+					// 	return;
+					// }
 					//涓绘暟鎹被鎵爜鏌ヨ鏁版嵁
 					if (isVal!=result.decodedata) {
 						this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
+						uni.hideKeyboard();
 						//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈� 						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
 					        var req=[];
 					        var attrlist = this.$data.classAttrList;  //涓绘暟鎹被灞炴�
+					        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];
+					        		if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
+					        			if(ar.Value=='璇�) ar.Value='';
+					        		if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
+					        			req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
+					        		else if(ar.Type=='甯冨皵鍊�)
+					        			req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
+					        		else
+					        			req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
+					        	}
+					        }
+					        var info = {
+					            eventid: eventid,
+					            edtype: "7",//"0",
+					            projectid: '',
+					            rclsid: '',
+					            robjid: '',
+					            userlogin: '',
+					            clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
+					            objid: "",
+					            attr: req,
+								mast_attr: [],
+								inputParamter:[{ attr: 'mast_input_3037', value: result.decodedata }]
+					        }
+							
+					        this.scan_DataObjRunCustomEvent(info, "");
+					    }
+					}
+				})
+			},
+			subontap(e){ //鎵爜鍔熻兘
+				//console.log(e.target)
+				getApp().onScan((result)=>{
+					//console.log(result.decodedata);
+					var isVal =this.$data.subClassAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value;
+					//涓绘暟鎹被鎵爜鏌ヨ鏁版嵁
+					if (isVal!=result.decodedata) {
+						this.$data.subClassAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
+						uni.hideKeyboard();
+						//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�+						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+						if (eventid) {
+					        var req=[];
+					        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++) {
@@ -830,6 +909,7 @@
 					}
 					//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
 					if (isflag) {
+						uni.hideKeyboard();
 						this.$data.scanCodeVal=result.decodedata;
 						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
@@ -886,13 +966,91 @@
 					}
 				})
 			},
+			scan_onevent(e){
+				// console.log(e.target);
+				if(e.target.value){
+					var isflag=true;
+					for(var i in this.$data.subPanelList){
+						if(this.$data.subPanelList[i].scanCodeVal == e.target.value) 
+							isflag=false;
+					}
+					//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
+					if (isflag) {
+						uni.hideKeyboard();
+						this.$data.scanCodeVal=e.target.value;
+						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, value: ar.ValID ?ar.ValID :'' });
+									else if(ar.Type=='甯冨皵鍊�)
+										mast_req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
+									else
+										mast_req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
+								}
+							}
+							var req=[];
+							//瀛愭暟鎹被灞炴�
+							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];
+									if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
+										if(ar.Value=='璇�) ar.Value='';
+									if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
+										req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
+									else if(ar.Type=='甯冨皵鍊�)
+										req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
+									else
+										req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
+								}
+							}
+							var info = {
+								eventid: eventid,
+								edtype: '7',//"0",
+								projectid: '',
+								rclsid: '',
+								robjid: '',
+								userlogin: '',
+								clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
+								objid: "",
+								attr: req,
+								mast_attr: mast_req,
+								inputParamter:[{ attr: 'input_3037', value: this.$data.scanCodeVal }]
+							}
+							
+							this.scan_DataObjRunCustomEvent(info, "");
+						}
+					}
+				}
+			},
 			onarrow(index,open){
 				// console.log(index+'--'+open);
-				this.$data.classAttrList[index].Open=open==true?false:true;
+				var data_attr=this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Open;
+				if(!data_attr){
+					this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=open==true?false:true;
+					return;
+				}
+				this.$data.classAttrList[e.target.dataset['iiindex']].subClassAttr[index].Open=open==true?false:true;
 			},
 			ondateTime(e) {
 				//console.log(e.target)
+				var data_attr=this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value;
+				if(!data_attr){
+					this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.target.value;
+					return;
+				}
 				this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.target.value;
+				
 			},
 			onchange(e) {
 				console.log(e.target);
@@ -1011,17 +1169,19 @@
 				
 				
 			},
-			onevent(e){
-				// console.log(e.target);
-				var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
-				// console.log(data_attr);
-				if (e.target.value != data_attr.Value) {
-					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.target.value;
-					var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
+			sub_onchange(e) {
+				console.log(e.target);
+				var value=this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].dictitem[e.target.value];
+				var data_attr = this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
+				console.log(data_attr);
+				if (value.Name != data_attr.Value) {
+					this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value.Name;
+					console.log(this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value);
+					var eventid = this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
 					if (eventid) {
 				        // self.event_no_sub = 1;
 				        var req=[];
-				        var attrlist = this.$data.classAttrList;
+				        var attrlist = this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr;
 				        for (var i = 0; i < attrlist.length; i++) {
 				        	var attr = attrlist[i].Attr;
 				        	for (var j = 0; j < attr.length; j++) {
@@ -1043,11 +1203,136 @@
 				            rclsid: '',
 				            robjid: '',
 				            userlogin: '',
-				            clsid: this.$data.param.Master_Cls.ID,
+				            clsid: this.$data.param.Sub_Cls.ID,
 				            objid: "",
 				            attr: req,
 				        }
-				        this.DataObjRunCustomEvent(info, data_attr);
+				        this.DataObjRunCustomEvent(info);
+				    }
+				}
+				
+			},
+			sub_onchange2(item,value,delvalue) {
+				// console.log(item);
+				// console.log(value);
+				// console.log(delvalue);
+				var subClassAttr = this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr;
+				if(item.length==0){ //涓虹┖鏃讹紝娓呯┖灞炴�value
+					var index ,iindex,dindex=0;
+					for(var i in subClassAttr){
+						for(var j in subClassAttr[i].Attr){
+							for(var d in subClassAttr[i].Attr[j].dictitem){
+								if(delvalue[0].Name == subClassAttr[i].Attr[j].dictitem[d].Name){
+									subClassAttr[i].Attr[j].Value="";
+								}
+							}
+						}
+					}
+				}
+					
+				for(var v in item){
+					var index ,iindex,dindex=0;
+					for(var i in subClassAttr){
+						for(var j in subClassAttr[i].Attr){
+							for(var d in subClassAttr[i].Attr[j].dictitem){
+								if(item[v].Name == subClassAttr[i].Attr[j].dictitem[d].Name){
+									index=i;iindex=j;dindex=d;
+								}
+							}
+						}
+					}
+					var itemvalue = item[v];
+					var data_attr = subClassAttr[index].Attr[iindex];
+					
+					console.log(data_attr);
+					if (itemvalue.Name != data_attr.Value) {
+						subClassAttr[index].Attr[iindex].Value=value;
+						console.log(subClassAttr[index].Attr[iindex].Value);
+						var eventid = subClassAttr[index].Attr[iindex].action;
+						if (eventid) {
+					        // self.event_no_sub = 1;
+					        var req=[];
+					        var attrlist = subClassAttr;
+					        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];
+					        		if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
+					        			if(ar.Value=='璇�) ar.Value='';
+					        		if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
+					        			req.push({ attr: ar.Name, val: ar.ValID ?ar.ValID :'' });
+					        		else if(ar.Type=='甯冨皵鍊�)
+										req.push({ attr: ar.Name, val: ar.Value?'1':'0'});
+					        		else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓�)
+										req.push({ attr: ar.Name, val: itemvalue.Name});
+					        		else
+					        			req.push({ attr: ar.Name, val: ar.Value ?ar.Value :''});
+					        	}
+					        }
+					        var info = {
+					            eventid: eventid,
+					            edtype: "0",
+					            projectid: '',
+					            rclsid: '',
+					            robjid: '',
+					            userlogin: '',
+					            clsid: this.$data.param.Sub_Cls.ID,
+					            objid: "",
+					            attr: req,
+					        }
+					        this.DataObjRunCustomEvent(info);
+					    }
+					}
+				}
+				
+				
+			},
+			onevent(e){
+				// console.log(e.target);
+				var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
+				if(!data_attr){
+					this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.target.value;
+					return;
+				}
+				// console.log(data_attr);
+				if (e.target.value != data_attr.Value) {
+					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.target.value;
+					// var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
+					//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�+					var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+					if (eventid) {
+				        // self.event_no_sub = 1;
+				        var req=[];
+				        var attrlist = this.$data.classAttrList;  //涓绘暟鎹被灞炴�
+				        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];
+				        		if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
+				        			if(ar.Value=='璇�) ar.Value='';
+				        		if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
+				        			req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
+				        		else if(ar.Type=='甯冨皵鍊�)
+				        			req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
+				        		else
+				        			req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
+				        	}
+				        }
+				        var info = {
+				            eventid: eventid,
+				            edtype: "7",//"0",
+				            projectid: '',
+				            rclsid: '',
+				            robjid: '',
+				            userlogin: '',
+				            clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
+				            objid: "",
+				            attr: req,
+				        	mast_attr: [],
+				        	inputParamter:[{ attr: 'mast_input_3037', value: e.target.value }]
+				        }
+				        
+				        this.scan_DataObjRunCustomEvent(info, "");
 				    }
 				}
 				
@@ -1056,6 +1341,10 @@
 				// console.log(e.target);
 				var ischecked = e.target.dataset.ischeck?false:true;
 				var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
+				if(!data_attr){
+					this.$data.subPanelList[e.target.dataset['iiindex']].subClassAttr[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=ischecked;
+					return;
+				}
 				// console.log(data_attr);
 				if (ischecked != data_attr.Value) {
 					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=ischecked;
@@ -1103,7 +1392,7 @@
 			addresschange(e) {
 			    // console.log(e.target);
 			    console.log(e.data.join(';'))
-				this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.data.join(';');
+				this.$data.subClassAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.data.join(';');
 			},
 			classAttr_extButton(index,iindex){
 				var $this = this;
@@ -1216,8 +1505,10 @@
 			sava(){
 				if (this.$data.param.Before_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍓嶈剼鏈� 					this.scan_OKDataObjRunCustomEvent(this.$data.param.Before_OK_Event.ID);
-				else
+				else if (this.$data.param.After_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍚庤剼鏈� 					this.scan_OKDataObjRunCustomEvent(this.$data.param.After_OK_Event.ID);
+				else
+					uni.navigateBack({delta:1 });//杩斿洖灞傛暟锛�鍒欎笂涓婇〉
 			},
 			add(){
 				uni.showLoading({
@@ -2477,13 +2768,13 @@
 						objects:objects
 					}
 				};
-				console.log(JSON.stringify(dataJson));
+				// console.log(JSON.stringify(dataJson));
 		    	var dataInfo = {
 		            edtype: "7", eventid: eventID, projectid: '',rclsid: '', robjid: '', userlogin: '', 
 					clsid: 'MBOX', objid: '',attr: JSON.stringify([]), extinfo: JSON.stringify([]), 
 					global_attr: JSON.stringify($this.$data.global_attr),dataJson:JSON.stringify(dataJson)
 		        }
-				console.log(JSON.stringify(dataInfo));
+				// console.log(JSON.stringify(dataInfo));
 		    	console.log(dataInfo);
 		    	this.$store.dispatch('DataObjRunCustomEventInfo',dataInfo).then(success=>{
 		    		console.log(success);
@@ -2491,24 +2782,6 @@
 		    		if (success.code=='00000') {
 		    			var data = JSON.parse(success.data);		
 		    			var result = data.result;
-		    			for (var i = 0; i < result.length; i++) {
-		    			    // self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
-		    			    var length = 0;
-		    			    if (!$this.$data.refdatastore.filter(function (s) {
-		    			        return result[i].attr == s.attr
-		    			    }).length) {
-		    			        length = 1;
-		    			        $this.$data.refdatastore.push(result[i]);
-		    			    }
-		    			    if (length == 0) {
-		    			        for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-		    			            if ($this.$data.refdatastore[j].attr == result[i].attr) {
-		    			                $this.$data.refdatastore[j].value = result[i].value;
-		    			            }
-		    			        }
-		    			    }
-		    			}
-		    			
 		    			if(eventID != $this.$data.param.After_OK_Event.ID)
 		    				$this.scan_OKDataObjRunCustomEvent($this.$data.param.After_OK_Event.ID);
 						else{

--
Gitblit v1.9.1