From 9314df38af921dc7d72279e8c452badcd5e22d94 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期三, 04 一月 2023 15:20:31 +0800
Subject: [PATCH] test

---
 pages/modal/ms_classAttr.vue |  471 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 343 insertions(+), 128 deletions(-)

diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index 4c2deb3..4867287 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -81,6 +81,11 @@
 	    /* margin-left: -12px;
 	    margin-right: -12px; */
 	}
+	.subclass_attr_body .form-group {
+		margin: 20rpx 10rpx;
+	    /* margin-left: -12px;
+	    margin-right: -12px; */
+	}
 	.form-group > label[class*="col-"] {
 	    margin-bottom: 8rpx;
 		font-size: 32rpx;
@@ -96,10 +101,10 @@
 	    width: 100%;
 	}
 	.tx_title{
-		font-size: 36rpx;
+		font-size: 32rpx;
 	}
 	.tx_title2{
-		font-size: 36rpx;
+		font-size: 32rpx;
 		text-align: right;
 		display: inline-block;
 		vertical-align: -2px;
@@ -146,6 +151,7 @@
 		transition-duration: 0.1s;
 	}
 	button.btn_add {
+		width:49.5%;
 		margin-top: 50rpx;
 		padding: 20rpx;
 		line-height: 1.5;
@@ -154,6 +160,21 @@
 		color: #fff;
 	    font-size: 38rpx;
 		font-weight: bold;
+		float: right;
+		display: inline-block;
+	}
+	button.btn_cancel {
+		width:49.5%;
+		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;
@@ -200,8 +221,27 @@
 	.v-panellist{
 		border:4rpx solid #aaa;
 		border-radius: 10rpx;
-		margin-bottom: 10rpx;
+		margin: 0rpx 20rpx 10rpx 20rpx;
 	}
+	.v-paneldel{
+		text-align: right;
+	}
+	.panel_del{
+		font-size: 44rpx;
+		text-decoration: initial;
+		margin-top: 10rpx;
+		margin-right: 20rpx;
+	}
+	.divX{
+	    width: 20px;
+	    height: 20px;
+	    border-radius: 60%;
+	    position: absolute;
+	    top: -10px;
+	    right: -10px;
+	    z-index: 100;
+	}
+	
 </style>
 
 <template>
@@ -219,24 +259,29 @@
 				<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 v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || attr.NotEmpty=='1'">*</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 -->
 							<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="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
+							<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>
+							<!-- <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>
+							<!-- </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>
-							<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':''}">
@@ -249,39 +294,37 @@
 					</view>
 					<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="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || attr.NotEmpty=='1'">*</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="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
+							<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) +'%'}">
 							   <view class="picker">{{attr.Value}}</view>
 							</picker>
-							<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>
 						</view>
 					</view>
 					<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">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || 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}" :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="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
+							<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) +'%'}">
 								<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>
-							<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>
 						</view>
 					</view>
 					<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">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || attr.NotEmpty=='1'">*</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>
@@ -294,7 +337,7 @@
 							<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="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
+							<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" >
 							<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>
@@ -305,63 +348,59 @@
 								</picker>
 								<a class="class_attr_add_ref"><i class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
-							<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 v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || attr.NotEmpty=='1'">*</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="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
+							<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" >
 							<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>
-							<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 v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || attr.NotEmpty=='1'">*</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="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
+							<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" >
 							<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>
-							<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 v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || 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" >
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
-							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
+							<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" >
 							<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 v-if="classattr.control_style=='涓婁笅甯冨眬'">
-							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || 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>
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
-							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
+							<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>
-							<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>
 						</view>
 					</view>
 				</div>
@@ -371,7 +410,7 @@
 			<view class="form-group">
 				<!-- 宸﹀彸甯冨眬 -->
 				<p class="tx_title2" >{{param.Scan_Code.Name}}:</p>
