From 2e01be1d067ad3366f8353e2732307ce8a769d52 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期三, 30 八月 2023 11:38:08 +0800
Subject: [PATCH] 3037增加从数据-带选择按钮-选择前事件和选择后事件处理功能和侧滑功能

---
 pages/modal/ms_classAttr.vue |  896 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 667 insertions(+), 229 deletions(-)

diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index f0babd9..463dbc3 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;
@@ -241,11 +257,72 @@
 	    right: -10px;
 	    z-index: 100;
 	}
-	
+	.view-popup{
+		position:relative;
+	}
+	.popup-content {
+		@include flex;
+		align-items: center;
+		justify-content: center;
+		padding: 30rpx;
+		background-color: #fff;
+		/* height: 150px; */
+		/* border: 1px solid red; */
+	}
+	.popup-cont {
+		overflow-y: auto;
+		/* border: 1px solid red; */
+	}
+	.popup-height {
+		@include height;
+		/* width: 200px; */
+	}
+	.popup-header{
+		font-size: 42rpx;
+		font-weight: bold;
+		margin:20rpx 20rpx 0px 20rpx;
+	}
+	.view_popup_CheckList{
+		margin-bottom: 20rpx;
+	}
+	.popup-footer{
+		float: right;
+		position:absolute;
+		bottom:0;
+		right:20rpx;
+	}
+	button.btn_popup_add {
+		width:180rpx;
+		margin-top: 50rpx;
+		margin-right: 20rpx;
+		padding: 15rpx;
+		line-height: 1.5;
+		background: #27A6E1;
+		border: none;
+		color: #fff;
+	    font-size: 38rpx;
+		font-weight: bold;
+		/* float: left; */
+		display: inline-block;
+	}
+	button.btn_popup_cancel {
+		width:180rpx;
+		margin-top: 50rpx;
+		padding: 15rpx;
+		line-height: 1.5;
+		background: #27A6E1;
+		border: none;
+		color: #fff;
+	    font-size: 38rpx;
+		font-weight: bold;
+		/* float: right; */
+		display: inline-block;
+	}
 </style>
 
 <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,76 +332,77 @@
 				<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':''}">
+					<view class="form-group" v-if="attr.Type=='瀛楃涓� || attr.Type=='鍙彉闀垮瓧绗︿覆' || attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�" :style="{'display':attr.hidden == true?'none':''}">
 						<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</text>  <!-- attr.NotEmpty=='1' -->
+							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</text>  <!-- attr.NotEmpty=='1' -->
 							<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>
 							<!-- <div style='width: 100px;position: relative;'> 
 							<image class="divX" src="../../images/msg_50_new.png"></image>-->
-							<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}" :disabled="attr.edit?false:true" > <!-- =='flase'?true:false -->
+							<input :type="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�?'number':'text'" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" :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}" :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}" :disabled="attr.edit?false:true"></textarea>
 							<!-- </div> -->
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}">
-							<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</p>
+							<i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</p>
 							<!-- <div style='width: 100%;position: relative;'>
 								<image class="divX" src="../../images/msg_50_new.png"></image> -->
-							<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] - classattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) - (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] - classattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) - (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] - classattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true"></textarea>
+							<input :type="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�?'number':'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] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (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] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (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] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true"></textarea>
 							<!-- </div> -->
 							<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':''}">
+					<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': classattr.control_style=='宸﹀彸甯冨眬'?classattr.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>
+								<text>{{attr.DispName}}<i class="i_tishi" v-if="attr.notempty==true">*</i></text>
 							</label>
 						</checkbox-group>
 					</view>
-					<view class="form-group" v-if="attr.Type=='鏃ユ湡' || attr.Type=='鏃堕棿'" :style="{'display':attr.hidden == 'True'?'none':''}">
+					<view class="form-group" v-if="attr.Type=='鏃ユ湡' || attr.Type=='鏃堕棿'" :style="{'display':attr.hidden == true?'none':''}">
 						<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</text>
+							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.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}">
 							   <view class="picker">{{attr.Value}}</view>
 							</picker>
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
-							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.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] - classattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) +'%'}">
+							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</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] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}">
 							   <view class="picker">{{attr.Value}}</view>
 							</picker>
 						</view>
 					</view>
