From 5e3982550bf4fa9e550b2b02d7c91de1073b619c Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期一, 10 四月 2023 17:14:08 +0800
Subject: [PATCH] test

---
 pages/modal/classAttr.vue |  372 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 276 insertions(+), 96 deletions(-)

diff --git a/pages/modal/classAttr.vue b/pages/modal/classAttr.vue
index f7d3b31..fe39040 100644
--- a/pages/modal/classAttr.vue
+++ b/pages/modal/classAttr.vue
@@ -96,10 +96,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,12 +146,30 @@
 		transition-duration: 0.1s;
 	}
 	button.btn_add {
+		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: 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;
@@ -166,12 +184,33 @@
 		margin-left: 8px;
 		/* width: 71%; */
 	}
+	
+	.input_vallist {
+		max-height: 350rpx;
+		overflow-y:auto;
+		display: none;
+	}
+	.input_vallist ul{
+		/* border: 1px solid red; */
+		padding: 0 20rpx;
+	}
+	.input_vallist ul li{
+		list-style: none;
+		padding: 20rpx;
+		border-bottom: 1px solid #ccc;
+	}
+	.input_vallist ul li a{
+		float: right;
+	}
+	.input_vallist ul li a i {
+	    font-size: 45rpx;
+	}
 </style>
 
 <template>
 	<view class="content">
 		<view class="v-area" v-for="(classattr,index) in classAttrList">
-			<div class="class_attr_title">
+			<div class="class_attr_title" style="display: none;">
 				<div class="title_line"></div>
 				<div class="title_icon" :style="{'background-color':classattr.BkColor}">   
 					<i class="ace-icon fa" :class="classattr.ImgFontStyle"></i>
@@ -181,68 +220,76 @@
 			</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="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+							<text class="tx_title" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></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}" :readonly="attr.edit=='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}" :readonly="attr.edit=='Flase'?true:false"></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}" :readonly="attr.edit=='Flase'?true:false"></textarea>
+							<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 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 v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'width':classattr.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] - classattr.title_p_wdith - (attr.NotEmpty=='1'?10:5) - (attr.ext_button==true?9:0) +'%'}" :readonly="attr.edit=='Flase'?true:false" >
-							<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=='1'?10:5) - (attr.ext_button==true?9:0) +'%'}" :readonly="attr.edit=='Flase'?true:false"></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=='1'?10:5) - (attr.ext_button==true?9:0) +'%'}" :readonly="attr.edit=='Flase'?true:false"></textarea>
+							<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?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 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=='1'">*</i>
+							<i class="i_tishi" v-if="attr.notempty==true">*</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':''}">
 						<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=='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="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+							<text class="tx_title" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></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>
-							<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=='1'?10:5) +'%'}">
+							<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>
-							<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+							<i class="i_tishi" v-if="attr.notempty==true">*</i>
 						</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">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
-							<picker class="section_iput" @change="onchange" :range="attr.dictitem" range-key="CN_S_NAME" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}">
+							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></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>
-							<picker class="section_iput attr_field" @change="onchange" :range="attr.dictitem" range-key="CN_S_NAME" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.NotEmpty=='1'?10:5) +'%'}">
+							<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>
-							<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+							<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">*</i>
 						</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">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></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>
@@ -256,7 +303,7 @@
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'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=='1'?10:5) - 9 +'%'}" disabled="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) - 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>
@@ -266,12 +313,12 @@
 								</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=='1'">*</i>
+							<i class="i_tishi" v-if="attr.notempty==true">*</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">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></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>
@@ -279,16 +326,16 @@
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
-							<input type="text" class="attr_field" :value="attr.Value" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.NotEmpty=='1'?10:5) - 9 +'%'}" disabled="true" >
+							<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>
-							<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+							<i class="i_tishi" v-if="attr.notempty==true">*</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">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></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>
@@ -296,41 +343,41 @@
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
-							<input type="text" class="attr_field" :value="attr.Value" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.NotEmpty=='1'?10:5) - 9 +'%'}" disabled="true" >
+							<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>
-							<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+							<i class="i_tishi" v-if="attr.notempty==true">*</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">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
-							<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" :readonly="attr.edit=='Flase'?true:false" >
+							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></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>
-							<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.NotEmpty=='1'?10:5) +'%'}" :readonly="attr.edit=='Flase'?true:false" >
-							<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+							<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">*</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">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></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>
-							<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=='1'?10:5) +'%'}">{{attr.Value}}</pickerAddress>
-							<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+							<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>
+							<i class="i_tishi" v-if="attr.notempty==true">*</i>
 						</view>
 					</view>
 				</div>
 			</div>
 			
