From 8b47a6acff1683df5764c5df1b2460110255f544 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期一, 29 四月 2024 17:16:33 +0800
Subject: [PATCH] 登录时将获取的mac地址例如：78b8d67511ca 作为client_info传进api/user/ace/VerifyPassword接口里
---
pages/modal/3037.vue | 118 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 73 insertions(+), 45 deletions(-)
diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue
index 7276da5..e71b2a6 100644
--- a/pages/modal/3037.vue
+++ b/pages/modal/3037.vue
@@ -387,16 +387,20 @@
<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">
- <label class="">{{ attr.Value }}</label>
+ <!-- 鍗曢� -->
+ <picker class="section_iput" @change="onchange" :range="attr.dictitem" range-key="CN_S_VALUE" v-if="attr.select==false" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" :disabled="attr.edit?false:true">
+ <label class="">{{ attr.Label }}</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="{'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}}:</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?10:5) +'%'}">
- <label class="">{{ attr.Value }}</label>
+ <!-- 鍗曢� -->
+ <picker class="section_iput attr_field" @change="onchange" :range="attr.dictitem" range-key="CN_S_VALUE" 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.Label }}</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="{'display':'inline-block','margin-left':'8px','width':attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}"></select-cy>
</view>
</view>
@@ -1018,7 +1022,7 @@
}
},
class_attr_init(){
- var attrlist = this.$data.classGridStyle.StyleDef.show_style
+ var attrlist = this.$data.classGridStyle.StyleDef.show_style;
var newattrlist = [];
if (this.$data.classAttrList.length > 0) {
for (var i = 0; i < attrlist.length; i++) {
@@ -1027,7 +1031,7 @@
var attrs = attrlist[i].attrs;
for (var s = 0; s < this.$data.classAttrList.length; s++) {
var clsattr = this.$data.classAttrList[s];
- if (name == clsattr.Name) {
+ // if (name == clsattr.Name) {
var attr = [];
for (var j = 0; j < attrs.length; j++) {
for (var l = 0; l < clsattr.Attr.length; l++) {
@@ -1051,12 +1055,15 @@
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].label=ca.dictitem[d].CN_S_VALUE;
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')
+ if(ca.dictitem[d].CN_C_IS_DEFAULT=='1'){
+ ca.Label=ca.dictitem[d].CN_S_VALUE;
ca.Value=ca.dictitem[d].CN_S_NAME;
+ }
}
+ console.log(ca.dictitem);
}
if(ca.Type=='鏃ユ湡' || ca.Type=='鏃堕棿'){
var nowDate = new Date();
@@ -1089,8 +1096,8 @@
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'
- })
- }
+ });
+ // }
}
}
if (newattrlist.length > 0) {
@@ -1151,7 +1158,7 @@
}
},
subClass_attr_init(){
- var attrlist = this.$data.subClassGridStyle.StyleDef.show_style
+ var attrlist = this.$data.subClassGridStyle.StyleDef.show_style;
var newattrlist = [];
if (this.$data.subClassAttrList.length > 0) {
for (var i = 0; i < attrlist.length; i++) {
@@ -1160,7 +1167,7 @@
var attrs = attrlist[i].attrs;
for (var s = 0; s < this.$data.subClassAttrList.length; s++) {
var clsattr = this.$data.subClassAttrList[s];
- if (name == clsattr.Name) {
+ // if (name == clsattr.Name) {
var attr = [];
for (var j = 0; j < attrs.length; j++) {
for (var l = 0; l < clsattr.Attr.length; l++) {
@@ -1184,11 +1191,13 @@
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].label=ca.dictitem[d].CN_S_VALUE;
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')
+ if(ca.dictitem[d].CN_C_IS_DEFAULT=='1'){
+ ca.Label=ca.dictitem[d].CN_S_VALUE;
ca.Value=ca.dictitem[d].CN_S_NAME;
+ }
}
}
if(ca.Type=='鏃ユ湡' || ca.Type=='鏃堕棿'){
@@ -1222,8 +1231,8 @@
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'
- })
- }
+ });
+ // }
}
}
if (newattrlist.length > 0) {
@@ -1708,8 +1717,8 @@
userlogin: '',
clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
objid: "",
- attr: req,
- mast_attr: mast_req,
+ attr: mast_req,
+ sub_attr: req,
inputParamter:[{ attr: 'input_3037', value: this.$data.scanCodeVal }]
}
@@ -1775,8 +1784,8 @@
userlogin: '',
clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
objid: "",
- attr: req,
- mast_attr: mast_req,
+ attr: mast_req,
+ sub_attr: req,
inputParamter:[{ attr: 'input_3037', value: this.$data.scanCodeVal }]
}
@@ -2411,7 +2420,7 @@
else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+data.ret,showCancel:false,confirmText:"鍙栨秷"});
return false
}else{
- let tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
if(data.action){
@@ -2437,7 +2446,7 @@
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});
+ dictItemList.push({"CN_S_NAME":val,"CN_S_VALUE":val,"Name":val,"label":val,"value":val});
}
ca.dictitem = dictItemList;
@@ -2553,7 +2562,7 @@
else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+data.ret,showCancel:false,confirmText:"鍙栨秷"});
return false
}else{
- let tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
var actionlist = data.action;
@@ -2573,7 +2582,7 @@
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});
+ dictItemList.push({"CN_S_NAME":val,"CN_S_VALUE":val,"Name":val,"label":val,"value":val});
}
attr[j].dictitem = dictItemList;
// attr[j].dictitem = result[i].choice_list;
@@ -2742,7 +2751,7 @@
else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+data.ret,showCancel:false,confirmText:"鍙栨秷"});
return false
}else{
- let tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
var result = data.result;
@@ -2870,7 +2879,7 @@
else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+data.ret,showCancel:false,confirmText:"鍙栨秷"});
return false
}else{
- let tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
if (data != "") {
@@ -3006,6 +3015,10 @@
});
},
scan_ini_DataObjRunCustomEvent(info){
+ var obj_attr={};
+ info.attr.forEach(item=>{
+ obj_attr[item.attr] = item.value;
+ });
var param = {
EditStyle: this.$data.param.Sub_Cls.View_Style.Name,
ViewStyle: this.$data.param.Sub_Cls.View_Style.Name,
@@ -3018,6 +3031,7 @@
master: {
cls_id: this.$data.param.Sub_Cls.ID, // button=bottom鏃�master鐨刢ls_id
//obj_id: '' // button=bottom鏃�master鐨刼bj_id
+ obj_attrs:obj_attr,
}
}
}
@@ -3029,10 +3043,7 @@
// attr: JSON.stringify(info.attr), extinfo: JSON.stringify(param), inputparameter: inputparameter, global_attr: global_attr
// }
param = Base64.encode(JSON.stringify(param));//灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
- var obj_attr={};
- info.attr.forEach(item=>{
- obj_attr[item.attr] = item.val;
- });
+
if(!info.eventid.includes('{')) info.eventid= '{'+ info.eventid +'}';
var dataInfo={
ed_type: info.edtype,
@@ -3065,7 +3076,7 @@
else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+data.ret,showCancel:false,confirmText:"鍙栨秷"});
return false
}else{
- let tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
var actionlist = data.action;
@@ -3090,7 +3101,7 @@
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});
+ dictItemList.push({"CN_S_NAME":val,"CN_S_VALUE":val,"Name":val,"label":val,"value":val});
}
ca.dictitem = dictItemList;
@@ -3135,6 +3146,10 @@
},
scan_DataObjRunCustomEvent(info,data_attr){
var $this = this;
+ var obj_attr={};
+ info.attr.forEach(item=>{
+ obj_attr[item.attr] = item.value;
+ });
var enviroment = {};
if(info.enviroment){
enviroment = info.enviroment;
@@ -3148,6 +3163,11 @@
type: 'small', //灏忕獥鍙� class_id: 'MBOX', //this.$data.param.Sub_Cls.ID,//褰撳墠鏁版嵁绫籭d
},
+ master: {
+ cls_id: info.clsid, // button=bottom鏃�master鐨刢ls_id
+ //obj_id: '' // button=bottom鏃�master鐨刼bj_id
+ obj_attrs:obj_attr,
+ }
};
}
@@ -3157,15 +3177,12 @@
}
enviroment = Base64.encode(JSON.stringify(enviroment));//灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+ var inputParamter=info.inputParamter;
if(info.inputParamter){
info.inputParamter = Base64.encode(JSON.stringify(info.inputParamter));//灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
}
var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr));//灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
- var obj_attr={};
- info.attr.forEach(item=>{
- obj_attr[item.attr] = item.val;
- });
if(!info.eventid.includes('{')) info.eventid= '{'+ info.eventid +'}';
var dataInfo={
ed_type: info.edtype,
@@ -3198,7 +3215,7 @@
else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+data.ret,showCancel:false,confirmText:"鍙栨秷"});
return false
}else{
- let tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
var actionlist = data.action;
@@ -3219,7 +3236,7 @@
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});
+ dictItemList.push({"CN_S_NAME":val,"CN_S_VALUE":val,"Name":val,"label":val,"value":val});
}
attr[j].dictitem = dictItemList;
// attr[j].dictitem = result[i].choice_list;
@@ -3271,14 +3288,14 @@
} else if (action.action_type == 'add_subcls_panel') { //涓讳粠鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹� var result = action.value;
var $this = this;
- let list_1 = JSON.parse(JSON.stringify(this.$data.subClassAttrList));
+ var list_1 = JSON.parse(JSON.stringify(this.$data.subClassAttrList));
var scanCodeVal = $this.$data.scanCodeVal;
var rand = '';
for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
rand += Math.floor(Math.random() * 10);
}
- if (info.inputParamter[0].attr) {
- if (info.inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ if (inputParamter[0].attr) {
+ if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹� scanCodeVal = "mast_input_3037-" + rand;
}
if (info.attr[0].attr) {
@@ -3308,6 +3325,7 @@
// $this.$data.subPanelList[s].subClassAttr=list_1;
}
}
+
var length = 0;
if (!$this.$data.refdatastore.filter(function (s) {
return result[i].attr == s.attr
@@ -3328,10 +3346,20 @@
}
if (data.result) {
- let list_1 = JSON.parse(JSON.stringify(this.$data.subClassAttrList));
+ var list_1 = JSON.parse(JSON.stringify(this.$data.subClassAttrList));
var scanCodeVal = $this.$data.scanCodeVal;
- if(info.inputParamter[0].attr=="mast_input_3037")
- scanCodeVal = "mast_input_3037-"+ii;
+ var rand = '';
+ for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
+ rand += Math.floor(Math.random() * 10);
+ }
+ if (inputParamter[0].attr) {
+ if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ scanCodeVal = "mast_input_3037-" + rand;
+ }
+ if (info.attr[0].attr) {
+ if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ scanCodeVal = "mast_input_3037-" + rand;
+ }
$this.$data.subPanelList.push({
scanCodeVal:scanCodeVal,
subClassAttr:list_1
@@ -3521,7 +3549,7 @@
else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+data.ret,showCancel:false,confirmText:"鍙栨秷"});
return false
}else{
- let tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
+ var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join('<br/>') : '';
if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
var result = data.result;
--
Gitblit v1.9.1