-				<input type="text" class="attr_field" :value="scanCodeVal" @focus="scan_ontap" :style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-16)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-7)+'%;'">
+				<input type="text" class="attr_field" :value="scanCodeVal" @focus="scan_ontap" :style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'">
 				<div class="text-right2" v-if="param.Scan_Code.Have_Select_Button==true">
 					<a @tap="scan_classAttr_extButton()" ><i class="ace-icon fa" :class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
 				</div>
@@ -381,19 +420,13 @@
 					<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="" > -->
-				<!-- 鎵爜鍚庝簨浠惰繑鍥�-->
-				<!-- <div class="input_vallist" >
-					<ul v-for="(inputval,vindex) in inputValList">
-						<li><span>{{inputval.Name}}</span><a href="javascript:;" @tap="inputValListIsDel(vindex)"><i class="ace-icon fa fa-times"></i></a></li>
-					</ul>
-				</div> -->
 			</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" v-for="(subclassattr,index) in subpanel.subClassAttrList">
+				<view class="v-area" v-for="(subclassattr,index) in subpanel.subClassAttr">
 					<div class="class_attr_title" style="display: none;">
 						<div class="title_line"></div>
 						<div class="title_icon" :style="{'background-color':subclassattr.BkColor}">   
@@ -402,28 +435,26 @@
 						<span class="title">{{subclassattr.Name}}</span>
 						<a href="javascript:;" class="arrow" @tap="onarrow(index,subclassattr.Open)"><i class="ace-icon fa ":class="subclassattr.Open?'fa-angle-down':'fa-angle-up'"></i></a>
 					</div>
