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/5602.vue | 207 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 168 insertions(+), 39 deletions(-)
diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index 1090b40..639ab96 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -1,4 +1,7 @@
<style>
+.v-headStyle:first-child{
+ margin-top: 15rpx;
+}
.v-headStyle .txt_title{
font-size: 34rpx;
text-align: right;
@@ -62,13 +65,16 @@
background-color:#efefef;
padding: 20rpx 20rpx 4rpx 0px;
border-radius: 12rpx;
- margin-bottom: 20rpx;
+ margin: 10rpx 0 20rpx 0;
text-align: right;
}
.dv-panel-input{
width: 100%;
display: inline-block;
text-align: left;
+}
+.dv-panel-input .dv-input{
+ margin-bottom: 2rpx;
}
.dv-panel .txt_title{
font-size: 34rpx;
@@ -233,14 +239,24 @@
<!-- 琛ㄥご鏍峰紡 -->
<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items" >
<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
- <view class="input-wrapper">
+ <!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
+ <uni-data-select id="dv_select" v-if="item.name=='Select'"
+ :class="item.disabled?'input-disabled':''"
+ v-model="item.value"
+ :localdata="item.dict"
+ @change="onChange(item)"
+ :disabled="item.disabled"
+ :clear="false"
+ ></uni-data-select>
+ <view class="input-wrapper" v-if="item.name=='Input' || item.name=='InputNumber'">
<text v-if="item.setting.prefix"
class="uni-icon"
:class="[item.setting.prefix]"
@click="onEnterChange(item)"></text>
<input
class="uni-input"
- :type="item.name=='Input'?'text':'text'"
+ :class="item.disabled?'input-disabled':''"
+ :type="item.name=='Input'?'text':'number'"
v-model="item.value"
:disabled="item.disabled"
:placeholder="item.placeholder"
@@ -283,9 +299,9 @@
:id="'tabpanel'+style.form.htmlobjId"
:class="style.form.htmlobjId==active_id?'bk-active':activelist[ii].active==true?'bk-active':''">
<div class="dv-panel-input">
- <div v-for="(item,index) in style.form.items">
+ <div class="dv-input" v-for="(item,index) in style.form.items">
<!-- 鏅�甯冨眬 -->
- <view v-if="item.name=='Input'">
+ <view v-if="item.name!='Layout'">
<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
<span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
<input
@@ -415,6 +431,7 @@
onLoad(options) {
// console.log(options);
uni.setNavigationBarTitle({ title: options.titlename}); //璁剧疆椤堕儴鏍囬
+ this.$data.title = options.titlename;
this.$data.param = JSON.parse(options.param);
// console.log(this.$data.param);
//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁�@@ -456,11 +473,11 @@
$this.$data.head_styledef = ret.result.style_def? JSON.parse(styledef): {};
// this.form = this.head_styledef.form.model;
// console.log($this.$data.head_styledef);
- // $this.head_styledef.form.items.forEach(async (ele,index) => {
- // if(ele.useDict==true){ //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
- // await this.DictGetInfo(ele.bind.dict,index,'mast');
- // }
- // });
+ $this.head_styledef.form.items.forEach(async (ele,index) => {
+ if(ele.useDict==true){ //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+ await this.DictGetInfo(ele.bind.dict,index,'mast');
+ }
+ });
}else{
uni.showModal({title:"閿欒1",content:ret.err_msg,showCancel:false,confirmText:"鍙栨秷"});
}
@@ -493,11 +510,11 @@
// var aa = JSON.stringify(this.detail1_styledef);
// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
// console.log($this.$data.detail1StyleDefList);
- // $this.detail1_styledef.form.items.forEach(async (ele,index) => {
- // if(ele.useDict==true){ //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
- // await this.DictGetInfo(ele.bind.dict,index,'sub');
- // }
- // });
+ $this.detail1_styledef.form.items.forEach(async (ele,index) => {
+ if(ele.useDict==true){ //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+ await this.DictGetInfo(ele.bind.dict,index,'sub');
+ }
+ });
}else{
uni.showModal({title:"閿欒2",content:ret.err_msg,showCancel:false,confirmText:"鍙栨秷"});
}
@@ -565,6 +582,9 @@
$this.head_styledef.form.model[attr] = itemName;
}
$this.head_styledef.form.items[index].dict=list;
+ var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
+ $this.head_styledef=[];
+ $this.head_styledef = head_styledef;
// console.log($this.$data.detail1StyleDefList);
}
else{
@@ -574,21 +594,23 @@
$this.detail1_styledef.form.model[attr] = itemName;
}
$this.detail1_styledef.form.items[index].dict=list;
- console.log($this.$data.detail1_styledef);
+ var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
+ $this.detail1_styledef=[];
+ $this.detail1_styledef = detail1_styledef;
+ // console.log($this.$data.detail1_styledef);
}
}else{
- uni.showModal({title:"閿欒1.2",content:success.err_msg,showCancel:false,confirmText:"鍙栨秷"});
+ uni.showModal({title:"閿欒9.1",content:success.err_msg,showCancel:false,confirmText:"鍙栨秷"});
}
}).catch(ex=>{
// console.log(ex);
- uni.showModal({title:"閿欒1.3",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
+ uni.showModal({title:"閿欒9",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
});
},
ontap(item){ //鎵爜鍔熻兘
// var $ele = e;
- //console.log(e.target)
getApp().onScan((result)=>{
console.log(result.decodedata);
item.value = result.decodedata;
@@ -614,7 +636,7 @@
// $this.focusMateria=true; //绗簩涓緭鍏ユ鑾峰彇鐒︾偣
setTimeout(function(){
uni.hideKeyboard();
- },100);
+ },1000);
// },500);
}
// if(onSuffixClickCallbackEvent.id){ //鍚庡浘鏍囩偣鍑讳簨浠�@@ -690,7 +712,7 @@
var tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result.err_info.join('<br/>') : '';
if (result.ret == 801) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+result.ret,showCancel:false,confirmText:"鍙栨秷"});
- return false
+ return false;
}else{
var tip = result.info ? typeof result.info == 'string' ? result.info : result.info.join('<br/>') : '';
if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
@@ -705,21 +727,16 @@
else if(item.action_type == "set_subtable_page_content"){ //宸插垎鎷� $this.$data.param.Show_Welcom_Page=false;
var value = item.value;
- if(value.clear == true && $this.$data.detail1StyleDefList.length>0){ //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鍒嗘嫞鏄惁鏈夋暟鎹�+ if(value.clear == true && $this.$data.detail1StyleDefList.length>0 && value.page_name == $this.$data.param.Sub_Page[0].Name){ //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鍒嗘嫞鏄惁鏈夋暟鎹� uni.showModal({
title: '鎻愮ず',
- content: '绯荤粺妫�祴鍒版湁寰呭垎鎷ｄ腑鐨勮揣鍝侊紝缁х画鎿嶄綔浼氭竻绌猴紝鏄惁缁х画锛�,
+ content: '绯荤粺妫�祴鍒版湁寰呭垎鎷ｄ腑鐨勬暟鎹紝缁х画鎿嶄綔浼氭竻绌猴紝鏄惁缁х画锛�,
success: function (res) {
if (res.confirm) {
$this.$data.detail1StyleDefList=[];
- $this.$data.detail2StyleDefList=[];
$this.viewAceionContent(value);
} else if (res.cancel) {
- if(value.page_name == $this.$data.param.Sub_Page[0].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
- $this.$data.detail1StyleDefList=[];
- }else{
- $this.$data.detail2StyleDefList=[];
- }
+ $this.$data.detail1StyleDefList=[];
$this.viewAceionContent(value);
}
}
@@ -795,6 +812,10 @@
//鍔犺浇姝ｅ湪鍒嗘嫞鍐呭
viewAceionRow(data,type){
// console.log(data);
+ if(JSON.stringify(data.row) =='{}'){
+ return;
+ }
+ data.row.forEach(row=>{
var styleStr = JSON.stringify(this.$data.detail1_styledef);
if(type){ //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
styleStr = JSON.stringify(this.$data.detail2_styledef);
@@ -804,7 +825,10 @@
}
}
var detailStyle = JSON.parse(styleStr);
- data.row.attrs.forEach(attr=>{
+ detailStyle.form.objId = row.id;
+ detailStyle.form.htmlobjId = row.id?row.id.replace(/-/g,'').replace('{','').replace('}',''):'null';
+ detailStyle.form.attrs = row.attrs;
+ row.attrs.forEach(attr=>{
detailStyle.form.items.forEach(ele=>{
if(ele.name!='Layout'){
if(ele.fieldId == attr.attr) ele.value = attr.value;
@@ -817,27 +841,28 @@
}
});
});
+
if(type){ //纭畾鍚庤剼鏈繘鍏ュ姞杞藉凡鍒嗘嫞鏁版嵁
- detailStyle.form.objId = data.row.id;
this.$data.detail2StyleDefList.push(detailStyle);
// console.log(this.$data.detail2StyleDefList);
}else{
if(data.page_name == this.$data.param.Sub_Page[1].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄凡鍒嗘嫞
- detailStyle.form.objId = data.row.id;
this.$data.detail2StyleDefList.push(detailStyle);
// console.log(this.$data.detail2StyleDefList);
}else{
- detailStyle.form.objId = data.row.id?data.row.id.replace(/-/g,'').replace('{','').replace('}',''):'null';
- detailStyle.form.attrs = data.row.attrs;
this.$data.detail1StyleDefList.push(detailStyle);
this.activelist.push({active:false});
// console.log(this.$data.detail1StyleDefList);
}
}
+ });
},
//鍔犺浇宸插垎鎷ｅ唴瀹� viewAceionContent(data){
var $this = this;
+ if(JSON.stringify(data.content) =='{}'){
+ return;
+ }
data.content.forEach(cont=>{
var styleStr = JSON.stringify($this.$data.detail2_styledef); //宸插垎鎷� if(data.page_name == $this.$data.param.Sub_Page[0].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
@@ -847,6 +872,7 @@
detailStyle.SelBut_Checked = data.checkbox??true;
detailStyle.form.objId = cont.id;
detailStyle.form.htmlobjId = cont.id?cont.id.replace(/-/g,'').replace('{','').replace('}',''):'null';
+ detailStyle.form.attrs = cont.attrs;
cont.attrs.forEach(attr=>{
detailStyle.form.items.forEach(ele=>{
if(ele.name!='Layout'){
@@ -860,13 +886,61 @@
}
});
});
- detailStyle.form.attrs = cont.attrs;
+
if(data.page_name == $this.$data.param.Sub_Page[0].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
- $this.$data.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+ //濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+ if(data.clear == false){
+ var isflag = true;
+ $this.detail1StyleDefList.forEach((style,index)=>{
+ if(style.form.objId == detailStyle.form.objId){
+ cont.attrs.forEach(attr=>{
+ style.form.items.forEach(ele=>{
+ if(ele.name!='Layout'){
+ if(ele.fieldId == attr.attr) ele.value = attr.value;
+ } else if(ele.name=='Layout'){
+ ele.setting.colList.forEach(col=>{
+ if(col){
+ if(col.fieldId == attr.attr) col.value = attr.value;
+ }
+ });
+ }
+ });
+ });
+ isflag = false;
+ }
+ });
+ if(isflag) $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+ }else{
+ $this.detail1StyleDefList.push(detailStyle); //寰呭垎鎷�+ }
$this.activelist.push({active:false});
// console.log($this.$data.detail1StyleDefList);
}else{
- $this.$data.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+ if(data.clear == false){
+ //濡傛灉 clear = false 鍒欎笉闇�娓呴櫎锛屾牴鎹甶d鍒ゆ柇鏄惁瀛樺湪锛屼笉瀛樺湪鎻掑叆鍒伴〉闈紝濡傛灉瀛樺湪鐢ㄦ柊鐨勫睘鎬ц鐩�+ var isflag = true;
+ $this.detail2StyleDefList.forEach((style,index)=>{
+ if(style.form.objId == detailStyle.form.objId){
+ cont.attrs.forEach(attr=>{
+ style.form.items.forEach(ele=>{
+ if(ele.name!='Layout'){
+ if(ele.fieldId == attr.attr) ele.value = attr.value;
+ } else if(ele.name=='Layout'){
+ ele.setting.colList.forEach(col=>{
+ if(col){
+ if(col.fieldId == attr.attr) col.value = attr.value;
+ }
+ });
+ }
+ });
+ });
+ isflag = false;
+ }
+ });
+ if(isflag) $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+ }else{
+ $this.detail2StyleDefList.push(detailStyle); //宸插垎鎷�+ }
// console.log($this.$data.detail2StyleDefList);
}
});
@@ -1136,7 +1210,7 @@
var tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result.err_info.join('<br/>') : '';
if (result.ret == 801) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
else uni.showModal({title:'鎻愮ず',content:tip+',鎻愮ず:'+result.ret,showCancel:false,confirmText:"鍙栨秷"});
- return false
+ return false;
}else{
var tip = result.info ? typeof result.info == 'string' ? result.info : result.info.join('<br/>') : '';
if (tip) uni.showModal({title:'鎻愮ず',content:tip,showCancel:false,confirmText:"鍙栨秷"});
@@ -1147,7 +1221,8 @@
if(item.action_type == "insert_subtable_page_row"){ //鍒嗘嫞涓� var value = item.value;
//鍔犺浇寰呭垎鎷ｆ暟鎹�- $this.viewAceionRow(value,'add');
+ $this.viewAceionRow(value,'');
+ // $this.viewAceionRow(value,'add');
//娓呯┖鏉＄爜鍐呭
$this.$data.head_styledef.form.items.forEach((item,index) => {
if(item.fieldId != "S_CNTR_CODE"){
@@ -1165,6 +1240,60 @@
});
// this.detail2StyleDefList=[];
uni.showModal({title:"鎻愮ず",content:"鍒嗘嫞鎴愬姛",showCancel:false,confirmText:"鍙栨秷"});
+ } else if(item.action_type == "set_subtable_page_content"){ //鍔犺浇澶氭潯鏁版嵁
+ $this.param.Show_Welcom_Page=false;
+ var value = item.value;
+ if(value.clear == true && $this.detail1StyleDefList.length>0){ //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,寰呭垎鎷ｆ槸鍚︽湁鏁版嵁
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '绯荤粺妫�祴鍒版湁寰呭垎鎷ｄ腑鐨勬暟鎹紝缁х画鎿嶄綔浼氭竻绌猴紝鏄惁缁х画锛�,
+ success: function (res) {
+ if (res.confirm) {
+ $this.$data.detail1StyleDefList=[];
+ $this.$data.detail2StyleDefList=[];
+ $this.viewAceionContent(value);
+ } else if (res.cancel) {
+ $this.viewAceionContent(value);
+ }
+ }
+ });
+ } else {
+ $this.viewAceionContent(value);
+ }
+ } else if(item.action_type == "remove_subtable_page_row"){ //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ var value = item.value;
+ if(value.page_name == $this.page.Sub_Page[0].Name){ //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞
+ //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ value.row.forEach(row=>{
+ $this.detail1StyleDefList.forEach((ele,index)=>{
+ if(ele.form.objId == row.id){
+ $this.detail1StyleDefList.splice(index,1);
+ }
+ });
+ });
+ }
+ } else if(item.action_type == "refresh"){ //鍒锋柊
+ var value = item.value;
+ //娓呴櫎寰呭垎鎷ｆ垚鍔熺殑鏁版嵁
+ // value.forEach((val_id,key)=>{
+ // this.detail1StyleDefList.forEach((style,index)=>{
+ // if(style.form.objId == val_id){
+ // this.detail1StyleDefList.splice(index,1);
+ // return;
+ // }
+ // });
+ // });
+ //鍒锋柊褰撳墠椤甸潰
+ uni.redirectTo({
+ url:'../modal/5602?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
+ });
+ } else if(item.action_type == "prompt"){ //鎵撳紑绯荤粺鎻愮ず寮规
+ var value = '';
+ item.value.forEach(ele=>{
+ if(value) value+='\n';
+ value+=ele;
+ });
+ uni.showModal({title:"绯荤粺鎻愮ず",content:value,showCancel:false,confirmText:"鍏抽棴"});
}
});
}else{
--
Gitblit v1.9.1