-					<view class="form-group" v-if="attr.Type=='瀛楀吀' || attr.Type=='瀛楀吀-瀛楃涓�" :style="{'display':attr.hidden == 'True'?'none':''}">
+					<view class="form-group" v-if="attr.Type=='瀛楀吀' || attr.Type=='瀛楀吀-瀛楃涓� || attr.Type=='瀛楀吀-鏁存暟'" :style="{'display':attr.hidden == true?'none':''}">
 						<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</text>
+							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</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}" :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}" :disabled="attr.edit?false:true"></select-cy>
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
-							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.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] - classattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) +'%'}">
+							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</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] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}">
 								<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="onchange2" v-else-if="attr.select==true" :data-index="index" :data-iindex="iindex" :style="{'display':'inline-block','margin-left':'8px','width':attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}"></select-cy>
 						</view>
 					</view>
-					<view class="form-group" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)' || attr.Type=='寮曠敤瀵硅薄(澶氫釜)'" :style="{'display':attr.hidden == 'True'?'none':''}">
+					<view class="form-group" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)' || attr.Type=='寮曠敤瀵硅薄(澶氫釜)'" :style="{'display':attr.hidden == true?'none':''}">
 						<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</text>
+							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</text>
 							<div class="text-right" 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>
@@ -337,8 +415,8 @@
 							<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" disabled="true" >
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
-							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.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] - classattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) - 9 +'%'}" disabled="true" >
+							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</p>
+							<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}" 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>
@@ -350,82 +428,86 @@
 							</div>
 						</view>
 					</view>
-					<view class="form-group" v-if="attr.Type=='寮曠敤浜哄憳'" :style="{'display':attr.hidden == 'True'?'none':''}">
+					<view class="form-group" v-if="attr.Type=='寮曠敤浜哄憳'" :style="{'display':attr.hidden == true?'none':''}">
 						<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</text>
+							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</text>
 							<div class="text-right">
 								<a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
 							<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true" >
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
-							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.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" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) - 9 +'%'}" disabled="true" >
+							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</p>
+							<input type="text" class="attr_field" :value="attr.Value" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}" disabled="true" >
 							<div class="text-right2">
 								<a class="class_attr_add_per" @tap="classAttr_AddPer(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':''}">
+					<view class="form-group" v-if="attr.Type=='寮曠敤椤圭洰'" :style="{'display':attr.hidden == true?'none':''}">
 						<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</text>
+							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</text>
 							<div class="text-right">
 								<a href="#" class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
 							<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true" >
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
-							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.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" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) - 9 +'%'}" disabled="true" >
+							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</p>
+							<input type="text" class="attr_field" :value="attr.Value" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true ?10:5) - 9 +'%'}" disabled="true" >
 							<div class="text-right2">
 								<a class="class_attr_add_prj" @tap="classAttr_AddPrj(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':''}">
+					<view class="form-group" v-if="attr.Type=='缂栫爜'" :style="{'display':attr.hidden == true?'none':''}">
 						<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</text>
+							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</text>
 							<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" :disabled="attr.edit?false:true" >
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
-							<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) +'%'}" :disabled="attr.edit?false:true" >
+							<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true ?10:5) +'%'}" :disabled="attr.edit?false:true" >
 							<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>
 						</view>
 					</view>
-					<view class="form-group" v-if="attr.Type=='鐪佸競鍖�" :style="{'display':attr.hidden == 'True'?'none':''}">
+					<view class="form-group" v-if="attr.Type=='鐪佸競鍖�" :style="{'display':attr.hidden == true?'none':''}">
 						<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>{{attr.DispName}}:</text>
+							<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</text>
 							<pickerAddress class="date_iput" @change="addresschange" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" >{{attr.Value}}</pickerAddress>
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
-							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.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] - classattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) +'%'}">{{attr.Value}}</pickerAddress>
+							<p class="tx_title2" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</p>
+							<pickerAddress class="date_iput attr_field" @change="addresschange" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true ?10:5) +'%'}">{{attr.Value}}</pickerAddress>
 						</view>
 					</view>
 				</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" @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-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>
@@ -437,155 +519,182 @@
 					</div>
 					<div class="subclass_attr_body" :style="{'display':subclassattr.Open?'block':'none'}">
 						<div class="dv_field_div" v-for="(attr,iindex) in subclassattr.Attr">