-			
-			<button type="default" @tap="sava" class="btn_add">{{title}}</button>
 		</view>
+		<button type="default" @tap="cancel" class="btn_cancel">鍙栨秷</button>
+		<button type="default" @tap="sava" class="btn_add">{{title}}</button>
 	</view>
 </template> 
 
@@ -352,14 +399,14 @@
 				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"}],
 			}
 		},
 		onLoad(options) {
 			// console.log(options);
-			this.$data.title = options.titlename; //璁剧疆鎸夐挳鏂囧瓧
 			uni.setNavigationBarTitle({ title: options.titlename}); //璁剧疆椤堕儴鏍囬 
 			var param = JSON.parse(options.param);
+			this.$data.title = param.Add_BtnName?param.Add_BtnName:options.titlename; //璁剧疆鎸夐挳鏂囧瓧
 			// console.log(param);
 			if(!param.EditDlgMode){
 				uni.showModal({title:"鎻愮ず",content:"璇ュ姛鑳界偣鏈厤缃紪杈戠獥鍙o紝璇烽噸鏂伴厤缃紒",showCancel:false,confirmText:"鍙栨秷"});
@@ -399,9 +446,13 @@
 					uni.showModal({title:"閿欒1.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
 				});
 			
-			
 		},
 		methods: {
+			cancel(e){
+				uni.navigateBack({
+					delta:1 //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+				});
+			},
 			async classGridStyleInfo(){
 				var $this = this;
 				var gridstyleInfo = {
@@ -428,16 +479,19 @@
 							uni.showModal({title:"閿欒1.2",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
 						}
 					}).catch(ex=>{
-						// console.log(ex);
+						console.log(ex);
 						uni.showModal({title:"閿欒1.3",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
 					});
 				}
 			},
 			ontap(e){ //鎵爜鍔熻兘
+				var $ele = e;
 				//console.log(e.target)
 				getApp().onScan((result)=>{
 					//console.log(result.decodedata);
 					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=result.decodedata;
+					uni.hideKeyboard();
+					this.onevent($ele,result.decodedata);
 				})
 			},
 			onarrow(index,open){
@@ -449,12 +503,13 @@
 				this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.target.value;
 			},
 			onchange(e) {
-				// console.log(e.target);
+				console.log(e.target);
 				var value=this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].dictitem[e.target.value];
 				var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
-				// console.log(data_attr);
+				console.log(data_attr);
 				if (value.Name != data_attr.Value) {
 					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value.Name;
+					console.log(this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value);
 					var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
 					if (eventid) {
 				        // self.event_no_sub = 1;
@@ -490,12 +545,86 @@
 				}
 				
 			},
-			onevent(e){
+			onchange2(item,value,delvalue) {
+				// console.log(item);
+				// console.log(value);
+				// console.log(delvalue);
+				if(item.length==0){ //涓虹┖鏃讹紝娓呯┖灞炴�value
+					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="";
+								}
+							}
+						}
+					}
+				}
+					
+				for(var v in item){
+					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;
+								}
+							}
+						}
+					}
+					var itemvalue = item[v];
+					var data_attr = this.$data.classAttrList[index].Attr[iindex];
+					
+					console.log(data_attr);
+					if (itemvalue.Name != data_attr.Value) {
+						this.$data.classAttrList[index].Attr[iindex].Value=value;
+						console.log(this.$data.classAttrList[index].Attr[iindex].Value);
+						var eventid = this.$data.classAttrList[index].Attr[iindex].action;
+						if (eventid) {
+					        // self.event_no_sub = 1;
+					        var req=[];
+					        var attrlist = this.$data.classAttrList;
+					        for (var i = 0; i < attrlist.length; i++) {
+					        	var attr = attrlist[i].Attr;
+					        	for (var j = 0; j < attr.length; j++) {
+					        		var ar = attr[j];
+					        		if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
+					        			if(ar.Value=='璇�) ar.Value='';
+					        		if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
+					        			req.push({ attr: ar.Name, val: ar.ValID ?ar.ValID :'' });
+					        		else if(ar.Type=='甯冨皵鍊�)
+										req.push({ attr: ar.Name, val: ar.Value?'1':'0'});
+					        		else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓�)
+										req.push({ attr: ar.Name, val: itemvalue.Name});
+					        		else
+					        			req.push({ attr: ar.Name, val: ar.Value ?ar.Value :''});
+					        	}
+					        }
+					        var info = {
+					            eventid: eventid,
+					            edtype: "0",
+					            projectid: '',
+					            rclsid: '',
+					            robjid: '',
+					            userlogin: '',
+					            clsid: this.$data.param.clsid,
+					            objid: "",
+					            attr: req,
+					        }
+					        this.DataObjRunCustomEvent(info);
+					    }
+					}
+				}
+				
+				
+			},
+			onevent(e,decodedata){
 				// console.log(e.target);
 				var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
-				// console.log(data_attr);
+				// console.log(decodedata);
 				if (e.target.value != data_attr.Value) {
-					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.target.value;
+					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=decodedata?decodedata:e.target.value;
 					var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
 					if (eventid) {
 				        // self.event_no_sub = 1;
@@ -573,6 +702,11 @@
 				    }
 				}
 				
+			},
+			inputValListIsDel(index){
+				// console.log(index);
+                this.$data.inputValList.splice(index, 1); //鍒犻櫎tabPagejson鐨勫唴瀹�+				// console.log(this.$data.inputValList);
 			},
 			addresschange(e) {
 			    // console.log(e.target);
@@ -679,25 +813,44 @@
 					this.add();
 			},
 			add(){
+				uni.showLoading({
+					title:"鍔犺浇涓�.."
+				});
 				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.NotEmpty=='1'){
-							uni.showModal({title:"鎻愮ず",content:'瀛楁锛�+ar.Name+'锛屽�涓嶈兘涓虹┖锛�,showCancel:false,confirmText:"鍙栨秷"});
-							return;
-						}
-						if(ar.Value=='璇烽�鎷�) ar.Value='';
+						if(ar.Value=='璇烽�鎷� || ar.Value=='鈥斺�璇烽�鎷┾�鈥�) ar.Value='';
 						if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
 							if(ar.Value=='璇�) ar.Value='';
 				        if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
 				        	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=='瀛楀吀-瀛楃涓�){
+							if(ar.select==true){ //鍒ゆ柇涓嬫媺鏄惁澶氶�
+								var valStr ="";
+								for(var v in ar.Value){
+									if(valStr)
+										valStr+=";";
+									valStr+=ar.Value[v];
+								}
+								req.push({ name: ar.Name, value: valStr});
+							}else
+								req.push({ name: ar.Name, value: ar.Value});
+						}
 						else
 							req.push({ name: ar.Name, value: ar.Value ?ar.Value :''});
+							
+						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:"鍙栨秷"});
+							return;
+						}
 					}
 				}
 				var enviroment = {
@@ -716,17 +869,32 @@
 				    compose: JSON.stringify([]), refdatastore: JSON.stringify([]), extinfo: JSON.stringify(enviroment), 
 					not_trigger_sys_event: ''
 				};
