From e01994d84332869ebad232af477a4ded68560c55 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期二, 20 八月 2024 13:27:16 +0800
Subject: [PATCH] test
---
pages/modal/3018_2.vue | 36 +++++++++---------
pages/modal/5602.vue | 4 +-
pages/modal/5601.vue | 4 +-
pages.json | 3 +
pages/modal/3037_2.vue | 4 +-
.gitignore | 2
What's New.txt | 4 ++
pages/index/index.vue | 5 +-
manifest.json | 4 +-
pages/modal/5600.vue | 4 +-
10 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/.gitignore b/.gitignore
index edf52fe..582429f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,4 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
-unpackage/
\ No newline at end of file
+unpackage
\ No newline at end of file
diff --git "a/What\047s New.txt" "b/What\047s New.txt"
index fad916d..e61cc1d 100644
--- "a/What\047s New.txt"
+++ "b/What\047s New.txt"
@@ -1,3 +1,7 @@
+2024.08.20
+1.鑾峰彇pda鍔熻兘闇�鍒ゆ柇鏉冮檺
+2024.08.16
+1.鍙缃甿obox3 pda鍔熻兘瀵瑰簲鐨勫簲鐢ㄧ被鍨嬪拰鍚勬湇鍔＄鍙� 2024.07.04
1.澶氳瑷� 2024.07.01
diff --git a/manifest.json b/manifest.json
index 15782ef..a2e6a6b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "MoboxPDA",
"appid" : "__UNI__56D451E",
"description" : "",
- "versionName" : "1.1.12",
- "versionCode" : 1112,
+ "versionName" : "1.1.15",
+ "versionCode" : 1115,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index d97ebf4..2cb99b0 100644
--- a/pages.json
+++ b/pages.json
@@ -114,7 +114,8 @@
"float": "right", //瀵艰埅鏍忕殑宸﹀彸浣嶇疆
"fontSrc": "/static/uni.ttf",
"text": "\ue612"
- }, {
+ },
+ {
"color": "#000000",
"colorPressed": "#2D8CF0",
"fontSize": "24px",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bac1495..3338b09 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -62,7 +62,8 @@
else {
const appType = utils.session.getValue('app_type') || "MES";
this.$store.dispatch('areaFunc', {
- app_type: appType
+ app_type: appType,
+ need_ace:1,
}).then(success => {
// console.log(success);
if (success.code == '00000' || success.err_code == 0) {
@@ -104,7 +105,7 @@
app_type: area.app_type,
area_id: area.id,
area_client_type: area.client_type,
- need_ace: '0',
+ need_ace:1,
};
this.$store.dispatch('GetFuncTree', json).then(success => {
// console.log(success);
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index 483a96a..b2bd8bb 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -235,7 +235,8 @@
}
})
- } else if (e.index == 1) {
+ }
+ else if (e.index == 1) {
//鍒锋柊
uni.redirectTo({
url: '../modal/3018_2?param=' + JSON.stringify(this.$data.param) +
@@ -319,7 +320,7 @@
class_id: class_id,
ui_style_id: style_id,
};
- this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async(ret) => {
+ this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async (ret) => {
// console.log(ret);
if (ret.err_code == 0) {
var styledef = "";
@@ -332,8 +333,7 @@
.style_def);
}
const styledefHead = styledef ? JSON.parse(styledef) : {};
- for (let i in styledefHead.form.items)
- {
+ for (let i in styledefHead.form.items) {
const ele = styledefHead.form.items[i]
if (ele.name != "Layout") {
ele.show = true
@@ -352,10 +352,9 @@
}
}
} else {
- for (let j in ele.setting.colList)
- {
+ for (let j in ele.setting.colList) {
const col = ele.setting.colList[j]
-
+
if (col) {
col.show = true
if (col?.useDict) {
@@ -382,7 +381,7 @@
$this.setData({
head_styledef: styledefHead
})
-
+
if ($this.head_styledef.event?.length > 0) {
$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
if (a.event_id == "initial") {
@@ -440,7 +439,7 @@
formModel[formItem.fieldId] = itemName;
}
formItem.dict = list;
-
+
// $this.head_styledef.form.items[index].dictitem=success.result;
// this.$store.commit("classAttrList", $this.$data.classAttrList);
} catch (ex) {
@@ -742,6 +741,7 @@
ontap(item) { //鎵爜鍔熻兘
+ // console.log("ontap",item);
// 鎵撳紑钃濈墮閫傞厤鍣� // uni.openBluetoothAdapter({
// success: function() {
@@ -789,13 +789,13 @@
},
onScanValue(item, value) {
const $this = this;
- console.log("onScanValue", item);
+ //console.log("onScanValue", item);
if (item.oldvalue != value) {
item.oldvalue = value;
item.value = value;
- var attr = value
+ var attr = item.fieldId;
$this.head_styledef.form.model[attr] = value;
- if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�+ /*if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌� //鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
var findd = false
const items = $this.head_styledef.form.items || []
@@ -859,7 +859,7 @@
}
}
}
-
+ */
var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠� if (eventid) {
var obj_attr = this.head_styledef.form.model;
@@ -886,12 +886,12 @@
}
},
onClick(item) {
+ // console.log("onClick",item);
this.focusFieldId = item.fieldId
},
onevent(item) {
- // console.log(e.target);
- console.log(item);
- if (item.oldvalue != item.value) {
+ // console.log("onevent",item);
+ if (item.oldvalue != item.value && item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
@@ -922,8 +922,8 @@
},
onchange(item) {
- console.log(item);
- if (item.oldvalue != item.value) {
+ // console.log("onchange",item);
+ if (item.oldvalue != item.value&& item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index ad44580..5ef4a3f 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -806,7 +806,7 @@
// console.log(e.target);
var $this = this;
console.log(item);
- if (item.oldvalue != item.value) {
+ if (item.oldvalue != item.value&& item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
$this.head_styledef.form.model[attr] = item.value;
@@ -845,7 +845,7 @@
console.log(item);
var $this = this;
console.log(item);
- if (item.oldvalue != item.value) {
+ if (item.oldvalue != item.value&& item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
$this.head_styledef.form.model[attr] = item.value;
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index b16d955..34a9ef2 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -571,7 +571,7 @@
// .exec();
// }
//console.log(item);
- if (item.oldvalue != item.value) {
+ if (item.oldvalue != item.value&& item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
@@ -653,7 +653,7 @@
},
onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
// console.log(item);
- if (item.oldvalue != item.value) {
+ if (item.oldvalue != item.value&& item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 114018f..4d9d1d8 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -522,7 +522,7 @@
console.log(result.decodedata);
item.value = result.decodedata;
var $this = this;
- if (item.oldvalue != item.value) {
+ if (item.oldvalue != item.value&& item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
@@ -610,7 +610,7 @@
onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
console.log(item);
- if (item.oldvalue != item.value) {
+ if (item.oldvalue != item.value&& item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index f6e30b5..25973ec 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -559,7 +559,7 @@
var $this = this;
console.log(item);
- if (item.oldvalue != item.value) {
+ if (item.oldvalue != item.value&& item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
@@ -642,7 +642,7 @@
},
onEnterChange(item) { //鍥炶溅锛岀偣鍑绘寜閽紝鍙栨秷鑺傜偣浜嬩欢
// console.log(item);
- if (item.oldvalue != item.value) {
+ if (item.oldvalue != item.value&& item.value.trim() != "") {
item.oldvalue = item.value;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = item.value;
--
Gitblit v1.9.1