-							<view class="form-group" v-if="attr.Type=='瀛楃涓� || attr.Type=='鍙彉闀垮瓧绗︿覆' || attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�" :style="{'display':attr.hidden == 'True'?'none':''}">
+							<view class="form-group" v-if="attr.Type=='瀛楃涓� || attr.Type=='鍙彉闀垮瓧绗︿覆' || 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>  <!-- attr.NotEmpty=='1' -->
+									<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>  <!-- attr.NotEmpty=='1' -->
 									<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="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�?'number':'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>
+									<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">*</i>{{attr.DispName}}:</p>
+									<input :type="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�?'number':'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'}">
+							<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-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>
+										<text>{{attr.DispName}}<i class="i_tishi" v-if="attr.notempty==true">*</i></text>
 									</label>
 								</checkbox-group>
 							</view>
-							<view class="form-group" v-if="attr.Type=='鏃ユ湡' || attr.Type=='鏃堕棿'" :style="{'display':attr.hidden == 'True'?'none':''}">
+							<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 +'%'}">
+									<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">*</i>{{attr.DispName}}:</p>
+									<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>
 							</view>
-							<view class="form-group" v-if="attr.Type=='瀛楀吀' || attr.Type=='瀛楀吀-瀛楃涓�" :style="{'display':attr.hidden == 'True'?'none':''}">
+							<view class="form-group" v-if="attr.Type=='瀛楀吀' || 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">
+									<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 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 +'%'}">
+									<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">*</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-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="{'display':'inline-block','margin-left':'8px','width':attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}"></select-cy>
 									
 								</view>
 							</view>
-							<view class="form-group" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)' || attr.Type=='寮曠敤瀵硅薄(澶氫釜)'" :style="{'display':attr.hidden == 'True'?'none':''}">
+							<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>
+									<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>
 									<div class="text-right" 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-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" >
+									<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">*</i>{{attr.DispName}}:</p>
+									<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>
 									</div>
 								</view>
 							</view>
-							<view class="form-group" v-if="attr.Type=='寮曠敤浜哄憳'" :style="{'display':attr.hidden == 'True'?'none':''}">
+							<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>
+									<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>
 									<div class="text-right">
 										<a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i class="ace-icon fa fa-plus-circle"></i></a>
 									</div>
 									<input type="text" :value="attr.Value" :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>
+									<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">*</i>{{attr.DispName}}:</p>
 									<input type="text" class="attr_field" :value="attr.Value" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 16 +'%'}" disabled="true" >
 									<div class="text-right2">
 										<a class="class_attr_add_per" @tap="classAttr_AddPer(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':''}">
+							<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>
+									<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>
 									<div class="text-right">
 										<a href="#" class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i class="ace-icon fa fa-plus-circle"></i></a>
 									</div>
 									<input type="text" :value="attr.Value" :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>
+									<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">*</i>{{attr.DispName}}:</p>
 									<input type="text" class="attr_field" :value="attr.Value" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 16 +'%'}" disabled="true" >
 									<div class="text-right2">
 										<a class="class_attr_add_prj" @tap="classAttr_AddPrj(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':''}">
+							<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" >
+									<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>
+									<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" >
+									<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">*</i>{{attr.DispName}}:</p>
+									<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 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>
+									<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>
+									<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>
+									<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">*</i>{{attr.DispName}}:</p>
+									<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(iiindex)"><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>
+		
+		<!-- 鏅�寮圭獥 top bottom center left right -->
+		<view>
+			<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
+				<view class="popup-header">{{check_list.title}}</view>
+				<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }" 
+				:style="{'width':check_list.width?check_list.width+'px':'200px','height':check_list.height?check_list.height+'px':'88%'}">
+					<view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}">
+						<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
+							<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check" :data-index="index"  :style="{'margin-left': '10rpx'}">
+								<label>
+									<checkbox :value="item.check" :checked="item.check"/>
+									<text>{{item.name}}</text>
+								</label>
+							</checkbox-group>
+						</view>
+					</view>
+					<view class="popup-footer">
+						<button type="default" @tap="popup_sava" class="btn_popup_add">纭畾</button>
+						<button type="default" @tap="popup_cancel" class="btn_popup_cancel">鍙栨秷</button>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 	</view>
 </template> 
 
