From 2ffd3fc56f81f08ec3dcfb50076e54542685725b Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期一, 29 一月 2024 09:18:14 +0800
Subject: [PATCH] Mobox3PDA-3037调试错误改进
---
pages/modal/3037.vue | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue
index 7276da5..6874283 100644
--- a/pages/modal/3037.vue
+++ b/pages/modal/3037.vue
@@ -1018,7 +1018,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 +1027,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++) {
@@ -1089,8 +1089,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 +1151,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 +1160,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++) {
@@ -1222,8 +1222,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) {
@@ -3157,6 +3157,7 @@
}
enviroment = Base64.encode(JSON.stringify(enviroment));//灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+ var inputParamter=info.inputParamter;
if(info.inputParamter){
info.inputParamter = Base64.encode(JSON.stringify(info.inputParamter));//灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
}
@@ -3277,8 +3278,8 @@
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 +3309,7 @@
// $this.$data.subPanelList[s].subClassAttr=list_1;
}
}
+
var length = 0;
if (!$this.$data.refdatastore.filter(function (s) {
return result[i].attr == s.attr
@@ -3330,8 +3332,18 @@
if (data.result) {
let 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
--
Gitblit v1.9.1