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 |  136 ++++++++++++++++++++++++++++++++------------
 1 files changed, 98 insertions(+), 38 deletions(-)

diff --git a/pages/modal/classAttr.vue b/pages/modal/classAttr.vue
index d1142bb..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;
@@ -165,6 +183,27 @@
 		vertical-align: middle;
 		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>
 
@@ -181,7 +220,7 @@
 			</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==true">*</i></text>  <!-- attr.NotEmpty=='1' -->
 							<div class="text-right" v-if="attr.ext_button==true">
@@ -190,19 +229,25 @@
 							<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) +'%'}" :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=='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=='1'?10:5) - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true"></textarea>
+							<input type="text" class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-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==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"/>
@@ -210,7 +255,7 @@
 							</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==true">*</i></text>
 							<picker mode="date" :value="attr.Value" @change="ondateTime" class="date_iput" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}">
@@ -219,13 +264,13 @@
 						</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==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==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">
@@ -235,14 +280,14 @@
 						</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" v-if="attr.select==false" :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>
 							<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==true">*</i></text>
 							<div class="text-right" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)'">
@@ -258,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>
@@ -271,7 +316,7 @@
 							<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==true">*</i></text>
 							<div class="text-right">
@@ -281,14 +326,14 @@
 						</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==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==true">*</i></text>
 							<div class="text-right">
@@ -298,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==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==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) +'%'}" :disabled="attr.edit?false:true" >
+							<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}" :disabled="attr.edit?false:true" >
 							<i class="i_tishi" v-if="attr.notempty==true">*</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==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>
+							<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> 
 
@@ -354,7 +399,7 @@
 				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) {
@@ -403,6 +448,11 @@
 			
 		},
 		methods: {
+			cancel(e){
+				uni.navigateBack({
+					delta:1 //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+				});
+			},
 			async classGridStyleInfo(){
 				var $this = this;
 				var gridstyleInfo = {
@@ -435,10 +485,13 @@
 				}
 			},
 			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){
@@ -566,12 +619,12 @@
 				
 				
 			},
-			onevent(e){
+			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;
@@ -649,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);
@@ -786,8 +844,8 @@
 						else
 							req.push({ name: ar.Name, value: ar.Value ?ar.Value :''});
 							
-						if ((ar.NotEmpty == '1' || ar.notempty == true) && !ar.Value) {
-						// if(ar.notEmpty=='1'){
+						if (ar.notempty == true && !ar.Value) {
+						// if(ar.NotEmpty=='1'){
 							uni.hideLoading();
 							// uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
 							uni.showModal({title:"鎻愮ず",content:ar.DispName+'涓嶈兘涓虹┖锛�,showCancel:false,confirmText:"鍙栨秷"});
@@ -812,8 +870,8 @@
 					not_trigger_sys_event: ''
 				};
 				
-				// return
 				console.log(dataInfo);
+				// return
 				this.$store.dispatch('addclassattr',dataInfo).then(success=>{
 					console.log(success);
 					uni.hideLoading();
@@ -867,15 +925,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();
@@ -994,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=>{
@@ -1022,8 +1082,8 @@
 														if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓�){
 															var dictItemList=[];
 															for(var d in val[i].choice_list){
-																var val =val[i].choice_list[d];
-																dictItemList.push({"CN_S_NAME":val,"Name":val,"label":val,"value":val});
+																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;

--
Gitblit v1.9.1