@@ -611,6 +720,8 @@
 				subClassAttrList:[],
 				subPanelList:[],
 				subClassGridStyle:[],
+				popupType:"center",
+				check_list:{},
 			}
 		},
 		onLoad(options) {
@@ -683,6 +794,157 @@
 			}
 		},
 		methods: {
+			scan_classAttr_extButton(e){ //閫夋嫨鎸夐挳鍓�+				var $this = this;
+				var Before_Select_Event = $this.$data.param.Scan_Code.Before_Select_Event;
+				if(!Before_Select_Event){
+					uni.showModal({title:"鎻愮ず",content:"閫夋嫨鍓嶄簨浠朵负绌猴紒",showCancel:false,confirmText:"鍙栨秷"});
+					return;
+				}
+				// if(!After_Select_Event){
+				// 	uni.showModal({title:"鎻愮ず",content:"閫夋嫨鍚庝簨浠朵负绌猴紒",showCancel:false,confirmText:"鍙栨秷"});
+				// 	return;
+				// }
+				// var data_attr = this.$data.classAttrList[index].Attr[iindex];
+				// this.DataObjRunCustomEvent_Return(Before_Select_Event, '', After_Select_Event, '', '');
+				var mast_attr=[];
+				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.Value=='璇烽�鎷�){
+							uni.showModal({title:"鎻愮ず",content:ar.DispName+"鏈�鎷╂暟鎹紒",showCancel:false,confirmText:"鍙栨秷"});
+							return;
+						}
+						if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
+							if(ar.Value=='璇�) ar.Value='';
+						if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
+							mast_attr.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
+						else if(ar.Type=='甯冨皵鍊�)
+							mast_attr.push({ attr: ar.Name, value: ar.Value?'1':'0'});
+						else
+							mast_attr.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
+					}
+				}
+				
+				var req=[];
+				var attrlist = this.$data.subClassAttrList;
+				var msg='';
+				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: Before_Select_Event.ID,
+				    edtype: "7",//"0",
+				    projectid: '',
+				    rclsid: '',
+				    robjid: '',
+				    userlogin: '',
+				    clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
+				    objid: "",
+				    attr: req,
+					mast_attr: mast_attr,
+					inputParamter: mast_attr
+				}
+				// console.log(info);
+				this.scan_DataObjRunCustomEvent(info, "");
+			},
+			popupChange(e) {
+				console.log('褰撳墠妯″紡锛� + e.type + ',鐘舵�锛� + e.show);
+			},
+			checkChange(e){ //寮规check閫夋嫨
+				// console.log(e.target.dataset);
+				var index = e.target.dataset.index;
+				var ischeck = e.target.dataset.ischeck;
+				var data = this.$data.check_list.items;
+				// this.$data.check_list.items=[];
+				if(this.$data.check_list.multiple_choice=="0"){ //鍒ゆ柇鏃跺崟閫夎繕鏄閫�+					for(var i in data){
+						data[i].check=false;
+					}
+				}
+				data[index].check=ischeck?false:true;
+				this.$data.check_list.items=data;
+				
+			},
+			popup_cancel(e){ //寮规鍙栨秷
+				this.$refs.popup.close();
+			},
+			popup_sava(e){ //寮规纭畾 閫夋嫨鎸夐挳鍚�+				var $this = this;
+				var After_Select_Event = $this.$data.param.Scan_Code.After_Select_Event;
+				if(!After_Select_Event){
+					uni.showModal({title:"鎻愮ず",content:"閫夋嫨鍚庝簨浠朵负绌猴紒",showCancel:false,confirmText:"鍙栨秷"});
+					return;
+				}
+				var items = $this.$data.check_list.items;
+				var data=[];
+				var name="";
+				for (var i = 0; i < items.length; i++) {
+					if(items[i].check==true){
+						if(name)
+							name+=';';
+						name+=items[i].name;
+						data.push({id:items[i].id,name:items[i].name});
+					}
+				}
+				if(data.length==0){
+					uni.showModal({title:"鎻愮ず",content:"鏈�鎷╂暟鎹紒",showCancel:false,confirmText:"鍙栨秷"});
+					return;
+				}
+				var mast_attr=[];
+				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.Value=='璇烽�鎷�){
+							uni.showModal({title:"鎻愮ず",content:ar.DispName+"鏈�鎷╂暟鎹紒",showCancel:false,confirmText:"鍙栨秷"});
+							return;
+						}
+						if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
+							if(ar.Value=='璇�) ar.Value='';
+						if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
+							mast_attr.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
+						else if(ar.Type=='甯冨皵鍊�)
+							mast_attr.push({ attr: ar.Name, value: ar.Value?'1':'0'});
+						else
+							mast_attr.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
+					}
+				}
+				
+				$this.$data.scanCodeVal=name;
+				var info = {
+				    eventid: After_Select_Event.ID,
+				    edtype: "7",
+				    projectid: '',
+				    rclsid: '',
+				    robjid: '',
+					userlogin: '',
+					clsid: 'MBOX',
+					objid: "",
+				    attr: mast_attr,
+					inputParamter: data,
+					enviroment: ''
+				}
+				// console.log(info);
+				this.scan_DataObjRunCustomEvent(info, "");
+				this.$refs.popup.close();
+			},
+			
 			cancel(e){
 				uni.navigateBack({
 					delta:1 //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
@@ -726,10 +988,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 +1013,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,6 +1041,11 @@
 				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;
@@ -787,6 +1055,53 @@
 						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++) {
@@ -890,76 +1205,89 @@
 			},
 			scan_onevent(e){
 				// console.log(e.target);
-				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 :''});
+				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, "");
 						}