-					<div class="class_attr_body" :style="{'display':subclassattr.Open?'block':'none'}">
+					<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 v-if="subclassattr.control_style=='涓婁笅甯冨眬'">
-									<text class="tx_title" :style="{'width':subclassattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || attr.NotEmpty=='1'">*</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}" :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>
-									
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
-									<p class="tx_title2" :style="{'width':subclassattr.title_p_wdith+'%'}">{{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 - (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] - subclassattr.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] - subclassattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) - (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 || 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>
 									<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>
-									<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':''}">
@@ -436,39 +467,38 @@
 							</view>
 							<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="{'width':subclassattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></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>
 									<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="subclassattr.control_style=='宸﹀彸甯冨眬'">
-									<p class="tx_title2" :style="{'width':subclassattr.title_p_wdith+'%'}">{{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 - (attr.notempty==true || attr.NotEmpty=='1'?10:5) +'%'}">
+									<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 +'%'}">
 									   <view class="picker">{{attr.Value}}</view>
 									</picker>
-									<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>
 								</view>
 							</view>
 							<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">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || 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}" :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="subclassattr.control_style=='宸﹀彸甯冨眬'">
-									<p class="tx_title2" :style="{'width':subclassattr.title_p_wdith+'%'}">{{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 - (attr.notempty==true || attr.NotEmpty=='1'?10:5) +'%'}">
+									<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 +'%'}">
 										<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>
-									<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>
+									
 								</view>
 							</view>
 							<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">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || attr.NotEmpty=='1'">*</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>
@@ -481,8 +511,8 @@
 									<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" disabled="true" >
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
-									<p class="tx_title2" :style="{'width':subclassattr.title_p_wdith+'%'}">{{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 - (attr.notempty==true || attr.NotEmpty=='1'?10:5) - 9 +'%'}" 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 || 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" >
 									<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>
@@ -492,71 +522,69 @@
 										</picker>
 										<a class="class_attr_add_ref"><i class="ace-icon fa fa-plus-circle"></i></a>
 									</div>
-									<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 v-if="subclassattr.control_style=='涓婁笅甯冨眬'">
-									<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || attr.NotEmpty=='1'">*</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="{'width':subclassattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
-									<input type="text" class="attr_field" :value="attr.Value" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) - 9 +'%'}" 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 || attr.NotEmpty=='1'">*</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>
-									<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 v-if="subclassattr.control_style=='涓婁笅甯冨眬'">
-									<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || attr.NotEmpty=='1'">*</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="{'width':subclassattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
-									<input type="text" class="attr_field" :value="attr.Value" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - (attr.notempty==true || attr.NotEmpty=='1'?10:5) - 9 +'%'}" 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 || attr.NotEmpty=='1'">*</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>
-									<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 v-if="subclassattr.control_style=='涓婁笅甯冨眬'">
-									<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || 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" >
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
-									<p class="tx_title2" :style="{'width':subclassattr.title_p_wdith+'%'}">{{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 - (attr.notempty==true || attr.NotEmpty=='1'?10:5) +'%'}" :disabled="attr.edit?false:true" >
-									<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>
+									<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" >
 								</view>
 							</view>
 							<view class="form-group" v-if="attr.Type=='鐪佸競鍖�" :style="{'display':attr.hidden == 'True'?'none':''}">
 								<view v-if="subclassattr.control_style=='涓婁笅甯冨眬'">
-									<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i></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 || 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>
 								</view>
 								<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
-									<p class="tx_title2" :style="{'width':subclassattr.title_p_wdith+'%'}">{{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 - (attr.notempty==true || attr.NotEmpty=='1'?10:5) +'%'}">{{attr.Value}}</pickerAddress>
-									<i class="i_tishi" v-if="attr.notempty==true || attr.NotEmpty=='1'">*</i>
+									<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>
 								</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>
 		</view>
 		
+		<button type="default" @tap="cancel" class="btn_cancel">鍙栨秷</button>
 		<button type="default" @tap="sava" class="btn_add">{{title}}</button>
 	</view>
 </template> 
@@ -579,7 +607,6 @@
 				edit_compose_cls_id:"",
 				global_attr:[],
 				refdatastore: [],	   //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
-				// inputValList:[{Name:"test"},{Name:"test2"},{Name:"test3"},{Name:"test4"},{Name:"test5"},{Name:"test6"},{Name:"test7"}],
 				scanCodeVal:"",
 				subClassAttrList:[],
 				subPanelList:[],
@@ -656,6 +683,17 @@
 			}
 		},
 		methods: {
+			cancel(e){
+				uni.navigateBack({
+					delta:1 //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+				});
+			},
+			panel_del(index){
+				if (this.$data.subPanelList[index].scanCodeVal == this.$data.scanCodeVal) {
+					this.$data.scanCodeVal='';
+				}
+				this.$data.subPanelList.splice(index, 1);
+			},
 			async classGridStyleInfo(clsid,styleName,clsType){
 				var $this = this;
 				var gridstyleInfo = {
@@ -721,12 +759,14 @@
 				//console.log(e.target)
 				getApp().onScan((result)=>{
 					console.log(result.decodedata);
-					if (result.decodedata != this.$data.scanCodeVal) {
+					var isflag=true;
+					for(var i in this.$data.subPanelList){
+						if(this.$data.subPanelList[i].scanCodeVal == result.decodedata) 
+							isflag=false;
+					}
+					
+					if (isflag) {
 						this.$data.scanCodeVal=result.decodedata;
-						this.$data.subPanelList.push({
-							scanCodeVal:this.$data.scanCodeVal,
-							subClassAttrList:this.$data.subClassAttrList
-						}); 
 						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
 						if (eventid) {
 					        var req=[];
@@ -738,11 +778,11 @@
 					        		if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
 					        			if(ar.Value=='璇�) ar.Value='';
 					        		if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
-					        			req.push({ attr: ar.Name, val: ar.ValID ?ar.ValID :'' });
+					        			req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
 					        		else if(ar.Type=='甯冨皵鍊�)
-										req.push({ attr: ar.Name, val: ar.Value?'1':'0'});
+										req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
 					        		else
-					        			req.push({ attr: ar.Name, val: ar.Value ?ar.Value :''});
+					        			req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
 					        	}
 					        }
 					        var info = {
@@ -755,7 +795,7 @@
 					            clsid: this.$data.param.Sub_Cls.ID,
 					            objid: "",
 					            attr: req,
-								inputParamter:[{ attr: 'inout_3037', val: this.$data.scanCodeVal }]
+								inputParamter:[{ attr: 'input_3037', value: this.$data.scanCodeVal }]
 					        }
 							
 					        this.scan_DataObjRunCustomEvent(info, "");
@@ -1091,10 +1131,10 @@
 				});
 			},
 			sava(){
-				if (this.$data.edit_ok_event)
-					this.OKDataObjRunCustomEvent();
+				if (this.$data.param.Before_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍓嶈剼鏈�+					this.scan_OKDataObjRunCustomEvent(this.$data.param.Before_OK_Event.ID);
 				else
-					this.add();
+					this.scan_OKDataObjRunCustomEvent(this.$data.param.After_OK_Event.ID);
 			},
 			add(){
 				uni.showLoading({
@@ -1169,7 +1209,7 @@
 						}
 						//鍒锋柊
 						uni.redirectTo({
-							url:'../modal/classAttr?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
+							url:'../modal/ms_classAttr?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
 						});
 						// this.class_attr_init();
 					}else{
@@ -1209,15 +1249,17 @@
 				                            ca.select = attrs[j].select==undefined?false:attrs[j].select;
 											ca.Value ="";
 											if(ca.dictitem){
-												var dictitemlist=[];
-												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;
-												}
 												if(ca.select == true)
 													ca.Value = [];//ca.dictitem[0].CN_S_NAME;
 												else 
 													ca.Value = '璇烽�鎷�;//ca.dictitem[0].CN_S_NAME;
+												var dictitemlist=[];
+												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;
+													if(ca.dictitem[d].CN_C_IS_DEFAULT=='1')
+														ca.Value=ca.dictitem[d].CN_S_NAME;
+												}
 											}
 											if(ca.Type=='鏃ユ湡' || ca.Type=='鏃堕棿'){
 												var nowDate = new Date();
@@ -1252,7 +1294,10 @@
 				                    Open: open,
 				                    Attr: attr,
 									control_style:this.$data.classGridStyle.StyleDef.control_style,
-									title_p_wdith:this.$data.classGridStyle.StyleDef.title_p_wdith
+									title_p_wdith:this.$data.classGridStyle.StyleDef.title_p_wdith,
+									Font:this.$data.classGridStyle.StyleDef.Font?this.$data.classGridStyle.StyleDef.Font:{},
+									Bk_Color:this.$data.classGridStyle.StyleDef.Bk_Color?this.$data.classGridStyle.StyleDef.Bk_Color:'#FFFFFF',
+									Text_Color:this.$data.classGridStyle.StyleDef.Text_Color?this.$data.classGridStyle.StyleDef.Text_Color:'#000000'
 				                })
 				            }
 				        }
@@ -1270,7 +1315,7 @@
 				                var attr = attrlist[i].attrs
 				                for (var j = 0; j < attr.length; j++) {
 				                    var ar = attr[j];
-									req.push({ attr: ar.attr, val: ar.value?ar.value:'' });
+									req.push({ attr: ar.attr, value: ar.value?ar.value:'' });
 				                }
 				            }
 				        }
@@ -1291,7 +1336,7 @@
 					        }
 						}
 					}
-					console.log(req);
+					// console.log(req);
 					if (this.$data.edit_inital_event) {
 					    var eventid = this.$data.edit_inital_event.scrip_id;
 					    var info = {
@@ -1342,15 +1387,17 @@
 				                            ca.select = attrs[j].select==undefined?false:attrs[j].select;
 											ca.Value ="";
 											if(ca.dictitem){
-												var dictitemlist=[];
-												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;
-												}
 												if(ca.select == true)
 													ca.Value = [];//ca.dictitem[0].CN_S_NAME;
 												else 
 													ca.Value = '璇烽�鎷�;//ca.dictitem[0].CN_S_NAME;
+												var dictitemlist=[];
+												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;
+													if(ca.dictitem[d].CN_C_IS_DEFAULT=='1')
+														ca.Value=ca.dictitem[d].CN_S_NAME;
+												}
 											}
 											if(ca.Type=='鏃ユ湡' || ca.Type=='鏃堕棿'){
 												var nowDate = new Date();
@@ -1385,7 +1432,10 @@
 				                    Open: open,
 				                    Attr: attr,
 									control_style:this.$data.subClassGridStyle.StyleDef.control_style,
-									title_p_wdith:this.$data.subClassGridStyle.StyleDef.title_p_wdith
+									title_p_wdith:this.$data.subClassGridStyle.StyleDef.title_p_wdith,
+									Font:this.$data.subClassGridStyle.StyleDef.Font?this.$data.subClassGridStyle.StyleDef.Font:{},
+									Bk_Color:this.$data.subClassGridStyle.StyleDef.Bk_Color?this.$data.subClassGridStyle.StyleDef.Bk_Color:'#FFFFFF',
+									Text_Color:this.$data.subClassGridStyle.StyleDef.Text_Color?this.$data.subClassGridStyle.StyleDef.Text_Color:'#000000'
 				                })
 				            }
 				        }