+				
 				console.log(dataInfo);
+				// return
 				this.$store.dispatch('addclassattr',dataInfo).then(success=>{
 					console.log(success);
+					uni.hideLoading();
 					if (success.code=='00000') {
-						this.class_attr_init();
+						var action = JSON.parse(success.data.Action);
+						if(action.ret=='0'){
+							if(action.result_type=='0'){
+								uni.showToast({title:action.result,icon:"success",duration:3000});
+							}
+							// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
+						}
+						//鍒锋柊
+						uni.redirectTo({
+							url:'../modal/classAttr?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
+						});
+						// this.class_attr_init();
 					}else{
-						uni.showModal({title:"閿欒5",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
+						uni.showModal({title:"閿欒",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
 					}
 				}).catch(ex=>{
-					// console.log(ex);
-					uni.showModal({title:"閿欒5.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
+					console.log(ex);
+					uni.hideLoading();
+					uni.showModal({title:"鎻愮ず",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
 				});
 			},
 			class_attr_init(){
@@ -754,15 +922,20 @@
 				                            ca.before_click_button = attrs[j].before_click_button;
 				                            ca.button_callback = attrs[j].button_callback;
 				                            ca.hidden = attrs[j].hidden;
-				                            attr.push(ca);
+				                            ca.select = attrs[j].select==undefined?false:attrs[j].select;
+											ca.Value ="";
 											if(ca.dictitem){
-												// var dictitem=ca.dictitem;
-												// var dictitemlist=[];
-												// for (var d = 0; d < dictitem.length; d++) {
-												// 	dictitemlist.push(dictitem[d].CN_S_NAME);
-												// }
-												// ca.dictitemlist = dictitemlist;
-												ca.Value = ca.dictitem[0].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();
@@ -783,6 +956,8 @@
 												ca.Value = '璇烽�鎷�;
 											if(ca.Type=='甯冨皵鍊�)
 												ca.Value = false;
+												
+				                            attr.push(ca);
 				                        }
 				                    }
 				                }
@@ -879,7 +1054,7 @@
 				var dataInfo = {
                     edtype: info.edtype, eventid: info.eventid, projectid: info.projectid,
                     rclsid: info.rclsid, robjid: info.robjid, userlogin: info.userlogin, clsid: info.clsid, objid: info.objid,
-                    attr: JSON.stringify(info.attr), extinfo: JSON.stringify(param), inputparameter: inputparameter, global_attr: global_attr
+                    attr: JSON.stringify(info.attr), extinfo: JSON.stringify(param.enviroment), inputparameter: inputparameter, global_attr: global_attr
                 }
 				console.log(dataInfo);
 				this.$store.dispatch('DataObjRunCustomEventInfo',dataInfo).then(success=>{
@@ -900,25 +1075,25 @@
 						                }
 										console.log(val);
 						                for (var i = 0; i < val.length; i++) {
-											for (var l = 0; l < this.$data.classAttrList.Attr.length; l++) {
-											    var ca = this.$data.classAttrList.Attr[l];
-											    if (val[i].attr  == ca.Name) {
-											        ca.value = val[i].value;
+											for (var a = 0; a < this.$data.classAttrList.length; a++) {
+												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=='瀛楀吀-瀛楃涓�){
+															var dictItemList=[];
+															for(var d in val[i].choice_list){
+																var list_val =val[i].choice_list[d];
+																dictItemList.push({"CN_S_NAME":list_val,"Name":list_val,"label":list_val,"value":list_val});
+																
+															}
+															ca.dictitem = dictItemList;
+															// attr[j].dictitem = val[i].choice_list;
+														}else{
+															// ca.value = val[i].value;
+														}
+													}
 												}
 											}
-						                    // if ($el_attr.data('type') == 'bool') {
-						                    //     $el_attr.prop('checked', val[i].value == 'Y' || val[i].value == 'y' || val[i].value == '1')
-						                    // }
-						                    // else {
-						                        // if (val[i].choice_list) {
-						                        //     $el_attr.empty();
-						                        //     val[i].choice_list.forEach(function (list) {
-						                        //         $el_attr.append('<option value="' + list + '">' + list + '</option>');
-						                        //     })
-						                        // }
-						                    //     $el_attr.val(val[i].value);
-						                    // }
-						                    // $el_attr.data('val', val[i].value);
 					
 						                    var length = 0;
 						                    if (!this.$data.refdatastore.filter(function (s) {
@@ -937,7 +1112,7 @@
 						                }
 						            }
 						        }
-						        if (action_type = 'open_select_userdlg') {
+						        if (action_type == 'open_select_userdlg') {
 									uni.showModal({title:"閿欒2.2",content:"open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,showCancel:false,confirmText:"鍙栨秷"});
 						        }
 						    }
@@ -1005,7 +1180,13 @@
 												for (var j = 0; j < attr.length; j++) {
 													if(attr[j].Name==result[i].attr){
 														if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓�){
-															attr[j].dictitem = result[i].choice_list;
+															var dictItemList=[];
+															for(var d in result[i].choice_list){
+																var val =result[i].choice_list[d];
+																dictItemList.push({"CN_S_NAME":val,"Name":val,"label":val,"value":val});
+															}
+															attr[j].dictitem = dictItemList;
+															// attr[j].dictitem = result[i].choice_list;
 														}
 													}
 												}
@@ -1096,7 +1277,7 @@
 					var attr = attrlist[i].Attr;
 					for (var j = 0; j < attr.length; j++) {
 						var ar = attr[j];
-						if(ar.Value=='璇烽�鎷�) ar.Value='';
+						if(ar.Value=='璇烽�鎷� || ar.Value=='鈥斺�璇烽�鎷┾�鈥�) ar.Value='';
 						if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
 							if(ar.Value=='璇�) ar.Value='';
 				        if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
@@ -1184,7 +1365,6 @@
 					var attr = attrlist[i].Attr;
 					for (var j = 0; j < attr.length; j++) {
 						var ar = attr[j];
-						if(ar.Value=='璇烽�鎷�) ar.Value='';
 						if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
 							if(ar.Value=='璇�) ar.Value='';
 				        if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
@@ -1353,14 +1533,14 @@
 						    }
 						}
 						}else{
-							uni.showModal({title:"閿欒5.2",content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,showCancel:false,confirmText:"鍙栨秷"});
+							uni.showModal({title:"鎻愮ず5.2",content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,showCancel:false,confirmText:"鍙栨秷"});
 						}
 					}else{
 						uni.showModal({title:"閿欒5",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
 					}
 				}).catch(ex=>{
 					// console.log(ex);
-					uni.showModal({title:"閿欒5.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
+					uni.showModal({title:"鎻愮ず5.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
 				});
 		    },
 		    

--
Gitblit v1.9.1