-				        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);
@@ -1012,10 +1340,8 @@
 					var index ,iindex,dindex=0;
 					for(var i in this.$data.classAttrList){
 						for(var j in this.$data.classAttrList[i].Attr){
-							for(var d in this.$data.classAttrList[i].Attr[j].dictitem){
-								if(delvalue[0].Name == this.$data.classAttrList[i].Attr[j].dictitem[d].Name){
-									this.$data.classAttrList[i].Attr[j].Value="";
-								}
+							if(delvalue[0].attr == this.$data.classAttrList[i].Attr[j].Name){
+								this.$data.classAttrList[i].Attr[j].Value="";
 							}
 						}
 					}
@@ -1025,10 +1351,8 @@
 					var index ,iindex,dindex=0;
 					for(var i in this.$data.classAttrList){
 						for(var j in this.$data.classAttrList[i].Attr){
-							for(var d in this.$data.classAttrList[i].Attr[j].dictitem){
-								if(item[v].Name == this.$data.classAttrList[i].Attr[j].dictitem[d].Name){
-									index=i;iindex=j;dindex=d;
-								}
+							if(item[v].attr == this.$data.classAttrList[i].Attr[j].Name){
+								index=i;iindex=j;
 							}
 						}
 					}
@@ -1054,7 +1378,7 @@
 					        			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=='瀛楀吀-瀛楃涓�)
+					        		else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓� || ar.Type=='瀛楀吀-鏁存暟')
 										req.push({ attr: ar.Name, val: itemvalue.Name});
 					        		else
 					        			req.push({ attr: ar.Name, val: ar.Value ?ar.Value :''});
@@ -1078,9 +1402,131 @@
 				
 				
 			},
+			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.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++) {
+				        		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
+				        			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);
+				    }
+				}
+				
+			},
+			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=='瀛楀吀-瀛楃涓� || 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;
@@ -1128,6 +1574,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;
@@ -1175,7 +1625,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;
@@ -1191,21 +1641,6 @@
 				}
 				var data_attr = this.$data.classAttrList[index].Attr[iindex];
 				this.DataObjRunCustomEvent_Return(before_click_button, data_attr, button_callback, index,iindex);