@@ -1403,7 +1453,7 @@
 				                var attr = attrlist[i].attrs
 				                for (var j = 0; j < attr.length; j++) {
 				                    var ar = attr[j];
-									req.push({ attr: ar.attr, val: ar.value?ar.value:'' });
+									req.push({ attr: ar.attr, value: ar.value?ar.value:'' });
 				                }
 				            }
 				        }
@@ -1424,7 +1474,7 @@
 					        }
 						}
 					}
-					console.log(req);
+					// console.log(req);
 					if (this.$data.edit_inital_event) {
 					    var eventid = this.$data.edit_inital_event.scrip_id;
 					    var info = {
@@ -1694,11 +1744,11 @@
 						if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
 							if(ar.Value=='璇�) ar.Value='';
 				        if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
-				        	req.push({ attr: ar.Name, val: ar.ValID ?ar.ValID :'' });
+				        	req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
 				        else if(ar.Type=='甯冨皵鍊�)
-							req.push({ attr: ar.Name, val: ar.Value?'1':'0'});
+							req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
 						else
-							req.push({ attr: ar.Name, val: ar.Value });
+							req.push({ attr: ar.Name, value: ar.Value });
 					}
 				}
 				
@@ -1708,7 +1758,7 @@
 		    	            return this.$data.refdatastore[i].attr == s.name
 		    	        }).length) {
 		    	            length = 1;
-		    	            req.push({ 'attr': this.$data.refdatastore[i].attr, 'val': this.$data.refdatastore[i].value });
+		    	            req.push({ 'attr': this.$data.refdatastore[i].attr, 'value': this.$data.refdatastore[i].value });
 		    	        }
 		    	    }
 		    	}
