From e48615ec0a07b304b0287271f7f3833f8587b376 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期一, 21 八月 2023 16:52:33 +0800
Subject: [PATCH] 5600码盘页面功能新增
---
pages/modal/ms_classAttr.vue | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index 7dc2336..7a98041 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -283,7 +283,7 @@
</div>
<!-- <div style='width: 100px;position: relative;'>
<image class="divX" src="../../images/msg_50_new.png"></image>-->
- <input type="text" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" :disabled="attr.edit?false:true" > <!-- =='flase'?true:false -->
+ <input :type="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�?'number':'text'" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" :disabled="attr.edit?false:true" > <!-- =='flase'?true:false -->
<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'" :data-index="index":data-iindex="iindex" style="height:60px;" :style="{'width':attr.Width}" :disabled="attr.edit?false:true"></textarea>
<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'" :data-index="index":data-iindex="iindex" style="height:90px;" :style="{'width':attr.Width}" :disabled="attr.edit?false:true"></textarea>
<!-- </div> -->
@@ -293,7 +293,7 @@
<i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</p>
<!-- <div style='width: 100%;position: relative;'>
<image class="divX" src="../../images/msg_50_new.png"></image> -->
- <input type="text" class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true" >
+ <input :type="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�?'number':'text'" class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true" >
<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'" :data-index="index":data-iindex="iindex" style="height:60px;" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true"></textarea>
<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'" :data-index="index":data-iindex="iindex" style="height:90px;" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true"></textarea>
<!-- </div> -->
@@ -324,7 +324,7 @@
</picker>
</view>
</view>
- <view class="form-group" v-if="attr.Type=='瀛楀吀' || attr.Type=='瀛楀吀-瀛楃涓�" :style="{'display':attr.hidden == true?'none':''}">
+ <view class="form-group" v-if="attr.Type=='瀛楀吀' || attr.Type=='瀛楀吀-瀛楃涓� || attr.Type=='瀛楀吀-鏁存暟'" :style="{'display':attr.hidden == true?'none':''}">
<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
<text class="tx_title" :style="{'font-family':classattr.Font.Name?classattr.Font.Name:'initial','font-size':classattr.Font.Size?classattr.Font.Size:'initial','font-weight':classattr.Font.Bold?'bold':'initial','font-style':classattr.Font.Tilt?'italic':'initial','text-decoration':classattr.Font.Underline?'underline':'initial','background-color':classattr.Font.Bk_Color,'color':classattr.Font.Text_Color,'width':classattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</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">
@@ -337,7 +337,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>
</view>
</view>
<view class="form-group" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)' || attr.Type=='寮曠敤瀵硅薄(澶氫釜)'" :style="{'display':attr.hidden == true?'none':''}">
@@ -465,13 +465,13 @@
<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-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true" > <!-- =='flase'?true:false -->
+ <input :type="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�?'number':'text'" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true" > <!-- =='flase'?true:false -->
<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'" :data-iiindex="iiindex" :data-index="index":data-iindex="iindex" style="height:60px;" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true"></textarea>
<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'" :data-iiindex="iiindex" :data-index="index":data-iindex="iindex" style="height:90px;" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true"></textarea>
</view>
<view v-if="subclassattr.control_style=='宸﹀彸甯冨眬'">
<p class="tx_title2" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith +'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</p>
- <input type="text" class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true" >
+ <input :type="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�?'number':'text'" class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true" >
<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'" :data-iiindex="iiindex" :data-index="index":data-iindex="iindex" style="height:60px;" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true"></textarea>
<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'" :data-iiindex="iiindex" :data-index="index":data-iindex="iindex" style="height:90px;" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 - (attr.ext_button==true?9:0) +'%'}" :disabled="attr.edit?false:true"></textarea>
<div class="text-right2" v-if="attr.ext_button==true">
@@ -501,7 +501,7 @@
</picker>
</view>
</view>
- <view class="form-group" v-if="attr.Type=='瀛楀吀' || attr.Type=='瀛楀吀-瀛楃涓�" :style="{'display':attr.hidden == true?'none':''}">
+ <view class="form-group" v-if="attr.Type=='瀛楀吀' || attr.Type=='瀛楀吀-瀛楃涓� || attr.Type=='瀛楀吀-鏁存暟'" :style="{'display':attr.hidden == true?'none':''}">
<view v-if="subclassattr.control_style=='涓婁笅甯冨眬'">
<text class="tx_title" :style="{'font-family':subclassattr.Font.Name?subclassattr.Font.Name:'initial','font-size':subclassattr.Font.Size?subclassattr.Font.Size:'initial','font-weight':subclassattr.Font.Bold?'bold':'initial','font-style':subclassattr.Font.Tilt?'italic':'initial','text-decoration':subclassattr.Font.Underline?'underline':'initial','background-color':subclassattr.Font.Bk_Color,'color':subclassattr.Font.Text_Color,'width':subclassattr.title_p_wdith+'%'}"><i class="i_tishi" v-if="attr.notempty==true">*</i>{{attr.DispName}}:</text>
<picker class="section_iput" @change="onchange" :range="attr.dictitem" range-key="CN_S_NAME" v-if="attr.select==false" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width.split('%')[0] - 2.5 +'%'}" :disabled="attr.edit?false:true">
@@ -514,7 +514,7 @@
<picker class="section_iput attr_field" @change="onchange" :range="attr.dictitem" range-key="CN_S_NAME" v-if="attr.select==false" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - subclassattr.title_p_wdith - 7 +'%'}">
<label class="">{{ attr.Value }}</label>
</picker>
- <select-cy :value="attr.Value" :name="attr.Name" :options="attr.dictitem" showClearIcon="true" @change="sub_onchange2" v-else-if="attr.select==true" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"></select-cy>
+ <select-cy :value="attr.Value" :name="attr.Name" :options="attr.dictitem" showClearIcon="true" @change="sub_onchange2" v-else-if="attr.select==true" :data-iiindex="iiindex" :data-index="index" :data-iindex="iindex" :style="{'display':'inline-block','margin-left':'8px','width':attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}"></select-cy>
</view>
</view>
@@ -1103,10 +1103,8 @@
var index ,iindex,dindex=0;
for(var i in this.$data.classAttrList){
for(var j in this.$data.classAttrList[i].Attr){
- for(var d in this.$data.classAttrList[i].Attr[j].dictitem){
- if(delvalue[0].Name == this.$data.classAttrList[i].Attr[j].dictitem[d].Name){
- this.$data.classAttrList[i].Attr[j].Value="";
- }
+ if(delvalue[0].attr == this.$data.classAttrList[i].Attr[j].Name){
+ this.$data.classAttrList[i].Attr[j].Value="";
}
}
}
@@ -1116,10 +1114,8 @@
var index ,iindex,dindex=0;
for(var i in this.$data.classAttrList){
for(var j in this.$data.classAttrList[i].Attr){
- for(var d in this.$data.classAttrList[i].Attr[j].dictitem){
- if(item[v].Name == this.$data.classAttrList[i].Attr[j].dictitem[d].Name){
- index=i;iindex=j;dindex=d;
- }
+ if(item[v].attr == this.$data.classAttrList[i].Attr[j].Name){
+ index=i;iindex=j;
}
}
}
@@ -1145,7 +1141,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 :''});
@@ -1263,7 +1259,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 :''});
@@ -1512,7 +1508,8 @@
},
add(){
uni.showLoading({
- title:"鍔犺浇涓�.."
+ title:"鍔犺浇涓�..",
+ mask:true
});
var req=[];
var attrlist = this.$data.classAttrList;
@@ -1527,7 +1524,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){
@@ -1631,6 +1628,7 @@
for (var d = 0; d < ca.dictitem.length; d++) {
ca.dictitem[d].label=ca.dictitem[d].CN_S_NAME;
ca.dictitem[d].value=ca.dictitem[d].CN_S_NAME;
+ ca.dictitem[d].attr=ca.Name;
if(ca.dictitem[d].CN_C_IS_DEFAULT=='1')
ca.Value=ca.dictitem[d].CN_S_NAME;
}
@@ -1769,6 +1767,7 @@
for (var d = 0; d < ca.dictitem.length; d++) {
ca.dictitem[d].label=ca.dictitem[d].CN_S_NAME;
ca.dictitem[d].value=ca.dictitem[d].CN_S_NAME;
+ ca.dictitem[d].attr=ca.Name;
if(ca.dictitem[d].CN_C_IS_DEFAULT=='1')
ca.Value=ca.dictitem[d].CN_S_NAME;
}
@@ -1918,7 +1917,7 @@
for (var l = 0; l < this.$data.classAttrList[a].Attr.length; l++) {
var ca = this.$data.classAttrList[a].Attr[l];
if (val[i].attr == ca.Name) {
- if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓�){
+ if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓� || ca.Type=='瀛楀吀-鏁存暟'){
var dictItemList=[];
for(var d in val[i].choice_list){
var val =val[i].choice_list[d];
@@ -2016,7 +2015,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];
@@ -2427,7 +2426,7 @@
for (var l = 0; l < this.$data.subClassAttrList[a].Attr.length; l++) {
var ca = this.$data.subClassAttrList[a].Attr[l];
if (val[i].attr == ca.Name) {
- if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓�){
+ if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓� || ca.Type=='瀛楀吀-鏁存暟'){
var dictItemList=[];
for(var d in val[i].choice_list){
var val =val[i].choice_list[d];
@@ -2528,7 +2527,7 @@
var attr = $this.$data.subPanelList[s].subClassAttrList[c].Attr;
for (var j = 0; j < attr.length; j++) {
if(attr[j].Name==result[i].attr){
- if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓�){
+ if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓� || attr[j].Type=='瀛楀吀-鏁存暟'){
var dictItemList=[];
for(var d in result[i].choice_list){
var val =result[i].choice_list[d];
@@ -2672,7 +2671,8 @@
},
scan_OKDataObjRunCustomEvent(eventID){
uni.showLoading({
- title:"鍔犺浇涓�.."
+ title:"鍔犺浇涓�..",
+ mask:true
});
var $this = this;
var req=[];
@@ -2688,7 +2688,7 @@
req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
else if(ar.Type=='甯冨皵鍊�)
req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
- else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓�){
+ else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓� || ar.Type=='瀛楀吀-鏁存暟'){
if(ar.select==true){ //鍒ゆ柇涓嬫媺鏄惁澶氶�
var valStr ="";
for(var v in ar.Value){
@@ -2727,7 +2727,7 @@
sub_req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
else if(ar.Type=='甯冨皵鍊�)
sub_req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
- else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓�){
+ else if(ar.Type=='瀛楀吀' || ar.Type=='瀛楀吀-瀛楃涓� || ar.Type=='瀛楀吀-鏁存暟'){
if(ar.select==true){ //鍒ゆ柇涓嬫媺鏄惁澶氶�
var valStr ="";
for(var v in ar.Value){
--
Gitblit v1.9.1