-			},
-			scan_classAttr_extButton(e){  //---------鏈畬鎴�----------
-				var $this = this;
-				var Before_Select_Event = $this.$data.param.Scan_Code.Before_Select_Event.ID;
-				var After_Select_Event = $this.$data.param.Scan_Code.After_Select_Event.ID;
-				if(!Before_Select_Event){
-					uni.showModal({title:"鎻愮ず",content:"閫夋嫨鎸夐挳鍓嶄簨浠朵负绌猴紒",showCancel:false,confirmText:"鍙栨秷"});
-					return;
-				}
-				if(!After_Select_Event){
-					uni.showModal({title:"鎻愮ず",content:"鏂板鎸夐挳鍚庝簨浠朵负绌猴紒",showCancel:false,confirmText:"鍙栨秷"});
-					return;
-				}
-				// var data_attr = this.$data.classAttrList[index].Attr[iindex];
-				this.DataObjRunCustomEvent_Return(Before_Select_Event, '', After_Select_Event, '', '');
 			},
 			classAttr_AddPer(index,iindex){
 				var param={index:index,iindex:iindex};
@@ -1288,12 +1723,15 @@
 			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({
-					title:"鍔犺浇涓�.."
+					title:"鍔犺浇涓�..",
+					mask:true
 				});
 				var req=[];
 				var attrlist = this.$data.classAttrList;
@@ -1308,7 +1746,7 @@
 				        	req.push({ name: ar.Name, value: ar.ValID ?ar.ValID :'' });
 				        else if(ar.Type=='甯冨皵鍊�)
 							req.push({ name: ar.Name, value: ar.Value?'1':'0'});
-				        else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓�){
+				        else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓� || ar.Type=='瀛楀吀-鏁存暟'){
 							if(ar.select==true){ //鍒ゆ柇涓嬫媺鏄惁澶氶�
 								var valStr ="";
 								for(var v in ar.Value){
@@ -1323,8 +1761,8 @@
 						else
 							req.push({ name: ar.Name, value: ar.Value ?ar.Value :''});
 							
-						if ((ar.NotEmpty == '1' || ar.notempty == true) && !ar.Value) {
-						// if(ar.notEmpty=='1'){
+						if (ar.notempty == true && !ar.Value) {
+						// if(ar.NotEmpty=='1'){
 							uni.hideLoading();
 							// uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
 							uni.showModal({title:"鎻愮ず",content:ar.DispName+'涓嶈兘涓虹┖锛�,showCancel:false,confirmText:"鍙栨秷"});
@@ -1412,6 +1850,7 @@
 												for (var d = 0; d < ca.dictitem.length; d++) {
 													ca.dictitem[d].label=ca.dictitem[d].CN_S_NAME;
 													ca.dictitem[d].value=ca.dictitem[d].CN_S_NAME;
+													ca.dictitem[d].attr=ca.Name;
 													if(ca.dictitem[d].CN_C_IS_DEFAULT=='1')
 														ca.Value=ca.dictitem[d].CN_S_NAME;
 												}
@@ -1550,6 +1989,7 @@
 												for (var d = 0; d < ca.dictitem.length; d++) {
 													ca.dictitem[d].label=ca.dictitem[d].CN_S_NAME;
 													ca.dictitem[d].value=ca.dictitem[d].CN_S_NAME;
+													ca.dictitem[d].attr=ca.Name;
 													if(ca.dictitem[d].CN_C_IS_DEFAULT=='1')
 														ca.Value=ca.dictitem[d].CN_S_NAME;
 												}
@@ -1699,7 +2139,7 @@
 												for (var l = 0; l < this.$data.classAttrList[a].Attr.length; l++) {
 													var ca = this.$data.classAttrList[a].Attr[l];
 													if (val[i].attr  == ca.Name) {
-														if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓�){
+														if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓� || ca.Type=='瀛楀吀-鏁存暟'){
 															var dictItemList=[];
 															for(var d in val[i].choice_list){
 																var val =val[i].choice_list[d];
@@ -1797,7 +2237,7 @@
 												var attr = $this.$data.classAttrList[c].Attr;
 												for (var j = 0; j < attr.length; j++) {
 													if(attr[j].Name==result[i].attr){
-														if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓�){
+														if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓� || attr[j].Type=='瀛楀吀-鏁存暟'){
 															var dictItemList=[];
 															for(var d in result[i].choice_list){
 																var val =result[i].choice_list[d];
@@ -2208,7 +2648,7 @@
 		    									for (var l = 0; l < this.$data.subClassAttrList[a].Attr.length; l++) {
 		    										var ca = this.$data.subClassAttrList[a].Attr[l];
 		    										if (val[i].attr  == ca.Name) {
-		    											if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓�){
+		    											if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓� || ca.Type=='瀛楀吀-鏁存暟'){
 		    												var dictItemList=[];
 		    												for(var d in val[i].choice_list){
 		    													var val =val[i].choice_list[d];
@@ -2309,7 +2749,7 @@
 		    										var attr = $this.$data.subPanelList[s].subClassAttrList[c].Attr;
 													for (var j = 0; j < attr.length; j++) {
 														if(attr[j].Name==result[i].attr){
-															if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓�){
+															if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓� || attr[j].Type=='瀛楀吀-鏁存暟'){
 																var dictItemList=[];
 																for(var d in result[i].choice_list){
 																	var val =result[i].choice_list[d];
@@ -2351,12 +2791,26 @@
 		    			            }
 		    			        } else if (action.action_type == 'set_global_attr') {
 		    			            $this.$actiontr = action.value || [];
-		    			        } else if (action.action_type == 'add_subcls_panel') { //涓讳粠鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+		    			        } else if (action.action_type == 'open_common_dlg') {  //鎵撳紑渚ф粦寮规
+									var $this = this;
+						            if(action.value.common_dlg_id == 'check_list'){
+									   $this.$data.check_list= action.value.config;
+									   if(action.value.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+											$this.$data.popupType = 'right';
+									   else
+											$this.$data.popupType = 'center'
+									   // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+									   $this.$refs.popup.open($this.$data.popupType);
+								    }
+						        } else if (action.action_type == 'add_subcls_panel') { //涓讳粠鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹� 		    			            var result = action.value;
+									var $this = this;
 									let list_1 = JSON.parse(JSON.stringify(this.$data.subClassAttrList));
 									var scanCodeVal = $this.$data.scanCodeVal;
-									if(info.inputParamter[0].attr=="mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�-										scanCodeVal = "mast_input_3037-"+ii;
+									if(info.inputParamter[0].attr){
+										if(info.inputParamter[0].attr=="mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+											scanCodeVal = "mast_input_3037-"+ii;
+									}
 									$this.$data.subPanelList.push({
 										scanCodeVal:scanCodeVal,
 										subClassAttr:list_1
@@ -2396,6 +2850,7 @@
 										}
 									}
 		    			        }
+								
 		    			    }
 		    			}
 		    			
@@ -2453,7 +2908,8 @@
 		    },
 		    scan_OKDataObjRunCustomEvent(eventID){
 				uni.showLoading({
-					title:"鍔犺浇涓�.."
+					title:"鍔犺浇涓�..",
+					mask:true
 				});
 				var $this = this;
 				var req=[];
@@ -2469,7 +2925,7 @@
 							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 if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓�){
+						else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓� || ar.Type=='瀛楀吀-鏁存暟'){
 							if(ar.select==true){ //鍒ゆ柇涓嬫媺鏄惁澶氶�
 								var valStr ="";
 								for(var v in ar.Value){
@@ -2484,8 +2940,8 @@
 						else
 							req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
 							
-						if ((ar.NotEmpty == '1' || ar.notempty == true) && !ar.Value) {
-						// if(ar.notEmpty=='1'){
+						if (ar.notempty == true && !ar.Value) {
+						// if(ar.NotEmpty=='1'){
 							uni.hideLoading();
 							// uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
 							uni.showModal({title:"鎻愮ず",content:ar.DispName+'涓嶈兘涓虹┖锛�,showCancel:false,confirmText:"鍙栨秷"});
@@ -2508,7 +2964,7 @@
 								sub_req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
 							else if(ar.Type=='甯冨皵鍊�)
 								sub_req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
-							else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓�){
+							else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓� || ar.Type=='瀛楀吀-鏁存暟'){
 								if(ar.select==true){ //鍒ゆ柇涓嬫媺鏄惁澶氶�
 									var valStr ="";
 									for(var v in ar.Value){
@@ -2523,8 +2979,8 @@
 							else
 								sub_req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
 								
-							if ((ar.NotEmpty == '1' || ar.notempty == true) && !ar.Value) {
-							// if(ar.notEmpty=='1'){
+							if (ar.notempty == true && !ar.Value) {
+							// if(ar.NotEmpty=='1'){
 								uni.hideLoading();
 								// uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
 								uni.showModal({title:"鎻愮ず",content:ar.DispName+'涓嶈兘涓虹┖锛�,showCancel:false,confirmText:"鍙栨秷"});
@@ -2549,13 +3005,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);
@@ -2563,24 +3019,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