From 5c40d374e5638249026e08114348361c611d22a9 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期二, 09 五月 2023 08:53:47 +0800
Subject: [PATCH] test

---
 pages/modal/classAttr.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pages/modal/classAttr.vue b/pages/modal/classAttr.vue
index 7448247..756cd2a 100644
--- a/pages/modal/classAttr.vue
+++ b/pages/modal/classAttr.vue
@@ -270,7 +270,7 @@
 							<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=='瀛楀吀-瀛楃涓� || 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">
@@ -283,7 +283,7 @@
 							<picker class="section_iput attr_field" @change="onchange" :range="attr.dictitem" range-key="CN_S_NAME" v-if="attr.select==false" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}">
 								<label class="">{{ attr.Value }}</label>
 							</picker>
-							<select-cy :value="attr.Value" :name="attr.Name" :options="attr.dictitem" showClearIcon="true" @change="onchange2" v-else-if="attr.select==true" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"></select-cy>
+							<select-cy :value="attr.Value" :name="attr.Name" :options="attr.dictitem" showClearIcon="true" @change="onchange2" v-else-if="attr.select==true" :data-index="index" :data-iindex="iindex" :style="{'display':'inline-block','margin-left':'8px','width':attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}"></select-cy>
 							<i class="i_tishi" v-if="attr.notempty==true">*</i>
 						</view>
 					</view>
@@ -595,7 +595,7 @@
 					        			req.push({ attr: ar.Name, val: ar.ValID ?ar.ValID :'' });
 					        		else if(ar.Type=='甯冨皵鍊�)
 										req.push({ attr: ar.Name, val: ar.Value?'1':'0'});
-					        		else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓�)
+					        		else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓� || ar.Type=='瀛楀吀-鏁存暟')
 										req.push({ attr: ar.Name, val: itemvalue.Name});
 					        		else
 					        			req.push({ attr: ar.Name, val: ar.Value ?ar.Value :''});
@@ -829,7 +829,7 @@
 				        	req.push({ name: ar.Name, value: ar.ValID ?ar.ValID :'' });
 				        else if(ar.Type=='甯冨皵鍊�)
 							req.push({ name: ar.Name, value: ar.Value?'1':'0'});
-				        else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓�){
+				        else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓� || ar.Type=='瀛楀吀-鏁存暟'){
 							if(ar.select==true){ //鍒ゆ柇涓嬫媺鏄惁澶氶�
 								var valStr ="";
 								for(var v in ar.Value){
@@ -1089,7 +1089,7 @@
 												for (var l = 0; l < this.$data.classAttrList[a].Attr.length; l++) {
 													var ca = this.$data.classAttrList[a].Attr[l];
 													if (val[i].attr  == ca.Name) {
-														if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓�){
+														if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓� || ca.Type=='瀛楀吀-鏁存暟'){
 															var dictItemList=[];
 															for(var d in val[i].choice_list){
 																var list_val =val[i].choice_list[d];
@@ -1192,7 +1192,7 @@
 												var attr = $this.$data.classAttrList[c].Attr;
 												for (var j = 0; j < attr.length; j++) {
 													if(attr[j].Name==result[i].attr){
-														if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓�){
+														if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓� || attr[j].Type=='瀛楀吀-鏁存暟'){
 															var dictItemList=[];
 															for(var d in result[i].choice_list){
 																var val =result[i].choice_list[d];

--
Gitblit v1.9.1