@@ -1781,11 +1831,11 @@
 						if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
 							if(ar.Value=='璇�) ar.Value='';
 				        if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
-				        	req.push({ attr: ar.Name, val: ar.ValID ?ar.ValID :'' });
+				        	req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
 				        else if(ar.Type=='甯冨皵鍊�)
-							req.push({ attr: ar.Name, val: ar.Value?'1':'0'});
+							req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
 						else
-							req.push({ attr: ar.Name, val: ar.Value });
+							req.push({ attr: ar.Name, value: ar.Value });
 					}
 				}
 				if (this.$data.refdatastore.length > 0) {
@@ -1794,7 +1844,7 @@
 				            return this.$data.refdatastore[i].attr == s.name
 				        }).length) {
 				            length = 1;
-				            req.push({ 'attr': this.$data.refdatastore[i].attr, 'val': this.$data.refdatastore[i].value });
+				            req.push({ 'attr': this.$data.refdatastore[i].attr, 'value': this.$data.refdatastore[i].value });
 				        }
 				    }
 				}
@@ -2037,17 +2087,17 @@
 		    			            }
 		    			        }
 		    			        if (action_type == 'open_select_userdlg') {
-		    						uni.showModal({title:"閿欒2.2",content:"open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,showCancel:false,confirmText:"鍙栨秷"});
+		    						uni.showModal({title:"閿欒6.2",content:"open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,showCancel:false,confirmText:"鍙栨秷"});
 		    			        }
 		    			    }
 		    			}
 		    			
 		    		}else{
-		    			uni.showModal({title:"閿欒2",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
+		    			uni.showModal({title:"閿欒6",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
 		    		}
 		    	}).catch(ex=>{
 		    		// console.log(ex);
-		    		uni.showModal({title:"閿欒2.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
+		    		uni.showModal({title:"閿欒6.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
 		    	});
 		    },
 		    scan_DataObjRunCustomEvent(info,data_attr){
@@ -2147,16 +2197,26 @@
 		    			            $this.$data.global_attr = data.action[i].value || [];
 		    			        } else if (data.action[i].action_type == 'add_subcls_panel') {
 		    			            var result = action.value;
+									let list_1 = JSON.parse(JSON.stringify(this.$data.subClassAttrList));
+									$this.$data.subPanelList.push({
+										scanCodeVal:$this.$data.scanCodeVal,
+										subClassAttr:list_1
+									}); 
 		    			            for (var i = 0; i < result.length; i++) {
 										for (var s = 0; s < $this.$data.subPanelList.length; s++) {
-											for (var c = 0; c < $this.$data.subPanelList[s].subClassAttrList.length; c++) {
-												var attr = $this.$data.subPanelList[s].subClassAttrList[c].Attr;
-												for (var j = 0; j < attr.length; j++) {
-													console.log(attr[j].Name+'=='+result[i].attr);
-													if(attr[j].Name==result[i].attr){
-														attr[j].Value = result[i].value;
+											if($this.$data.subPanelList[s].scanCodeVal == $this.$data.scanCodeVal){
+												var _subClassAttr = $this.$data.subPanelList[s].subClassAttr;
+												for (var c = 0; c < _subClassAttr.length; c++) {
+													var attr = _subClassAttr[c].Attr;
+													for (var j = 0; j < attr.length; j++) {
+														// console.log(attr[j].Name+'=='+result[i].attr);
+														if(attr[j].Name==result[i].attr){
+															attr[j].Value = result[i].value;
+														}
 													}
 												}
+												
+												// $this.$data.subPanelList[s].subClassAttr=list_1;
 											}
 										}
 										var length = 0;
@@ -2179,17 +2239,25 @@
 		    			}
 		    			
 		    			if (data.result) {
+							let list_1 = JSON.parse(JSON.stringify(this.$data.subClassAttrList));
+							$this.$data.subPanelList.push({
+								scanCodeVal:$this.$data.scanCodeVal,
+								subClassAttr:list_1
+							}); 
 		    			    var result = data.result;
 		    			    for (var i = 0; i < result.length; i++) {
 		    			        for (var s = 0; s < $this.$data.subPanelList.length; s++) {
-		    			        	for (var c = 0; c < $this.$data.subPanelList[s].subClassAttrList.length; c++) {
-		    			        		var attr = $this.$data.subPanelList[s].subClassAttrList[c].Attr;
-		    			        		for (var j = 0; j < attr.length; j++) {
-		    			        			console.log(attr[j].Name+'=='+result[i].attr);
-		    			        			if(attr[j].Name==result[i].attr){
-		    			        				attr[j].Value = result[i].value;
-		    			        			}
-		    			        		}
+									if($this.$data.subPanelList[s].scanCodeVal == $this.$data.scanCodeVal){
+										var _subClassAttr = $this.$data.subPanelList[s].subClassAttr;
+										for (var c = 0; c < _subClassAttr.length; c++) {
+											var attr = _subClassAttr[c].Attr;
+											for (var j = 0; j < attr.length; j++) {
+												// console.log(attr[j].Name+'=='+result[i].attr);
+												if(attr[j].Name==result[i].attr){
+													attr[j].Value = result[i].value;
+												}
+											}
+										}
 		    			        	}
 		    			        }
 		    					
@@ -2210,11 +2278,158 @@
 		    			    }
 		    			}
 		    		}else{
-		    			uni.showModal({title:"閿欒3",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
+		    			uni.showModal({title:"閿欒7",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
 		    		}
 		    	}).catch(ex=>{
 		    		// console.log(ex);
-		    		uni.showModal({title:"閿欒3.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
+		    		uni.showModal({title:"閿欒7.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
+		    	});
+		    },
+		    scan_OKDataObjRunCustomEvent(eventID){
+				uni.showLoading({
+					title:"鍔犺浇涓�.."
+				});
+				var $this = this;
+				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.Value=='璇烽�鎷� || ar.Value=='鈥斺�璇烽�鎷┾�鈥�) ar.Value='';
+						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 if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓�){
+							if(ar.select==true){ //鍒ゆ柇涓嬫媺鏄惁澶氶�
+								var valStr ="";
+								for(var v in ar.Value){
+									if(valStr)
+										valStr+=";";
+									valStr+=ar.Value[v];
+								}
+								req.push({ attr: ar.Name, value: valStr});
+							}else
+								req.push({ attr: ar.Name, value: ar.Value});
+						}
+						else
+							req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
+							
+						if ((ar.NotEmpty == '1' || 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:"鍙栨秷"});
+							return;
+						}
+					}
+				}
+				var objects=[];
+				var subPanelList = $this.$data.subPanelList;
+				for (var s = 0; s < subPanelList.length; s++) {
+					var sub_req=[];
+					for (var i = 0; i < subPanelList[s].subClassAttr.length; i++) {
+						var attr = subPanelList[s].subClassAttr[i].Attr;
+						for (var j = 0; j < attr.length; j++) {
+							var ar = attr[j];
+							if(ar.Value=='璇烽�鎷� || ar.Value=='鈥斺�璇烽�鎷┾�鈥�) ar.Value='';
+							if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
+								if(ar.Value=='璇�) ar.Value='';
+							if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
+								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=='瀛楀吀-瀛楃涓�){
+								if(ar.select==true){ //鍒ゆ柇涓嬫媺鏄惁澶氶�
+									var valStr ="";
+									for(var v in ar.Value){
+										if(valStr)
+											valStr+=";";
+										valStr+=ar.Value[v];
+									}
+									sub_req.push({ attr: ar.Name, value: valStr});
+								}else
+									sub_req.push({ attr: ar.Name, value: ar.Value});
+							}
+							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'){
+								uni.hideLoading();
+								// uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
+								uni.showModal({title:"鎻愮ず",content:ar.DispName+'涓嶈兘涓虹┖锛�,showCancel:false,confirmText:"鍙栨秷"});
+								return;
+							}
+						}
+					}
+					objects.push({
+						obj_id:subPanelList[s].scanCodeVal,
+						obj_attrs:sub_req
+					});
+				}
+				var dataJson={
+					master_cls:{
+						cls_name:$this.$data.param.Master_Cls.Name,
+						obj_attrs:req
+					},
+					input_3037:$this.$data.scanCodeVal,   //鎵爜鍐呭
+					op_type:$this.$data.param.OperationType, //浣滀笟绫诲瀷瀹氫箟
+					sub_cls:{
+						cls_name:$this.$data.param.Sub_Cls.Name,
+						objects:objects
+					}
+				};
+				console.log(JSON.stringify(dataJson));
+		    	var dataInfo = {
+		            edtype: "0", eventid: eventID, projectid: '',rclsid: '', robjid: '', userlogin: '', 
+					clsid: $this.$data.param.Sub_Cls.ID, 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(dataInfo);
+		    	this.$store.dispatch('DataObjRunCustomEventInfo',dataInfo).then(success=>{
+		    		console.log(success);
+					uni.hideLoading();
+		    		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{
+							//鍒锋柊
+							uni.redirectTo({
+								url:'../modal/ms_classAttr?param='+JSON.stringify($this.$data.param)+"&titlename="+$this.$data.title
+							});
+						}
+		    		}else{
+		    			uni.showModal({title:"閿欒8",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
+		    		}
+		    	}).catch(ex=>{
+		    		// console.log(ex);
+					uni.hideLoading();
+		    		uni.showModal({title:"閿欒8.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
 		    	});
 		    },
 		    

--
Gitblit v1.9.1